From 34c7d903efa4dc06a0f7b38bc5d2d721f80b220d Mon Sep 17 00:00:00 2001 From: liujie <1793218484@qq.com> Date: 星期三, 09 七月 2025 09:04:52 +0800 Subject: [PATCH] 7.8冒烟修改问题 --- ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TbOrderServiceImpl.java | 42 ++++++++++++++++++++++++++++++++---------- 1 files changed, 32 insertions(+), 10 deletions(-) diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TbOrderServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TbOrderServiceImpl.java index 842584a..f161767 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TbOrderServiceImpl.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TbOrderServiceImpl.java @@ -31,6 +31,7 @@ import java.math.RoundingMode; import java.net.InetAddress; import java.util.Date; +import java.util.HashMap; import java.util.List; /** @@ -64,11 +65,24 @@ @Autowired private TbMessageService messageService; + @Autowired + private TbShareholderService shareholderService; + @Override public Page<MyPushCompanyListVo> getMyOrderList(MyOrderListQuery query, Long userId) { Page<MyPushCompanyListVo> page = new Page<>(query.getPageNum(), query.getPageSize()); return this.baseMapper.getMyOrderList(page,query,userId); + } + + @Override + public HashMap<String, Object> getMyOrderListNum(Long userId, HashMap<String, Object> map) { + List<MyPushCompanyListVo> list = this.baseMapper.getMyOrderListNum(userId); + map.put("toBeConfirmed", list.stream().filter(e -> e.getStatus() == 2).count()); + map.put("pendingPayment", list.stream().filter(e -> e.getStatus() == 3).count()); + map.put("processing", list.stream().filter(e -> e.getStatus() == 4).count()); + map.put("completed", list.stream().filter(e -> e.getStatus() == 6).count()); + return map; } @Override @@ -104,7 +118,8 @@ if (order!=null) { order.setStatus(4); order.setPayTime(new Date()); - order.setOutTradeNo(notifyResult.getTransactionId()); + order.setOutTradeNo(notifyResult.getOutTradeNo()); + order.setTransactionId(notifyResult.getTransactionId()); TbCompany company = companyService.getById(order.getCompanyId()); // 生成记录 看是否分佣 金额 TbUser user = userService.getById(company.getUserId()); @@ -150,10 +165,11 @@ messageService.addMessage("下单成功,请及时发送快递", order.getUserId(),order.getId()); messageService.addMessage("您发布的订单买家已支付,请尽快处理!", company.getUserId(),order.getId()); + return "<xml> <return_code><![CDATA[SUCCESS]]></return_code> <return_msg><![CDATA[OK]]></return_msg> </xml>"; } + return null; - return "<xml> <return_code><![CDATA[SUCCESS]]></return_code> <return_msg><![CDATA[OK]]></return_msg> </xml>"; } @Override @@ -187,9 +203,12 @@ @Override @Transactional(propagation = Propagation.REQUIRED, rollbackFor = Exception.class) - public void lastPayOrderData(TbOrder tbOrder, AddBuyerCompanyInfoDto dto, Long userId,TbCompany company) { + public void lastPayOrderData(TbOrder tbOrder, AddBuyerCompanyInfoDto dto, Long userId,TbCompany company, TbBuyerCompanyInfo one) { TbBuyerCompanyInfo tbBuyerCompanyInfo = new TbBuyerCompanyInfo(); BeanUtils.copyProperties(dto,tbBuyerCompanyInfo); + if(one!=null){ + tbBuyerCompanyInfo.setId(one.getId()); + } tbBuyerCompanyInfo.setOrderId(tbOrder.getId()); List<TbShareholder> shareholders = dto.getShareholders(); @@ -205,20 +224,23 @@ addDay = addDay+company.getRelocationAreaDay(); } // 更新订单金额 - if(addMoney.compareTo(BigDecimal.ZERO)>0){ - BigDecimal add = tbOrder.getPrice().add(addMoney); - tbOrder.setPrice(add); - tbOrder.updateById(); - } + BigDecimal add = company.getSaleMoney().add(addMoney); + tbOrder.setPrice(add); + tbOrder.setOrderNo(OrderUtil.getOrderNoForPrefix("ZSX")); + tbOrder.updateById(); + if(addDay>0){ tbBuyerCompanyInfo.setAddDay(addDay); } - tbBuyerCompanyInfo.insert(); + tbBuyerCompanyInfo.insertOrUpdate(); + + shareholderService.remove(new LambdaQueryWrapper<TbShareholder>().eq(TbShareholder::getOrderId, tbOrder.getId())); for (TbShareholder shareholder : shareholders) { shareholder.setOrderId(tbOrder.getId()); shareholder.insert(); } } + /** @@ -245,7 +267,7 @@ InetAddress.getLoopbackAddress().getHostAddress()); wxPayUnifiedOrderRequest.setTradeType("JSAPI"); wxPayUnifiedOrderRequest.setNotifyUrl( - wxProperties.getNotifyUrl() +"mall-hotel-order/WX/callback"); + wxProperties.getNotifyUrl()); WxPayMpOrderResult result = wxPayService.createOrder(wxPayUnifiedOrderRequest); return result; -- Gitblit v1.7.1