From db5fdfbfe157b6b45389fadffa8831f8a3ad955d Mon Sep 17 00:00:00 2001
From: jiaosong <jiaosong6760@dingtalk.com>
Date: 星期三, 25 十月 2023 11:57:57 +0800
Subject: [PATCH] # 时间设置
---
server/services/src/main/java/com/doumee/service/business/impl/GoodsorderServiceImpl.java | 18 ++++++++++++++----
1 files changed, 14 insertions(+), 4 deletions(-)
diff --git a/server/services/src/main/java/com/doumee/service/business/impl/GoodsorderServiceImpl.java b/server/services/src/main/java/com/doumee/service/business/impl/GoodsorderServiceImpl.java
index 2a55636..b62949e 100644
--- a/server/services/src/main/java/com/doumee/service/business/impl/GoodsorderServiceImpl.java
+++ b/server/services/src/main/java/com/doumee/service/business/impl/GoodsorderServiceImpl.java
@@ -26,6 +26,7 @@
import com.doumee.dao.business.model.MemberRides;
import com.doumee.dao.business.vo.GoodsorderExportVO;
import com.doumee.dao.business.vo.GoodsorderTotalDataVO;
+import com.doumee.dao.business.web.request.BikeRepairDTO;
import com.doumee.dao.business.web.request.GoodsorderCanBanlanceDTO;
import com.doumee.dao.business.web.request.MemberRidesQuery;
import com.doumee.dao.business.web.request.RefundDTO;
@@ -394,6 +395,8 @@
@Transactional(rollbackFor = {Exception.class,BusinessException.class})
@Override
public void closeGoodsorder( Goodsorder goodsorder ,int type ) {
+
+//
List<MemberRides> memberRides = getMemberRidesForClose(goodsorder.getId());
//榛樿缁撶畻涓烘娂閲戦噾棰�
BigDecimal closeMoney = new BigDecimal(0.00);
@@ -424,6 +427,8 @@
if(Constants.REFUND_TYPE.PLAT_FORCE.getKey() == type){
//濡傛灉鏄己鍒剁粨绠�
update.setCloseType(Constants.ONE);
+ LoginUserInfo principal = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
+ update.setEditor(principal.getId());
}else if(Constants.REFUND_TYPE.NORMAL.getKey() == type){
//濡傛灉鏄嚜琛岀祼绠�
update.setCloseType(Constants.ZERO);
@@ -441,6 +446,7 @@
refundDTO.setTotalAmount(goodsorder.getMoney());
refundDTO.setMemberId(goodsorder.getMemberId());
refundDTO.setReason(Constants.REFUND_TYPE.get(type).getName());
+ refundDTO.setCreator(update.getEditor());
refundDTO.setType(type);
Refund refund = wxMiniUtilService.wxRefund(refundDTO);
update.setCloseId(refund.getId());
@@ -529,7 +535,7 @@
BigDecimal refundMoney = total == null?new BigDecimal(0):Constants.formatDecimalNum(total.getMoney());
//鍙��鍓╀綑 鍗曚綅鍏�
BigDecimal canBalance =Constants.translateMoney(Constants.formatDecimalNum(goodsorder.getMoney()).subtract(refundMoney));
- if(canBalance.compareTo(money) > Constants.ZERO){
+ if(canBalance.compareTo(money) >= Constants.ZERO){
RefundDTO refundDTO = new RefundDTO();
refundDTO.setOrderId(orderId);
refundDTO.setCanBalance(canBalance);
@@ -565,7 +571,7 @@
BigDecimal reduce = total!=null?Constants.formatDecimalNum(total.getMoney()):new BigDecimal(0);
goodsorderCanBanlanceDTO.setHasRefundMoney(Constants.translateMoney(reduce));
- BigDecimal subtract = Constants.translateMoney(goodsorder.getMoney()).subtract(goodsorderCanBanlanceDTO.getCloseMoney()).subtract(goodsorderCanBanlanceDTO.getHasRefundMoney());
+ BigDecimal subtract = Constants.translateMoney(goodsorder.getMoney()).subtract(goodsorderCanBanlanceDTO.getHasRefundMoney());
goodsorderCanBanlanceDTO.setCanBanlanceMoney(subtract.compareTo(new BigDecimal("0")) > 0 ? subtract : new BigDecimal("0"));
return goodsorderCanBanlanceDTO;
}
@@ -630,8 +636,12 @@
throw new BusinessException(ResponseStatus.DATA_EMPTY);
}
- List<MemberRides> memberRides = memberRidesJoinMapper.selectList(new QueryWrapper<MemberRides>()
- .lambda().eq(MemberRides::getOrdreId,id).orderByDesc(MemberRides::getCreateDate));
+ List<MemberRides> memberRides = memberRidesJoinMapper.selectJoinList(MemberRides.class,new MPJLambdaWrapper<MemberRides>()
+ .selectAll(MemberRides.class)
+ .selectAs(BaseParam::getName,MemberRides::getParamName)
+ .leftJoin(BaseParam.class,BaseParam::getId,MemberRides::getParamId)
+ .eq(MemberRides::getOrdreId,id)
+ .orderByDesc(MemberRides::getCreateDate));
if (!CollectionUtils.isEmpty(memberRides)){
//棰勮缁撶畻浠锋牸鍜岃绠楁椂闀�
int freeTime = 0;
--
Gitblit v1.9.3