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

mall-server-api/src/main/java/com/gree/mall/manager/logic/admin/AdminDeptLogic.java

@@ -55,10 +55,10 @@ public class AdminDeptLogic {
 
     public List<AdminDeptTree> tree(HttpServletRequest request) {
 
-        AdminUserCom adminUser = commonLogic.getAdminUser(request);
+
 
         List<AdminDept> list = adminDeptService.lambdaQuery()
-                .eq(AdminDept::getAdminDeptId,adminUser.getAdminDept().getAdminDeptId())
+                .eq(AdminDept::getAdminDeptId,"1")
                 .list();
         List<AdminDeptTree> trees = new ArrayList<>();
         for(AdminDept adminDept : list){

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

@@ -17,6 +17,7 @@ import com.github.binarywang.wxpay.exception.WxPayException;
 import com.github.binarywang.wxpay.service.ProfitSharingService;
 import com.github.binarywang.wxpay.service.WxPayService;
 import com.gree.mall.manager.bean.PayDetail;
+import com.gree.mall.manager.bean.admin.AdminUserCom;
 import com.gree.mall.manager.bean.common.WechatOpenBean;
 import com.gree.mall.manager.bean.common.WxJsApiSignBean;
 import com.gree.mall.manager.config.wx.WxConfiguration;
@@ -95,6 +96,9 @@ public class WechatLogic {
     @Autowired
     AdminCompanyWechatPayConfigService adminCompanyWechatPayConfigService;
 
+    @Autowired
+    CommonLogic commonLogic;
+
     /**
      * 微信支付服务
      * @param companyWechatId
@@ -596,6 +600,8 @@ public class WechatLogic {
      * @throws WxPayException
      */
     public void shareSettlementAmount(SettlementOrder settlementOrder) throws WxPayException {
+
+        AdminUserCom adminUser = commonLogic.getAdminUser();
         if(settlementOrder == null){
             return;
         }
@@ -616,6 +622,8 @@ public class WechatLogic {
                     settlementOrder.getCompanyWechatId(), "B",settlementOrder.getConfigId());
 
             settlementOrder.setStatus(SettlementStatusNewEnum.OK.toString());
+            settlementOrder.setSettlementTime(new Date());
+            settlementOrder.setSettlementName(adminUser.getNickName());
             settlementOrder.updateById();
 
         } catch (WxPayException e) {
@@ -623,7 +631,7 @@ public class WechatLogic {
 
             settlementOrder.setStatus(SettlementStatusNewEnum.YC.toString());
             settlementOrder.setYcRemark(e.getMessage());
-           // settlementOrder.updateById();
+            settlementOrder.updateById();
         }
     }