From 026d15ddf508317942482da480cb79c0ee9f68fd Mon Sep 17 00:00:00 2001
From: jiangqs <jiangqs>
Date: 星期三, 13 九月 2023 13:19:16 +0800
Subject: [PATCH] bug
---
ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/order/ConsumerGoodsServiceImpl.java | 45 ++++++++++++++++++++++-----------------------
1 files changed, 22 insertions(+), 23 deletions(-)
diff --git a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/order/ConsumerGoodsServiceImpl.java b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/order/ConsumerGoodsServiceImpl.java
index 29ba1ef..6dcdcc6 100644
--- a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/order/ConsumerGoodsServiceImpl.java
+++ b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/order/ConsumerGoodsServiceImpl.java
@@ -29,7 +29,6 @@
import com.ruoyi.system.api.domain.poji.member.Member;
import com.ruoyi.system.api.service.RemoteGoodsService;
import com.ruoyi.system.api.service.RemoteMemberService;
-import com.ruoyi.system.api.service.RemoteShopService;
import io.seata.spring.annotation.GlobalTransactional;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@@ -58,9 +57,6 @@
@Resource
private RemoteMemberService remoteMemberService;
-
- @Resource
- private RemoteShopService remoteShopService;
@Resource
private RemoteGoodsService remoteGoodsService;
@@ -101,7 +97,7 @@
* @param merSureConsumerGoodsDto
*/
@Override
- @Transactional
+ @Transactional
public void sureMerConsumerGoods(MerSureConsumerGoodsDto merSureConsumerGoodsDto){
ConsumerGoods oldConsumerGoods = this.getById(merSureConsumerGoodsDto.getConsumerGoodsId());
if(oldConsumerGoods.getSureNum()==null||oldConsumerGoods.getSureNum()<1){
@@ -112,16 +108,17 @@
ConsumerGoods consumerGoods;
Integer serviceCount = 0;
Integer cycleService = 0;
- Integer cyclePerson = 0;
+ //Integer cyclePerson = 0;
Integer serviceService = 0;
- Integer servicePerson = 0;
+ //Integer servicePerson = 0;
Integer experienceService = 0;
- Integer experiencePerson = 0;
+ //Integer experiencePerson = 0;
Goods goods;
GoodsFile goodsFile;
String consumerGoodsId;
List<ConsumerGoods> consumerGoodsList = new ArrayList<>();
- MerMemberConsumerGoodsTotalVo memberConsumerGoodsTotalVo = this.getMemberConsumerGoodsTotalVo(merSureConsumerGoodsDto.getUserId(), merSureConsumerGoodsDto.getShopId());
+ //获取用户各类型订单数
+ //MerMemberConsumerGoodsTotalVo memberConsumerGoodsTotalVo = this.getMemberConsumerGoodsTotalVo(merSureConsumerGoodsDto.getUserId(), merSureConsumerGoodsDto.getShopId());
int sureNum = 0;
for(MerSureConsumerGoodsListDto merSureConsumerGoodsListDto : merSureConsumerGoodsListDtoList){
goods = remoteGoodsService.getGoods(merSureConsumerGoodsListDto.getGoodsId()).getData();
@@ -168,6 +165,7 @@
}
}
}
+ //判断商品确认次数
if(sureNum>oldConsumerGoods.getSureNum()){
throw new ServiceException(AppErrorConstant.GOODS_SURE_FAILED);
}else{
@@ -181,7 +179,7 @@
}
this.saveBatch(consumerGoodsList);
//判断是否加人
- if (cycleService > 0 && memberConsumerGoodsTotalVo.getCycleOrder() == 0) {
+ /*if (cycleService > 0 && memberConsumerGoodsTotalVo.getCycleOrder() == 0) {
cyclePerson = 1;
}
if (serviceService > 0 && memberConsumerGoodsTotalVo.getServiceOrder() == 0) {
@@ -189,7 +187,7 @@
}
if (experienceService > 0 && memberConsumerGoodsTotalVo.getExperienceOrder() == 0) {
experiencePerson = 1;
- }
+ }*/
serviceCount = cycleService + serviceService + experienceService;
//更新商户和会员服务统计
MemberTotalChangeDto memberTotalChangeDto = new MemberTotalChangeDto();
@@ -234,15 +232,15 @@
Integer serviceType = 1;
Integer serviceCount = 0;
Integer cycleService = 0;
- Integer cyclePerson = 0;
+ //Integer cyclePerson = 0;
Integer serviceService = 0;
- Integer servicePerson = 0;
+ //Integer servicePerson = 0;
Integer experienceService = 0;
- Integer experiencePerson = 0;
+ //Integer experiencePerson = 0;
//获取会员商品总数
List<ServiceRecordDetail> serviceRecordDetailList = new ArrayList<>();
ServiceRecordDetail serviceRecordDetail;
- MerMemberConsumerGoodsTotalVo memberGoodsTotal = this.getMemberConsumerGoodsTotalVo(merSureConsumerGoodsDto.getMemberUserId(), merSureConsumerGoodsDto.getShopId());
+ //MerMemberConsumerGoodsTotalVo memberGoodsTotal = this.getMemberConsumerGoodsTotalVo(merSureConsumerGoodsDto.getMemberUserId(), merSureConsumerGoodsDto.getShopId());
List<String> consumerGoodsList = new ArrayList<>();
for (MerSureConsumerGoodsListDto goodsDto : goodsList) {
consumerGoods = this.getById(goodsDto.getConsumerGoodsId());
@@ -304,7 +302,7 @@
}
//判断是否减人
- if (cycleService > 0 && memberGoodsTotal.getCycleOrder() - cycleService < 1) {
+ /*if (cycleService > 0 && memberGoodsTotal.getCycleOrder() - cycleService < 1) {
cyclePerson = 1;
}
if (serviceService > 0 && memberGoodsTotal.getServiceOrder() - serviceService < 1) {
@@ -312,7 +310,7 @@
}
if (experienceService > 0 && memberGoodsTotal.getExperienceOrder() - experienceService < 1) {
experiencePerson = 1;
- }
+ }*/
serviceCount = cycleService + serviceService + experienceService;
UserServiceRecord serviceRecord = new UserServiceRecord();
serviceRecord.setCreateTime(new Date());
@@ -323,6 +321,7 @@
serviceRecord.setConsumerGoodsIds(goodsIds);
serviceRecord.setConsumerGoodsNames(goodsNames);
userServiceRecordService.saveOrUpdate(serviceRecord);
+ //服务记录详情
for(ServiceRecordDetail serviceRecordDetail1 : serviceRecordDetailList){
serviceRecordDetail1.setRecordId(serviceRecord.getId());
}
@@ -465,14 +464,14 @@
public boolean saveBatchConsumerGoods(List<ConsumerGoods> consumerGoodsList){
Integer serviceCount = 0;
Integer cycleService = 0;
- Integer cyclePerson = 0;
+ //Integer cyclePerson = 0;
Integer serviceService = 0;
- Integer servicePerson = 0;
+ //Integer servicePerson = 0;
Integer experienceService = 0;
- Integer experiencePerson = 0;
+ //Integer experiencePerson = 0;
Long shopId = consumerGoodsList.get(0).getShopId();
Long userId = consumerGoodsList.get(0).getUserId();
- MerMemberConsumerGoodsTotalVo memberConsumerGoodsTotalVo = this.getMemberConsumerGoodsTotalVo(userId, shopId);
+ //MerMemberConsumerGoodsTotalVo memberConsumerGoodsTotalVo = this.getMemberConsumerGoodsTotalVo(userId, shopId);
for(ConsumerGoods consumerGoods : consumerGoodsList){
//处理商品服务次数
switch (consumerGoods.getGoodsType()) {
@@ -496,7 +495,7 @@
}
}
//判断是否加人
- if (cycleService > 0 && memberConsumerGoodsTotalVo.getCycleOrder() == 0) {
+ /*if (cycleService > 0 && memberConsumerGoodsTotalVo.getCycleOrder() == 0) {
cyclePerson = 1;
}
if (serviceService > 0 && memberConsumerGoodsTotalVo.getServiceOrder() == 0) {
@@ -504,7 +503,7 @@
}
if (experienceService > 0 && memberConsumerGoodsTotalVo.getExperienceOrder() == 0) {
experiencePerson = 1;
- }
+ }*/
serviceCount = cycleService + serviceService + experienceService;
//更新商户和会员服务统计
MemberTotalChangeDto memberTotalChangeDto = new MemberTotalChangeDto();
--
Gitblit v1.7.1