framework/src/main/java/cn/lili/modules/lmk/domain/form/PrizeDrawForm.java
@@ -33,7 +33,7 @@ @NotNull(message = "优惠卷id不能为空", groups = {Add.class, Update.class}) @ApiModelProperty("优惠卷id") private Long couponId; private String couponId; @NotBlank(message = "奖品内容不能为空", groups = {Add.class, Update.class}) @ApiModelProperty("奖品内容") framework/src/main/java/cn/lili/modules/lmk/domain/vo/ActivityRefPrizeInfoVO.java
@@ -18,4 +18,5 @@ private String prizeCoverUrl; private String prizeName; private String prizeType; private Integer maxPreDay; } framework/src/main/java/cn/lili/modules/lmk/enums/general/DEFAULT_PASSWORD.java
New file @@ -0,0 +1,12 @@ package cn.lili.modules.lmk.enums.general; import lombok.AllArgsConstructor; import lombok.Getter; @Getter @AllArgsConstructor public enum DEFAULT_PASSWORD { DEFAULT_PASSWORD("111111"); private final String desc; } framework/src/main/java/cn/lili/modules/lmk/enums/general/PrizeActivityStatusEnum.java
@@ -17,7 +17,7 @@ /** * 抽奖活动状态 */ OFF("off"), ON("on"); OFF("关闭"), ON("开启"); private final String description; } framework/src/main/java/cn/lili/modules/lmk/service/impl/ActivityRefPrizeServiceImpl.java
@@ -77,7 +77,7 @@ this.saveBatch(activityRefPrizeList); } return Result.ok(); return Result.ok("成功"); }
@@ -61,14 +61,12 @@ } // 使用 list } if (PrizeActivityStatusEnum.OFF.getDescription().equals(prizeActivity.getEnableStatus())) { prizeActivity.setEnableStatus(PrizeActivityStatusEnum.ON.getDescription()); if (PrizeActivityStatusEnum.OFF.name().equals(prizeActivity.getEnableStatus())) { prizeActivity.setEnableStatus(PrizeActivityStatusEnum.ON.name()); baseMapper.updateById(prizeActivity); return Result.ok("启动成功"); }else { prizeActivity.setEnableStatus(PrizeActivityStatusEnum.OFF.getDescription()); prizeActivity.setEnableStatus(PrizeActivityStatusEnum.OFF.name()); baseMapper.updateById(prizeActivity); return Result.ok("关闭成功"); } @@ -84,6 +82,7 @@ @Override public Result add(PrizeActivityForm form) { PrizeActivity entity = PrizeActivityForm.getEntityByForm(form, null); entity.setEnableStatus(PrizeActivityStatusEnum.OFF.name()); baseMapper.insert(entity); return Result.ok("添加成功"); } @@ -100,6 +99,7 @@ // 为空抛IllegalArgumentException，做全局异常处理 Assert.notNull(entity, "记录不存在"); BeanUtils.copyProperties(form, entity); entity.setEnableStatus(PrizeActivityStatusEnum.OFF.name()); baseMapper.updateById(entity); return Result.ok("修改成功"); } framework/src/main/java/cn/lili/modules/store/serviceimpl/StoreServiceImpl.java
@@ -2,6 +2,7 @@ import cn.hutool.core.date.DateTime; import cn.hutool.core.text.CharSequenceUtil; import cn.hutool.crypto.SecureUtil; import cn.lili.cache.Cache; import cn.lili.cache.CachePrefix; import cn.lili.common.enums.ResultCode; @@ -11,10 +12,12 @@ import cn.lili.common.security.context.UserContext; import cn.lili.common.security.enums.UserEnums; import cn.lili.common.utils.BeanUtil; import cn.lili.common.utils.StringUtils; import cn.lili.common.vo.PageVO; import cn.lili.modules.goods.entity.dos.GoodsSku; import cn.lili.modules.goods.service.GoodsService; import cn.lili.modules.goods.service.GoodsSkuService; import cn.lili.modules.lmk.enums.general.DEFAULT_PASSWORD; import cn.lili.modules.member.entity.dos.Clerk; import cn.lili.modules.member.entity.dos.FootPrint; import cn.lili.modules.member.entity.dos.Member; @@ -44,6 +47,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import org.apache.rocketmq.spring.core.RocketMQTemplate; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -216,6 +220,9 @@ Member member = memberService.getById(store.getMemberId()); member.setHaveStore(true); member.setStoreId(id); if (StringUtils.isBlank(member.getPassword()) || DEFAULT_PASSWORD.DEFAULT_PASSWORD.getDesc().equals(member.getPassword())) { member.setPassword(new BCryptPasswordEncoder().encode(SecureUtil.md5(DEFAULT_PASSWORD.DEFAULT_PASSWORD.getDesc()))); } memberService.updateById(member); //创建店员 ClerkAddDTO clerkAddDTO = new ClerkAddDTO(); framework/src/main/resources/mapper/lmk/ActivityRefPrizeMapper.xml
@@ -26,6 +26,7 @@ <result column="prize_name" property="prizeName" /> <result column="prize_cover" property="prizeCover"/> <result column="prize_type" property="prizeType"/> <result column="max_pre_day" property="maxPreDay"/> </resultMap> <select id="getActivityRefPrizeByActivityId" resultMap="activityRefPrizeInfoMap"> SELECT @@ -37,6 +38,7 @@ LARP.version, LARP.remain_num, LARP.id, LARP.max_pre_day, LPD.prize_name, LPD.prize_cover, LPD.prize_type manager-api/src/main/java/cn/lili/controller/lmk/PrizeActivityController.java
@@ -39,18 +39,18 @@ public Result detail(@PathVariable("id") String id){ return prizeActivityService.detail(id); } @PutMapping public Result edit(@RequestBody PrizeActivityForm form){ return prizeActivityService.update(form); } // @PutMapping // public Result edit(@RequestBody PrizeActivityForm form){ // return prizeActivityService.update(form); // } @PostMapping public Result add(@RequestBody PrizeActivityForm form){ return prizeActivityService.add(form); } @DeleteMapping("/{id}") public Result del(@PathVariable("id") String id){ return prizeActivityService.removeById(id); } // @DeleteMapping("/{id}") // public Result del(@PathVariable("id") String id){ // return prizeActivityService.removeById(id); // } @PostMapping("/addActivityRefPrizeList/{id}") public Result addListByPrizeDraw(@PathVariable("id") String prizeActivityId,@RequestBody @Valid @Size(max = 5, message = "奖品数量必须在1到5个之间") List<ActivityRefPrizeForm> list){ return activityRefPrizeService.addList(prizeActivityId,list);
