From d34c4224259ce76e65f5824aae57f892a9febc41 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BC=A0=E6=9D=BE?= <8605635+zhang3064194730@user.noreply.gitee.com> Date: Fri, 26 Sep 2025 09:46:12 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E4=BC=9A=E5=91=98=E6=94=AF=E4=BB=98?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/czg/controller/VipPayController.java | 2 +- .../java/com/czg/market/dto/MemberOrderDTO.java | 2 ++ .../czg/service/order/dto/VipMemberPayParamDTO.java | 8 ++++++-- .../order/service/impl/OrderInfoServiceImpl.java | 2 +- .../service/order/service/impl/PayServiceImpl.java | 13 +++++++++---- 5 files changed, 19 insertions(+), 8 deletions(-) diff --git a/cash-api/order-server/src/main/java/com/czg/controller/VipPayController.java b/cash-api/order-server/src/main/java/com/czg/controller/VipPayController.java index 74c288b9..a1538da9 100644 --- a/cash-api/order-server/src/main/java/com/czg/controller/VipPayController.java +++ b/cash-api/order-server/src/main/java/com/czg/controller/VipPayController.java @@ -95,7 +95,7 @@ public class VipPayController { * @return */ @PostMapping("/ltPayMember") - @Debounce(value = "#payParam.memberOrderId") + @Debounce(value = "#payParam.shopUserId") public CzgResult> ltPayMember(HttpServletRequest request, @Validated @RequestBody VipMemberPayParamDTO payParam) { AssertUtil.isNull(payParam.getShopUserId(), "购买失败 未指定店铺用户Id"); payParam.setPlatformType(ServletUtil.getHeaderIgnoreCase(ServletUtil.getRequest(), "platformType")); diff --git a/cash-common/cash-common-service/src/main/java/com/czg/market/dto/MemberOrderDTO.java b/cash-common/cash-common-service/src/main/java/com/czg/market/dto/MemberOrderDTO.java index 31bd5737..6d6e6e2d 100644 --- a/cash-common/cash-common-service/src/main/java/com/czg/market/dto/MemberOrderDTO.java +++ b/cash-common/cash-common-service/src/main/java/com/czg/market/dto/MemberOrderDTO.java @@ -9,6 +9,7 @@ import jakarta.validation.constraints.NotNull; import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; +import lombok.experimental.Accessors; /** * 会员充值订单 实体类。 @@ -19,6 +20,7 @@ import lombok.NoArgsConstructor; @Data @NoArgsConstructor @AllArgsConstructor +@Accessors(chain = true) public class MemberOrderDTO implements Serializable { private static final long serialVersionUID = 1L; diff --git a/cash-service/order-service/src/main/java/com/czg/service/order/dto/VipMemberPayParamDTO.java b/cash-service/order-service/src/main/java/com/czg/service/order/dto/VipMemberPayParamDTO.java index ddf6fcbd..bf1a2d3c 100644 --- a/cash-service/order-service/src/main/java/com/czg/service/order/dto/VipMemberPayParamDTO.java +++ b/cash-service/order-service/src/main/java/com/czg/service/order/dto/VipMemberPayParamDTO.java @@ -17,8 +17,6 @@ public class VipMemberPayParamDTO { private Long shopId; @NotNull(message = "用户ID不能为空") private Long shopUserId; - @NotNull(message = "会员订单id不能为空") - private Long memberOrderId; /** * 平台类型 pc 收银机客户端 wechat 微信小程序 alipay 支付宝小程序 admin-pc PC管理端 admin-app APP管理端 */ @@ -32,4 +30,10 @@ public class VipMemberPayParamDTO { private String pwd; private String returnUrl; private String buyerRemark; + private String name; + private String nickName; + private String orderType; + private Integer sex; + private String birthDay; + } 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 2506a469..21b2161f 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 @@ -1139,7 +1139,7 @@ public class OrderInfoServiceImpl extends ServiceImpl 0) { diff --git a/cash-service/order-service/src/main/java/com/czg/service/order/service/impl/PayServiceImpl.java b/cash-service/order-service/src/main/java/com/czg/service/order/service/impl/PayServiceImpl.java index c0716f5f..6fc4224f 100644 --- a/cash-service/order-service/src/main/java/com/czg/service/order/service/impl/PayServiceImpl.java +++ b/cash-service/order-service/src/main/java/com/czg/service/order/service/impl/PayServiceImpl.java @@ -17,6 +17,7 @@ import com.czg.entity.resp.*; import com.czg.enums.ShopUserFlowBizEnum; import com.czg.exception.CzgException; import com.czg.exception.PaySuccessException; +import com.czg.market.dto.MemberOrderDTO; import com.czg.market.entity.MkShopCouponRecord; import com.czg.market.service.MemberOrderService; import com.czg.market.service.MkShopCouponRecordService; @@ -36,6 +37,7 @@ import com.czg.resp.CzgResult; import com.czg.sa.StpKit; import com.czg.service.CzgPayService; import com.czg.service.RedisService; +import com.czg.service.market.service.impl.MemberOrderServiceImpl; import com.czg.service.order.dto.*; import com.czg.service.order.enums.OrderStatusEnums; import com.czg.service.order.service.PayService; @@ -395,15 +397,18 @@ public class PayServiceImpl implements PayService { @Override public CzgResult> ltPayMember(String clientIP, VipMemberPayParamDTO payParam) { - MemberOrder memberOrder = memberOrderService.getOne(new QueryWrapper().eq(MemberOrder::getId, payParam.getMemberOrderId())); - AssertUtil.isNull(memberOrder, "充值会员失败 该会员订单不存在"); - ShopUser shopUser = shopUserService.getOne(new QueryWrapper().eq(ShopUser::getSourceShopId, payParam.getShopId()).eq(ShopUser::getId, payParam.getShopUserId())); + ShopUser shopUser = shopUserService.getOne(new QueryWrapper().eq(ShopUser::getSourceShopId, payParam.getShopId()).eq(ShopUser::getUserId, StpKit.USER.getLoginIdAsLong())); AssertUtil.isNull(shopUser, "充值失败 该店铺用户不存在"); + MemberOrder memberOrder = memberOrderService.createMemberOrder(new MemberOrderDTO().setName(payParam.getName()) + .setNum(1).setNickName(payParam.getNickName()) + .setOrderType(payParam.getOrderType()) + .setPlatformType(payParam.getPlatformType()).setSex(payParam.getSex()).setUserId(StpKit.USER.getLoginIdAsLong()).setShopId(payParam.getShopId()).setBirthDay(payParam.getBirthDay())); + AssertUtil.isBlank(payParam.getOpenId(), "用户小程序ID不能为空"); AssertUtil.isBlank(payParam.getPayType(), "支付方式不能为空"); String payOrderNo = payParam.getPlatformType() + IdUtil.getSnowflakeNextId(); initOrderPayment(new OrderPayment(payParam.getShopId(), shopUser.getId(), "memberPay", payOrderNo, - "", memberOrder.getAmount(), payParam.getMemberOrderId())); + "", memberOrder.getAmount(), memberOrder.getId())); return ltPay(payParam.getShopId(), payParam.getPayType(), new CzgLtPayReq(payOrderNo, memberOrder.getAmount().multiply(MONEY_RATE).longValue(), payParam.getPayType(), "会员充值", payParam.getOpenId(), clientIP, payParam.getReturnUrl(), payParam.getBuyerRemark(), "")); } From 080554f6207a5f46343c7a2123ae4f42bd56d6fc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BC=A0=E6=9D=BE?= <8605635+zhang3064194730@user.noreply.gitee.com> Date: Fri, 26 Sep 2025 09:53:13 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E4=BC=9A=E5=91=98=E6=94=AF=E4=BB=98?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/czg/service/order/dto/VipMemberPayParamDTO.java | 9 +++++++++ .../czg/service/order/service/impl/PayServiceImpl.java | 4 ++-- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/cash-service/order-service/src/main/java/com/czg/service/order/dto/VipMemberPayParamDTO.java b/cash-service/order-service/src/main/java/com/czg/service/order/dto/VipMemberPayParamDTO.java index bf1a2d3c..33947549 100644 --- a/cash-service/order-service/src/main/java/com/czg/service/order/dto/VipMemberPayParamDTO.java +++ b/cash-service/order-service/src/main/java/com/czg/service/order/dto/VipMemberPayParamDTO.java @@ -30,8 +30,17 @@ public class VipMemberPayParamDTO { private String pwd; private String returnUrl; private String buyerRemark; + /** + * 开通方案名 + */ private String name; + /** + * 昵称 + */ private String nickName; + /** + * + */ private String orderType; private Integer sex; private String birthDay; diff --git a/cash-service/order-service/src/main/java/com/czg/service/order/service/impl/PayServiceImpl.java b/cash-service/order-service/src/main/java/com/czg/service/order/service/impl/PayServiceImpl.java index 6fc4224f..8fd959c6 100644 --- a/cash-service/order-service/src/main/java/com/czg/service/order/service/impl/PayServiceImpl.java +++ b/cash-service/order-service/src/main/java/com/czg/service/order/service/impl/PayServiceImpl.java @@ -397,12 +397,12 @@ public class PayServiceImpl implements PayService { @Override public CzgResult> ltPayMember(String clientIP, VipMemberPayParamDTO payParam) { - ShopUser shopUser = shopUserService.getOne(new QueryWrapper().eq(ShopUser::getSourceShopId, payParam.getShopId()).eq(ShopUser::getUserId, StpKit.USER.getLoginIdAsLong())); + ShopUser shopUser = shopUserService.getOne(new QueryWrapper().eq(ShopUser::getSourceShopId, payParam.getShopId()).eq(ShopUser::getId, payParam.getShopUserId())); AssertUtil.isNull(shopUser, "充值失败 该店铺用户不存在"); MemberOrder memberOrder = memberOrderService.createMemberOrder(new MemberOrderDTO().setName(payParam.getName()) .setNum(1).setNickName(payParam.getNickName()) .setOrderType(payParam.getOrderType()) - .setPlatformType(payParam.getPlatformType()).setSex(payParam.getSex()).setUserId(StpKit.USER.getLoginIdAsLong()).setShopId(payParam.getShopId()).setBirthDay(payParam.getBirthDay())); + .setPlatformType(payParam.getPlatformType()).setSex(payParam.getSex()).setUserId(shopUser.getUserId()).setShopId(payParam.getShopId()).setBirthDay(payParam.getBirthDay())); AssertUtil.isBlank(payParam.getOpenId(), "用户小程序ID不能为空"); AssertUtil.isBlank(payParam.getPayType(), "支付方式不能为空");