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

mall-server-api/src/main/java/com/gree/mall/manager/bean/admin/AdminUserCom.java

@@ -15,7 +15,7 @@ import java.util.List;
 public class AdminUserCom extends AdminUser {
 
 
-    private AdminWebsit adminWebsit;
+    private List<AdminWebsit> adminWebsit;
     private List<AdminDept> adminDept;
 
     @ApiModelProperty("部门id")

mall-server-api/src/main/java/com/gree/mall/manager/bean/count/MaterialCount.java

@@ -196,6 +196,19 @@ public class MaterialCount {
     private Integer overWechatNum = 0;
 
 
+    @ApiModelProperty("微信支付待结算")
+    private Integer waitWechatNumOne = 0;
+
+    @ApiModelProperty("微信支付已完成")
+    private Integer okWechatNumOne = 0;
+
+    @ApiModelProperty("微信支付异常结算")
+    private Integer ycWechatNumOne = 0;
+
+    @ApiModelProperty("微信支付线下结算")
+    private Integer lineWechatNumOne = 0;
+
+
 
 
     @ApiModelProperty("线下支付待结算")

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

@@ -74,6 +74,7 @@ public class AdminDeptLogic {
     }
 
     private List<AdminDeptTree> treeModule(String adminDeptId) {
+        AdminUserCom adminUser = commonLogic.getAdminUser();
 
         //最父级资源树
 
@@ -81,7 +82,7 @@ public class AdminDeptLogic {
                 .eq(AdminDept::getPId,adminDeptId).list();
 
         if(collect.size() == 0){
-            return null;
+            return new ArrayList<>();
         }
 
         List<AdminDeptTree> adminDeptTrees = new ArrayList<>();

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

@@ -156,6 +156,37 @@ public class CommonLogic {
         List<AdminUserDeptRela> adminUserDeptRelaList = adminUserDeptRelaService.lambdaQuery()
                 .eq(AdminUserDeptRela::getAdminUserId, adminUser.getAdminUserId()).list();
 
+
+        //所有帐号
+       // adminUserCom = this.websitAccount(adminUserCom);
+
+        List<AdminUserWebsitRela> websitList = adminUserWebsitRelaService.lambdaQuery().eq(AdminUserWebsitRela::getAdminUserId, userId).list();
+        if(!CollectionUtils.isEmpty(websitList)){
+            List<String> adminWebsitIds = websitList.stream().map(AdminUserWebsitRela::getAdminWebsitId).distinct().collect(Collectors.toList());
+            List<String> companyWechatIds = websitList.stream().map(AdminUserWebsitRela::getCompanyWechatId).distinct().collect(Collectors.toList());
+
+            List<AdminWebsit> list = new ArrayList<>();
+            for(String websitId : adminWebsitIds) {
+                list.addAll(this.queryAllChild(list, websitId));
+            }
+            List<String> websitIds = list.stream().map(AdminWebsit::getWebsitId).distinct().collect(Collectors.toList());
+            websitIds.addAll(adminWebsitIds);
+
+
+            AdminWebsit adminWebsit = adminWebsitService.getById(websitList.get(0).getAdminWebsitId());
+            adminUserCom.setCompanyWechatIds(companyWechatIds);
+            adminUserCom.setAdminWebsitIds(websitIds.stream().distinct().collect(Collectors.toList()));
+            adminUserCom.setOnlyRead(companyWechatIds.size() > 1);
+
+
+            List<AdminWebsit> adminWebsitList = adminWebsitService.lambdaQuery().in(AdminWebsit::getWebsitId, websitList.get(0).getAdminWebsitId()).list();
+            adminUserCom.setAdminWebsit(adminWebsitList);
+            //获取当前登录人的企业微信配置
+            AdminCompanyWechat adminCompanyWechatA = this.getAdminCompanyWechat(companyWechatIds.get(0));
+            adminUserCom.setAdminCompanyWechat(adminCompanyWechatA);
+        }
+
+
         if (!CollectionUtils.isEmpty(adminUserDeptRelaList)){
 
             List<String> deptids = adminUserDeptRelaList.stream().map(AdminUserDeptRela::getAdminDeptId).collect(Collectors.toList());
@@ -172,10 +203,10 @@ public class CommonLogic {
             }
 
             adminUserCom.setAdminCompanyWechat(adminCompanyWechat);
-        }else {
-            //所有帐号
-            adminUserCom = this.websitAccount(adminUserCom);
         }
+
+
+
         return adminUserCom;
     }
 
@@ -188,7 +219,7 @@ public class CommonLogic {
         if(adminUserCom.getType() != 2){
             List<AdminUserWebsitRela> websitList = adminUserWebsitRelaService.lambdaQuery().eq(AdminUserWebsitRela::getAdminUserId, userId).list();
             if(CollectionUtils.isEmpty(websitList)){
-                throw new RemoteServiceException("暂无授权,请联系管理员");
+                return adminUserCom;
             }
 
             List<String> adminWebsitIds = websitList.stream().map(AdminUserWebsitRela::getAdminWebsitId).distinct().collect(Collectors.toList());
@@ -203,7 +234,7 @@ public class CommonLogic {
             websitIds.addAll(adminWebsitIds);
 
 
-           // adminWebsitService.lambdaQuery().eq();
+            AdminWebsit adminWebsit = adminWebsitService.getById(websitList.get(0).getAdminWebsitId());
             adminUserCom.setCompanyWechatIds(companyWechatIds);
             adminUserCom.setAdminWebsitIds(websitIds.stream().distinct().collect(Collectors.toList()));
             adminUserCom.setOnlyRead(companyWechatIds.size() > 1);

mall-server-api/src/main/java/com/gree/mall/manager/logic/count/CountLogic.java

@@ -800,6 +800,32 @@ public class CountLogic {
         List<SettlementOrder> settlementOrders = settlementOrderService.lambdaQuery()
                 .in(!CollectionUtils.isEmpty(adminUser.getAdminWebsitIds()), SettlementOrder::getWebsitId, adminUser.getAdminWebsitIds())
                 .select(SettlementOrder::getStatus, SettlementOrder::getPayStatus, SettlementOrder::getSettlementOrderId, SettlementOrder::getPayType).list();
+        materialCount.setWaitWechatNumOne(
+                Convert.toInt(settlementOrders.stream().filter(item -> item.getPayType().equals(PayTypeEnum.WECHAT.getKey()) &&
+                        item.getStatus().equals(ExamineStatusEnum.WAIT.getKey())
+                ).count())
+        );
+
+        materialCount.setOkWechatNumOne(
+                Convert.toInt(settlementOrders.stream().filter(item -> item.getPayType().equals(PayTypeEnum.WECHAT.getKey()) &&
+                        item.getStatus().equals(SettlementStatusNewEnum.OK.getKey())
+                ).count())
+        );
+
+        materialCount.setYcWechatNumOne(
+                Convert.toInt(settlementOrders.stream().filter(item -> item.getPayType().equals(PayTypeEnum.WECHAT.getKey()) &&
+                        item.getStatus().equals(SettlementStatusNewEnum.YC.getKey())
+                ).count())
+        );
+
+        materialCount.setLineWechatNumOne(
+                Convert.toInt(settlementOrders.stream().filter(item -> item.getPayType().equals(PayTypeEnum.WECHAT.getKey()) &&
+                        item.getStatus().equals(SettlementStatusNewEnum.LINE.getKey())
+                ).count())
+        );
+
+
+
 
 
         materialCount.setWaitWechatNum(