From 085926fe3c1db4d9237ec4adcb90b813ea30228d Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期四, 26 十月 2023 16:00:34 +0800
Subject: [PATCH] 修復车辆绑定关系bug
---
server/services/src/main/java/com/doumee/service/business/impl/GoodsorderServiceImpl.java | 36 +++++++++++++++++++++++++-----------
1 files changed, 25 insertions(+), 11 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 237d248..95ab98a 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
@@ -210,6 +210,7 @@
if (Objects.nonNull(model.getEndDate())){
queryWrapper.le( Goodsorder::getPayDate, Utils.Date.getEnd(model.getEndDate()));
}
+
queryWrapper.eq(model.getPayStatus() !=null,Goodsorder::getPayStatus,model.getPayStatus());
queryWrapper.like(model.getCode() !=null,Goodsorder::getCode,model.getCode());
queryWrapper.like(model.getId() !=null,Goodsorder::getId,model.getId());
@@ -227,6 +228,13 @@
public PageData<Goodsorder> findPage(PageWrap<Goodsorder> pageWrap) {
IPage<Goodsorder> page = new Page<>(pageWrap.getPage(), pageWrap.getCapacity());
MPJLambdaWrapper<Goodsorder> queryWrapper = initQueryParamByModel(pageWrap.getModel());
+ queryWrapper.select("(select er.status from member_rides er where er.ordre_id=t.id order by er.create_date limit 1) as memberRidesStatus");
+ if(Objects.nonNull(pageWrap.getModel().getCloseStatus()) && pageWrap.getModel().getCloseStatus().equals(Constants.ZERO)){
+ queryWrapper.ne(Goodsorder::getStatus,Constants.GOODSORDER_STATUS.CLOSE.getKey());
+ }
+ if(Objects.nonNull(pageWrap.getModel().getCloseStatus()) && pageWrap.getModel().getCloseStatus().equals(Constants.ONE)){
+ queryWrapper.eq(Goodsorder::getStatus,Constants.GOODSORDER_STATUS.CLOSE.getKey());
+ }
IPage<Goodsorder> goodsorderIPage = goodsorderJoinMapper.selectJoinPage(page, Goodsorder.class, queryWrapper);
if (!CollectionUtils.isEmpty(goodsorderIPage.getRecords())){
goodsorderIPage.getRecords().forEach(s->{
@@ -409,7 +417,7 @@
Goodsorder update = new Goodsorder();
update.setId(goodsorder.getId());
update.setStatus(Constants.GOODSORDER_STATUS.CLOSE.getKey());
- update.setCloseMoney(goodsorder.getMoney());
+ update.setCloseMoney(closeMoney);
update.setCloseDate(new Date());
update.setCloseInfo(Constants.REFUND_TYPE.get(type).getInfo());
update.setCloseUserId(goodsorder.getEditor());
@@ -494,7 +502,8 @@
wrapper.eq(MemberRides::getOrdreId,id);
wrapper.selectAll(MemberRides.class).selectAs(BaseParam::getName, MemberRides::getParamName);
wrapper.leftJoin(BaseParam.class, BaseParam::getId, MemberRides::getParamId);
- wrapper.orderByDesc(BaseParam::getSortnum);//鍙栨渶楂樿溅鍨嬩綔涓鸿浠锋柟妗�
+ wrapper.orderByDesc(BaseParam::getSortnum);
+ //鍙栨渶楂樿溅鍨嬩綔涓鸿浠锋柟妗�
//鏌ヨ鎵�鏈夐獞琛岃褰�
List<MemberRides> memberRides = memberRidesJoinMapper.selectList(wrapper);
return memberRides;
@@ -518,12 +527,13 @@
wrapper.select("sum(money) as money").last(" limit 1");
Refund total = refundMapper.selectOne(wrapper);
BigDecimal refundMoney = total == null?new BigDecimal(0):Constants.formatDecimalNum(total.getMoney());
- BigDecimal canBalance =Constants.formatDecimalNum(goodsorder.getMoney()).subtract(money);
+ //鍙��鍓╀綑 鍗曚綅鍏�
+ BigDecimal canBalance =Constants.translateMoney(Constants.formatDecimalNum(goodsorder.getMoney()).subtract(refundMoney));
if(canBalance.compareTo(money) > Constants.ZERO){
RefundDTO refundDTO = new RefundDTO();
refundDTO.setOrderId(orderId);
refundDTO.setCanBalance(canBalance);
- refundDTO.setRefundAmount(money);
+ refundDTO.setRefundAmount(money.multiply(new BigDecimal(100)));
refundDTO.setTotalAmount(goodsorder.getMoney());
refundDTO.setMemberId(goodsorder.getMemberId());
refundDTO.setCreator(principal.getId());
@@ -531,7 +541,7 @@
refundDTO.setType(Constants.REFUND_TYPE.BACK.getKey());
Refund refund = wxMiniUtilService.wxRefund(refundDTO);
}else {
- throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"瀵逛笉璧凤紝閫�娆鹃噾棰濅笉鍏佽瓒呰繃"+canBalance);
+ throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"瀵逛笉璧凤紝閫�娆鹃噾棰濅笉鍏佽瓒呰繃"+canBalance+"鍏�");
}
}
@@ -550,11 +560,13 @@
wrapper.select("sum(money) as money").last(" limit 1");
Refund total = refundMapper.selectOne(wrapper);
GoodsorderCanBanlanceDTO goodsorderCanBanlanceDTO = new GoodsorderCanBanlanceDTO();
- goodsorderCanBanlanceDTO.setGoodsorderMoney(goodsorder.getMoney());
- goodsorderCanBanlanceDTO.setCloseMoney(goodsorder.getCloseMoney());
+ goodsorderCanBanlanceDTO.setGoodsorderMoney( Constants.translateMoney(goodsorder.getMoney()));
+ goodsorderCanBanlanceDTO.setCloseMoney(Constants.translateMoney(goodsorder.getCloseMoney()));
BigDecimal reduce = total!=null?Constants.formatDecimalNum(total.getMoney()):new BigDecimal(0);
- goodsorderCanBanlanceDTO.setHasRefundMoney(reduce);
- goodsorderCanBanlanceDTO.setCanBanlanceMoney(Constants.formatDecimalNum(goodsorder.getMoney()).subtract(goodsorderCanBanlanceDTO.getHasRefundMoney()));
+ goodsorderCanBanlanceDTO.setHasRefundMoney(Constants.translateMoney(reduce));
+
+ BigDecimal subtract = Constants.translateMoney(goodsorder.getMoney()).subtract(goodsorderCanBanlanceDTO.getCloseMoney()).subtract(goodsorderCanBanlanceDTO.getHasRefundMoney());
+ goodsorderCanBanlanceDTO.setCanBanlanceMoney(subtract.compareTo(new BigDecimal("0")) > 0 ? subtract : new BigDecimal("0"));
return goodsorderCanBanlanceDTO;
}
@@ -617,7 +629,9 @@
if(goodsorder ==null){
throw new BusinessException(ResponseStatus.DATA_EMPTY);
}
- List<MemberRides> memberRides = getMemberRidesForClose(id);
+
+ List<MemberRides> memberRides = memberRidesJoinMapper.selectList(new QueryWrapper<MemberRides>()
+ .lambda().eq(MemberRides::getOrdreId,id).orderByDesc(MemberRides::getCreateDate));
if (!CollectionUtils.isEmpty(memberRides)){
//棰勮缁撶畻浠锋牸鍜岃绠楁椂闀�
int freeTime = 0;
@@ -742,7 +756,7 @@
*/
@Override
public Boolean checkTemporaryStop(){
- if(systemDictDataBiz.queryByCode(Constants.MINI_PROGRAMME,Constants.IS_STOP_SERVE).getCode().equals(Constants.ONE)){
+ if(systemDictDataBiz.queryByCode(Constants.MINI_PROGRAMME,Constants.IS_STOP_SERVE).getCode().equals(Constants.ONE.toString())){
String stopServeStartTime = systemDictDataBiz.queryByCode(Constants.MINI_PROGRAMME,Constants.STOP_SERVE_STARTTIME).getCode();
String stopServeEndTime = systemDictDataBiz.queryByCode(Constants.MINI_PROGRAMME,Constants.STOP_SERVE_ENDTIME).getCode();
//鏌ヨ褰撳墠鏃堕棿鏄惁鍦ㄥ仠姝腑
--
Gitblit v1.9.3