Merge remote-tracking branch 'origin/master'

luodangjia

2024-09-27 2e9f0c10501ca6a8cb9633272b2636058ba72bf3

 ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/TShoppingOrderController.java

@@ -274,14 +274,14 @@
    */
   @PostMapping("/cancelShoppingOrderWxRefund")
   public void cancelShoppingOrderWxRefund(HttpServletRequest request) {
      WxRefundNotifyResp data = wxPaymentClient.refundNotify(request).getData();
      if (null != data) {
         String out_refund_no = data.getOut_refund_no();
         String refund_id = data.getRefund_id();
         String tradeState = data.getTradeState();
         String success_time = data.getSuccess_time();
         shoppingOrderService.cancelShoppingOrderWxRefund(out_refund_no, refund_id, tradeState, success_time);
      }
//      WxRefundNotifyResp data = wxPaymentClient.refundNotify(request).getData();
//      if (null != data) {
//         String out_refund_no = data.getOut_refund_no();
//         String refund_id = data.getRefund_id();
//         String tradeState = data.getTradeState();
//         String success_time = data.getSuccess_time();
//         shoppingOrderService.cancelShoppingOrderWxRefund(out_refund_no, refund_id, tradeState, success_time);
//      }
   }