From 3f7a3aefe2965459aed169383b285fba400cfe8c Mon Sep 17 00:00:00 2001
From: jiangqs <343695869@qq.com>
Date: 星期日, 04 六月 2023 13:13:54 +0800
Subject: [PATCH] Merge branch 'master' of http://sinata.cn:10101/gitblit/r/java/HongRuiTang
---
ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/order/ConsumerGoodsServiceImpl.java | 7 ++++---
1 files changed, 4 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 003aa9c..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,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.DateUtils;
import com.ruoyi.common.core.utils.StringUtils;
import com.ruoyi.order.domain.dto.*;
import com.ruoyi.order.domain.pojo.order.ConsumerGoods;
@@ -111,10 +112,10 @@
throw new ServiceException(AppErrorConstant.BEYOND_SURP_NUM);
}
consumerGoods.setUsedNum(usedNum+useNum);
- consumerGoods.setUseTime(new Date());
+ 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();
@@ -132,7 +133,7 @@
}
}
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