wangming 3 周之前
父节点
当前提交
3c14f68fc3

+ 2 - 13
yami-shop-api/src/main/java/com/yami/shop/api/controller/PayController.java

@@ -21,26 +21,19 @@ import lombok.SneakyThrows;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.*;
 
-import javax.servlet.http.HttpServletResponse;
 import javax.validation.Valid;
 
 @RestController
-@RequestMapping("/p/order")
+@RequestMapping("/order")
 @Api(tags = "订单接口")
 @AllArgsConstructor
 public class PayController {
 
     private final PayService payService;
-    private final PayManagerService payManagerService;
     private final OrderService orderService;
-    private final OrderRefundService orderRefundService;
     private final RefundDeliveryService refundDeliveryService;
     private final WxProviderService wxProviderService;
 
-
-    /**
-     * 支付接口
-     */
     @SneakyThrows
     @PostMapping("/pay")
     @ApiOperation(value = "根据订单号进行支付", notes = "根据订单号进行支付")
@@ -66,14 +59,10 @@ public class PayController {
         return ResponseEntity.ok(wxProviderService.subJsapi(po));
     }
 
-
-    /**
-     * 支付接口
-     */
     @PostMapping("/refundPay")
     @ApiOperation(value = "根据订单号进行支付", notes = "根据订单号进行支付")
     @SneakyThrows
-    public ResponseEntity<?> refundPay(HttpServletResponse httpResponse, @Valid @RequestBody PayParam payParam) {
+    public ResponseEntity<?> refundPay(@Valid @RequestBody PayParam payParam) {
         YamiUser user = SecurityUtils.getUser();
 
         RefundDelivery refundDelivery = refundDeliveryService.getOne(new LambdaQueryWrapper<RefundDelivery>()

+ 2 - 1
yami-shop-wx/src/main/java/com/yami/shop/wx/service/impl/WxProviderServiceImpl.java

@@ -52,7 +52,7 @@ public class WxProviderServiceImpl implements WxProviderService {
 
     private static final String WX_SUCCESS_XML = "<xml><return_code><![CDATA[SUCCESS]]></return_code><return_msg><![CDATA[OK]]></return_msg></xml>";
 
-
+    @Override
     public Map<String, Object> subJsapi(JsapiPayInfoPo po) {
         System.out.println("微信支付传入参数===========" + po);
         Map<String, Object> params = new HashMap<>(8);
@@ -252,6 +252,7 @@ public class WxProviderServiceImpl implements WxProviderService {
         return resMap;
     }
 
+
     /**
      * 获取商户的私钥文件
      *