Merge remote-tracking branch 'origin/master'

# Conflicts:
#	src/main/java/com/gree/mall/manager/logic/admin/AdminCompanyWechatTemplateLogic.java

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

@@ -23,7 +23,7 @@ public class CouponBean extends Coupon {
     private List<CouponUserTypeBean> userList;
 
     @ApiModelProperty( value = "商户列表")
-    private List<CouponCompany> couponCompanys;
+    private List<CouponCompany> couponCompanyList;
 
     @ApiModelProperty( value = "商家列表")
     private List<CouponWebsit> couponWebsitList;

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

@@ -144,11 +144,11 @@ public class CouponLogic {
         couponBean.setTagList(couponDateMapper.couponTagDetail(couponId));
         couponBean.setUserList(couponDateMapper.couponTagUser(couponId));
         couponBean.setCouponCompanyList(couponCompanyService.lambdaQuery().eq(CouponCompany::getCouponId, couponId)
-                .in(CouponCompany::getCompanyId,adminUser.getAdminCompanyIds())
+                .in(CollectionUtils.isNotEmpty(adminUser.getAdminCompanyIds()),CouponCompany::getCompanyId,adminUser.getAdminCompanyIds())
                 .list());
         couponBean.setCouponWebsitList(couponWebsitService.lambdaQuery()
                 .eq(CouponWebsit::getCouponId, couponId)
-                .in(CouponWebsit::getWebsitId, adminUser.getAdminWebsitIds())
+                .in(CollectionUtils.isNotEmpty(adminUser.getAdminCompanyIds()),CouponWebsit::getWebsitId, adminUser.getAdminWebsitIds())
                 .list());
         return couponBean;
     }
@@ -163,7 +163,7 @@ public class CouponLogic {
     public void add(HttpServletRequest request,CouponBean couponBean) throws RemoteServiceException {
         AdminUserCom adminUser = commonLogic.getAdminUser(request);
 
-        if (CollectionUtils.isEmpty(couponBean.getCouponCompanys()))
+        if (CollectionUtils.isEmpty(couponBean.getCouponWebsitList()))
             throw new RemoteServiceException("请选择使用商户");
 
  /*       if (couponBean.getActiveType() == 1) {
@@ -188,13 +188,13 @@ public class CouponLogic {
         String couponId = couponBean.getCouponId();
 
 
-        for (CouponCompany couponCompany : couponBean.getCouponCompanys()) {
+        for (CouponCompany couponCompany : couponBean.getCouponCompanyList()) {
             AdminCompany adminCompany = adminCompanyService.getById(couponCompany.getCompanyId());
             couponCompany.setCouponId(couponId);
             couponCompany.setCompanyName(adminCompany.getAdminCompanyName());
         }
 
-        couponCompanyService.saveBatch(couponBean.getCouponCompanys());
+        couponCompanyService.saveBatch(couponBean.getCouponCompanyList());
 
         if (!CollectionUtils.isEmpty(couponBean.getCouponWebsitList())){
             for (CouponWebsit couponWebsit : couponBean.getCouponWebsitList()) {
@@ -223,7 +223,7 @@ public class CouponLogic {
         if (couponBean.getReceiveCrowd().equals(Convert.toInt(CouponCrowdEnum.ALL.getKey())) && couponBean.getUserList() != null) {
             List<CouponUser> couponUserList = new ArrayList<>();
             List<User> userList = userService.lambdaQuery()
-                    .in(CollectionUtils.isNotEmpty(couponBean.getCouponCompanys()),User::getCompanyId, couponBean.getCouponCompanys().stream().map(CouponCompany::getCompanyId).collect(Collectors.toList()))
+                    .in(CollectionUtils.isNotEmpty(couponBean.getCouponWebsitList()),User::getCompanyId, couponBean.getCouponCompanyList().stream().map(CouponCompany::getCompanyId).collect(Collectors.toList()))
                     .in(CollectionUtils.isNotEmpty(couponBean.getCouponWebsitList()),User::getWebsitId, couponBean.getCouponWebsitList().stream().map(CouponWebsit::getWebsitId).collect(Collectors.toList()))
                     .list();
             for (User user : userList) {
@@ -273,7 +273,7 @@ public class CouponLogic {
             List<UserCoupon> userCouponList = new ArrayList<>();
             List<User> userList = userService.lambdaQuery()
                     .eq(User::getType, UserTypeEnum.SERVICE.toString())
-                    .in(CollectionUtils.isNotEmpty(couponBean.getCouponCompanys()),User::getCompanyId, couponBean.getCouponCompanys().stream().map(CouponCompany::getCompanyId).collect(Collectors.toList()))
+                    .in(CollectionUtils.isNotEmpty(couponBean.getCouponWebsitList()),User::getCompanyId, couponBean.getCouponCompanyList().stream().map(CouponCompany::getCompanyId).collect(Collectors.toList()))
                     .in(CollectionUtils.isNotEmpty(couponBean.getCouponWebsitList()),User::getWebsitId, couponBean.getCouponWebsitList().stream().map(CouponWebsit::getWebsitId).collect(Collectors.toList()))
                     .list();
             List<CouponUser> couponUserList = new ArrayList<>();
@@ -295,7 +295,7 @@ public class CouponLogic {
             List<CouponUser> couponUserList = new ArrayList<>();
             List<User> userList = userService.lambdaQuery()
                     .eq(User::getType, UserTypeEnum.GENERAL.toString())
-                    .in(CollectionUtils.isNotEmpty(couponBean.getCouponCompanys()),User::getCompanyId, couponBean.getCouponCompanys().stream().map(CouponCompany::getCompanyId).collect(Collectors.toList()))
+                    .in(CollectionUtils.isNotEmpty(couponBean.getCouponWebsitList()),User::getCompanyId, couponBean.getCouponCompanyList().stream().map(CouponCompany::getCompanyId).collect(Collectors.toList()))
                     .in(CollectionUtils.isNotEmpty(couponBean.getCouponWebsitList()),User::getWebsitId, couponBean.getCouponWebsitList().stream().map(CouponWebsit::getWebsitId).collect(Collectors.toList()))
                     .list();
             for (User user : userList) {
@@ -410,13 +410,13 @@ public class CouponLogic {
         couponBean.setCreateTime(null);
 
         couponCompanyService.lambdaUpdate().eq(CouponCompany::getCouponId,coupon.getCouponId()).remove();
-        for (CouponCompany couponCompany : couponBean.getCouponCompanys()) {
+        for (CouponCompany couponCompany : couponBean.getCouponCompanyList()) {
             AdminCompany adminCompany = adminCompanyService.getById(couponCompany.getCompanyId());
             couponCompany.setCouponId(coupon.getCouponId());
             couponCompany.setCompanyName(adminCompany.getAdminCompanyName());
         }
 
-        couponCompanyService.saveBatch(couponBean.getCouponCompanys());
+        couponCompanyService.saveBatch(couponBean.getCouponCompanyList());
 
         couponWebsitService.lambdaUpdate().eq(CouponWebsit::getCouponId,coupon.getCouponId()).remove();
         if (!CollectionUtils.isEmpty(couponBean.getCouponWebsitList())){