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

mall-server-api/src/main/java/com/gree/mall/manager/commonmapper/WebsitSalesRetCMapper.java

@@ -15,12 +15,10 @@ import java.util.List;
 public interface WebsitSalesRetCMapper {
 
     @SqlParser(filter = true)
-    IPage<WebsitSalesRetVO> pageV2(Page page, @Param("ex") ZfireParamBean zfireParam, @Param("companyWechatIds")List<String> companyWechatIds
-    ,@Param("websitId") String websitId);
+    IPage<WebsitSalesRetVO> pageV2(Page page, @Param("ex") ZfireParamBean zfireParam, @Param("companyWechatIds")List<String> companyWechatIds);
 
     @SqlParser(filter = true)
-    IPage<WebsitPartsRetVO> pagePartsRetV2(Page page,@Param("ex")  ZfireParamBean zfireParam, @Param("companyWechatIds")List<String> companyWechatIds
-,@Param("websitId") String websitId);
+    IPage<WebsitPartsRetVO> pagePartsRetV2(Page page,@Param("ex")  ZfireParamBean zfireParam, @Param("companyWechatIds")List<String> companyWechatIds);
 
     @SqlParser(filter = true)
     IPage<SettlementOrderLogicVO> pageSettletV2(Page page,@Param("ex")  ZfireParamBean zfireParam,@Param("companyWechatIds") List<String> companyWechatIds);
@@ -35,6 +33,5 @@ public interface WebsitSalesRetCMapper {
     IPage<WorkerSettlementLineVO> pageLineSettlementV2(Page page,@Param("ex") ZfireParamBean zfireParam);
 
     @SqlParser(filter = true)
-    IPage<WebsitPartsFactoryRetVO> pagePartsFactoryRetV2(Page page,@Param("ex")  ZfireParamBean zfireParam, @Param("companyWechatIds")List<String> companyWechatIds
-            ,@Param("websitId") String websitId);
+    IPage<WebsitPartsFactoryRetVO> pagePartsFactoryRetV2(Page page,@Param("ex")  ZfireParamBean zfireParam, @Param("companyWechatIds")List<String> companyWechatIds);
 }

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);

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

@@ -71,15 +71,13 @@ public class WebsitPartsRetLogic {
         List<String> companyWechatIds = adminUser.getCompanyWechatIds();
 
         //1.组装查询条件
-        ZfireParamBean zfireParam = FieldUtils.supplyParam(zfireParamBean, WebsitPartsRetVO.class);
+        ZfireParamBean zfireParam = FieldUtils.supplyParam(zfireParamBean, WebsitPartsRetVO.class,adminUser);
 
-        // 网点权限
-        String websitId = adminUser.getType() == 0 ? adminUser.getAdminWebsitIds().get(0) : null;
 
         IPage<WebsitPartsRetVO> websitPartsRetVOIPage = websitSalesRetCMapper.pagePartsRetV2(new Page(zfireParamBean.getPageNum(),
                         zfireParamBean.getPageSize()),
                 zfireParam
-                , companyWechatIds, websitId);
+                , companyWechatIds);
 
         return websitPartsRetVOIPage;
     }
@@ -509,15 +507,13 @@ public class WebsitPartsRetLogic {
         List<String> companyWechatIds = adminUser.getCompanyWechatIds();
 
         //1.组装查询条件
-        ZfireParamBean zfireParam = FieldUtils.supplyParam(zfireParamBean, WebsitPartsFactoryRetVO.class);
+        ZfireParamBean zfireParam = FieldUtils.supplyParam(zfireParamBean, WebsitPartsFactoryRetVO.class,adminUser);
 
-        // 网点权限
-        String websitId = adminUser.getType() == 0 ? adminUser.getAdminWebsitIds().get(0) : null;
 
         IPage<WebsitPartsFactoryRetVO> websitPartsRetVOIPage = websitSalesRetCMapper.pagePartsFactoryRetV2(new Page(zfireParamBean.getPageNum(),
                         zfireParamBean.getPageSize()),
                 zfireParam
-                , companyWechatIds, websitId);
+                , companyWechatIds);
 
         return websitPartsRetVOIPage;
     }

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

@@ -70,15 +70,13 @@ public class WebsitSalesRetLogic {
         List<String> companyWechatIds = adminUser.getCompanyWechatIds();
 
         //1.组装查询条件
-        ZfireParamBean zfireParam = FieldUtils.supplyParam(zfireParamBean, WebsitSalesRetVO.class);
+        ZfireParamBean zfireParam = FieldUtils.supplyParam(zfireParamBean, WebsitSalesRetVO.class,adminUser);
 
-        // 网点权限
-        String websitId = adminUser.getType() == 0 ? adminUser.getAdminWebsitIds().get(0) : null;
 
         IPage<WebsitSalesRetVO> websitSalesRetVOIPage = websitSalesRetCMapper.pageV2(new Page(zfireParamBean.getPageNum(),
                         zfireParamBean.getPageSize()),
                 zfireParam
-                , companyWechatIds,websitId);
+                , companyWechatIds);
 
         return websitSalesRetVOIPage;
     }

mall-server-api/src/main/resources/mapper/WebsitSalesCMapper.xml

@@ -16,11 +16,16 @@
                 #{item}
             </foreach>
 
-
         </if>
-        <if test="websitId != null and websitId != ''">
-            AND a.websit_id = #{websitId}
+        <if test="ex.adminWebsitIds != null and ex.adminWebsitIds.size > 0">
+            AND (
+            a.websit_id IN
+            <foreach item="item" index="index" collection="ex.adminWebsitIds" open="(" separator="," close=")">
+                #{item}
+            </foreach>
+            )
         </if>
+
         <if test="ex.orderBy == null or ex.orderBy ==''">
             order by a.create_time desc
         </if>
@@ -39,11 +44,16 @@
                 #{item}
             </foreach>
 
-
         </if>
-        <if test="websitId != null and websitId != ''">
-            AND a.websit_id = #{websitId}
+        <if test="ex.adminWebsitIds != null and ex.adminWebsitIds.size > 0">
+            AND (
+            a.websit_id IN
+            <foreach item="item" index="index" collection="ex.adminWebsitIds" open="(" separator="," close=")">
+                #{item}
+            </foreach>
+            )
         </if>
+
         <if test="ex.orderBy == null or ex.orderBy ==''">
             order by a.create_time desc
         </if>
@@ -148,9 +158,14 @@
 
 
         </if>
-        <if test="websitId != null and websitId != ''">
-            AND a.websit_id = #{websitId}
+
+        <if test="ex.adminWebsitIds != null and ex.adminWebsitIds.size > 0">
+            AND a.websit_id IN
+            <foreach item="item" index="index" collection="ex.adminWebsitIds" open="(" separator="," close=")">
+                #{item}
+            </foreach>
         </if>
+
         <if test="ex.orderBy == null or ex.orderBy ==''">
             order by a.create_time desc
         </if>