Merge remote-tracking branch 'origin/master'

puzhibing

2024-09-10 951cd384e7b81eb7686e303f77992340cc91e6d1

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

@@ -3,11 +3,15 @@
import com.ruoyi.common.core.constant.ServiceNameConstants;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.payment.api.factory.WxPaymentFallbackFactory;
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;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestParam;

import javax.servlet.http.HttpServletRequest;
import java.util.Map;
@@ -50,4 +54,22 @@
    */
   @PostMapping("/wx/pay/ack")
   void ack();
	
	
   /**
    * 关闭订单
    * @param outTradeNo
    */
   @PostMapping("/wx/pay/close")
   void close(String outTradeNo);

   @ApiOperation("订单退款")
   @PostMapping(value = "/wx/refundOrderR")
   public R<String> refundOrderR(@RequestBody WxPaymentRefundModel model);
	
	
	
   @ApiOperation("订单退款回调")
   @PostMapping(value = "/wx/refund/notify")
   R<WxRefundNotifyResp> refundNotify(HttpServletRequest request);
}