From 3b09eb084576dd6be9a7b342edf345293bcc6459 Mon Sep 17 00:00:00 2001
From: jiangqs <jiangqs>
Date: 星期二, 25 七月 2023 09:57:27 +0800
Subject: [PATCH] bug
---
ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/order/ConsumerGoodsServiceImpl.java | 19 ++++++++++++++-----
1 files changed, 14 insertions(+), 5 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 b0155f3..a7d7a25 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
@@ -28,6 +28,7 @@
import com.ruoyi.system.api.service.RemoteMemberService;
import com.ruoyi.system.api.service.RemoteShopService;
import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
import javax.annotation.Resource;
import java.util.*;
@@ -93,6 +94,7 @@
* @param merSureConsumerGoodsDto
*/
@Override
+ @Transactional
public void sureMerConsumerGoods(MerSureConsumerGoodsDto merSureConsumerGoodsDto){
List<MerSureConsumerGoodsListDto> merSureConsumerGoodsListDtoList = merSureConsumerGoodsDto.getMerSureConsumerGoodsListDtoList();
if(merSureConsumerGoodsListDtoList!=null && !merSureConsumerGoodsListDtoList.isEmpty()){
@@ -162,6 +164,7 @@
* @param merSureConsumerGoodsDto
*/
@Override
+ @Transactional
public void useMerConsumerGoods(MerSureConsumerGoodsDto merSureConsumerGoodsDto){
List<MerSureConsumerGoodsListDto> goodsList = merSureConsumerGoodsDto.getMerSureConsumerGoodsListDtoList();
if (goodsList != null && !goodsList.isEmpty()) {
@@ -183,7 +186,7 @@
Integer experienceService = 0;
Integer experiencePerson = 0;
//获取会员商品总数
- MerMemberConsumerGoodsTotalVo memberGoodsTotal = this.getMemberConsumerGoodsTotalVo(merSureConsumerGoodsDto.getUserId(), merSureConsumerGoodsDto.getShopId());
+ MerMemberConsumerGoodsTotalVo memberGoodsTotal = this.getMemberConsumerGoodsTotalVo(merSureConsumerGoodsDto.getMemberUserId(), merSureConsumerGoodsDto.getShopId());
for (MerSureConsumerGoodsListDto goodsDto : goodsList) {
goods = this.getById(goodsDto.getConsumerGoodsId());
serviceNum = goods.getServiceNum();
@@ -254,7 +257,7 @@
userServiceRecordService.saveOrUpdate(serviceRecord);
//更新商户和会员服务统计
MemberTotalChangeDto memberTotalChange = new MemberTotalChangeDto();
- memberTotalChange.setUserId(merSureConsumerGoodsDto.getUserId());
+ memberTotalChange.setUserId(merSureConsumerGoodsDto.getMemberUserId());
memberTotalChange.setTypeService(2);
memberTotalChange.setServiceCount(serviceCount);
remoteMemberService.changeMemberTotal(memberTotalChange);
@@ -393,13 +396,19 @@
//处理商品服务次数
switch (consumerGoods.getGoodsType()) {
case 1:
- cycleService = cycleService + consumerGoods.getServiceNum();
+ if(consumerGoods.getServiceNum()!=null){
+ cycleService = cycleService + consumerGoods.getServiceNum();
+ }
break;
case 2:
- serviceService = serviceService + consumerGoods.getServiceNum();
+ if(consumerGoods.getServiceNum()!=null){
+ serviceService = serviceService + consumerGoods.getServiceNum();
+ }
break;
case 3:
- experienceService = experienceService + consumerGoods.getServiceNum();
+ if(consumerGoods.getServiceNum()!=null) {
+ experienceService = experienceService + consumerGoods.getServiceNum();
+ }
break;
default:
break;
--
Gitblit v1.7.1