Merge remote-tracking branch 'origin/develop' into develop

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

@@ -302,7 +302,12 @@ public class PayOrderLogic {
         workerOrderItem.setGoodsCode(partsWorkerStockBean.getGoodsId());
 
 
-        workerOrderItem.setNormAmount(partsWorkerStockBean.getMarketPrice());
+        if (workerOrderItem.getRepairFlag().equals("INNER")){
+            workerOrderItem.setNormAmount(Convert.toBigDecimal("0"));
+
+        }else {
+            workerOrderItem.setNormAmount(partsWorkerStockBean.getMarketPrice());
+        }
 
         workerOrderItem.setGoodsAmount(workerOrderItem.getNormAmount());
 
@@ -329,8 +334,7 @@ public class PayOrderLogic {
 
         workerOrderItem.setWorkerAmount(workerOrderItem.getWorkerAmount().subtract(workerOrderItem.getWorkerProceAmount()));
 
-
-        if (workerOrderItem.getWorkerAmount().doubleValue() < 0){
+        if (workerOrderItem.getWorkerAmount().doubleValue() <= 0){
             workerOrderItem.setWorkerProceAmount(Convert.toBigDecimal("0"));
             workerOrderItem.setWorkerAmount(Convert.toBigDecimal("0"));
         }
@@ -578,10 +582,14 @@ public class PayOrderLogic {
 
 
         if (payType.equals(PayTypeEnum.WECHAT.getKey())) {
-            String transcationId = wechatLogic.paymentFkm(workerOrder.getOrderId(), workerOrder.getTotalAmount(), authCode, "Y", ip,
-                    adminWebsit.getPayWorkerCodeId(),workerOrder.getSource());
+            if (workerOrder.getTotalAmount().doubleValue() > 0) {
+                String transcationId = wechatLogic.paymentFkm(workerOrder.getOrderId(), workerOrder.getTotalAmount(), authCode, "Y", ip,
+                        adminWebsit.getPayWorkerCodeId(), workerOrder.getSource());
+
+                workerOrder.setTranscationId(transcationId);
+            }
+
 
-            workerOrder.setTranscationId(transcationId);
             workerOrder.setOpenId(currentCompanyWechat.getUser().getOpenId());
             workerOrder.setConfigId(adminWebsit.getPayWorkerCodeId());
             workerOrder.updateById();