Commit 2a3677ac by huluobin

update

parent c6ecf555
......@@ -5,13 +5,9 @@ import com.github.binarywang.wxpay.bean.notify.WxPayNotifyResponse;
import com.github.binarywang.wxpay.bean.notify.WxPayOrderNotifyResult;
import com.github.binarywang.wxpay.bean.order.WxPayMpOrderResult;
import com.github.binarywang.wxpay.exception.WxPayException;
import com.gogirl.application.order.mall.*;
import com.gogirl.application.xcx.GogirlTokenService;
import com.gogirl.application.order.mall.MallOrderPayService;
import com.gogirl.application.order.mall.MallRefundOrderService;
import com.gogirl.infrastructure.common.base.JsonResult;
import com.gogirl.infrastructure.config.property.GogirlProperties;
import com.gogirl.infrastructure.config.property.WxProperties;
import com.gogirl.infrastructure.mapper.user.customer.CustomerMapper;
import com.gogirl.infrastructure.service.wx.WxPayService;
import com.gogirl.infrastructure.util.SessionUtils;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
......@@ -30,18 +26,9 @@ import java.net.UnknownHostException;
public class MallOrderPayController {
private final GogirlTokenService gogirlTokenService;
private final MallOrderPayService mallOrderPayService;
private final MallOrderService mallOrderService;
private final MallOrderDetailService mallOrderDetailService;
private final MallRefundOrderService mallRefundOrderService;
private final MallRefundOrderDetailService mallRefundOrderDetailService;
private final GogirlProperties gogirlProperties;
private final WxProperties wxProperties;
private final WxPayService wxPayService;
private final CustomerMapper customerMapper;
@ApiOperation("微信支付")
@GetMapping("/customer/mallOrderPay/payMallOrder/{mallOrderId}")
......@@ -67,7 +54,7 @@ public class MallOrderPayController {
@ApiOperation("余额支付")
@GetMapping("/customer/mallOrderPay/pbalancePayMallOrder/{mallOrderId}")
@GetMapping("/customer/mallOrderPay/balancePayMallOrder/{mallOrderId}")
public JsonResult<Integer> balancePayMallOrder(@RequestHeader String token,
@PathVariable Long mallOrderId) {
Integer currentCustomerId = SessionUtils.getCustomerId();
......@@ -77,7 +64,7 @@ public class MallOrderPayController {
@ApiOperation("余额抵扣的微信支付")
@GetMapping("/customer/mallOrderPay/pbalanceWxPayMallOrder/{mallOrderId}")
@GetMapping("/customer/mallOrderPay/balanceWxPayMallOrder/{mallOrderId}")
public JsonResult<WxPayMpOrderResult> balanceWxPayMallOrder(@RequestHeader String token,
@PathVariable Long mallOrderId) {
Integer currentCustomerId = SessionUtils.getCustomerId();
......@@ -86,7 +73,7 @@ public class MallOrderPayController {
}
@ApiOperation("朋友代付")
@GetMapping("/customer/mallOrderPay/pfriendPayMallOrder/{mallOrderId}")
@GetMapping("/customer/mallOrderPay/friendPayMallOrder/{mallOrderId}")
public JsonResult<Integer> friendPayMallOrder(@RequestHeader String token,
@PathVariable Long mallOrderId,
@ApiParam("朋友手机号")
......@@ -97,7 +84,7 @@ public class MallOrderPayController {
}
@ApiOperation(("/确认退款"))
@GetMapping("/customer/mallOrderPay/prefund/{orderDetailId}")
@GetMapping("/customer/mallOrderPay/refund/{orderDetailId}")
@Transactional(timeout = 10000)
public JsonResult<Void> refund(@PathVariable Long orderDetailId) throws WxPayException {
mallRefundOrderService.refund(orderDetailId);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment