From 7433322e94209c63bd6257dd4bf3b24be0452325 Mon Sep 17 00:00:00 2001
From: zxl <763096477@qq.com>
Date: 星期四, 21 八月 2025 18:12:04 +0800
Subject: [PATCH] 奖品,抽奖活动bug改动，商家入驻密码重置111111
---
manager-api/src/main/java/cn/lili/controller/lmk/PrizeActivityController.java | 16 ++++++++--------
framework/src/main/java/cn/lili/modules/lmk/domain/form/PrizeDrawForm.java | 2 +-
framework/src/main/java/cn/lili/modules/store/serviceimpl/StoreServiceImpl.java | 7 +++++++
framework/src/main/java/cn/lili/modules/lmk/service/impl/PrizeActivityServiceImpl.java | 10 +++++-----
framework/src/main/resources/mapper/lmk/ActivityRefPrizeMapper.xml | 2 ++
framework/src/main/java/cn/lili/modules/lmk/enums/general/DEFAULT_PASSWORD.java | 12 ++++++++++++
framework/src/main/java/cn/lili/modules/lmk/domain/vo/ActivityRefPrizeInfoVO.java | 1 +
framework/src/main/java/cn/lili/modules/lmk/enums/general/PrizeActivityStatusEnum.java | 4 ++--
framework/src/main/java/cn/lili/modules/lmk/service/impl/ActivityRefPrizeServiceImpl.java | 2 +-
9 files changed, 39 insertions(+), 17 deletions(-)
diff --git a/framework/src/main/java/cn/lili/modules/lmk/domain/form/PrizeDrawForm.java b/framework/src/main/java/cn/lili/modules/lmk/domain/form/PrizeDrawForm.java
index 2d2e83c..459f609 100644
--- a/framework/src/main/java/cn/lili/modules/lmk/domain/form/PrizeDrawForm.java
+++ b/framework/src/main/java/cn/lili/modules/lmk/domain/form/PrizeDrawForm.java
@@ -33,7 +33,7 @@
@NotNull(message = "浼樻儬鍗穒d涓嶈兘涓虹┖", groups = {Add.class, Update.class})
@ApiModelProperty("浼樻儬鍗穒d")
- private Long couponId;
+ private String couponId;
@NotBlank(message = "濂栧搧鍐呭涓嶈兘涓虹┖", groups = {Add.class, Update.class})
@ApiModelProperty("濂栧搧鍐呭")
diff --git a/framework/src/main/java/cn/lili/modules/lmk/domain/vo/ActivityRefPrizeInfoVO.java b/framework/src/main/java/cn/lili/modules/lmk/domain/vo/ActivityRefPrizeInfoVO.java
index 3fabc88..3ea5af6 100644
--- a/framework/src/main/java/cn/lili/modules/lmk/domain/vo/ActivityRefPrizeInfoVO.java
+++ b/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;
}
diff --git a/framework/src/main/java/cn/lili/modules/lmk/enums/general/DEFAULT_PASSWORD.java b/framework/src/main/java/cn/lili/modules/lmk/enums/general/DEFAULT_PASSWORD.java
new file mode 100644
index 0000000..95011af
--- /dev/null
+++ b/framework/src/main/java/cn/lili/modules/lmk/enums/general/DEFAULT_PASSWORD.java
@@ -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;
+
+}
diff --git a/framework/src/main/java/cn/lili/modules/lmk/enums/general/PrizeActivityStatusEnum.java b/framework/src/main/java/cn/lili/modules/lmk/enums/general/PrizeActivityStatusEnum.java
index c985764..e5fd857 100644
--- a/framework/src/main/java/cn/lili/modules/lmk/enums/general/PrizeActivityStatusEnum.java
+++ b/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;
}
diff --git a/framework/src/main/java/cn/lili/modules/lmk/service/impl/ActivityRefPrizeServiceImpl.java b/framework/src/main/java/cn/lili/modules/lmk/service/impl/ActivityRefPrizeServiceImpl.java
index 1b6fb25..779e295 100644
--- a/framework/src/main/java/cn/lili/modules/lmk/service/impl/ActivityRefPrizeServiceImpl.java
+++ b/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("鎴愬姛");
}
diff --git a/framework/src/main/java/cn/lili/modules/lmk/service/impl/PrizeActivityServiceImpl.java b/framework/src/main/java/cn/lili/modules/lmk/service/impl/PrizeActivityServiceImpl.java
index 2b199ce..1405050 100644
--- a/framework/src/main/java/cn/lili/modules/lmk/service/impl/PrizeActivityServiceImpl.java
+++ b/framework/src/main/java/cn/lili/modules/lmk/service/impl/PrizeActivityServiceImpl.java
@@ -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 @@
// 涓虹┖鎶汭llegalArgumentException锛屽仛鍏ㄥ眬寮傚父澶勭悊
Assert.notNull(entity, "璁板綍涓嶅瓨鍦�");
BeanUtils.copyProperties(form, entity);
+ entity.setEnableStatus(PrizeActivityStatusEnum.OFF.name());
baseMapper.updateById(entity);
return Result.ok("淇敼鎴愬姛");
}
diff --git a/framework/src/main/java/cn/lili/modules/store/serviceimpl/StoreServiceImpl.java b/framework/src/main/java/cn/lili/modules/store/serviceimpl/StoreServiceImpl.java
index 2d6693b..4beb1dc 100644
--- a/framework/src/main/java/cn/lili/modules/store/serviceimpl/StoreServiceImpl.java
+++ b/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();
diff --git a/framework/src/main/resources/mapper/lmk/ActivityRefPrizeMapper.xml b/framework/src/main/resources/mapper/lmk/ActivityRefPrizeMapper.xml
index 1ea9f4e..a6fcdd5 100644
--- a/framework/src/main/resources/mapper/lmk/ActivityRefPrizeMapper.xml
+++ b/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
diff --git a/manager-api/src/main/java/cn/lili/controller/lmk/PrizeActivityController.java b/manager-api/src/main/java/cn/lili/controller/lmk/PrizeActivityController.java
index 2a93009..d32b54e 100644
--- a/manager-api/src/main/java/cn/lili/controller/lmk/PrizeActivityController.java
+++ b/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);
--
Gitblit v1.8.0