合并代码

Pu Zhibing

2024-10-16 c4664502dfdaffff555b532e65b51a57ac8b29c2

 ruoyi-api/ruoyi-api-payment/src/main/java/com/ruoyi/payment/api/feignClient/WxPaymentClient.java

@@ -6,6 +6,7 @@
import com.ruoyi.payment.api.model.WxPaymentRefundModel;
import com.ruoyi.payment.api.vo.NotifyV3PayDecodeRespBody;
import com.ruoyi.payment.api.vo.PaymentOrder;
import com.ruoyi.payment.api.vo.WxRefundNotifyResp;
import io.swagger.annotations.ApiOperation;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.web.bind.annotation.PostMapping;
@@ -28,7 +29,7 @@
    * @return
    */
   @PostMapping("/wx/query/queryOrderInfo")
   R<NotifyV3PayDecodeRespBody> queryOrderInfo(String orderId);
   R<NotifyV3PayDecodeRespBody> queryOrderInfo(@RequestParam("orderId") String orderId);
   
   
   /**
@@ -39,20 +40,6 @@
   @PostMapping("/wx/orderPay")
   R<Map<String, Object>> orderPay(@RequestBody PaymentOrder paymentOrder);
   
	
   /**
    * 支付回调
    * @param request
    * @return
    */
   @PostMapping("/wx/pay/notify")
   R<Map<String, Object>> payNotify(HttpServletRequest request);
	
   /**
    * 支付回调成功后的成功应答
    */
   @PostMapping("/wx/pay/ack")
   void ack();
   
   
   /**