diff --git a/cash-api/order-server/src/main/java/com/czg/controller/OrderPayController.java b/cash-api/order-server/src/main/java/com/czg/controller/OrderPayController.java index fdf05cbc..6d1fb87f 100644 --- a/cash-api/order-server/src/main/java/com/czg/controller/OrderPayController.java +++ b/cash-api/order-server/src/main/java/com/czg/controller/OrderPayController.java @@ -142,17 +142,17 @@ public class OrderPayController { /** * 获取店铺订单支付URL */ - @GetMapping("/shopPayApi/orderPayUrl") + @PostMapping("/shopPayApi/orderPayUrl") @Debounce(value = "#checkOrderPay.orderId") - public CzgResult getOrderPayUrl(@RequestHeader Long shopId, @RequestParam(required = false) String extend, - CheckOrderPay checkOrderPay) { + public CzgResult getOrderPayUrl(@RequestHeader Long shopId, + @RequestBody CheckOrderPay checkOrderPay) { AssertUtil.isNull(shopId, "店铺id不能为空"); AssertUtil.isNull(checkOrderPay, "订单信息不能为空"); Map map = new HashMap<>(); map.put("shopId", shopId); map.put("orderId", checkOrderPay.getOrderId()); map.put("payAmount", checkOrderPay.getOrderAmount()); - map.put("extend", StrUtil.isEmpty(extend) ? "" : extend); + map.put("extend", StrUtil.isEmpty(checkOrderPay.getExtend()) ? "" : checkOrderPay.getExtend()); if (checkOrderPay.getOrderId() != null) { OrderInfo orderInfo = orderInfoService.checkOrderPay(checkOrderPay); map.put("payAmount", orderInfo.getOrderAmount()); diff --git a/cash-common/cash-common-service/src/main/java/com/czg/order/dto/CheckOrderPay.java b/cash-common/cash-common-service/src/main/java/com/czg/order/dto/CheckOrderPay.java index 479a724c..846936d1 100644 --- a/cash-common/cash-common-service/src/main/java/com/czg/order/dto/CheckOrderPay.java +++ b/cash-common/cash-common-service/src/main/java/com/czg/order/dto/CheckOrderPay.java @@ -118,6 +118,8 @@ public class CheckOrderPay implements Serializable { private String remark; + private String extend; + public Integer getSeatNum() { return seatNum == null ? 0 : seatNum; @@ -138,7 +140,7 @@ public class CheckOrderPay implements Serializable { return newCustomerDiscountAmount == null ? BigDecimal.ZERO : newCustomerDiscountAmount; } - /** + /** * 满减活动抵扣金额 */ public BigDecimal getDiscountActAmount() { @@ -165,7 +167,7 @@ public class CheckOrderPay implements Serializable { return roundAmount == null ? BigDecimal.ZERO : roundAmount; } - public BigDecimal getVipDiscountAmount(){ + public BigDecimal getVipDiscountAmount() { return vipDiscountAmount == null ? BigDecimal.ZERO : vipDiscountAmount; }