Merge branch 'dev/2024/0703/update-app-Y' of Harper/feifan-backend-zx-app into master

新增支付通道

feifan-module-mall/feifan-module-trade-biz/src/main/java/cn/newfeifan/mall/module/trade/controller/app/order/AppTradeOrderController.java

@@ -72,9 +72,9 @@ public class AppTradeOrderController {
     @Operation(summary = "获得支付订单")
     @Parameter(name = "id", description = "支付订单编号", required = true, example = "1024")
     public CommonResult<PayOrderRespVO> getPayOrderByStatus(@RequestParam("id") Long id) {
-
+        log.info("getPayOrderByStatus:=========id:{}",id);
         PayOrderDO oldPayOrderDO = payOrderMapper.selectById(id);
-        log.info("getPayOrderByStatus:oldPayOrderDO===========:{}=========id:{}",oldPayOrderDO,id);
+        log.info("getPayOrderByStatus:oldPayOrderDO===========:{}",oldPayOrderDO);
         PayOrderDO newPayOrderDO = payOrderService.getOrderByStatus(oldPayOrderDO);
 
         CommonResult<PayOrderRespVO> success = success(PayOrderConvert.INSTANCE.convert(newPayOrderDO));
@@ -106,8 +106,9 @@ public class AppTradeOrderController {
     @Operation(summary = "获得支付订单2")
     @Parameter(name = "id", description = "支付订单编号", required = true, example = "1024")
     public CommonResult<PayOrderRespVO> getPayOrderByStatus2(@RequestParam("id") Long id) {
+        log.info("getPayOrderByStatus2:=========id:{}",id);
         PayOrderDO oldPayOrderDO = payOrderMapper.selectById(id);
-        log.info("getPayOrderByStatus:oldPayOrderDO===========:{}=========id:{}",oldPayOrderDO,id);
+        log.info("getPayOrderByStatus2:oldPayOrderDO===========:{}",oldPayOrderDO);
         PayOrderDO newPayOrderDO = payOrderService.getOrderByStatus(oldPayOrderDO);
 
         CommonResult<PayOrderRespVO> success = success(PayOrderConvert.INSTANCE.convert(newPayOrderDO));
@@ -135,6 +136,14 @@ public class AppTradeOrderController {
         return success;
     }
 
+    @GetMapping("/getPayOrderByStatus3")
+    @Operation(summary = "获得支付订单2")
+    @Parameter(name = "id", description = "支付订单编号", required = true, example = "1024")
+    public CommonResult<PayOrderRespVO> getPayOrderByStatus3(@RequestParam("id") Long id) {
+        log.info("getPayOrderByStatus3:=========id:{}",id);
+        return null;
+    }
+
 
 
     /**

feifan-module-pay/feifan-module-pay-biz/src/main/java/cn/newfeifan/mall/module/pay/controller/app/fuyouorder/NewPayOrderController.java

@@ -2,6 +2,7 @@ package cn.newfeifan.mall.module.pay.controller.app.fuyouorder;
 
 import cn.newfeifan.mall.framework.common.exception.ErrorCode;
 import cn.newfeifan.mall.framework.common.pojo.CommonResult;
+import cn.newfeifan.mall.module.pay.controller.admin.order.vo.PayOrderRespVO;
 import cn.newfeifan.mall.module.pay.fuiou.reqvo.SubmitOrderRequestVO;
 import cn.newfeifan.mall.module.pay.fuiou.respVO.FuYouPaymentResponseVO;
 import cn.newfeifan.mall.module.pay.fuiou.util.FuiouHttpPoster;
@@ -51,6 +52,14 @@ public class NewPayOrderController {
         return success("success");
     }
 
+    @PostMapping("/getPayOrderByStatus")
+    @Operation(summary = "富友支付订单回调")
+    public CommonResult<PayOrderRespVO> getPayOrderByStatus(@RequestParam("id") Long id) {
+
+
+        return null;
+    }
+
     @PostMapping("/afterSale")
     @Operation(summary = "向富友申请退款")
     public CommonResult<String> afterSaleFuYouPayOrder(Long afterSaleId) {