From 25314d6c4fe5155691a75f9ea2be8608efeca359 Mon Sep 17 00:00:00 2001
From: jiangqs <jiangqs>
Date: 星期五, 02 六月 2023 18:56:54 +0800
Subject: [PATCH] 商户管理调整
---
ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/order/ConsumerGoodsServiceImpl.java | 22 ++++++++++++++++------
1 files changed, 16 insertions(+), 6 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..db79d33 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,8 @@
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.DateUtils;
+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;
@@ -110,20 +112,28 @@
throw new ServiceException(AppErrorConstant.BEYOND_SURP_NUM);
}
consumerGoods.setUsedNum(usedNum+useNum);
- consumerGoods.setUseTime(new Date());
- if(consumerGoods.getUsedNum()==serviceNum){
+ consumerGoods.setUseTime(DateUtils.getNowDate());
+ if(consumerGoods.getUsedNum().equals(serviceNum)){
consumerGoods.setServiceStatus(2);
- consumerGoods.setCompleteTime(new Date());
+ consumerGoods.setCompleteTime(DateUtils.getNowDate());
}
this.saveOrUpdate(consumerGoods);
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());
+ userServiceRecord.setCreateTime(DateUtils.getNowDate());
userServiceRecord.setServiceType(serviceType);
userServiceRecord.setDelFlag(0);
userServiceRecord.setShopId(shopId);
--
Gitblit v1.7.1