需求

mall-miniapp-service/src/main/java/com/gree/mall/miniapp/logic/order/PayOrderLogic.java

@@ -231,17 +231,21 @@ public class PayOrderLogic {
         if (workerOrderBuy.getServicePrice() != null){
 
             totalAmount = totalAmount.add(workerOrderBuy.getServicePrice());
-            workerAmount = workerAmount.add(workerOrderBuy.getServicePrice());
+
 
             BigDecimal workerServiceProceAmount = workerOrderBuy.getServicePrice().multiply(Convert.toBigDecimal("0.006"));
 
 
             if (workerServiceProceAmount.doubleValue() > 0.01) {
-                workerProceAmount =workerProceAmount.add(workerServiceProceAmount.setScale(2, BigDecimal.ROUND_CEILING));
+                workerServiceProceAmount = workerServiceProceAmount.setScale(2, BigDecimal.ROUND_CEILING);
+                workerProceAmount =workerProceAmount.add(workerServiceProceAmount);
 
             }else {
-                workerProceAmount =workerProceAmount.add(Convert.toBigDecimal("0.01"));
+                workerServiceProceAmount = Convert.toBigDecimal("0.01");
+                workerProceAmount =workerProceAmount.add(workerServiceProceAmount);
             }
+
+            workerAmount = workerAmount.add(workerOrderBuy.getServicePrice()).subtract(workerServiceProceAmount);
         }
 
 
@@ -253,11 +257,14 @@ public class PayOrderLogic {
 
 
             if (workerOtherProceAmount.doubleValue() > 0.01) {
+                workerOtherProceAmount = workerOtherProceAmount.setScale(2, BigDecimal.ROUND_CEILING);
                 workerProceAmount =workerProceAmount.add(workerOtherProceAmount.setScale(2, BigDecimal.ROUND_CEILING));
 
             }else {
+                workerOtherProceAmount = Convert.toBigDecimal("0.01");
                 workerProceAmount =workerProceAmount.add(Convert.toBigDecimal("0.01"));
             }
+            workerAmount = workerAmount.add(workerOrderBuy.getServicePrice()).subtract(workerOtherProceAmount);
 
         }
 
@@ -284,7 +291,7 @@ public class PayOrderLogic {
         workerOrderBuy.setWorkerProceAmount(workerProceAmount);
         workerOrderBuy.setCommissionAmount(workerProceAmount);
         workerOrderBuy.setTotalAmount(totalAmount);
-        workerOrderBuy.setWorkerAmount(workerAmount.subtract(workerProceAmount));
+        workerOrderBuy.setWorkerAmount(workerAmount);
         workerOrderBuy.setManualAmount(manualAmount);
 
         workerOrderBuy.setNum(num);