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

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

@@ -221,7 +221,7 @@ public class PayOrderLogic {
             num = num.add(workerOrderItem.getNum());
         }
 
-        if (workerOrderBuy.getServicePrice() != null){
+        if (workerOrderBuy.getServicePrice() != null && workerOrderBuy.getServicePrice().doubleValue() > 0){
 
             totalAmount = totalAmount.add(workerOrderBuy.getServicePrice());
 
@@ -237,7 +237,7 @@ public class PayOrderLogic {
         }
 
 
-        if (workerOrderBuy.getOtherPrice() != null){
+        if (workerOrderBuy.getOtherPrice() != null && workerOrderBuy.getServicePrice().doubleValue() > 0){
 
             totalAmount = totalAmount.add(workerOrderBuy.getOtherPrice());
             BigDecimal workerOtherProceAmount = workerOrderBuy.getOtherPrice().multiply(Convert.toBigDecimal("0.006"));

mall-server-api/src/main/java/com/gree/mall/manager/logic/websit/SettlementOrderLogic.java

@@ -143,7 +143,7 @@ public class SettlementOrderLogic {
             if (!settlementOrder.getPayType().equals("LINE"))
              wechatLogic.shareSettlementAmount(settlementOrder);
             else{
-                settlementOrder.setStatus("OK");
+                settlementOrder.setStatus("LINE");
                 settlementOrder.updateById();
             }
 
@@ -307,12 +307,12 @@ public class SettlementOrderLogic {
                 .in(SettlementOrder::getSettlementOrderId, id)
                 .notIn(SettlementOrder::getStatus, SettlementStatusNewEnum.YC.getKey())
                 .count() > 0) {
-            throw new RemoteServiceException("存在非异常结算得结算单");
+            //throw new RemoteServiceException("存在非异常结算得结算单");
         }
 
         settlementOrderService.lambdaUpdate()
                 .in(SettlementOrder::getSettlementOrderId, id)
-                .eq(SettlementOrder::getStatus, SettlementStatusNewEnum.YC.getKey())
+                .in(SettlementOrder::getStatus, "WAIT")
                 .set(SettlementOrder::getStatus, SettlementStatusNewEnum.LINE.getKey()).update();
     }
 }