需求

mall-server-api/src/main/java/com/gree/mall/manager/controller/admin/AdminDeptController.java

@@ -113,10 +113,11 @@ public class AdminDeptController {
     @PostMapping("/addWebsit")
     @ApiOperation("添加部门网点")
     public ResponseHelper addWebsit(
-            @RequestBody AdminDeptWebsit adminDeptWebsit,
+            @ApiParam(value = "部门id" , required = true) @RequestParam(required = true) String adminDeptId,
+            @ApiParam(value = "网点" , required = true) @RequestParam(required = true) List<String> websitIds,
             HttpServletRequest request
     ) throws ParseException {
-        adminDeptLogic.addWebsit(adminDeptWebsit);
+        adminDeptLogic.addWebsit(adminDeptId,websitIds);
         return ResponseHelper.success();
     }
 

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

@@ -135,11 +135,13 @@ public class AdminDeptLogic {
         adminDeptService.removeById(id);
     }
 
-    public void addWebsit(AdminDeptWebsit adminDeptWebsit) {
-        adminDeptWebsit.insert();
-    }
 
     public void updateWebsit(AdminDeptWebsit adminDeptWebsit) {
+
+        if (adminDeptWebsitService.lambdaQuery().eq(AdminDeptWebsit::getAdminDeptId,adminDeptWebsit.getAdminDeptId())
+                .eq(AdminDeptWebsit::getWebsitId,adminDeptWebsit.getWebsitId()).count() > 0)
+            return;
+
         adminDeptWebsit.updateById();
     }
 
@@ -194,4 +196,24 @@ public class AdminDeptLogic {
 
         return trees;
     }
+
+    public void addWebsit(String adminDeptId, List<String> websitIds) {
+        AdminDept adminDept = adminDeptService.getById(adminDeptId);
+
+        List<AdminWebsit> adminWebsits = adminWebsitService.lambdaQuery().in(AdminWebsit::getWebsitId, websitIds).list();
+
+        for (AdminWebsit adminWebsit : adminWebsits) {
+            AdminDeptWebsit adminDeptWebsit = new AdminDeptWebsit();
+            adminDeptWebsit.setDeptName(adminDept.getDeptName());
+            adminDeptWebsit.setAdminDeptId(adminDept.getAdminDeptId());
+            adminDeptWebsit.setWebsitId(adminWebsit.getWebsitId());
+            adminDeptWebsit.setWebsitName(adminWebsit.getName());
+
+            if (adminDeptWebsitService.lambdaQuery().eq(AdminDeptWebsit::getAdminDeptId,adminDeptWebsit.getAdminDeptId())
+                    .eq(AdminDeptWebsit::getWebsitId,adminWebsit.getWebsitId()).count() > 0)
+                continue;
+
+            adminDeptWebsit.insert();
+        }
+    }
 }

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

@@ -64,6 +64,7 @@ public class SettlementOrderLogic {
     public IPage<SettlementOrderLogicVO> pageV2(ZfireParamBean zfireParamBean) {
         AdminUserCom adminUser = commonLogic.getAdminUser();
         List<String> companyWechatIds = adminUser.getCompanyWechatIds();
+        List<String> websitIds = adminUser.getAdminWebsitIds();
 
         //1.组装查询条件
         ZfireParamBean zfireParam = FieldUtils.supplyParam(zfireParamBean, SettlementOrderLogicVO.class, adminUser);