From cde49794973557adda93091606a9820e7fddb46f Mon Sep 17 00:00:00 2001 From: jiangping <jp@doumee.com> Date: 星期三, 11 十月 2023 17:03:58 +0800 Subject: [PATCH] Merge branch 'dev' of http://139.186.142.91:10010/r/productDev/parkBike into dev --- server/services/src/main/java/com/doumee/service/business/impl/GoodsorderServiceImpl.java | 201 ++++++++++++++++++++++++++++++++++++++------------ 1 files changed, 152 insertions(+), 49 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 e2c3aaf..0c8f1e1 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,12 +26,15 @@ 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.MemberRidesQuery; import com.doumee.dao.business.web.request.RefundDTO; import com.doumee.dao.business.web.response.*; import com.doumee.dao.business.join.MemberRidesJoinMapper; import com.doumee.dao.business.model.*; import com.doumee.service.business.GoodsorderService; +import com.doumee.service.business.MemberRidesService; import com.doumee.service.business.PricingRuleService; +import com.doumee.service.business.RefundService; import com.github.binarywang.wxpay.bean.notify.WxPayNotifyResponse; import com.github.binarywang.wxpay.bean.request.BaseWxPayRequest; import com.github.binarywang.wxpay.bean.request.WxPayUnifiedOrderRequest; @@ -99,6 +102,9 @@ @Autowired PricingRuleService pricingRuleService; + @Autowired + RefundService refundService; + @Override public String create(Goodsorder goodsorder) { goodsorderMapper.insert(goodsorder); @@ -147,12 +153,12 @@ @Override public Goodsorder findOne(Goodsorder goodsorder) { QueryWrapper<Goodsorder> wrapper = new QueryWrapper<>(goodsorder); - return goodsorderMapper.selectOne(wrapper); + return goodsorderMapper.selectOne(wrapper.last(" limit 1")); } @Override public Goodsorder findOneByWrapper(QueryWrapper<Goodsorder> wrapper) { - return goodsorderMapper.selectOne(wrapper); + return goodsorderMapper.selectOne(wrapper.last(" limit 1")); } @Override @@ -161,43 +167,51 @@ return goodsorderMapper.selectList(wrapper); } @Override - public List<GoodsorderExportVO> findExportNotBikPage(Goodsorder model){ - List<GoodsorderExportVO> list = new ArrayList<>(); + public PageData<GoodsorderExportVO> findAccountDetailPage(PageWrap<Goodsorder> pageWrap) { + IPage<Goodsorder> page = new Page<>(pageWrap.getPage(), pageWrap.getCapacity()); + pageWrap.getModel().setPayStatus(Constants.ONE); //鍙煡璇㈡敮浠樻垚鍔熺殑 + MPJLambdaWrapper<Goodsorder> queryWrapper = initQueryParamByModel(pageWrap.getModel()); + return PageData.from(goodsorderJoinMapper.selectJoinPage(page, GoodsorderExportVO.class,queryWrapper)); + } + @Override + public List<GoodsorderExportVO> findExportAccountDetailPage(Goodsorder model){ model.setPayStatus(Constants.ONE); //鍙煡璇㈡敮浠樻垚鍔熺殑 MPJLambdaWrapper<Goodsorder> queryWrapper = initQueryParamByModel(model); - List<Goodsorder> goodsorderList = goodsorderJoinMapper.selectJoinList(Goodsorder.class,queryWrapper); + List<GoodsorderExportVO> goodsorderList = goodsorderJoinMapper.selectJoinList(GoodsorderExportVO.class,queryWrapper); + /* List<GoodsorderExportVO> list = new ArrayList<>(); if(goodsorderList!=null){ for(Goodsorder order : goodsorderList){ GoodsorderExportVO vo = new GoodsorderExportVO(); vo.setId(order.getId()); + vo.setCode(order.getCode()); vo.setOpenid(order.getMemberOpenid()); vo.setPayDate(order.getPayDate()); vo.setCloseDate(order.getCloseDate()); - vo.setCloseDate(order.getCloseDate()); - vo.setCloseMoney(Constants.formatDecimalNum(order.getCloseMoney()).divide(new BigDecimal(100), 2, BigDecimal.ROUND_UP)); + vo.setMoney(Constants.translateMoney(order.getMoney())); + vo.setCloseMoney(Constants.translateMoney(order.getCloseMoney())); vo.setRefundDate(order.getRefundDate()); - vo.setRefundMoney(Constants.formatDecimalNum(order.getRefundMoney()).divide(new BigDecimal(100), 2, BigDecimal.ROUND_UP)); + vo.setRefundMoney(Constants.translateMoney(order.getRefundMoney())); list.add(vo); } - } - return list; + }*/ + return goodsorderList; } private MPJLambdaWrapper<Goodsorder> initQueryParamByModel(Goodsorder model) { MPJLambdaWrapper<Goodsorder> queryWrapper = new MPJLambdaWrapper<>(); Utils.MP.blankToNull(model); - queryWrapper.selectAll(Goodsorder.class); queryWrapper.selectAs(Member::getOpenid, Goodsorder::getMemberOpenid); queryWrapper.leftJoin(Member.class, Member::getId ,Goodsorder::getMemberId); - queryWrapper.select("select max(r.done_date) from refund r where t1.obj_id=t.id and r.status=2 ) as refund_date"); - queryWrapper.select("select sum(r.money) from refund r where t1.obj_id=t.id and r.status=2) as refund_money"); + queryWrapper.select("(select max(r.done_date) from refund r where r.obj_id=t.id and r.status=2 ) as refund_date"); + queryWrapper.select("(select sum(r.money) from refund r where r.obj_id=t.id and r.status=2) as refund_money"); //鏃堕棿娈电瓫閫� queryWrapper.ge(model.getStartDate()!=null, Goodsorder::getPayDate, model.getStartDate()); queryWrapper.le(model.getEndDate()!=null, Goodsorder::getPayDate, model.getEndDate()); queryWrapper.eq(model.getPayStatus() !=null,Goodsorder::getPayStatus,model.getPayStatus()); - queryWrapper.eq(model.getCode() !=null,Goodsorder::getCode,model.getCode()); + queryWrapper.like(model.getCode() !=null,Goodsorder::getCode,model.getCode()); + queryWrapper.like(model.getId() !=null,Goodsorder::getId,model.getId()); queryWrapper.eq(model.getStatus() !=null,Goodsorder::getStatus,model.getStatus()); - queryWrapper.eq(model.getOnlineOrderid() !=null,Goodsorder::getOnlineOrderid,model.getOnlineOrderid()); + queryWrapper.like(model.getOnlineOrderid() !=null,Goodsorder::getOnlineOrderid,model.getOnlineOrderid()); queryWrapper.like(model.getMemberOpenid() !=null,Member::getOpenid,model.getMemberOpenid()); queryWrapper.eq(Goodsorder::getIsdeleted,Constants.ZERO); queryWrapper.orderByDesc(Goodsorder::getPayDate); @@ -211,6 +225,7 @@ MPJLambdaWrapper<Goodsorder> queryWrapper = initQueryParamByModel(pageWrap.getModel()); return PageData.from(goodsorderJoinMapper.selectJoinPage(page, Goodsorder.class,queryWrapper)); } + @Override public long count(Goodsorder goodsorder) { @@ -276,47 +291,55 @@ List<PayOrderDTO> payOrderDTOList = new ArrayList<>(); Goodsorder goodsorder = goodsorderMapper.selectById(id); + if(goodsorder == null){ + throw new BusinessException(ResponseStatus.DATA_EMPTY ); + } QueryWrapper<Refund> refundQuery = new QueryWrapper<>(); refundQuery.lambda() - .eq(Refund::getObjId,id); + .eq(Refund::getObjId,id) + .orderByAsc(Refund::getDoneDate); + //鏌ヨ鎵�鏈夋湁閫�娆捐褰� List<Refund> refunds = refundMapper.selectList(refundQuery); - PayOrderDTO payOrderDTO = new PayOrderDTO(); + payOrderDTO.setId(goodsorder.getId()); payOrderDTO.setOrderCode(goodsorder.getCode()); payOrderDTO.setPayWay(goodsorder.getPayWay()); - payOrderDTO.setMoney(goodsorder.getMoney()); + payOrderDTO.setMoney(Constants.translateMoney(goodsorder.getMoney())); payOrderDTO.setPayDate(goodsorder.getPayDate()); + payOrderDTO.setOnlineorderId(goodsorder.getOnlineOrderid()); payOrderDTOList.add(0,payOrderDTO); if (!CollectionUtils.isEmpty(refunds)){ refunds.forEach(s->{ PayOrderDTO refundOrderDTO = new PayOrderDTO(); refundOrderDTO.setOrderCode(s.getCode()); + refundOrderDTO.setId(s.getId()); refundOrderDTO.setPayWay(s.getPayWay()); refundOrderDTO.setRefundType(s.getType()); - refundOrderDTO.setMoney(s.getMoney()); + refundOrderDTO.setMoney(Constants.translateMoney(s.getMoney())); refundOrderDTO.setPayDate(s.getDoneDate()); payOrderDTOList.add(refundOrderDTO); }); } - MPJLambdaWrapper<MemberRides> wrapper = new MPJLambdaWrapper<>(); - wrapper.leftJoin(BaseParam.class,BaseParam::getId,MemberRides::getParamId) - .eq(BaseParam::getType, Constants.THREE); - List<MemberRides> memberRides = memberRidesJoinMapper.selectJoinList(MemberRides.class, wrapper); + MemberRidesQuery query = new MemberRidesQuery(); + query.setGoodsorderId(goodsorder.getId()); + List<BikeLogDTO> memberRides = MemberRidesServiceImpl.findBikeLogList(memberRidesJoinMapper,query); GoodsorderDetailDTO goodsorderDetailDTO = new GoodsorderDetailDTO(); - goodsorderDetailDTO.setPayOrderDTOList(payOrderDTOList); - goodsorderDetailDTO.setMemberRidesList(memberRides); + goodsorderDetailDTO.setPayOrderDTOList(payOrderDTOList);//浜ゆ槗鏄庣粏 + goodsorderDetailDTO.setMemberRidesList(memberRides);//楠戣璁板綍 + goodsorderDetailDTO.setModel(goodsorder);//璁㈠崟瀵硅薄 return goodsorderDetailDTO; } + @Transactional(rollbackFor = {Exception.class,BusinessException.class}) @Override - public void closerGoodsorder(String id) { + public void closerGoodsorder(String orderId) { LoginUserInfo principal = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal(); - Goodsorder goodsorder = goodsorderMapper.selectById(id); + Goodsorder goodsorder = goodsorderMapper.selectById(orderId); QueryWrapper<MemberRides> wrapper = new QueryWrapper<>(); wrapper.lambda() - .eq(MemberRides::getOrdreId,id); + .eq(MemberRides::getOrdreId,orderId); List<MemberRides> memberRides = memberRidesMapper.selectList(wrapper); if (!CollectionUtils.isEmpty(memberRides)){ boolean exitUnBack = memberRides.stream().anyMatch(s -> !Constants.MEMBER_RIDES_STATUS.BACK_CYCLING.getKey().equals(s.getStatus())); @@ -343,8 +366,10 @@ Integer durationSum = memberRides.stream().filter(s -> s.getDuration() > 0).mapToInt(s -> s.getDuration()).sum(); if (durationSum > pricingRule.getMemberRides().getBaseTime()){ + BigDecimal bigDecimal = new BigDecimal((durationSum - pricingRule.getMemberRides().getBaseTime())); BigDecimal basePrice = pricingRule.getMemberRides().getBasePrice(); - BigDecimal multiply = pricingRule.getMemberRides().getUnitPrice().multiply(new BigDecimal((durationSum - pricingRule.getMemberRides().getBaseTime()))); + BigDecimal multiply = pricingRule.getMemberRides().getUnitPrice() + .multiply(bigDecimal.divide(pricingRule.getMemberRides().getUnitPrice(),BigDecimal.ROUND_UP)); ridesDetailResponse.setAmount(basePrice.add(multiply)); }else { ridesDetailResponse.setAmount(pricingRule.getMemberRides().getBasePrice()); @@ -353,36 +378,114 @@ ridesDetailResponse.setDuration(durationSum); ridesDetailResponse.setMemberRidesResponseList(collect); + if(goodsorder.getMoney().compareTo(ridesDetailResponse.getAmount())>Constants.ZERO){ - Refund refund = new Refund(); - refund.setCreateDate(new Date()); - refund.setCreator(principal.getId()); - refund.setEditDate(new Date()); - refund.setEditor(principal.getId()); - refund.setIsdeleted(Constants.ZERO); - refund.setInfo("绯荤粺缁撶畻鍚庤鍗曡嚜鍔ㄥ畬缁�"); -// refund.setCode(); - refund.setMemberId(goodsorder.getMemberId()); - refund.setMoney(goodsorder.getMoney().subtract(ridesDetailResponse.getAmount())); -// refund.setStatus(); -// refund.setPreOrderid(); -// refund.setOnlineOrderid(); - refund.setPayWay(goodsorder.getPayWay()); - refund.setDoneDate(new Date()); - refund.setType(Constants.ONE); - refund.setObjId(goodsorder.getId()); - refund.setReason("纭畾寮哄埗缁撶畻鍚楋紵缁撶畻鍚庤鍗曡嚜鍔ㄥ畬缁�"); - refundMapper.insert(refund); + RefundDTO refundDTO = new RefundDTO(); + refundDTO.setOrderId(orderId); + refundDTO.setCanBalance(goodsorder.getMoney()); + refundDTO.setRefundAmount(goodsorder.getMoney().subtract(ridesDetailResponse.getAmount())); + refundDTO.setTotalAmount(goodsorder.getMoney()); + refundDTO.setMemberId(goodsorder.getMemberId()); + refundDTO.setReason("骞冲彴寮哄埗缁撶畻閫�娆�"); + refundDTO.setType(Constants.REFUND_TYPE.PLAT_AUTO.getKey()); + Refund refund = wxMiniUtilService.wxRefund(refundDTO); + + //瀛樺偍 娑堣垂浜ゆ槗娴佹按 + Transactions transactions = new Transactions(); + transactions.setMemberId(goodsorder.getMemberId()); + transactions.setCreateDate(new Date()); + transactions.setIsdeleted(Constants.ZERO); + transactions.setOrderId(orderId); + transactions.setMoney(goodsorder.getMoney().compareTo(ridesDetailResponse.getAmount())<=Constants.ZERO?goodsorder.getMoney():ridesDetailResponse.getAmount()); + transactions.setType(Constants.transactionsType.consumption); + transactions.setDoneDate(new Date()); + transactions.setTitle("娑堣垂缁撶畻"); + transactions.setContent("缁撶畻瀹為檯娑堣垂"); + transactions.setBalance(BigDecimal.ZERO); + transactions.setObjId(orderId); + transactions.setObjType(Constants.ONE); + transactionsMapper.insert(transactions); + + Goodsorder update = new Goodsorder(); + update.setId(goodsorder.getId()); + update.setStatus(Constants.GOODSORDER_STATUS.CLOSE.getKey()); + update.setCloseMoney(goodsorder.getMoney().subtract(ridesDetailResponse.getAmount())); + update.setCloseId(refund.getId()); + update.setCloseDate(refund.getDoneDate()); + update.setCloseInfo(refund.getInfo()); + update.setCloseUserId(principal.getId()); + update.setCloseType(Constants.ONE); + goodsorderMapper.updateById(update); + } + }else { + + RefundDTO refundDTO = new RefundDTO(); + refundDTO.setOrderId(orderId); + refundDTO.setCanBalance(goodsorder.getMoney()); + refundDTO.setRefundAmount(goodsorder.getMoney()); + refundDTO.setTotalAmount(goodsorder.getMoney()); + refundDTO.setMemberId(goodsorder.getMemberId()); + refundDTO.setReason("骞冲彴寮哄埗缁撶畻閫�娆�"); + refundDTO.setType(Constants.REFUND_TYPE.PLAT_FORCE.getKey()); + Refund refund = wxMiniUtilService.wxRefund(refundDTO); + + //瀛樺偍 娑堣垂浜ゆ槗娴佹按 + Transactions transactions = new Transactions(); + transactions.setMemberId(goodsorder.getMemberId()); + transactions.setCreateDate(new Date()); + transactions.setIsdeleted(Constants.ZERO); + transactions.setOrderId(orderId); + transactions.setMoney(goodsorder.getMoney()); + transactions.setType(Constants.transactionsType.consumption); + transactions.setDoneDate(new Date()); + transactions.setTitle("娑堣垂缁撶畻"); + transactions.setContent("缁撶畻瀹為檯娑堣垂"); + transactions.setBalance(BigDecimal.ZERO); + transactions.setObjId(orderId); + transactions.setObjType(Constants.ONE); + transactionsMapper.insert(transactions); + Goodsorder update = new Goodsorder(); update.setId(goodsorder.getId()); update.setStatus(Constants.GOODSORDER_STATUS.CLOSE.getKey()); - update.setCloseMoney(goodsorder.getMoney().subtract(ridesDetailResponse.getAmount())); + update.setCloseMoney(goodsorder.getMoney()); update.setCloseId(refund.getId()); update.setCloseDate(refund.getDoneDate()); update.setCloseInfo(refund.getInfo()); update.setCloseUserId(principal.getId()); update.setCloseType(Constants.ONE); goodsorderMapper.updateById(update); + + } + + + } + + @Override + public void backGoodsorder(String orderId, BigDecimal money) { + + LoginUserInfo principal = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal(); + Goodsorder goodsorder = goodsorderMapper.selectById(orderId); + QueryWrapper<Refund> wrapper = new QueryWrapper<>(); + wrapper.lambda() + .eq(Refund::getObjId,orderId) + .orderByDesc(Refund::getCreateDate) + .last("limit 1"); + Refund lastRefund = refundMapper.selectOne(wrapper); + if (Objects.isNull(lastRefund)){ + throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"鏀硅鍗曡缁撶畻鍚庡湪閫�娆�"); + } + BigDecimal canBalance = lastRefund.getCanBalance(); + if(canBalance.compareTo(money) > Constants.ZERO){ + RefundDTO refundDTO = new RefundDTO(); + refundDTO.setOrderId(orderId); + refundDTO.setCanBalance(lastRefund.getCanBalance().subtract(lastRefund.getMoney())); + refundDTO.setRefundAmount(money); + refundDTO.setTotalAmount(goodsorder.getMoney()); + refundDTO.setMemberId(goodsorder.getMemberId()); + refundDTO.setReason("骞冲彴閫�娆�"); + refundDTO.setType(Constants.REFUND_TYPE.BACK.getKey()); + Refund refund = wxMiniUtilService.wxRefund(refundDTO); } } -- Gitblit v1.9.3