fix：“优化分销比例参数"

src/main/java/com/szwl/controller/TOrderController.java

@@ -308,19 +308,19 @@ public class TOrderController {
         order.setCompanyType(admin.getCompanyType());
         order.setMachineType(equipment.getMachineType());
         if (admin.getType() == 0) {
-            order.setAdminProportion(proportion.getAdminProportion());
+            order.setAdminProportion(proportion.getProportion());
             order.setAgencyProportion(proportion.getAgencyProportion());
             order.setAgencyId(proportion.getAgencyId());
         }
         if (admin.getType() == 1) {
-            order.setAdminProportion(proportion.getAdminProportion());
+            order.setAdminProportion(proportion.getProportion());
             order.setAgencyProportion(proportion.getAgencyProportion());
             order.setAgencyId(proportion.getAgencyId());
             order.setMerchantProportion(proportion.getMerchantProportion());
             order.setMerchantId(proportion.getMerchantId());
         }
         if (admin.getType() == 2) {
-            order.setAdminProportion(proportion.getAdminProportion());
+            order.setAdminProportion(proportion.getProportion());
             order.setAgencyProportion(proportion.getAgencyProportion());
             order.setAgencyId(proportion.getAgencyId());
             order.setMerchantProportion(proportion.getMerchantProportion());
@@ -600,19 +600,19 @@ public class TOrderController {
         order.setCompanyType(admin.getCompanyType());
         order.setMachineType(equipment.getMachineType());
         if (admin.getType() == 0) {
-            order.setAdminProportion(proportion.getAdminProportion());
+            order.setAdminProportion(proportion.getProportion());
             order.setAgencyProportion(proportion.getAgencyProportion());
             order.setAgencyId(proportion.getAgencyId());
         }
         if (admin.getType() == 1) {
-            order.setAdminProportion(proportion.getAdminProportion());
+            order.setAdminProportion(proportion.getProportion());
             order.setAgencyProportion(proportion.getAgencyProportion());
             order.setAgencyId(proportion.getAgencyId());
             order.setMerchantProportion(proportion.getMerchantProportion());
             order.setMerchantId(proportion.getMerchantId());
         }
         if (admin.getType() == 2) {
-            order.setAdminProportion(proportion.getAdminProportion());
+            order.setAdminProportion(proportion.getProportion());
             order.setAgencyProportion(proportion.getAgencyProportion());
             order.setAgencyId(proportion.getAgencyId());
             order.setMerchantProportion(proportion.getMerchantProportion());
@@ -868,19 +868,19 @@ public class TOrderController {
         order.setCompanyType(companyType);
         order.setMachineType(equipment.getMachineType());
         if (admin.getType() == 0) {
-            order.setAdminProportion(proportion.getAdminProportion());
+            order.setAdminProportion(proportion.getProportion());
             order.setAgencyProportion(proportion.getAgencyProportion());
             order.setAgencyId(proportion.getAgencyId());
         }
         if (admin.getType() == 1) {
-            order.setAdminProportion(proportion.getAdminProportion());
+            order.setAdminProportion(proportion.getProportion());
             order.setAgencyProportion(proportion.getAgencyProportion());
             order.setAgencyId(proportion.getAgencyId());
             order.setMerchantProportion(proportion.getMerchantProportion());
             order.setMerchantId(proportion.getMerchantId());
         }
         if (admin.getType() == 2) {
-            order.setAdminProportion(proportion.getAdminProportion());
+            order.setAdminProportion(proportion.getProportion());
             order.setAgencyProportion(proportion.getAgencyProportion());
             order.setAgencyId(proportion.getAgencyId());
             order.setMerchantProportion(proportion.getMerchantProportion());
@@ -913,19 +913,19 @@ public class TOrderController {
         order2.setCompanyType(companyType);
         order2.setMachineType(equipment.getMachineType());
         if (admin.getType() == 0) {
-            order2.setAdminProportion(proportion.getAdminProportion());
+            order2.setAdminProportion(proportion.getProportion());
             order2.setAgencyProportion(proportion.getAgencyProportion());
             order2.setAgencyId(proportion.getAgencyId());
         }
         if (admin.getType() == 1) {
-            order2.setAdminProportion(proportion.getAdminProportion());
+            order2.setAdminProportion(proportion.getProportion());
             order2.setAgencyProportion(proportion.getAgencyProportion());
             order2.setAgencyId(proportion.getAgencyId());
             order2.setMerchantProportion(proportion.getMerchantProportion());
             order2.setMerchantId(proportion.getMerchantId());
         }
         if (admin.getType() == 2) {
-            order2.setAdminProportion(proportion.getAdminProportion());
+            order2.setAdminProportion(proportion.getProportion());
             order2.setAgencyProportion(proportion.getAgencyProportion());
             order2.setAgencyId(proportion.getAgencyId());
             order2.setMerchantProportion(proportion.getMerchantProportion());
@@ -1352,19 +1352,19 @@ public class TOrderController {
         order.setCompanyType(companyType);
         order.setMachineType(equipment.getMachineType());
         if (admin.getType() == 0) {
-            order.setAdminProportion(proportion.getAdminProportion());
+            order.setAdminProportion(proportion.getProportion());
             order.setAgencyProportion(proportion.getAgencyProportion());
             order.setAgencyId(proportion.getAgencyId());
         }
         if (admin.getType() == 1) {
-            order.setAdminProportion(proportion.getAdminProportion());
+            order.setAdminProportion(proportion.getProportion());
             order.setAgencyProportion(proportion.getAgencyProportion());
             order.setAgencyId(proportion.getAgencyId());
             order.setMerchantProportion(proportion.getMerchantProportion());
             order.setMerchantId(proportion.getMerchantId());
         }
         if (admin.getType() == 2) {
-            order.setAdminProportion(proportion.getAdminProportion());
+            order.setAdminProportion(proportion.getProportion());
             order.setAgencyProportion(proportion.getAgencyProportion());
             order.setAgencyId(proportion.getAgencyId());
             order.setMerchantProportion(proportion.getMerchantProportion());
@@ -1396,19 +1396,19 @@ public class TOrderController {
         order2.setCompanyType(companyType);
         order2.setMachineType(equipment.getMachineType());
         if (admin.getType() == 0) {
-            order2.setAdminProportion(proportion.getAdminProportion());
+            order2.setAdminProportion(proportion.getProportion());
             order2.setAgencyProportion(proportion.getAgencyProportion());
             order2.setAgencyId(proportion.getAgencyId());
         }
         if (admin.getType() == 1) {
-            order2.setAdminProportion(proportion.getAdminProportion());
+            order2.setAdminProportion(proportion.getProportion());
             order2.setAgencyProportion(proportion.getAgencyProportion());
             order2.setAgencyId(proportion.getAgencyId());
             order2.setMerchantProportion(proportion.getMerchantProportion());
             order2.setMerchantId(proportion.getMerchantId());
         }
         if (admin.getType() == 2) {
-            order2.setAdminProportion(proportion.getAdminProportion());
+            order2.setAdminProportion(proportion.getProportion());
             order2.setAgencyProportion(proportion.getAgencyProportion());
             order2.setAgencyId(proportion.getAgencyId());
             order2.setMerchantProportion(proportion.getMerchantProportion());
@@ -1902,19 +1902,19 @@ public class TOrderController {
             order.setCoupons(couponList.toString());
         }
         if (admin.getType() == 0) {
-            order.setAdminProportion(proportion.getAdminProportion());
+            order.setAdminProportion(proportion.getProportion());
             order.setAgencyProportion(proportion.getAgencyProportion());
             order.setAgencyId(proportion.getAgencyId());
         }
         if (admin.getType() == 1) {
-            order.setAdminProportion(proportion.getAdminProportion());
+            order.setAdminProportion(proportion.getProportion());
             order.setAgencyProportion(proportion.getAgencyProportion());
             order.setAgencyId(proportion.getAgencyId());
             order.setMerchantProportion(proportion.getMerchantProportion());
             order.setMerchantId(proportion.getMerchantId());
         }
         if (admin.getType() == 2) {
-            order.setAdminProportion(proportion.getAdminProportion());
+            order.setAdminProportion(proportion.getProportion());
             order.setAgencyProportion(proportion.getAgencyProportion());
             order.setAgencyId(proportion.getAgencyId());
             order.setMerchantProportion(proportion.getMerchantProportion());
@@ -2225,19 +2225,19 @@ public class TOrderController {
         order.setCompanyType(companyType);
         order.setMachineType(equipment.getMachineType());
         if (admin.getType() == 0) {
-            order.setAdminProportion(proportion.getAdminProportion());
+            order.setAdminProportion(proportion.getProportion());
             order.setAgencyProportion(proportion.getAgencyProportion());
             order.setAgencyId(proportion.getAgencyId());
         }
         if (admin.getType() == 1) {
-            order.setAdminProportion(proportion.getAdminProportion());
+            order.setAdminProportion(proportion.getProportion());
             order.setAgencyProportion(proportion.getAgencyProportion());
             order.setAgencyId(proportion.getAgencyId());
             order.setMerchantProportion(proportion.getMerchantProportion());
             order.setMerchantId(proportion.getMerchantId());
         }
         if (admin.getType() == 2) {
-            order.setAdminProportion(proportion.getAdminProportion());
+            order.setAdminProportion(proportion.getProportion());
             order.setAgencyProportion(proportion.getAgencyProportion());
             order.setAgencyId(proportion.getAgencyId());
             order.setMerchantProportion(proportion.getMerchantProportion());
@@ -2270,19 +2270,19 @@ public class TOrderController {
         order2.setCompanyType(companyType);
         order2.setMachineType(equipment.getMachineType());
         if (admin.getType() == 0) {
-            order2.setAdminProportion(proportion.getAdminProportion());
+            order2.setAdminProportion(proportion.getProportion());
             order2.setAgencyProportion(proportion.getAgencyProportion());
             order2.setAgencyId(proportion.getAgencyId());
         }
         if (admin.getType() == 1) {
-            order2.setAdminProportion(proportion.getAdminProportion());
+            order2.setAdminProportion(proportion.getProportion());
             order2.setAgencyProportion(proportion.getAgencyProportion());
             order2.setAgencyId(proportion.getAgencyId());
             order2.setMerchantProportion(proportion.getMerchantProportion());
             order2.setMerchantId(proportion.getMerchantId());
         }
         if (admin.getType() == 2) {
-            order2.setAdminProportion(proportion.getAdminProportion());
+            order2.setAdminProportion(proportion.getProportion());
             order2.setAgencyProportion(proportion.getAgencyProportion());
             order2.setAgencyId(proportion.getAgencyId());
             order2.setMerchantProportion(proportion.getMerchantProportion());
@@ -2741,19 +2741,19 @@ public class TOrderController {
         order.setCompanyType(companyType);
         order.setMachineType(equipment.getMachineType());
         if (admin.getType() == 0) {
-            order.setAdminProportion(proportion.getAdminProportion());
+            order.setAdminProportion(proportion.getProportion());
             order.setAgencyProportion(proportion.getAgencyProportion());
             order.setAgencyId(proportion.getAgencyId());
         }
         if (admin.getType() == 1) {
-            order.setAdminProportion(proportion.getAdminProportion());
+            order.setAdminProportion(proportion.getProportion());
             order.setAgencyProportion(proportion.getAgencyProportion());
             order.setAgencyId(proportion.getAgencyId());
             order.setMerchantProportion(proportion.getMerchantProportion());
             order.setMerchantId(proportion.getMerchantId());
         }
         if (admin.getType() == 2) {
-            order.setAdminProportion(proportion.getAdminProportion());
+            order.setAdminProportion(proportion.getProportion());
             order.setAgencyProportion(proportion.getAgencyProportion());
             order.setAgencyId(proportion.getAgencyId());
             order.setMerchantProportion(proportion.getMerchantProportion());
@@ -2785,19 +2785,19 @@ public class TOrderController {
         order2.setCompanyType(companyType);
         order2.setMachineType(equipment.getMachineType());
         if (admin.getType() == 0) {
-            order2.setAdminProportion(proportion.getAdminProportion());
+            order2.setAdminProportion(proportion.getProportion());
             order2.setAgencyProportion(proportion.getAgencyProportion());
             order2.setAgencyId(proportion.getAgencyId());
         }
         if (admin.getType() == 1) {
-            order2.setAdminProportion(proportion.getAdminProportion());
+            order2.setAdminProportion(proportion.getProportion());
             order2.setAgencyProportion(proportion.getAgencyProportion());
             order2.setAgencyId(proportion.getAgencyId());
             order2.setMerchantProportion(proportion.getMerchantProportion());
             order2.setMerchantId(proportion.getMerchantId());
         }
         if (admin.getType() == 2) {
-            order2.setAdminProportion(proportion.getAdminProportion());
+            order2.setAdminProportion(proportion.getProportion());
             order2.setAgencyProportion(proportion.getAgencyProportion());
             order2.setAgencyId(proportion.getAgencyId());
             order2.setMerchantProportion(proportion.getMerchantProportion());