|
@@ -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>()
|