From c97706c3cc213b7db3d381e8a0435ff0ef9a04d6 Mon Sep 17 00:00:00 2001
From: jiangqs <jiangqs>
Date: 星期一, 04 九月 2023 18:53:40 +0800
Subject: [PATCH] seata 同步 支付调整
---
ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/service/impl/activity/ActivityServiceImpl.java | 24 +++++++++++++-----------
1 files changed, 13 insertions(+), 11 deletions(-)
diff --git a/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/service/impl/activity/ActivityServiceImpl.java b/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/service/impl/activity/ActivityServiceImpl.java
index 798f229..0901f6d 100644
--- a/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/service/impl/activity/ActivityServiceImpl.java
+++ b/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/service/impl/activity/ActivityServiceImpl.java
@@ -138,12 +138,12 @@
Date activityStartTime = mgtActivityEditDto.getActivityStartTime();
Date activityEndTime = mgtActivityEditDto.getActivityEndTime();
// 根据当前时间和活动时间判断活动状态
- if (nowTime.compareTo(activityStartTime) < 0) {
+ /*if (nowTime.compareTo(activityStartTime) < 0) {
activity.setActivityStatus(0);
} else {
activity.setActivityStatus(1);
- }
+ }*/
// 设置活动信息
activity.setActivityName(mgtActivityEditDto.getActivityName());
activity.setActivityIntroduce(mgtActivityEditDto.getActivityIntroduce());
@@ -172,6 +172,7 @@
activity.setApplicableShop(result);
}
}
+ activity.setActivityStatus(0);
this.saveOrUpdate(activity);
// 获取活动商品信息
List<MgtActivityGoodsEditDto> mgtActivityGoodsEditDtoList = mgtActivityEditDto.getMgtActivityGoodsEditDtoList();
@@ -186,6 +187,7 @@
activityGoods.setActivityPrice(dto.getActivityPrice());
activityGoods.setActivitySubscription(dto.getActivitySubscription());
activityGoods.setActivityNumber(dto.getActivityNumber());
+ activityGoods.setActivityStock(dto.getActivityNumber());
activityGoods.setSalesNumber(0);
activityGoods.setActivityDeadline(activity.getActivityEndTime());
activityGoods.setSellOutFlag(0);
@@ -459,12 +461,14 @@
String activityId = activityGoodsGetDto.getActivityId();
String goodsId = activityGoodsGetDto.getGoodsId();
Activity activity = this.getById(activityId);
+ //获取活动商品
ActivityGoods activityGoods = activityGoodsService.getByGoodsId(activityId,goodsId);
activityGoodsGetVo.setActivityName(activity.getActivityName());
activityGoodsGetVo.setActivityPrice(activityGoods.getActivityPrice());
activityGoodsGetVo.setActivitySubscription(activityGoods.getActivitySubscription());
activityGoodsGetVo.setActivityStatus(activity.getActivityStatus());
- Integer availableBuyNum = activityGoods.getActivityNumber() - activityGoods.getSalesNumber();
+ //剩余库存
+ Integer availableBuyNum = activityGoods.getActivityStock();
//限购判断
if(activityGoods.getPurchaseLimitationFlag()==1){
Integer buyNum = activityRecordService.getUserActivityGoodsNum(goodsId,activityId,activityGoodsGetDto.getUserId());
@@ -550,7 +554,7 @@
List<ActivityGoods> activityGoodsList = activityGoodsService.listByActivityId(activityId);
if(activityGoodsList!=null&&!activityGoodsList.isEmpty()){
for(ActivityGoods activityGoods : activityGoodsList){
- redisService.setCacheObject(SecurityConstant.ACTIVITY_GOODS+"-"+activityId+"-"+activityGoods.getGoodsId(),activityGoods.getActivityNumber());
+ redisService.setCacheObject(SecurityConstant.ACTIVITY_GOODS+"-"+activityId+"-"+activityGoods.getGoodsId(),activityGoods.getActivityStock());
}
}
this.saveOrUpdate(activity);
@@ -648,13 +652,11 @@
*/
@Override
public List<MgtActivityListVo> listStaffActivity(StaffActivityListDto staffActivityListDto){
- return activityMapper.listStaffActivity(staffActivityListDto);
+ List<MgtActivityListVo> activityListVoList = new ArrayList<>();
+ if(staffActivityListDto.getActivityFrom()!=null&&staffActivityListDto.getActivityFrom()==1){
+ activityListVoList = activityMapper.listStaffActivity(staffActivityListDto);
+ }
+ return activityListVoList;
}
- private void createActivityCode(String activityId){
-
-
-
-
- }
}
--
Gitblit v1.7.1