‘linchangsheng’ hai 11 meses
pai
achega
75269e1706

+ 3 - 0
mall-server-api/src/main/java/com/gree/mall/manager/logic/admin/AdminWebsitLogic.java

@@ -262,6 +262,9 @@ public class AdminWebsitLogic {
 
         adminWebsit.updateById();
 
+        adminDeptWebsitService.lambdaUpdate().eq(AdminDeptWebsit::getWebsitId,adminWebsit.getWebsitId())
+                .set(AdminDeptWebsit::getWebsitName,adminWebsit.getName()).update();
+
         AdminWebsit old = adminWebsitService.getById(adminWebsit.getWebsitId());
         //workWechatLogic.updateOrganization(adminWebsit.getWebsitId(),adminWebsit.getName(),adminWebsit.getParentId(),adminUser.getAdminCompanyWechat());
         if (old.getType().equals(AdminWebsitTypeEnum.B.getKey())) {

+ 3 - 1
mall-server-api/src/main/java/com/gree/mall/manager/logic/common/WechatLogic.java

@@ -616,7 +616,8 @@ public class WechatLogic {
         mapPhone.put(settlementOrder.getOpenId(),settlementOrder.getWorkerMobile());
         //开始分账
         try {
-            profitSettlementSharing(settlementOrder.getOrderId(), settlementOrder.getTranscationId(), map, mapPhone, settlementOrder.getCompanyWechatId(), "B",settlementOrder.getConfigId());
+            profitSettlementSharing(settlementOrder.getOrderId(), settlementOrder.getTranscationId(), map, mapPhone,
+                    settlementOrder.getCompanyWechatId(), "B",settlementOrder.getConfigId());
 
             settlementOrder.setStatus(SettlementStatusNewEnum.OK.toString());
             settlementOrder.updateById();
@@ -625,6 +626,7 @@ public class WechatLogic {
             log.error("异常结算", e);
 
             settlementOrder.setStatus(SettlementStatusNewEnum.YC.toString());
+            settlementOrder.setYcRemark(e.getMessage());
             settlementOrder.updateById();
         }
     }