changes

app/migrations/0356_discount_method.py

@@ -0,0 +1,27 @@
+# Generated by Django 5.1.7 on 2026-01-15 03:53
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('app', '0355_group_rights_is_edit_product_price_excluding_vat'),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='Discount_Method',
+            fields=[
+                ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('code', models.CharField(max_length=30, unique=True)),
+                ('name', models.CharField(max_length=100)),
+                ('index', models.IntegerField(default=1, null=True)),
+                ('create_time', models.DateTimeField(auto_now_add=True, null=True)),
+                ('update_time', models.DateTimeField(auto_now=True, null=True)),
+            ],
+            options={
+                'db_table': 'discount_method',
+            },
+        ),
+    ]

app/migrations/0357_discount_type_method.py

@@ -0,0 +1,20 @@
+# Generated by Django 5.1.7 on 2026-01-15 04:43
+
+import django.db.models.deletion
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('app', '0356_discount_method'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='discount_type',
+            name='method',
+            field=models.ForeignKey(default=1, on_delete=django.db.models.deletion.PROTECT, related_name='+', to='app.discount_method'),
+            preserve_default=False,
+        ),
+    ]

app/models.py

@@ -291,11 +291,23 @@ class Value_Type(models.Model):
         db_table = 'value_type'
 
 
+class Discount_Method(models.Model):
+    code = models.CharField(max_length=30, null=False, unique=True)
+    name = models.CharField(max_length=100, null=False)
+    index = models.IntegerField(null=True, default=1)
+    create_time = models.DateTimeField(null=True, auto_now_add=True)
+    update_time = models.DateTimeField(null=True, auto_now=True)
+
+    class Meta:
+        db_table = 'discount_method'
+
+
 class Discount_Type(models.Model):
     code = models.CharField(max_length=30, null=False, unique=True)
     name = models.CharField(max_length=100, null=False)
     value = models.IntegerField()
     type = models.ForeignKey(Value_Type, null=False, related_name='+', on_delete=models.PROTECT)
+    method = models.ForeignKey(Discount_Method, null=False, related_name='+', on_delete=models.PROTECT)
     create_time = models.DateTimeField(null=True, auto_now_add=True)
     update_time = models.DateTimeField(null=True, auto_now=True)
 

envmaster.py

@@ -10,8 +10,8 @@ def search_text(file, text, new_text):
         f.write(content)
 
 file = './api/settings.py'
-text1 = "'PORT': '6433'"
-newtext1 = "'PORT': '6432'"
+text1 = "'PORT': '5424'"
+newtext1 = "'PORT': '5423'"
 search_text(file, text1, newtext1)
 
 text1 = "MODE = 'dev'"

envslave.py

@@ -10,8 +10,8 @@ def search_text(file, text, new_text):
         f.write(content)
 
 file = './api/settings.py'
-text1 = "'PORT': '6432'"
-newtext1 = "'PORT': '6433'"
+text1 = "'PORT': '5423'"
+newtext1 = "'PORT': '5424'"
 search_text(file, text1, newtext1)
 
 text1 = "MODE = 'dev'"