用户端代码提交

pz-system/src/main/java/com/pz/system/service/impl/TotalOrderServiceImpl.java

@@ -621,22 +621,27 @@ public class TotalOrderServiceImpl implements ITotalOrderService {
             employeesDivide.setOrderId(totalOrder1.getId().intValue());
             employeesDivide.setOrderPrice(totalOrder1.getPayMoney() + "");
 
-            if (services.getFenmo() != 0) {
-                double money = 0;
+            double money = 0;
+
+            if(services.getFenmo() == 0){
+                money = totalOrder1.getPayMoney();
+            }else if(services.getFenmo() != 0){
+                double fenmo = (double) services.getFenmo() / 100;
+
+                double v = totalOrder1.getPayMoney() * fenmo;
+
+                money = totalOrder1.getPayMoney() - v;;
+            }
+
                 Employees employees = employeesMapper.selectById(totalOrder1.getEmId());
                 /**
                  * 1. 如果该陪诊员不属于任何商户，则陪诊员每完成一个订单，收益都会相应增加
                  * 2. 如果该陪诊员属于某个商户，则该陪诊员每完成一个订单，收益不会增加（因为陪诊员完成订单后，收益暂归商户所有）
                  */
-                double fenmo = (double) services.getFenmo() / 100;
-
-                double v = totalOrder1.getPayMoney() * fenmo;
 
                 employeesDivide.setProportion(services.getFenmo());
                 employeesDivide.setEmId(employees.getId());
 
-                money = totalOrder1.getPayMoney() - v;;
-
                 if (employees.getCompanyId() != 0) {
 
                     Company company = companyMapper.selectById(employees.getCompanyId());
@@ -658,7 +663,6 @@ public class TotalOrderServiceImpl implements ITotalOrderService {
 
                 employeesDivideMapper.insert(employeesDivide);
 
-            }
             if(totalOrder1.getBusinessId() == 0){
                 ISonOrderService orderService = serviceBuilder.getSonOrderService(totalOrder1.getBusinessId());
 
@@ -743,18 +747,22 @@ public class TotalOrderServiceImpl implements ITotalOrderService {
         // 除了商城订单和诊前挂号不需要给陪诊员和商户分成
         if (totalOrder.getBusinessId() != 0 && totalOrder.getBusinessId() != 6 && null != userRefund && sonOrderSimpleDataByTotalId.getOrderStatus() == 3) {
             Services services = servicesMapper.selectById(totalOrder.getServiceId());
-            if (services.getFenmo() != 0) {
-                double money = 0;
-                Employees employees = employeesMapper.selectById(totalOrder.getEmId());
-                /**
-                 * 1. 如果该陪诊员不属于任何商户，则陪诊员每完成一个订单，收益都会相应增加
-                 * 2. 如果该陪诊员属于某个商户，则该陪诊员每完成一个订单，收益不会增加（因为陪诊员完成订单后，收益暂归商户所有）
-                 */
+            double money = 0;
+            if (services.getFenmo() == 0) {
+                money = totalOrder.getPayMoney();
+            }else if(services.getFenmo() != 0){
                 double fenmo = (double) services.getFenmo() / 100;
 
                 double v = totalOrder.getPayMoney() * fenmo;
 
                 money = totalOrder.getPayMoney() - v;
+            }
+
+                Employees employees = employeesMapper.selectById(totalOrder.getEmId());
+                /**
+                 * 1. 如果该陪诊员不属于任何商户，则陪诊员每完成一个订单，收益都会相应增加
+                 * 2. 如果该陪诊员属于某个商户，则该陪诊员每完成一个订单，收益不会增加（因为陪诊员完成订单后，收益暂归商户所有）
+                 */
 
                 if (employees.getCompanyId() != 0) {
 
@@ -772,7 +780,6 @@ public class TotalOrderServiceImpl implements ITotalOrderService {
                     employeesMapper.updateById(employees);
 
                 }
-            }
         }
 
         if (!sonOrderFlag) {