需求

src/main/java/com/gree/mall/manager/bean/coupon/CouponBean.java

@@ -22,5 +22,11 @@ public class CouponBean extends Coupon {
     @ApiModelProperty( value = "待发券用户列表")
     private List<CouponUserTypeBean> userList;
 
+    @ApiModelProperty( value = "商户列表")
+    private List<CouponCompany> couponCompanyList;
+
+    @ApiModelProperty( value = "商家列表")
+    private List<CouponWebsit> couponWebsitList;
+
 
 }

src/main/java/com/gree/mall/manager/bean/coupon/CouponDetailBean.java

@@ -1,9 +1,6 @@
 package com.gree.mall.manager.bean.coupon;
 
-import com.gree.mall.manager.plus.entity.Coupon;
-import com.gree.mall.manager.plus.entity.CouponGoods;
-import com.gree.mall.manager.plus.entity.CouponTag;
-import com.gree.mall.manager.plus.entity.CouponUser;
+import com.gree.mall.manager.plus.entity.*;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -21,4 +18,10 @@ public class CouponDetailBean extends Coupon {
 
     @ApiModelProperty( value = "待发券用户列表")
     private List<CouponUserBean> userList;
+
+    @ApiModelProperty( value = "商户列表")
+    private List<CouponCompany> couponCompanyList;
+
+    @ApiModelProperty( value = "商家列表")
+    private List<CouponWebsit> couponWebsitList;
 }

src/main/java/com/gree/mall/manager/commonmapper/CouponDateMapper.java

@@ -32,7 +32,8 @@ public interface CouponDateMapper {
 
     @InterceptorIgnore(tenantLine = "1", blockAttack = "1", illegalSql = "1")
     IPage<CouponPageBean> pageCoupon(Page<CouponPageBean> objectPage, @Param("companyIds")List<String> companyIds,
-                                     @Param("couponName")String couponName, @Param("couponType")String couponType, @Param("flag")String flag);
+                                     @Param("couponName")String couponName, @Param("couponType")String couponType, @Param("flag")String flag,
+                                     @Param("adminWebsitIds")List<String> adminWebsitIds);
 
 
     @InterceptorIgnore(tenantLine = "1", blockAttack = "1", illegalSql = "1")

src/main/java/com/gree/mall/manager/commonmapper/CustomGoodsMapper.java

@@ -46,7 +46,7 @@ public interface CustomGoodsMapper {
                                   @Param("categoryId") List<String> categoryId,
                                   @Param("status") Boolean status,
                                   @Param("goodsTypes") List<String> goodsTypes,
-                                  @Param("companyWechatId")String companyWechatId);
+                                  @Param("companyWechatId")List<String> companyWechatId);
 
     @InterceptorIgnore(tenantLine = "1", blockAttack = "1", illegalSql = "1")
     List<GoodsSpecBean> list(@Param("commonTemplateId") String commonTemplateId);

src/main/java/com/gree/mall/manager/controller/member/MemberController.java

@@ -22,6 +22,7 @@ import org.springframework.web.multipart.MultipartFile;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
+import java.util.List;
 
 @Slf4j
 @RestController
@@ -39,6 +40,8 @@ public class MemberController {
     @ApiOperation(value = "会员列表")
     public ResponseHelper<Page<User>> page(HttpServletRequest request,
             @ApiParam(value = "名称/电话") @RequestParam(required = false) String keyword,
+            @ApiParam(value = "网点") @RequestParam(required = false) List<String> websitIds,
+            @ApiParam(value = "商户") @RequestParam(required = false) List<String> companyIds,
             @ApiParam(value = "用户角色,GENERAL=普通用户 SERVICE=业务员") @RequestParam(required = false) String type,
             @ApiParam(value = "是否为团长(true=是 false=否)") @RequestParam(required = false) Boolean promotionGroupLeader,
             @ApiParam(value = "是否为内部人员(true=是 false=否)") @RequestParam(required = false) Boolean innerr,
@@ -53,7 +56,7 @@ public class MemberController {
             @ApiParam(value = "页号", required = true) @RequestParam Integer pageNum,
             @ApiParam(value = "页大小", required = true) @RequestParam Integer pageSize
     ) throws RemoteServiceException {
-        IPage<User> page = userLogic.page(request,keyword, type,promotionGroupLeader,innerr, startTime, endTime, sortJson,websitId,isExchangeCode, pageNum, pageSize);
+        IPage<User> page = userLogic.page(request,keyword, type,promotionGroupLeader,innerr, startTime, endTime, sortJson,websitId,isExchangeCode, pageNum, pageSize,websitIds,companyIds);
         return ResponseHelper.success(page);
     }
 

src/main/java/com/gree/mall/manager/logic/coupon/CouponLogic.java

@@ -63,14 +63,28 @@ public class CouponLogic {
     @Autowired
     private CommonLogic commonLogic;
 
+    @Autowired
+    CouponCompanyService couponCompanyService;
+
+    @Autowired
+    CouponWebsitService couponWebsitService;
+
+    @Autowired
+    AdminCompanyService adminCompanyService;
+
+    @Autowired
+    AdminWebsitService adminWebsitService;
+
     /**
      * 优惠券列表
      */
     public IPage<CouponPageBean> page(String couponName, String couponType, String flag, Integer pageNum, Integer pageSize, HttpServletRequest request) {
         AdminUserCom adminUser = commonLogic.getAdminUser(request);
         List<String> companyWechatIds = adminUser.getAdminCompanyIds();
+        List<String> adminWebsitIds = adminUser.getAdminWebsitIds();
 
-        return couponDateMapper.pageCoupon(new Page<>(pageNum, pageSize), companyWechatIds, couponName, couponType, flag);
+        return couponDateMapper.pageCoupon(new Page<>(pageNum, pageSize), companyWechatIds, couponName, couponType, flag,
+                (adminUser.getType().equals(2) || adminUser.getType().equals(4))?adminWebsitIds:null);
     }
 
 
@@ -127,6 +141,8 @@ public class CouponLogic {
         couponBean.setGoodsList(couponGoodsService.lambdaQuery().eq(CouponGoods::getCouponId, couponId).list());
         couponBean.setTagList(couponDateMapper.couponTagDetail(couponId));
         couponBean.setUserList(couponDateMapper.couponTagUser(couponId));
+        couponBean.setCouponCompanyList(couponCompanyService.lambdaQuery().eq(CouponCompany::getCouponId, couponId).list());
+        couponBean.setCouponWebsitList(couponWebsitService.lambdaQuery().eq(CouponWebsit::getCouponId, couponId).list());
         return couponBean;
     }
 
@@ -140,6 +156,9 @@ public class CouponLogic {
     public void add(HttpServletRequest request,CouponBean couponBean) throws RemoteServiceException {
         AdminUserCom adminUser = commonLogic.getAdminUser(request);
 
+        if (CollectionUtils.isEmpty(couponBean.getCouponCompanyList()))
+            throw new RemoteServiceException("请选择使用商户");
+
  /*       if (couponBean.getActiveType() == 1) {
             if (Objects.isNull(couponBean.getActiveStartTime()) || Objects.isNull(couponBean.getActiveEndTime())) {
                 throw new RemoteServiceException("使用时间区间不能为空！");
@@ -154,8 +173,32 @@ public class CouponLogic {
         couponBean.setActiveType(2);
         couponBean.setCompanyName(adminUser.getCompanyName());
         couponBean.setCompanyId(adminUser.getCompanyId());
+
+        if (!CollectionUtils.isEmpty(couponBean.getCouponWebsitList()))
+            couponBean.setBuyType("WEBSIT");
+
         couponService.save(couponBean);
         String couponId = couponBean.getCouponId();
+
+
+        for (CouponCompany couponCompany : couponBean.getCouponCompanyList()) {
+            AdminCompany adminCompany = adminCompanyService.getById(couponCompany.getCompanyId());
+            couponCompany.setCouponId(couponId);
+            couponCompany.setCompanyName(adminCompany.getAdminCompanyName());
+        }
+
+        couponCompanyService.saveBatch(couponBean.getCouponCompanyList());
+
+        if (!CollectionUtils.isEmpty(couponBean.getCouponWebsitList())){
+            for (CouponWebsit couponWebsit : couponBean.getCouponWebsitList()) {
+                AdminWebsit adminWebsit = adminWebsitService.getById(couponWebsit.getWebsitId());
+                couponWebsit.setCouponId(couponId);
+                couponWebsit.setWebsitName(adminWebsit.getName());
+            }
+            couponWebsitService.saveBatch(couponBean.getCouponWebsitList());
+        }
+
+
         if (couponBean.getCouponType().trim().equals(CouponTypeEnum.GOODS.getKey()) && couponBean.getGoodsList() != null) {
             List<CouponGoods> couponGoodsList = new ArrayList<>();
             for (CouponGoods couponGoods : couponBean.getGoodsList()) {
@@ -328,6 +371,28 @@ public class CouponLogic {
 
         Coupon coupon = couponService.getById(couponBean.getCouponId());
         couponBean.setCreateTime(null);
+
+        couponCompanyService.lambdaUpdate().eq(CouponCompany::getCouponId,coupon.getCouponId()).remove();
+        for (CouponCompany couponCompany : couponBean.getCouponCompanyList()) {
+            AdminCompany adminCompany = adminCompanyService.getById(couponCompany.getCompanyId());
+            couponCompany.setCouponId(coupon.getCouponId());
+            couponCompany.setCompanyName(adminCompany.getAdminCompanyName());
+        }
+
+        couponCompanyService.saveBatch(couponBean.getCouponCompanyList());
+
+        couponWebsitService.lambdaUpdate().eq(CouponWebsit::getCouponId,coupon.getCouponId()).remove();
+        if (!CollectionUtils.isEmpty(couponBean.getCouponWebsitList())){
+            for (CouponWebsit couponWebsit : couponBean.getCouponWebsitList()) {
+                AdminWebsit adminWebsit = adminWebsitService.getById(couponWebsit.getWebsitId());
+                couponWebsit.setCouponId(coupon.getCouponId());
+                couponWebsit.setWebsitName(adminWebsit.getName());
+            }
+            couponWebsitService.saveBatch(couponBean.getCouponWebsitList());
+        }
+
+
+
         Date now = new Date();
         if (coupon.getFlag().trim().equals(CouponFlagEnum.WAIT.toString())) {
             //待发布处理

src/main/java/com/gree/mall/manager/logic/goods/GoodsLogic.java

@@ -89,6 +89,12 @@ public class GoodsLogic {
     @Autowired
     FreightTemplateDetailService freightTemplateDetailService;
 
+    @Autowired
+    GoodsCompanyService goodsCompanyService;
+
+    @Autowired
+    AdminCompanyService adminCompanyService;
+
     /**
      * 商品列表
      *
@@ -129,7 +135,7 @@ public class GoodsLogic {
         }
 
         IPage<GoodsSpecBean> goodsSpecBeanIPage = customGoodsMapper.pageList(new Page<>(pageNum, pageSize), flag, keyword, startPrice,
-                endPrice, startShare, endShare, sortStr, categoryIds, status, goodsTypes,adminUser.getCompanyId());
+                endPrice, startShare, endShare, sortStr, categoryIds, status, goodsTypes,adminUser.getAdminCompanyIds());
 
         //商品规格
         for (GoodsSpecBean goodsSpecBean : goodsSpecBeanIPage.getRecords()) {
@@ -196,7 +202,7 @@ public class GoodsLogic {
 
 
         IPage<GoodsSpecBean> goodsSpecBeanIPage = customGoodsMapper.pageList(new Page<>(1, -1), null, null, null,
-                null, null, null, null, categoryIds, null, null,adminUser.getCompanyId());
+                null, null, null, null, categoryIds, null, null,companyIds);
         //添加规格
         List<GoodsSpecBean> records = goodsSpecBeanIPage.getRecords();
         for (GoodsSpecBean record : records) {
@@ -419,7 +425,7 @@ public class GoodsLogic {
         if (StringUtils.isNotBlank(goodsBean.getUmsDiscountCode()) && !UMSDiscountCodeEnum.existDiscountCodeByCode(goodsBean.getUmsDiscountCode())) {
             throw new RemoteServiceException("补贴品类不存在");
         }
-
+        goodsBean.setGoodsId(IdWorker.getIdStr());
         Date creatDate = new Date();
         List<GoodsSpec> goodsSpecList = goodsBean.getGoodsSpecs();
         if (CollectionUtils.isNotEmpty(goodsSpecList)) {
@@ -429,17 +435,28 @@ public class GoodsLogic {
         goodsBean.setUpdateTime(new Date());
         goodsBean.setCreateTime(creatDate);
 
+        List<GoodsCompany> goodsCompanies = new ArrayList<>();
+
         if (!StringUtil.isEmpty(goodsBean.getPutCompanyId())) {
             goodsBean.setPutCompanyId(goodsBean.getPutCompanyId());
             String[] split = StringUtils.split(goodsBean.getPutCompanyId(), ",");
 
             String name ="";
             for (String s : split) {
-                AdminCompanyWechat adminCompanyWechat = adminCompanyWechatService.getById(s);
-                name = name+adminCompanyWechat.getCompanyName()+",";
+                AdminCompany adminCompany = adminCompanyService.getById(s);
+                name = name+adminCompany.getAdminCompanyId()+",";
+
+                GoodsCompany goodsCompany = new GoodsCompany();
+                goodsCompany.setGoodsId(goodsBean.getGoodsId());
+                goodsCompany.setConpanyName(adminCompany.getAdminCompanyId());
+                goodsCompany.setCompanyId(adminCompany.getAdminCompanyId());
+
+                goodsCompanies.add(goodsCompany);
             }
             String result = name.substring(0, name.length() - 1);
             goodsBean.setPutCompanyName(result);
+
+            goodsCompanyService.saveBatch(goodsCompanies);
         }
 
         GoodsCategory goodsCategory = goodsCategoryService.getById(goodsBean.getCategoryId());
@@ -449,6 +466,8 @@ public class GoodsLogic {
         goodsBean.setCategoryPid(goodsCategoryPid.getCategoryId());
         goodsService.save(goodsBean);
 
+
+
         if (CollectionUtils.isNotEmpty(goodsBean.getGoodsSpecs())) {
             goodsSpecList = goodsBean.getGoodsSpecs()
                     .stream()
@@ -576,18 +595,29 @@ public class GoodsLogic {
 
         //设置企业微信id
         AdminUserCom adminUser = commonLogic.getAdminUser(request);
+        List<GoodsCompany> goodsCompanies = new ArrayList<>();
 
+        goodsCompanyService.lambdaUpdate().eq(GoodsCompany::getGoodsId,goodsBean.getGoodsId()).remove();
         if (!StringUtil.isEmpty(goodsBean.getPutCompanyId())) {
             goodsBean.setPutCompanyId(goodsBean.getPutCompanyId());
             String[] split = StringUtils.split(goodsBean.getPutCompanyId(), ",");
 
             String name ="";
             for (String s : split) {
-                AdminCompanyWechat adminCompanyWechat = adminCompanyWechatService.getById(s);
-                name = name+adminCompanyWechat.getCompanyName()+",";
+                AdminCompany adminCompany = adminCompanyService.getById(s);
+                name = name+adminCompany.getAdminCompanyId()+",";
+
+                GoodsCompany goodsCompany = new GoodsCompany();
+                goodsCompany.setGoodsId(goodsBean.getGoodsId());
+                goodsCompany.setConpanyName(adminCompany.getAdminCompanyId());
+                goodsCompany.setCompanyId(adminCompany.getAdminCompanyId());
+
+                goodsCompanies.add(goodsCompany);
             }
             String result = name.substring(0, name.length() - 1);
             goodsBean.setPutCompanyName(result);
+
+            goodsCompanyService.saveBatch(goodsCompanies);
         }
 
         List<GoodsSpec> notRemoveList = new ArrayList<>();

src/main/java/com/gree/mall/manager/logic/user/UserLogic.java

@@ -104,7 +104,7 @@ public class UserLogic {
      */
     public IPage<User> page(HttpServletRequest request, String keyword, String type, Boolean promotionGroupLeader,
                             Boolean innerr,String startTime, String endTime, String sortJson, String websitId,Boolean isExchangeCode,
-                            Integer pageNum, Integer pageSize) {
+                            Integer pageNum, Integer pageSize,List<String> websitIds,List<String> companyIds) {
 
         //获取当前登录企业微信id
         AdminUserCom adminUser = commonLogic.getAdminUser(request);
@@ -115,6 +115,8 @@ public class UserLogic {
         memberLambdaQueryWrapper
                 .in(CollectionUtils.isNotEmpty(companyWechatIds), User::getCompanyId, companyWechatIds)
                 .in(CollectionUtils.isNotEmpty(adminWebsitIds), User::getWebsitId, adminWebsitIds)
+                .in(CollectionUtils.isNotEmpty(companyIds), User::getCompanyId, companyIds)
+                .in(CollectionUtils.isNotEmpty(websitIds), User::getWebsitId, websitIds)
                 .eq(isExchangeCode != null,User::getIsExchangeCode,isExchangeCode)
                 .eq(promotionGroupLeader != null, User::getPromotionGroupLeader, promotionGroupLeader)
                 .eq(StringUtils.isNotEmpty(type), User::getType, type)

src/main/resources/mapper/CouponDateMapper.xml

@@ -45,7 +45,10 @@
         when cp.flag <> 'CANCEL' and cp.obtain_end_time < now() then 'END'
         when cp.flag <> 'CANCEL' and cp.display_time < now() and cp.obtain_end_time > now() then 'START'
         end 'releaseFlag'
-        from coupon cp left join user_coupon uc on cp.coupon_id= uc.coupon_id
+        from coupon cp
+        join coupon_company cc on cc.coupon_id = cp.coupon_id
+        left join coupon_websit cw on cw.coupon_id = cp.coupon_id
+        left join user_coupon uc on cp.coupon_id= uc.coupon_id
         <where>
             <if test="flag != null and flag != ''">
                 <choose>
@@ -71,11 +74,17 @@
                 cp.coupon_name like concat('%',#{couponName,jdbcType=VARCHAR},'%')
             </if>
             <if test="companyIds != null and companyIds.size > 0">
-                and cp.company_id in
+                and cc.company_id in
                 <foreach item="item" index="index" collection="companyIds" open="(" separator="," close=")">
                     #{item}
                 </foreach>
             </if>
+            <if test="adminWebsitIds != null and adminWebsitIds.size > 0">
+                and cw.websit_id in
+                <foreach item="item" index="index" collection="adminWebsitIds" open="(" separator="," close=")">
+                    #{item}
+                </foreach>
+            </if>
         </where>
         GROUP BY cp.coupon_id ORDER BY cp.create_time DESC
     </select>

src/main/resources/mapper/CustomGoodsMapper.xml

@@ -16,13 +16,16 @@
         t2.bar_code
         FROM
         goods t1
+        join goods_company t4 on t1.goods_id = t4.goods_id
         left join goods_spec t2 on t1.goods_id = t2.goods_id         and t2.del = 0
         left join goods_category t3 on t3.category_id = t1.category_id
         WHERE
         t1.del = 0
-        <if test='companyWechatId != null and companyWechatId != "" ' >
-            AND FIND_IN_SET( #{companyWechatId},t1.company_id) > 0
-
+        <if test='companyWechatId != null and companyWechatId.size > 0' >
+            AND t4.company_id  in
+            <foreach collection="companyWechatId" open="(" close=")" item="item" separator=",">
+                #{item}
+            </foreach>
         </if>
         <if test='goodsTypes != null and goodsTypes.size > 0' >
             AND t1.goods_type  in