Merge branch 'dev/2024/0527/update-app-Y' of feifan/mall-backend-app into master

修改支付查询结果

feifan-module-mall/feifan-module-trade-biz/src/main/java/cn/newfeifan/mall/module/trade/service/order/TradeOrderUpdateServiceImpl.java

@@ -876,13 +876,6 @@ public class TradeOrderUpdateServiceImpl implements TradeOrderUpdateService {
     //下面的参数中的id1为交易订单TradeOrder表的id，已经没用了，因为一个支付订单对应多个订单。
     //只有支付订单id参数payOrderId是有用的。
     public void updateOrderPaid(Long id1, Long payOrderId) {
-        //修改程序,当微信支付回调的时候再次向微信请求查询pay订单的支付状态
-        log.info("============微信回调:支付订单号{}",payOrderId);
-        PayOrderDO payOrderDO = payOrderMapper.selectById(payOrderId);
-        log.info("============微信回调:支付订单详情{}",payOrderDO.toString());
-        PayOrderExtensionDO payOrderExtensionDO = orderExtensionMapper.selectByNo(payOrderDO.getNo());
-        payOrderService.syncOrder(payOrderExtensionDO);
-
 
 //        System.out.println("#########updateOrderPaid####payOrderId:"+payOrderId);
 

feifan-module-pay/feifan-module-pay-biz/src/main/java/cn/newfeifan/mall/module/pay/controller/app/order/AppPayOrderController.java

@@ -44,6 +44,8 @@ public class AppPayOrderController {
     public CommonResult<PayOrderRespVO> getOrder(@RequestParam("id") Long id) {
         CommonResult<PayOrderRespVO> rs =
                 success(PayOrderConvert.INSTANCE.convert(payOrderService.getOrder(id)));
+
+
         return rs;
     }
 

feifan-module-pay/feifan-module-pay-biz/src/main/java/cn/newfeifan/mall/module/pay/dal/mysql/order/PayOrderExtensionMapper.java

@@ -1,6 +1,7 @@
 package cn.newfeifan.mall.module.pay.dal.mysql.order;
 
 import cn.newfeifan.mall.framework.mybatis.core.mapper.BaseMapperX;
+import cn.newfeifan.mall.framework.mybatis.core.query.LambdaQueryWrapperX;
 import cn.newfeifan.mall.module.pay.dal.dataobject.order.PayOrderExtensionDO;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import org.apache.ibatis.annotations.Mapper;
@@ -30,4 +31,9 @@ public interface PayOrderExtensionMapper extends BaseMapperX<PayOrderExtensionDO
                 .le(PayOrderExtensionDO::getCreateTime, minCreateTime));
     }
 
+    default PayOrderExtensionDO selectByPayId(Long id) {
+        return selectList(new LambdaQueryWrapperX<PayOrderExtensionDO>()
+                .eq(PayOrderExtensionDO::getOrderId, id)
+                .orderByDesc(PayOrderExtensionDO::getCreateTime)).get(0);
+    }
 }

feifan-module-pay/feifan-module-pay-biz/src/main/java/cn/newfeifan/mall/module/pay/service/order/PayOrderServiceImpl.java

@@ -77,7 +77,17 @@ public class PayOrderServiceImpl implements PayOrderService {
 
     @Override
     public PayOrderDO getOrder(Long id) {
-        return orderMapper.selectById(id);
+        //添加验证是否支付成功
+        PayOrderDO payOrderDO = orderMapper.selectById(id);
+        if(payOrderDO.getStatus().equals(PayOrderStatusEnum.WAITING.getStatus())){
+            //修改程序,当微信支付回调的时候再次向微信请求查询pay订单的支付状态
+            log.info("============支付成功查询:支付订单号{}",payOrderDO.getId());
+            log.info("============支付成功查询:支付订单详情{}",payOrderDO);
+            PayOrderExtensionDO payOrderExtensionDO = orderExtensionMapper.selectByPayId(payOrderDO.getId());
+            syncOrder(payOrderExtensionDO);
+        }
+
+        return  payOrderDO;
     }
 
     @Override