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

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

@@ -135,10 +135,18 @@ public class SettlementOrderLogic {
         }
 
 
+
         List<SettlementOrder> settlementOrders = settlementOrderService.lambdaQuery().in(SettlementOrder::getSettlementOrderId, id).list();
 
+
         for (SettlementOrder settlementOrder : settlementOrders) {
-            wechatLogic.shareSettlementAmount(settlementOrder);
+            if (!settlementOrder.getPayType().equals("LINE"))
+             wechatLogic.shareSettlementAmount(settlementOrder);
+            else{
+                settlementOrder.setStatus("OK");
+                settlementOrder.updateById();
+            }
+
         }