Merge branch 'dev/2024/0703/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/controller/app/order/AppTradeOrderController.java

@@ -74,6 +74,7 @@ public class AppTradeOrderController {
     public CommonResult<PayOrderRespVO> getPayOrderByStatus(@RequestParam("id") Long id) {
 
         PayOrderDO oldPayOrderDO = payOrderMapper.selectById(id);
+        log.info("getPayOrderByStatus:oldPayOrderDO===========:{}",oldPayOrderDO);
         PayOrderDO newPayOrderDO = payOrderService.getOrderByStatus(oldPayOrderDO);
 
         CommonResult<PayOrderRespVO> success = success(PayOrderConvert.INSTANCE.convert(newPayOrderDO));

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

@@ -83,6 +83,9 @@ public class PayOrderServiceImpl implements PayOrderService {
 
     @Override
     public PayOrderDO getOrderByStatus(PayOrderDO payOrderDO) {
+        log.info("getOrderByStatus:oldPayOrderDO===========:{}",payOrderDO);
+        log.info("getOrderByStatus:WAITING===========:{}",PayOrderStatusEnum.WAITING.getStatus());
+
         //添加验证是否支付成功
         if (payOrderDO.getStatus().equals(PayOrderStatusEnum.WAITING.getStatus())) {
             //修改程序,当微信支付回调的时候再次向微信请求查询pay订单的支付状态