From 644a2420324c108ffc7ca218564dc3643a6790af Mon Sep 17 00:00:00 2001 From: rentaiming <806181062@qq.com> Date: 星期四, 06 六月 2024 11:46:23 +0800 Subject: [PATCH] 用户端商品 --- ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/PaylogServiceImpl.java | 54 +++++++++++++++++++++++++++++++++++++++++++++--------- 1 files changed, 45 insertions(+), 9 deletions(-) diff --git a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/PaylogServiceImpl.java b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/PaylogServiceImpl.java index 8f17f2f..d926c5f 100644 --- a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/PaylogServiceImpl.java +++ b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/PaylogServiceImpl.java @@ -9,12 +9,16 @@ import com.alipay.api.response.AlipayTradeRefundResponse; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.ruoyi.common.core.constant.SecurityConstants; import com.ruoyi.common.core.domain.R; +import com.ruoyi.common.core.enums.OrderStatusEnum; +import com.ruoyi.common.core.enums.PointStatusEnum; import com.ruoyi.common.core.utils.StringUtils; import com.ruoyi.order.domain.Paylog; import com.ruoyi.order.mapper.PaylogMapper; +import com.ruoyi.order.service.IOrderService; import com.ruoyi.order.service.IPaylogService; import com.ruoyi.order.util.SinataUtil; import com.ruoyi.order.util.alipay.config.AlipayConfig; @@ -24,8 +28,12 @@ import com.ruoyi.order.util.tencent.common.XMLParser; import com.ruoyi.order.util.tencent.protocol.AppPayReqData; import com.ruoyi.order.util.tencent.protocol.UnifiedorderReqData; +import com.ruoyi.system.api.domain.Order; import com.ruoyi.system.api.domain.dto.BondDTO; +import com.ruoyi.system.api.domain.dto.MemberPointsDTO; import com.ruoyi.system.api.domain.dto.RefundDTO; +import com.ruoyi.system.api.feignClient.AuctionClient; +import com.ruoyi.system.api.feignClient.MemberClient; import com.ruoyi.system.api.feignClient.OrderClient; import java.io.IOException; import java.io.PrintWriter; @@ -61,7 +69,12 @@ @Resource - private OrderClient orderClient; + private IOrderService iOrderService; + @Resource + private AuctionClient auctionClient; + + @Resource + private MemberClient memberClient; @Override public R<Map<String, Object>> getPayInfo(Integer uid, Integer type, String subject, String body, String orderNO,String openId, HttpServletRequest request) { @@ -131,12 +144,23 @@ Paylog one = this.getOne(wrapper); if(SinataUtil.isEmpty(one)) { this.save(paylog1); - if (paylog1.getOutTradeNo().contains("BO")) { BondDTO bondVO=new BondDTO(); bondVO.setOrderNO(paylog1.getOutTradeNo()); - orderClient.UpdateBond(bondVO, SecurityConstants.INNER); + auctionClient.UpdateBond(bondVO, SecurityConstants.INNER); - } + LambdaQueryWrapper<Order> wrapper1= Wrappers.lambdaQuery(); + wrapper1.eq(Order::getOrderNo,paylog1.getOutTradeNo()); + wrapper1.eq(Order::getDelFlag,0); + Order page1 = iOrderService.getOne(wrapper1); + page1.setOrderStatus(OrderStatusEnum.GOODS_TO_BE_RECEIVED); + iOrderService.updateById(page1); + + MemberPointsDTO memberPointsDTO=new MemberPointsDTO(); + memberPointsDTO.setMemberId(page1.getMemberId()); + memberPointsDTO.setPointsType(1); + memberPointsDTO.setPointsStatus(PointStatusEnum.INCREASE); + memberPointsDTO.setPoints(page1.getPoints()); + memberClient.addMemberPoints(memberPointsDTO); } @@ -226,12 +250,24 @@ System.out.println("支付完成时间" + time_end); paylog.setAddTime(LocalDateTime.now()); this.save(paylog); - if (paylog.getOutTradeNo().contains("BO")) { - BondDTO bondVO=new BondDTO(); - bondVO.setOrderNO(paylog.getOutTradeNo()); - orderClient.UpdateBond(bondVO, SecurityConstants.INNER); + BondDTO bondVO=new BondDTO(); - } + bondVO.setOrderNO(paylog.getOutTradeNo()); + auctionClient.UpdateBond(bondVO, SecurityConstants.INNER); + + LambdaQueryWrapper<Order> wrapper1= Wrappers.lambdaQuery(); + wrapper1.eq(Order::getOrderNo,paylog.getOutTradeNo()); + wrapper1.eq(Order::getDelFlag,0); + Order page1 = iOrderService.getOne(wrapper1); + page1.setOrderStatus(OrderStatusEnum.GOODS_TO_BE_RECEIVED); + iOrderService.updateById(page1); + + MemberPointsDTO memberPointsDTO=new MemberPointsDTO(); + memberPointsDTO.setMemberId(page1.getMemberId()); + memberPointsDTO.setPointsType(1); + memberPointsDTO.setPointsStatus(PointStatusEnum.INCREASE); + memberPointsDTO.setPoints(page1.getPoints()); + memberClient.addMemberPoints(memberPointsDTO); log.debug("WxpayController.notify__回调处理成功:SUCCESS"); -- Gitblit v1.7.1