From 6b785709f12fe3906fb052a3403236bfce6ddb9a Mon Sep 17 00:00:00 2001 From: wangw <1594593906@qq.com> Date: Mon, 24 Feb 2025 14:44:59 +0800 Subject: [PATCH] =?UTF-8?q?=E6=94=AF=E4=BB=98=E5=89=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../czg/controller/OrderPayController.java | 8 ++++ .../java/com/czg/order/dto/CheckOrderPay.java | 2 + .../czg/order/service/OrderInfoService.java | 2 +- .../service/order/dto/OrderPayParamDTO.java | 8 ++-- .../service/impl/OrderInfoServiceImpl.java | 7 +++- .../order/service/impl/PayServiceImpl.java | 41 +++++++------------ 6 files changed, 35 insertions(+), 33 deletions(-) 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 e6f1f756..0141bbba 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 @@ -1,6 +1,7 @@ package com.czg.controller; import com.czg.resp.CzgResult; +import com.czg.sa.StpKit; import com.czg.service.order.dto.OrderPayParamDTO; import com.czg.service.order.service.PayService; import com.czg.utils.AssertUtil; @@ -30,6 +31,7 @@ public class OrderPayController { @PostMapping("/cashPay") public CzgResult cashPayOrder(@Validated @RequestBody OrderPayParamDTO payParam) { + payParam.setShopId(StpKit.USER.getShopId()); return payService.cashPayOrder(payParam); } @@ -44,6 +46,7 @@ public class OrderPayController { */ @PostMapping("/vipPay") public CzgResult vipPayOrder(@Validated @RequestBody OrderPayParamDTO payParam) { + payParam.setShopId(StpKit.USER.getShopId()); AssertUtil.isBlank(payParam.getPayType(), "支付类型不可为空"); return payService.vipPayOrder(payParam); } @@ -53,6 +56,7 @@ public class OrderPayController { */ @PostMapping("/h5Pay") public CzgResult> h5PayOrder(HttpServletRequest request, @Validated @RequestBody OrderPayParamDTO payParam) { + payParam.setShopId(StpKit.USER.getShopId()); return payService.h5PayOrder(ServletUtil.getClientIPByHeader(request), payParam); } @@ -64,6 +68,7 @@ public class OrderPayController { */ @PostMapping("/jsPay") public CzgResult> jsPayOrder(HttpServletRequest request, @Validated @RequestBody OrderPayParamDTO payParam) { + payParam.setShopId(StpKit.USER.getShopId()); return payService.jsPayOrder(ServletUtil.getClientIPByHeader(request), payParam); } @@ -74,6 +79,7 @@ public class OrderPayController { */ @PostMapping("/ltPayOrder") public CzgResult> ltPayOrder(HttpServletRequest request, @Validated @RequestBody OrderPayParamDTO payParam) { + payParam.setShopId(StpKit.USER.getShopId()); return payService.ltPayOrder(ServletUtil.getClientIPByHeader(request), payParam); } @@ -82,6 +88,7 @@ public class OrderPayController { */ @PostMapping("/scanPay") public CzgResult> scanPayOrder(HttpServletRequest request, @Validated @RequestBody OrderPayParamDTO payParam) { + payParam.setShopId(StpKit.USER.getShopId()); return payService.scanPayOrder(ServletUtil.getClientIPByHeader(request), payParam); } @@ -91,6 +98,7 @@ public class OrderPayController { */ @PostMapping("/microPay") public CzgResult> microPayOrder(@Validated @RequestBody OrderPayParamDTO payParam) { + payParam.setShopId(StpKit.USER.getShopId()); return payService.microPayOrder(payParam); } } 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 1b655b1d..e6f0a679 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 @@ -1,6 +1,7 @@ package com.czg.order.dto; +import jakarta.validation.constraints.NotNull; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; @@ -22,6 +23,7 @@ import java.util.List; @AllArgsConstructor public class CheckOrderPay implements Serializable { + @NotNull(message = "订单id不可为空") private Long orderId; private Long userId; diff --git a/cash-common/cash-common-service/src/main/java/com/czg/order/service/OrderInfoService.java b/cash-common/cash-common-service/src/main/java/com/czg/order/service/OrderInfoService.java index 5ca37db7..2ec5d1f3 100644 --- a/cash-common/cash-common-service/src/main/java/com/czg/order/service/OrderInfoService.java +++ b/cash-common/cash-common-service/src/main/java/com/czg/order/service/OrderInfoService.java @@ -27,7 +27,7 @@ public interface OrderInfoService extends IService { // void updateOrder(OrderInfoUpDTO upDTO); - BigDecimal checkOrderPay(CheckOrderPay param); + OrderInfo checkOrderPay(CheckOrderPay param); CzgResult refundOrder(OrderInfoRefundDTO param); diff --git a/cash-service/order-service/src/main/java/com/czg/service/order/dto/OrderPayParamDTO.java b/cash-service/order-service/src/main/java/com/czg/service/order/dto/OrderPayParamDTO.java index cc9ec13e..36423d4a 100644 --- a/cash-service/order-service/src/main/java/com/czg/service/order/dto/OrderPayParamDTO.java +++ b/cash-service/order-service/src/main/java/com/czg/service/order/dto/OrderPayParamDTO.java @@ -1,6 +1,6 @@ package com.czg.service.order.dto; -import jakarta.validation.constraints.NotNull; +import com.czg.order.dto.CheckOrderPay; import lombok.Data; /** @@ -11,10 +11,10 @@ import lombok.Data; */ @Data public class OrderPayParamDTO { - @NotNull(message = "店铺不能为空") + + private CheckOrderPay checkOrderPay; +// @NotNull(message = "店铺不能为空") private Long shopId; - @NotNull(message = "订单不能为空") - private Long orderId; private Long shopUserId; private String buyerRemark; private String returnUrl; diff --git a/cash-service/order-service/src/main/java/com/czg/service/order/service/impl/OrderInfoServiceImpl.java b/cash-service/order-service/src/main/java/com/czg/service/order/service/impl/OrderInfoServiceImpl.java index 0a91a99e..52861b61 100644 --- a/cash-service/order-service/src/main/java/com/czg/service/order/service/impl/OrderInfoServiceImpl.java +++ b/cash-service/order-service/src/main/java/com/czg/service/order/service/impl/OrderInfoServiceImpl.java @@ -211,8 +211,11 @@ public class OrderInfoServiceImpl extends ServiceImpl 0 && !pointSetting.getEnableDeduction().equals(1)) { @@ -286,7 +289,7 @@ public class OrderInfoServiceImpl extends ServiceImpl cashPayOrder(OrderPayParamDTO payParam) { - OrderInfo orderInfo = checkPay(payParam.getOrderId()); + OrderInfo orderInfo = checkPay(payParam.getCheckOrderPay()); orderInfoService.upOrderInfo(orderInfo.getId(), orderInfo.getOrderAmount(), LocalDateTime.now(), null, PayEnums.CASH_PAY); return CzgResult.success(); @@ -106,7 +95,7 @@ public class PayServiceImpl implements PayService { @Override @Transactional public CzgResult vipPayOrder(OrderPayParamDTO payParam) { - OrderInfo orderInfo = checkPay(payParam.getOrderId()); + OrderInfo orderInfo = checkPay(payParam.getCheckOrderPay()); ShopUser shopUser = new ShopUser(); if ("scanCode".equals(payParam.getPayType())) { AssertUtil.isBlank(payParam.getAuthCode(), "会员码不能为空"); @@ -154,9 +143,9 @@ public class PayServiceImpl implements PayService { @Override @Transactional public CzgResult> h5PayOrder(@NonNull String clintIp, OrderPayParamDTO payParam) { - OrderInfo orderInfo = checkPay(payParam.getOrderId()); + OrderInfo orderInfo = checkPay(payParam.getCheckOrderPay()); String payOrderNo = orderInfo.getPlatformType() + IdUtil.getSnowflakeNextId(); - Long paymentId = initOrderPayment(new OrderPayment(payParam.getShopId(), payParam.getOrderId(), + Long paymentId = initOrderPayment(new OrderPayment(payParam.getShopId(), orderInfo.getId(), "order", payOrderNo, "", orderInfo.getOrderAmount())); upOrderPayInfo(orderInfo.getId(), PayEnums.H5_PAY, paymentId); return h5Pay(payParam.getShopId(), new CzgH5PayReq(payOrderNo, orderInfo.getOrderAmount().multiply(MONEY_RATE).longValue(), @@ -167,11 +156,11 @@ public class PayServiceImpl implements PayService { @Override @Transactional public CzgResult> jsPayOrder(@NonNull String clintIp, OrderPayParamDTO payParam) { - OrderInfo orderInfo = checkPay(payParam.getOrderId()); + OrderInfo orderInfo = checkPay(payParam.getCheckOrderPay()); AssertUtil.isBlank(payParam.getPayType(), "支付方式不能为空"); AssertUtil.isBlank(payParam.getOpenId(), "用户小程序ID不能为空"); String payOrderNo = orderInfo.getPlatformType() + IdUtil.getSnowflakeNextId(); - Long paymentId = initOrderPayment(new OrderPayment(payParam.getShopId(), payParam.getOrderId(), + Long paymentId = initOrderPayment(new OrderPayment(payParam.getShopId(), orderInfo.getId(), "order", payOrderNo, "", orderInfo.getOrderAmount())); upOrderPayInfo(orderInfo.getId(), "aliPay".equals(payParam.getPayType()) ? PayEnums.ALIPAY_MINI : PayEnums.WECHAT_MINI, paymentId); return jsPay(payParam.getShopId(), payParam.getPayType(), new CzgJsPayReq(payOrderNo, orderInfo.getOrderAmount().multiply(MONEY_RATE).longValue(), @@ -181,11 +170,11 @@ public class PayServiceImpl implements PayService { @Override @Transactional public CzgResult> ltPayOrder(@NonNull String clintIp, OrderPayParamDTO payParam) { - OrderInfo orderInfo = checkPay(payParam.getOrderId()); + OrderInfo orderInfo = checkPay(payParam.getCheckOrderPay()); AssertUtil.isBlank(payParam.getPayType(), "支付方式不能为空"); AssertUtil.isBlank(payParam.getOpenId(), "用户小程序ID不能为空"); String payOrderNo = orderInfo.getPlatformType() + IdUtil.getSnowflakeNextId(); - Long paymentId = initOrderPayment(new OrderPayment(payParam.getShopId(), payParam.getOrderId(), + Long paymentId = initOrderPayment(new OrderPayment(payParam.getShopId(), orderInfo.getId(), "order", payOrderNo, "", orderInfo.getOrderAmount())); upOrderPayInfo(orderInfo.getId(), "aliPay".equals(payParam.getPayType()) ? PayEnums.ALIPAY_MINI : PayEnums.WECHAT_MINI, paymentId); return ltPay(payParam.getShopId(), payParam.getPayType(), new CzgLtPayReq(payOrderNo, orderInfo.getOrderAmount().multiply(MONEY_RATE).longValue(), @@ -195,10 +184,10 @@ public class PayServiceImpl implements PayService { @Override @Transactional public CzgResult> scanPayOrder(@NonNull String clintIp, OrderPayParamDTO payParam) { - OrderInfo orderInfo = checkPay(payParam.getOrderId()); + OrderInfo orderInfo = checkPay(payParam.getCheckOrderPay()); String payOrderNo = orderInfo.getPlatformType() + IdUtil.getSnowflakeNextId(); - Long paymentId = initOrderPayment(new OrderPayment(payParam.getShopId(), payParam.getOrderId(), + Long paymentId = initOrderPayment(new OrderPayment(payParam.getShopId(), orderInfo.getId(), "order", payOrderNo, "", orderInfo.getOrderAmount())); upOrderPayInfo(orderInfo.getId(), PayEnums.MAIN_SCAN, paymentId); return scanPay(payParam.getShopId(), new CzgScanPayReq(payOrderNo, orderInfo.getOrderAmount().multiply(MONEY_RATE).longValue(), @@ -208,10 +197,10 @@ public class PayServiceImpl implements PayService { @Override @Transactional public CzgResult> microPayOrder(OrderPayParamDTO payParam) { - OrderInfo orderInfo = checkPay(payParam.getOrderId()); + OrderInfo orderInfo = checkPay(payParam.getCheckOrderPay()); AssertUtil.isBlank(payParam.getAuthCode(), "扫描码不能为空"); String payOrderNo = orderInfo.getPlatformType() + IdUtil.getSnowflakeNextId(); - Long paymentId = initOrderPayment(new OrderPayment(payParam.getShopId(), payParam.getOrderId(), + Long paymentId = initOrderPayment(new OrderPayment(payParam.getShopId(), orderInfo.getId(), "order", payOrderNo, payParam.getAuthCode(), orderInfo.getOrderAmount())); upOrderPayInfo(orderInfo.getId(), PayEnums.BACK_SCAN, paymentId); return microPay(payParam.getShopId(), new CzgMicroPayReq(payOrderNo, orderInfo.getOrderAmount().multiply(MONEY_RATE).longValue(),