From 431dde90aa20f7652092fc0bfa9e6a1a28b06b9f Mon Sep 17 00:00:00 2001
From: jiangqs <343695869@qq.com>
Date: 星期日, 06 八月 2023 12:41:23 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/HongRuiTang
---
ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/service/impl/activity/ActivityServiceImpl.java | 16 +++++++++++++++-
1 files changed, 15 insertions(+), 1 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 ec44e37..b096fea 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
@@ -29,6 +29,7 @@
import com.ruoyi.system.api.domain.vo.MgtSimpleShopVo;
import com.ruoyi.system.api.domain.vo.MgtUserIdByKeywordVo;
import com.ruoyi.system.api.service.RemoteConfigService;
+import com.ruoyi.system.api.service.RemoteFileService;
import com.ruoyi.system.api.service.RemoteMemberService;
import com.ruoyi.system.api.service.RemoteShopService;
import org.redisson.api.RLock;
@@ -85,6 +86,9 @@
@Autowired
private RedissonClient redissonClient;
+ @Resource
+ private RemoteFileService remoteFileService;
+
/**
* @param mgtActivityEditDto
* @return void
@@ -97,6 +101,9 @@
Activity activity;
// 获取当前时间
Date nowTime = new Date();
+ if(mgtActivityEditDto.getActivityStartTime().compareTo(mgtActivityEditDto.getActivityEndTime())>0){
+ throw new ServiceException(AppErrorConstant.ACTIVITY_SE_ERROR);
+ }
// 如果活动ID不为空，则表示修改活动信息
if (StringUtils.isNotBlank(mgtActivityEditDto.getActivityId())) {
// 获取活动信息
@@ -123,6 +130,12 @@
activityTotal.setRefundTotal(0);
activityTotal.setOrderMoneyTotal(BigDecimal.ZERO);
activityTotalService.save(activityTotal);
+ CodeGetDto codeGetDto = new CodeGetDto();
+ String url = "https://wxapp.hhhrt.cn/mini/activity?activityId="+activityId;
+ codeGetDto.setUrl(url);
+ codeGetDto.setFileName("activity-"+activityId);
+ String codeUrl = remoteFileService.getAppOrderTotal(codeGetDto).getData();
+ activity.setActivityCode(codeUrl);
}
// 获取活动开始时间和结束时间
Date activityStartTime = mgtActivityEditDto.getActivityStartTime();
@@ -577,9 +590,10 @@
try {
lock.lock(30, TimeUnit.SECONDS);
if(agStockChangeDto.getChangeType()==1){
+ //减少销量增加库存
activityMapper.addActivityGoodsStock(agStockChangeDto);
}else{
- //更新库存
+ //增加销量减少库存
activityMapper.subActivityGoodsStock(agStockChangeDto);
}
} finally {
--
Gitblit v1.7.1