From cc3bbf14c5fde619c23e5502c8583889e94deacc Mon Sep 17 00:00:00 2001 From: jiaosong <jiaosong6760@dingtalk.com> Date: 星期三, 25 十月 2023 09:58:58 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev --- server/services/src/main/java/com/doumee/service/business/impl/GoodsorderServiceImpl.java | 15 +++++++++++---- 1 files changed, 11 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 1b492b7..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; @@ -395,7 +396,7 @@ @Override public void closeGoodsorder( Goodsorder goodsorder ,int type ) { - LoginUserInfo principal = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal(); +// List<MemberRides> memberRides = getMemberRidesForClose(goodsorder.getId()); //榛樿缁撶畻涓烘娂閲戦噾棰� BigDecimal closeMoney = new BigDecimal(0.00); @@ -426,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); @@ -443,7 +446,7 @@ refundDTO.setTotalAmount(goodsorder.getMoney()); refundDTO.setMemberId(goodsorder.getMemberId()); refundDTO.setReason(Constants.REFUND_TYPE.get(type).getName()); - refundDTO.setCreator(principal.getId()); + refundDTO.setCreator(update.getEditor()); refundDTO.setType(type); Refund refund = wxMiniUtilService.wxRefund(refundDTO); update.setCloseId(refund.getId()); @@ -633,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