From dd5f54f84fdae40267ed76d714f863ccf5a61967 Mon Sep 17 00:00:00 2001 From: jiangping <jp@doumee.com> Date: 星期一, 17 二月 2025 18:27:22 +0800 Subject: [PATCH] jtt808初始化 --- server/services/src/main/java/com/doumee/service/business/impl/GoodsorderServiceImpl.java | 50 +++++++++++++++++++++++++++++++++++--------------- 1 files changed, 35 insertions(+), 15 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 eeef052..9facadf 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; @@ -317,7 +317,8 @@ 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"); + queryWrapper.select("(select sum(er.discount_price) from member_rides er where er.ordre_id=t.id and er.isdeleted=0) as discountMoney," + + "(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()); } @@ -330,6 +331,7 @@ s.setMoney(Constants.translateMoney(s.getMoney())); s.setCloseMoney(Constants.translateMoney(s.getCloseMoney())); s.setRefundMoney(Constants.translateMoney(s.getRefundMoney())); + s.setDiscountMoney(Constants.translateMoney(s.getDiscountMoney())); }); } return PageData.from(goodsorderIPage); @@ -471,6 +473,12 @@ GoodsorderDetailDTO goodsorderDetailDTO = new GoodsorderDetailDTO(); goodsorderDetailDTO.setPayOrderDTOList(payOrderDTOList);//浜ゆ槗鏄庣粏 goodsorderDetailDTO.setMemberRidesList(memberRides);//楠戣璁板綍 + if(memberRides!=null){ + for(BikeLogDTO dd: memberRides){ + goodsorder.setDiscountMoney(Constants.formatDecimalNum(goodsorder.getDiscountMoney()).add(Constants.formatDecimalNum(dd.getDiscountPrice()))); + } + goodsorder.setDiscountMoney(Constants.translateMoney(goodsorder.getDiscountMoney())); + } goodsorderDetailDTO.setModel(goodsorder);//璁㈠崟瀵硅薄 return goodsorderDetailDTO; } @@ -516,9 +524,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){ @@ -534,17 +548,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)){ //楠戣鎬绘椂闀� @@ -631,7 +647,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; @@ -735,23 +751,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()); //濡傛灉鏄竴鍙d环鏂瑰紡锛屼环鏍肩洿鎺ヤ负涓�鍙d环baseMoney,濡傛灉涓嶆槸璁$畻姝e父浠锋牸 @@ -763,6 +782,7 @@ closeMoney = closeMoney.add(unit.multiply(Constants.formatDecimalNum(topRides.getUnitPrice()))); } } + topRides.setActualPrice(closeMoney); } //濡傛灉璁㈠崟浠锋牸灏侀《浜嗭紝鍙栬鍗� 浠锋牸 if(Constants.compareBigdecimal(closeMoney, yjMoney) ==1){ @@ -770,7 +790,7 @@ } ridesDetailResponse.setDuration(durationSum); ridesDetailResponse.setAmount(closeMoney); - ridesDetailResponse.setBikeType(topRides.getParamName()); + ridesDetailResponse.setBikeType(topRides!=null?topRides.getParamName():"-"); return ridesDetailResponse; } @@ -964,7 +984,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