Merge remote-tracking branch 'origin/master'

src/main/java/com/gree/mall/manager/bean/admin/AdminDeptWebsitVO.java

@@ -34,9 +34,9 @@ public class AdminDeptWebsitVO {
     @ApiModelProperty(value = "更新时间")
     private Date updateTime;
 
-    @ApiModelProperty(value = "网点编号")
+    @ApiModelProperty(value = "商家编号")
     private String websitId;
 
-    @ApiModelProperty(value = "网点名称")
+    @ApiModelProperty(value = "商家名称")
     private String websitName;
 }

src/main/java/com/gree/mall/manager/enums/CouponCrowdEnum.java

@@ -14,10 +14,10 @@ import lombok.Getter;
 @AllArgsConstructor(access = AccessLevel.PRIVATE)
 public enum CouponCrowdEnum implements BaseEnum, IEnum<Integer> {
 
-    ALL("0","所有用户"),
-    SPECIFY("4","指定会员"),
+    ALL("0","所有会员"),
+    SPECIFY("2","指定会员"),
     ALL_SERVICE("3","全部业务员"),
-    ALL_GENRERAL("2","全部普通用户"),;
+    ALL_GENRERAL("4","全部普通用户"),;
 
     @JsonValue
     @EnumValue

src/main/java/com/gree/mall/manager/logic/CarouselMapLogic.java

@@ -37,7 +37,6 @@ public class CarouselMapLogic {
         List<String> companyWechatIds = adminUser.getAdminCompanyIds();
 
         return carouselMapService.lambdaQuery()
-                .in(CollectionUtils.isNotEmpty(companyWechatIds), CarouselMap::getCompanyWechatId, companyWechatIds)
                 .eq(state != null, CarouselMap::getState, state)
                 .orderByDesc(CarouselMap::getCreateTime)
                 .page(new Page<>(pageNum, pageSize));
@@ -59,9 +58,8 @@ public class CarouselMapLogic {
         AdminUserCom adminUser = commonLogic.getAdminUser(request);
 
         //新增轮播
-        carouselMap.setCreateTime(new Date());
-        carouselMap.setCompanyWechatId(adminUser.getLoginCompanyWechatId());
-        carouselMap.setCompanyName(adminUser.getLoginCompanyName());
+
+
         carouselMapService.save(carouselMap);
     }
 

src/main/java/com/gree/mall/manager/logic/admin/AdminCompanyWechatOtherLogic.java

@@ -58,10 +58,10 @@ public class AdminCompanyWechatOtherLogic {
     public void update(AdminCompanyWechatOther other,HttpServletRequest request) {
         AdminUserCom adminUser = commonLogic.getAdminUser(request);
         adminCompanyWechatOtherService.lambdaUpdate()
-                .eq(AdminCompanyWechatOther::getCompanyWechatId, adminUser.getCompanyWechatId())
+                .eq(AdminCompanyWechatOther::getCompanyWechatId, "0")
                 .remove();
-        other.setCompanyWechatId(adminUser.getCompanyWechatId());
-        other.setCompanyName(adminUser.getCompanyName());
+        other.setCompanyWechatId("0");
+        other.setCompanyName("平台");
         other.setCreateTime(new Date());
         other.insert();
     }

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

@@ -212,6 +212,7 @@ public class GoodsApplyLogic {
         else
             goodsApplyAddUp.setStatus(ExamineStatusEnum.WAIT.getKey());
 
+        goodsApplyAddUp.updateById();
         goodsApplyItemService.saveBatch(goodsApplyItemList);
     }
 

src/main/java/com/gree/mall/manager/logic/notice/MiniNoticeLogic.java

@@ -30,15 +30,9 @@ public class MiniNoticeLogic {
     public void add(HttpServletRequest request,MiniNotice miniNotice){
         //获取当前登录企业微信id
         AdminUserCom adminUser = commonLogic.getAdminUser(request);
-        if(StringUtils.isEmpty(adminUser.getLoginCompanyWechatId())){
-            throw new RemoteServiceException("无效微信企业id");
-        }
-
 
         Date createDate = new Date();
         miniNotice.setCreateTime(createDate);
-        miniNotice.setCompanyWechatId(adminUser.getLoginCompanyWechatId());
-        miniNotice.setCompanyName(adminUser.getLoginCompanyName());
         miniNoticeService.save(miniNotice);
     }
 

src/main/java/com/gree/mall/manager/schedule/CouponEndServiceSchedule.java

@@ -34,4 +34,19 @@ public class CouponEndServiceSchedule {
                 .set(Coupon::getFlag, CouponFlagEnum.CANCEL.toString())
                 .update();
     }
+
+
+    /**
+     * 优惠券超领取日期改变flag标志
+     */
+    @Scheduled(cron = "*/5 * * * * *")
+    @PostConstruct
+    @Transactional
+    public void task2() {
+        couponService.lambdaUpdate()
+                .eq(Coupon::getFlag, CouponFlagEnum.WAIT.toString())
+                .le(Coupon::getObtainStartTime, new Date())
+                .set(Coupon::getFlag, CouponFlagEnum.START.toString())
+                .update();
+    }
 }

src/main/resources/mapper/WxCustomerMapper.xml

@@ -130,7 +130,7 @@
             </foreach>
         </if>
         <if test="adminWebsitIds != null and adminWebsitIds.size > 0">
-            AND b.adminWebsitIds IN
+            AND b.websit_id IN
             <foreach item="item" index="index" collection="adminWebsitIds" open="(" separator="," close=")">
                 #{item}
             </foreach>