From e3067f58cce422bbd26a7729bf59f5f4f34a530f Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期五, 14 二月 2025 14:13:38 +0800
Subject: [PATCH] jtt808初始化
---
server/services/src/main/java/com/doumee/service/business/impl/GoodsorderServiceImpl.java | 46 ++++++++++++++++++++++++++++++----------------
1 files changed, 30 insertions(+), 16 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 4b18e96..de6cd97 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
@@ -90,9 +90,9 @@
private MemberMapper memberMapper;
@Autowired
private BaseParamMapper baseParamMapper;
-
@Autowired
private RefundMapper refundMapper;
+
@Autowired
private RefundJoinMapper refundJoinMapper;
@@ -247,6 +247,7 @@
List<GoodsorderExportVO> goodsorderList = null;
if(Constants.formatIntegerNum(model.getType())==Constants.ZERO){
MPJLambdaWrapper<Goodsorder> queryWrapper = initQueryParamByModel(model);
+ queryWrapper.orderByAsc(Goodsorder::getPayDate);
goodsorderList = goodsorderJoinMapper.selectJoinList(GoodsorderExportVO.class,queryWrapper);
}else{
@@ -270,7 +271,7 @@
queryWrapper.le( Refund::getDoneDate, Utils.Date.getEnd(model.getEndDate()));
}
queryWrapper.eq(Refund::getStatus,Constants.TWO);//閫�娆惧畬鎴�
- queryWrapper.orderByAsc(Refund::getDoneDate);
+ queryWrapper.orderByAsc(Refund::getDoneDate);;
goodsorderList = refundJoinMapper.selectJoinList(GoodsorderExportVO.class,queryWrapper);
}
if (!CollectionUtils.isEmpty(goodsorderList)){
@@ -306,7 +307,7 @@
queryWrapper.like(model.getOpenid() !=null,Member::getOpenid,model.getOpenid());
queryWrapper.eq(Goodsorder::getIsdeleted,Constants.ZERO);
queryWrapper.eq(Goodsorder::getPayStatus,Constants.ONE);
- queryWrapper.orderByDesc(Goodsorder::getPayDate);
+
return queryWrapper;
}
@@ -315,6 +316,7 @@
public PageData<Goodsorder> findPage(PageWrap<Goodsorder> pageWrap) {
IPage<Goodsorder> page = new Page<>(pageWrap.getPage(), pageWrap.getCapacity());
MPJLambdaWrapper<Goodsorder> queryWrapper = initQueryParamByModel(pageWrap.getModel());
+ queryWrapper.orderByDesc(Goodsorder::getPayDate);
queryWrapper.select("(select er.status from member_rides er where er.ordre_id=t.id order by er.create_date desc 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());
@@ -514,9 +516,15 @@
BigDecimal closeMoney = new BigDecimal(0.00);
if (!CollectionUtils.isEmpty(memberRides)){
//楠戣鎬绘椂闀�
- closeMoney = getCloseMoneyByRides(memberRides,true,goodsorder.getMoney()).getAmount();
+ //棰勮缁撶畻浠锋牸鍜岃绠楁椂闀�
+ int freeTime = 0;
+ try {
+ freeTime = Integer.parseInt(systemDictDataBiz.queryByCode(Constants.MINI_PROGRAMME, Constants.FREE_RENT_TIME).getCode());
+ }catch (Exception e){
+ }
+ closeMoney = getCloseMoneyByRides(memberRides,freeTime,true,goodsorder.getMoney()).getAmount();
//瀹為檯缁撶畻浠锋牸锛岃褰曞湪鏈�楂樿溅鍨嬭褰曚笂
- memberRides.get(0).setActualPrice(closeMoney);
+// memberRides.get(0).setActualPrice(closeMoney);
}
int refundMoney =( Constants.formatDecimalNum(goodsorder.getMoney()).subtract(closeMoney)).intValue();//璁＄畻浠锋牸
if(refundMoney>0){
@@ -532,17 +540,19 @@
boolean res = wxMiniUtilService.wxRefund(refundDTO);
}else{
//鏃犻��娆剧粨绠�
- closeGoodsorderDoneNoRefund(goodsorder,type,new BigDecimal(0),null);
+ closeGoodsorderDoneNoRefund(goodsorder,type,new BigDecimal(0),null,memberRides);
}
}
- public void closeGoodsorderDoneNoRefund(Goodsorder goodsorder,int type,BigDecimal refundMoney,String closeId) {
+ public void closeGoodsorderDoneNoRefund(Goodsorder goodsorder,int type,BigDecimal refundMoney,String closeId,List<MemberRides> memberRides ) {
log.error("========================================"+JSONObject.toJSONString(goodsorder));
if(goodsorder ==null || Constants.formatIntegerNum(goodsorder.getStatus()) != Constants.GOODSORDER_STATUS.HAVING_PAY.getKey()){
return;
}
BigDecimal closeMoney =( Constants.formatDecimalNum(goodsorder.getMoney()).subtract(refundMoney));
//杩涜璁㈠崟缁撶畻涓氬姟澶勭悊
- List<MemberRides> memberRides = getMemberRidesForClose(goodsorder.getId());
+ if(memberRides == null){
+ memberRides = getMemberRidesForClose(goodsorder.getId());
+ }
//榛樿缁撶畻涓烘娂閲戦噾棰�
if (!CollectionUtils.isEmpty(memberRides)){
//楠戣鎬绘椂闀�
@@ -629,7 +639,7 @@
//閫�娆句箰琛�
int type =Constants.formatIntegerNum(refund.getType());
Goodsorder goodsorder = goodsorderMapper.selectById(refund.getObjId());
- closeGoodsorderDoneNoRefund(goodsorder,refund.getType(),refund.getMoney(),refund.getId());
+ closeGoodsorderDoneNoRefund(goodsorder,refund.getType(),refund.getMoney(),refund.getId(),null);
/* log.error("========================================"+JSONObject.toJSONString(goodsorder));
if(goodsorder ==null || Constants.formatIntegerNum(goodsorder.getStatus()) != Constants.GOODSORDER_STATUS.HAVING_PAY.getKey()){
return;
@@ -733,23 +743,26 @@
transactionsMapper.insert(transactions);
}
- private RidesDetailResponse getCloseMoneyByRides(List<MemberRides> memberRides,boolean isClose,BigDecimal yjMoney) {
+ private RidesDetailResponse getCloseMoneyByRides(List<MemberRides> memberRides,int freeTime,boolean isClose,BigDecimal yjMoney) {
RidesDetailResponse ridesDetailResponse = new RidesDetailResponse();
BigDecimal closeMoney = new BigDecimal(0.00);
int durationSum = 0;
- MemberRides topRides =memberRides.get(0);
+ MemberRides topRides =null;
//鍙栨渶楂樿溅鍨嬭绠楁柟妗堢粨绠楄鍗�
for(MemberRides rides : memberRides){
if ( isClose && Constants.MEMBER_RIDES_STATUS.BACK_CYCLING.getKey()!=(Constants.formatIntegerNum(rides.getStatus()))){
throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"褰撳墠璁㈠崟鏈夋湭瀹屾垚鐨勯獞琛岋紝鏃犳硶寮哄埗缁撶畻");
}
durationSum += Constants.formatIntegerNum(rides.getDuration());//绱楠戣锛堣璐癸級鏃堕暱
- if(Constants.formatIntegerNum(topRides.getSortnum())<Constants.formatIntegerNum(rides.getSortnum())){
- topRides = rides;
+ if(durationSum-freeTime > 0 ){//鍙畻瓒呭嚭鍏嶈垂鏃堕暱鐨勬暟鎹�
+ if(topRides == null ||( Constants.formatIntegerNum(topRides.getSortnum())<Constants.formatIntegerNum(rides.getSortnum())
+ && Constants.formatIntegerNum(rides.getDuration())>0)){
+ topRides = rides;
+ }
}
}
// MemberRides topRides =memberRides.get(0);
- if(durationSum > 0 && topRides != null){
+ if( topRides != null){
int baseTime =Constants.formatIntegerNum(topRides.getBaseTime());
closeMoney = Constants.formatDecimalNum(topRides.getBasePrice());
//濡傛灉鏄竴鍙ｄ环鏂瑰紡锛屼环鏍肩洿鎺ヤ负涓�鍙ｄ环baseMoney,濡傛灉涓嶆槸璁＄畻姝ｅ父浠锋牸
@@ -761,6 +774,7 @@
closeMoney = closeMoney.add(unit.multiply(Constants.formatDecimalNum(topRides.getUnitPrice())));
}
}
+ topRides.setActualPrice(closeMoney);
}
//濡傛灉璁㈠崟浠锋牸灏侀《浜嗭紝鍙栬鍗� 浠锋牸
if(Constants.compareBigdecimal(closeMoney, yjMoney) ==1){
@@ -768,7 +782,7 @@
}
ridesDetailResponse.setDuration(durationSum);
ridesDetailResponse.setAmount(closeMoney);
- ridesDetailResponse.setBikeType(topRides.getParamName());
+ ridesDetailResponse.setBikeType(topRides!=null?topRides.getParamName():"-");
return ridesDetailResponse;
}
@@ -962,7 +976,7 @@
return memberRidesResponse;
}).collect(Collectors.toList());
//绱鍜岄绠楃粨绠楅噾棰�
- RidesDetailResponse ridesDetailResponse = getCloseMoneyByRides(memberRides,false,goodsorder.getMoney());
+ RidesDetailResponse ridesDetailResponse = getCloseMoneyByRides(memberRides,freeTime,false,goodsorder.getMoney());
if(Constants.formatIntegerNum(goodsorder.getStatus())!= Constants.goodsorderStatus.pay){
//濡傛灉闈炲凡鏀粯浣嗘湭缁撶畻锛屼娇鐢ㄨ鍗曢噾棰�
ridesDetailResponse.setAmount(goodsorder.getCloseMoney());
--
Gitblit v1.9.3