From ae41759bafec1c2a1e8858fcdcda4272ed4eb84c Mon Sep 17 00:00:00 2001
From: jiangqs <jiangqs>
Date: 星期五, 16 六月 2023 17:43:47 +0800
Subject: [PATCH] 联调bug和订单管理
---
ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/order/ConsumerGoodsServiceImpl.java | 15 ++++++++++++---
1 files changed, 12 insertions(+), 3 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 2200084..003aa9c 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
@@ -4,6 +4,7 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.common.core.exception.ServiceException;
+import com.ruoyi.common.core.utils.StringUtils;
import com.ruoyi.order.domain.dto.*;
import com.ruoyi.order.domain.pojo.order.ConsumerGoods;
import com.ruoyi.order.domain.pojo.order.UserServiceRecord;
@@ -111,7 +112,7 @@
}
consumerGoods.setUsedNum(usedNum+useNum);
consumerGoods.setUseTime(new Date());
- if(consumerGoods.getUsedNum()==serviceNum){
+ if(consumerGoods.getUsedNum().equals(serviceNum)){
consumerGoods.setServiceStatus(2);
consumerGoods.setCompleteTime(new Date());
}
@@ -119,8 +120,16 @@
shopId = consumerGoods.getShopId();
userId= consumerGoods.getUserId();
serviceType = consumerGoods.getGoodsType();
- consumerGoodsIds = consumerGoodsIds + consumerGoods.getConsumerGoodsId();
- consumerGoodsNames = consumerGoodsNames + consumerGoods.getGoodsName();
+ if(StringUtils.isBlank(consumerGoodsIds)){
+ consumerGoodsIds = consumerGoods.getConsumerGoodsId();
+ }else{
+ consumerGoodsIds = consumerGoodsIds + "," + consumerGoods.getConsumerGoodsId();
+ }
+ if(StringUtils.isBlank(consumerGoodsNames)){
+ consumerGoodsNames = consumerGoods.getGoodsName();
+ }else{
+ consumerGoodsNames = consumerGoodsNames + "、" + consumerGoods.getGoodsName();
+ }
}
UserServiceRecord userServiceRecord = new UserServiceRecord();
userServiceRecord.setCreateTime(new Date());
--
Gitblit v1.7.1