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

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

@@ -43,10 +43,10 @@ public class AdminUserBean extends AdminUser {
     @ApiModelProperty("小程序默认头像logo")
     private String minLogo3;
     @ApiModelProperty("网点id")
-    private String adminWebsitId;
+    private List<String> adminWebsitId;
 
     @ApiModelProperty("部门id")
-    private String adminDeptId;
+    private List<String> adminDeptId;
 
     @ApiModelProperty("部门ids")
     private List<String> adminWebsitIds;

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

@@ -16,7 +16,7 @@ public class AdminUserCom extends AdminUser {
 
 
     private AdminWebsit adminWebsit;
-    private AdminDept adminDept;
+    private List<AdminDept> adminDept;
 
     @ApiModelProperty("部门id")
     private List<String> adminWebsitIds;

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

@@ -13,8 +13,8 @@ import java.util.List;
 public class AdminUserAddReqBean extends AdminUser {
 
     @ApiModelProperty("网点id")
-    private String adminWebsitId;
+    private List<String> adminWebsitId;
 
     @ApiModelProperty("选择得部门id")
-    private String adminDeptId;
+    private List<String> adminDeptId;
 }

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

@@ -28,6 +28,8 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
+import java.util.ArrayList;
+import java.util.List;
 import java.util.Objects;
 
 @Slf4j
@@ -159,7 +161,9 @@ public class AdminCompanyWechatLogic {
         adminWebsit2.insert();
 
         //添加企业用户
-        adminUserAddReqBean.setAdminWebsitId(adminWebsit.getWebsitId());
+        List<String> websitIds = new ArrayList<>();
+        websitIds.add(adminWebsit.getWebsitId());
+        adminUserAddReqBean.setAdminWebsitId(websitIds);
         adminUserLogic.add(adminUserAddReqBean,true);
         //初始化模板
         adminCompanyWechatTemplateLogic.initCompanyWechatTemplate(adminCompanyWechat.getCompanyWechatId(), adminCompanyWechat.getCompanyName());

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

@@ -209,11 +209,13 @@ public class AdminUserLogic {
             throw new RemoteServiceException("帐号已被注册");
         }
         //当前用户选择的部门
-        if (StringUtil.isEmpty(adminUser.getAdminDeptId()) && StringUtil.isEmpty(adminUser.getAdminWebsitId()))
+        if (CollectionUtils.isEmpty(adminUser.getAdminDeptId()) && CollectionUtils.isEmpty(adminUser.getAdminWebsitId()))
             throw new RemoteServiceException("请选择部门/网点");
 
-        if (!StringUtil.isEmpty(adminUser.getAdminWebsitId())) {
-            AdminWebsit adminWebsit = adminWebsitService.getById(adminUser.getAdminWebsitId());
+        if (!CollectionUtils.isEmpty(adminUser.getAdminWebsitId())) {
+
+
+            AdminWebsit adminWebsit = adminWebsitService.getById(adminUser.getAdminWebsitId().get(0));
 
             if (adminWebsit.getType().equals(AdminWebsitTypeEnum.A.getKey()) && curAdminUser.getType() != 2) {
                 throw new RemoteServiceException("当前账号非“平台”类型不能创建平台账号");
@@ -241,8 +243,9 @@ public class AdminUserLogic {
                 }
             }
 
-        }else {
-            AdminDept adminDept = adminDeptService.getById(adminUser.getAdminDeptId());
+        }
+        if (!CollectionUtils.isEmpty(adminUser.getAdminDeptId())){
+            AdminDept adminDept = adminDeptService.getById(adminUser.getAdminDeptId().get(0));
 
             if (!curAdminUser.getType().equals("2") && adminDept.getAdminDeptId().equals("1")){
                 throw new RemoteServiceException("不可选高于商户得平台权限");
@@ -279,12 +282,12 @@ public class AdminUserLogic {
     private void addAdminUserDept(AdminUserAddReqBean adminUser) {
 
         //先清除
-        if (StringUtils.isEmpty(adminUser.getAdminDeptId())) {
+        if (CollectionUtils.isEmpty(adminUser.getAdminDeptId())) {
             return;
         }
         adminUserDeptRelaService.lambdaUpdate().eq(AdminUserDeptRela::getAdminUserId, adminUser.getAdminUserId()).remove();
 
-        List<AdminDept> adminDepts = adminDeptService.lambdaQuery().eq(AdminDept::getAdminDeptId, adminUser.getAdminDeptId()).list();
+        List<AdminDept> adminDepts = adminDeptService.lambdaQuery().in(AdminDept::getAdminDeptId, adminUser.getAdminDeptId()).list();
         if (adminDepts.size() == 0) {
             throw new RemoteServiceException("请选择至少1个部门");
         }
@@ -319,7 +322,7 @@ public class AdminUserLogic {
 //            throw new RemoteServiceException("无法为用户赋予与自身级别相当的角色");
 //        }
         //当前用户选择的部门
-        if (!StringUtil.isEmpty(newUser.getAdminWebsitId())) {
+/*        if (!CollectionUtils.isEmpty(newUser.getAdminWebsitId())) {
             AdminWebsit adminWebsit = adminWebsitService.getById(newUser.getAdminWebsitId());
             if (adminWebsit == null) {
                 throw new RemoteServiceException("请选择部门");
@@ -360,7 +363,7 @@ public class AdminUserLogic {
 
             newUser.setType(0);
             }
-        }
+        }*/
 
 
         newUser.setRoleName(addUserRole.getName());
@@ -388,11 +391,11 @@ public class AdminUserLogic {
     //添加用户部门关系
     private void addAdminUserWebsit(AdminUserAddReqBean adminUser) {
         //先清除
-        if (StringUtils.isEmpty(adminUser.getAdminWebsitId())) {
+        if (CollectionUtils.isEmpty(adminUser.getAdminWebsitId())) {
             return;
         }
-        adminUserWebsitRelaService.lambdaUpdate().eq(AdminUserWebsitRela::getAdminUserId, adminUser.getAdminUserId()).remove();
-        List<AdminWebsit> websits = adminWebsitService.lambdaQuery().eq(AdminWebsit::getWebsitId, adminUser.getAdminWebsitId()).list();
+        adminUserWebsitRelaService.lambdaUpdate().in(AdminUserWebsitRela::getAdminUserId, adminUser.getAdminUserId()).remove();
+        List<AdminWebsit> websits = adminWebsitService.lambdaQuery().in(AdminWebsit::getWebsitId, adminUser.getAdminWebsitId()).list();
         if (websits.size() == 0) {
             throw new RemoteServiceException("请选择至少1个部门");
         }
@@ -547,16 +550,23 @@ public class AdminUserLogic {
                     .eq(AdminUserWebsitRela::getAdminUserId, adminUser.getAdminUserId()).list();
             if (websitIds.size() > 0) {
                 List<String> collect = websitIds.stream().map(AdminUserWebsitRela::getAdminWebsitId).collect(Collectors.toList());
-                adminUserBean.setAdminWebsitId(collect.get(0));
+                adminUserBean.setAdminWebsitId(collect);
             }
 
-            AdminUserDeptRela adminUserDeptRela = adminUserDeptRelaService.lambdaQuery()
-                    .eq(AdminUserDeptRela::getAdminUserId, adminUser.getAdminUserId()).last("limit 1").one();
+            List<AdminUserDeptRela> adminUserDeptRelaList = adminUserDeptRelaService.lambdaQuery()
+                    .eq(AdminUserDeptRela::getAdminUserId, adminUser.getAdminUserId()).list();
+
+            if (!CollectionUtils.isEmpty(adminUserDeptRelaList)) {
+
+                List<String> deptIds = adminUserDeptRelaList.stream().map(AdminUserDeptRela::getAdminDeptId).collect(Collectors.toList());
+                adminUserBean.setAdminDeptId(deptIds);
+
+                List<AdminDeptWebsit> adminDeptWebsitList = adminDeptWebsitService.lambdaQuery()
+                        .in(AdminDeptWebsit::getAdminDeptId,deptIds).list();
 
-            if (adminUserDeptRela != null) {
-                adminUserBean.setAdminDeptId(adminUserDeptRela.getAdminDeptId());
-                List<AdminDeptWebsit> adminDeptWebsitList = adminDeptWebsitService.lambdaQuery().eq(AdminDeptWebsit::getAdminDeptId, adminUserDeptRela.getAdminDeptId()).list();
                 List<String> collect = adminDeptWebsitList.stream().map(AdminDeptWebsit::getWebsitId).collect(Collectors.toList());
+                if (!CollectionUtils.isEmpty(adminUserBean.getAdminWebsitId()))
+                    collect.addAll(adminUserBean.getAdminWebsitId());
                 adminUserBean.setAdminWebsitIds(collect);
             }
 

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

@@ -121,9 +121,10 @@ public class CommonLogic {
             adminUserCom.setAdminCompanyWechat(adminCompanyWechat);
             adminUserCom.setJoinCode(adminCompanyWechat.getJoinCode());
 
-            AdminUserDeptRela adminUserDeptRela = adminUserDeptRelaService.lambdaQuery().eq(AdminUserDeptRela::getAdminUserId, admin.getAdminUserId()).last("limit 1").one();
-            if (adminUserDeptRela != null) {
-                adminUserCom.setAdminDept(adminDeptService.getById(adminUserDeptRela.getAdminDeptId()));
+            List<AdminUserDeptRela> adminUserDeptRelas = adminUserDeptRelaService.lambdaQuery().in(AdminUserDeptRela::getAdminUserId, admin.getAdminUserId()).list();
+            if (!CollectionUtils.isEmpty(adminUserDeptRelas)) {
+                List<String> deptIds = adminUserDeptRelas.stream().map(AdminUserDeptRela::getAdminDeptId).collect(Collectors.toList());
+                adminUserCom.setAdminDept(adminDeptService.lambdaQuery().in(AdminDept::getAdminDeptId,deptIds).list());
             }
 
             return adminUserCom;
@@ -152,12 +153,16 @@ public class CommonLogic {
             adminUserCom.setJoinCode(adminCompanyWechat.getJoinCode());
         }
 
-        AdminUserDeptRela adminUserDeptRela = adminUserDeptRelaService.lambdaQuery().eq(AdminUserDeptRela::getAdminUserId, adminUser.getAdminUserId()).last("limit 1").one();
+        List<AdminUserDeptRela> adminUserDeptRelaList = adminUserDeptRelaService.lambdaQuery()
+                .eq(AdminUserDeptRela::getAdminUserId, adminUser.getAdminUserId()).list();
 
+        if (!CollectionUtils.isEmpty(adminUserDeptRelaList)){
 
-        if (adminUserDeptRela != null){
-            adminUserCom.setAdminDept(adminDeptService.getById(adminUserDeptRela.getAdminDeptId()));
-            List<AdminDeptWebsit> adminDeptWebsitList = adminDeptWebsitService.lambdaQuery().eq(AdminDeptWebsit::getAdminDeptId, adminUserDeptRela.getAdminDeptId()).list();
+            List<String> deptids = adminUserDeptRelaList.stream().map(AdminUserDeptRela::getAdminDeptId).collect(Collectors.toList());
+            List<AdminDept> adminDepts = adminDeptService.lambdaQuery().in(AdminDept::getAdminDeptId, deptids).list();
+            adminUserCom.setAdminDept(adminDepts);
+            List<AdminDeptWebsit> adminDeptWebsitList = adminDeptWebsitService.lambdaQuery()
+                    .in(AdminDeptWebsit::getAdminDeptId, deptids).list();
             List<String> collect = adminDeptWebsitList.stream().map(AdminDeptWebsit::getWebsitId).collect(Collectors.toList());
             if (!CollectionUtils.isEmpty(adminUserCom.getAdminWebsitIds())) {
                 adminUserCom.getAdminWebsitIds().addAll(collect);
@@ -198,11 +203,11 @@ public class CommonLogic {
             websitIds.addAll(adminWebsitIds);
 
 
-            AdminWebsit adminWebsit = adminWebsitService.getById(adminWebsitIds.get(0));
+           // adminWebsitService.lambdaQuery().eq();
             adminUserCom.setCompanyWechatIds(companyWechatIds);
             adminUserCom.setAdminWebsitIds(websitIds.stream().distinct().collect(Collectors.toList()));
             adminUserCom.setOnlyRead(companyWechatIds.size() > 1);
-            adminUserCom.setAdminWebsit(adminWebsit);
+           // adminUserCom.setAdminWebsit(adminWebsit);
             //获取当前登录人的企业微信配置
             AdminCompanyWechat adminCompanyWechat = this.getAdminCompanyWechat(companyWechatIds.get(0));
             adminUserCom.setAdminCompanyWechat(adminCompanyWechat);

mall-server-api/src/main/java/com/gree/mall/manager/logic/order/OrderOfflineRefundLogic.java

@@ -197,7 +197,7 @@ public class OrderOfflineRefundLogic {
             }
 
             //本次退货金额
-            itemRefundAmount = itemRefundAmount.add(item.getRefundAmount());
+            itemRefundAmount = itemRefundAmount.add(item.getRefundAmount().multiply(BigDecimal.valueOf(item.getRefundNum())));
         }
         if(waitRefundAmount.doubleValue() < itemRefundAmount.doubleValue()){
             throw new RemoteServiceException("退货总金额超出了本订单的可退金额，请检查");