From a95d0c4bdd96b09342c7ccf9aa1aef4b26b31302 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期四, 31 七月 2025 14:17:19 +0800
Subject: [PATCH] 修改bug
---
ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/service/impl/lottery/LotteryEventServiceImpl.java | 20 ++++++----
ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/service/lottery/ILotteryEventService.java | 4 +-
ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/controller/business/MerGoodsController.java | 30 ++++++--------
ruoyi-api/ruoyi-api-goods/src/main/java/com/ruoyi/goods/api/domain/TUserLotteryEvent.java | 5 ++
ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/controller/miniapp/AppLotteryEventController.java | 8 ++--
ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/domain/dto/CancelReservationDto.java | 4 +-
ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/service/RemoteShopService.java | 2
ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/controller/business/MerShopController.java | 4 +-
8 files changed, 41 insertions(+), 36 deletions(-)
diff --git a/ruoyi-api/ruoyi-api-goods/src/main/java/com/ruoyi/goods/api/domain/TUserLotteryEvent.java b/ruoyi-api/ruoyi-api-goods/src/main/java/com/ruoyi/goods/api/domain/TUserLotteryEvent.java
index 9b0a125..01fa7b4 100644
--- a/ruoyi-api/ruoyi-api-goods/src/main/java/com/ruoyi/goods/api/domain/TUserLotteryEvent.java
+++ b/ruoyi-api/ruoyi-api-goods/src/main/java/com/ruoyi/goods/api/domain/TUserLotteryEvent.java
@@ -64,5 +64,10 @@
*/
@TableField(value = "create_time")
private LocalDateTime createTime;
+ /**
+ * 订单id
+ */
+ @TableField(value = "orderId")
+ private String orderId;
}
diff --git a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/service/RemoteShopService.java b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/service/RemoteShopService.java
index 5d70ee6..1696d36 100644
--- a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/service/RemoteShopService.java
+++ b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/service/RemoteShopService.java
@@ -250,6 +250,6 @@
* @param shopId
* @return
*/
- @PostMapping("/getMemberIngTotal")
+ @PostMapping("/shop/getMemberIngTotal")
R<List<Integer>> getMemberIngTotal(@RequestParam("shopId") Long shopId);
}
diff --git a/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/controller/business/MerGoodsController.java b/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/controller/business/MerGoodsController.java
index 921b2a3..7dfb483 100644
--- a/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/controller/business/MerGoodsController.java
+++ b/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/controller/business/MerGoodsController.java
@@ -57,23 +57,19 @@
page.setOptimizeCountSql(false);
List<MerGoodsPageVo> merGoodsPageVoList = goodsService.pageMerShopGoods(page, merGoodsPageDto);
Shop shop = remoteShopService.getShop(merGoodsPageDto.getShopId()).getData();
- if (null != shop.getBelongShopId()){
- Shop belongShop = remoteShopService.getShop(shop.getBelongShopId()).getData();
- merGoodsPageVoList.forEach(merGoodsPageVo -> {
- ShopGoods shopGoods = shopGoodsService.getByShopIdAndGoodsId(merGoodsPageDto.getShopId(), merGoodsPageVo.getGoodsId());
- //后台开启经销商统一售价，且经销商设置了统一售价，加盟商不能修改价格
- if (1 == belongShop.getModifyPricePermission() && null != shopGoods) {
- merGoodsPageVo.setModifyPricePermission(0);
- merGoodsPageVo.setIsUnifiedPrice(1);
- merGoodsPageVo.setUnifiedPrice(shopGoods.getSalesPrice());
- merGoodsPageVo.setUnifiedServerNum(shopGoods.getServiceNum());
- } else {
- merGoodsPageVo.setModifyPricePermission(1);
- merGoodsPageVo.setIsUnifiedPrice(0);
- }
- });
- }
-
+ merGoodsPageVoList.forEach(merGoodsPageVo -> {
+ ShopGoods shopGoods = shopGoodsService.getByShopIdAndGoodsId(merGoodsPageDto.getShopId(), merGoodsPageVo.getGoodsId());
+ //后台开启经销商统一售价，且经销商设置了统一售价，加盟商不能修改价格
+ if (1 == shop.getModifyPricePermission() && null != shopGoods) {
+ merGoodsPageVo.setModifyPricePermission(0);
+ merGoodsPageVo.setIsUnifiedPrice(1);
+ merGoodsPageVo.setUnifiedPrice(shopGoods.getSalesPrice());
+ merGoodsPageVo.setUnifiedServerNum(shopGoods.getServiceNum());
+ } else {
+ merGoodsPageVo.setModifyPricePermission(1);
+ merGoodsPageVo.setIsUnifiedPrice(0);
+ }
+ });
return R.ok(page.setRecords(merGoodsPageVoList));
}
diff --git a/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/controller/miniapp/AppLotteryEventController.java b/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/controller/miniapp/AppLotteryEventController.java
index 284d34d..b2a3931 100644
--- a/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/controller/miniapp/AppLotteryEventController.java
+++ b/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/controller/miniapp/AppLotteryEventController.java
@@ -69,7 +69,7 @@
@ApiImplicitParam(name = "id", value = "抽奖活动id", required = true, dataType = "String", paramType = "path")
})
public R<LotteryEventVo> getLotteryEvent(@PathVariable("id") String id, @PathVariable("orderId") String orderId) {
- LotteryEventVo lotteryEvent = lotteryEventService.getLotteryEvent(id);
+ LotteryEventVo lotteryEvent = lotteryEventService.getLotteryEvent(id, orderId);
TLotteryEvent event = lotteryEventService.getById(id);
if (LocalDateTime.now().isBefore(event.getStartTime())) {
lotteryEvent.setStatus(1);
@@ -91,7 +91,7 @@
@ApiImplicitParam(name = "id", value = "抽奖活动id", required = true, dataType = "String", paramType = "path")
})
public R<TLotteryEventPrize> lotteryDraw(@PathVariable("id") String id, @PathVariable("orderId") String orderId) {
- return lotteryEventService.lotteryDraw(id);
+ return lotteryEventService.lotteryDraw(id, orderId);
}
@@ -122,12 +122,12 @@
@ResponseBody
- @PostMapping("/getLotteryEventInfo/{id}/{orderId}")
+ @PostMapping("/getLotteryEventInfo/{id}")
@ApiOperation(value = "获取抽奖活动详情【2.0】", tags = "抽奖活动")
@ApiImplicitParams({
@ApiImplicitParam(name = "id", value = "抽奖活动id", required = true, dataType = "String", paramType = "path")
})
- public R<LotteryEventInfoVo> getLotteryEventInfo(@PathVariable("id") String id, @PathVariable("orderId") String orderId){
+ public R<LotteryEventInfoVo> getLotteryEventInfo(@PathVariable("id") String id){
Long userId = SecurityUtils.getUserId();
TLotteryEvent lotteryEvent = lotteryEventService.getById(id);
LotteryEventInfoVo vo = new LotteryEventInfoVo();
diff --git a/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/service/impl/lottery/LotteryEventServiceImpl.java b/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/service/impl/lottery/LotteryEventServiceImpl.java
index 8767ffc..25e953d 100644
--- a/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/service/impl/lottery/LotteryEventServiceImpl.java
+++ b/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/service/impl/lottery/LotteryEventServiceImpl.java
@@ -79,7 +79,7 @@
* @return
*/
@Override
- public LotteryEventVo getLotteryEvent(String id) {
+ public LotteryEventVo getLotteryEvent(String id, String orderId) {
Long userId = SecurityUtils.getUserId();
TLotteryEvent lotteryEvent = this.getById(id);
//构建返回结果
@@ -87,7 +87,12 @@
vo.setId(lotteryEvent.getId());
vo.setName(lotteryEvent.getName());
vo.setActivityProfile(lotteryEvent.getActivityProfile());
- List<TUserLotteryEvent> userLotteryEvents = userLotteryEventService.list(new QueryWrapper<TUserLotteryEvent>().eq("lottery_event_id", id).eq("user_id", userId));
+ QueryWrapper<TUserLotteryEvent> wrapper = new QueryWrapper<TUserLotteryEvent>().eq("lottery_event_id", id).eq("user_id", userId);
+ //下单抽奖
+ if(2 == lotteryEvent.getActivityType()){
+ wrapper.eq("orderId", orderId);
+ }
+ List<TUserLotteryEvent> userLotteryEvents = userLotteryEventService.list(wrapper);
vo.setLaveTimes(lotteryEvent.getTimes() - userLotteryEvents.size());
//构建我的奖品明细
@@ -134,7 +139,7 @@
* @return
*/
@Override
- public R<TLotteryEventPrize> lotteryDraw(String id) {
+ public R<TLotteryEventPrize> lotteryDraw(String id, String orderId) {
Long userId = SecurityUtils.getUserId();
Member member = remoteMemberService.getMember(userId).getData();
TLotteryEvent lotteryEvent = this.getById(id);
@@ -152,11 +157,9 @@
boolean tryLock = lock.tryLock(30, TimeUnit.SECONDS);
if (tryLock) {
//判断抽奖次数是否用完
- if(2 != lotteryEvent.getActivityType()){
- int count = userLotteryEventService.count(new QueryWrapper<TUserLotteryEvent>().eq("lottery_event_id", id).eq("user_id", userId));
- if (lotteryEvent.getTimes() <= count) {
- return R.fail("抽奖次数已用完");
- }
+ int count = userLotteryEventService.count(new QueryWrapper<TUserLotteryEvent>().eq("lottery_event_id", id).eq("user_id", userId).eq("order_id", orderId));
+ if (lotteryEvent.getTimes() <= count) {
+ return R.fail("抽奖次数已用完");
}
List<TLotteryEventPrize> lotteryEventPrizeList = lotteryEventPrizeService.list(new QueryWrapper<TLotteryEventPrize>().eq("lottery_event_id", id));
//开始抽奖，根据中奖概率来抽奖
@@ -184,6 +187,7 @@
userLotteryEvent.setObjectId(lotteryEventPrize.getObjectId());
userLotteryEvent.setObjectName(lotteryEventPrize.getObjectName());
userLotteryEvent.setNumber(lotteryEventPrize.getNumber());
+ userLotteryEvent.setOrderId(orderId);
//中奖优惠券
if (1 == lotteryEventPrize.getPrizeType()) {
AddMemberCoupon addMemberCoupon = new AddMemberCoupon();
diff --git a/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/service/lottery/ILotteryEventService.java b/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/service/lottery/ILotteryEventService.java
index 2acb726..176a0f1 100644
--- a/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/service/lottery/ILotteryEventService.java
+++ b/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/service/lottery/ILotteryEventService.java
@@ -24,7 +24,7 @@
* @param id
* @return
*/
- LotteryEventVo getLotteryEvent(String id);
+ LotteryEventVo getLotteryEvent(String id, String orderId);
/**
@@ -33,7 +33,7 @@
* @param id
* @return
*/
- R<TLotteryEventPrize> lotteryDraw(String id);
+ R<TLotteryEventPrize> lotteryDraw(String id, String orderId);
/**
diff --git a/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/controller/business/MerShopController.java b/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/controller/business/MerShopController.java
index 2f8910d..120d96a 100644
--- a/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/controller/business/MerShopController.java
+++ b/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/controller/business/MerShopController.java
@@ -283,7 +283,7 @@
@RequestMapping(value = "/cancelReservation", method = RequestMethod.POST)
@ApiOperation(value = "商户取消预约【2.0】")
public R cancelReservation(@RequestBody CancelReservationDto dto) {
- TShopAppointableTime shopAppointableTime = shopAppointableTimeService.getById(dto.getId());
+ TShopAppointableTime shopAppointableTime = shopAppointableTimeService.getById(dto.getAppointmentId());
if (null == shopAppointableTime) {
return R.fail("预约不存在");
}
@@ -291,7 +291,7 @@
return R.fail("不能重复操作");
}
shopAppointableTime.setStatus(0);
- shopAppointableTime.setReason(dto.getReason());
+ shopAppointableTime.setReason(dto.getCancelReason());
shopAppointableTimeService.updateById(shopAppointableTime);
return R.ok();
}
diff --git a/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/domain/dto/CancelReservationDto.java b/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/domain/dto/CancelReservationDto.java
index 92ac870..c6d2623 100644
--- a/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/domain/dto/CancelReservationDto.java
+++ b/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/domain/dto/CancelReservationDto.java
@@ -10,7 +10,7 @@
@ApiModel
public class CancelReservationDto {
@ApiModelProperty(value = "预约id")
- private String id;
+ private String appointmentId;
@ApiModelProperty(value = "取消原因")
- private String reason;
+ private String cancelReason;
}
--
Gitblit v1.7.1