From 6beabe34786a1bcb9948581a844a5df475d2632d Mon Sep 17 00:00:00 2001 From: khy <2908249413@qq.com> Date: Fri, 25 Oct 2024 14:38:59 +0800 Subject: [PATCH] =?UTF-8?q?=E6=94=AF=E4=BB=98bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../TradeTradePaidMemberUserServiceImpl.java | 3 -- .../order/TradeOrderUpdateServiceImpl.java | 2 +- .../service/user/PaidMemberUserService.java | 6 ++++ .../user/PaidMemberUserServiceImpl.java | 32 +++++++++++++++++++ .../app/member/AppPaidMembeController.java | 2 +- 5 files changed, 40 insertions(+), 5 deletions(-) diff --git a/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/member/TradeTradePaidMemberUserServiceImpl.java b/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/member/TradeTradePaidMemberUserServiceImpl.java index 6580529..a52e7cd 100644 --- a/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/member/TradeTradePaidMemberUserServiceImpl.java +++ b/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/member/TradeTradePaidMemberUserServiceImpl.java @@ -88,9 +88,6 @@ public class TradeTradePaidMemberUserServiceImpl implements TradePaidMemberUserS public TradePaidMemberUserDO getByPayOrderId(Long payOrderId) { TradePaidMemberUserDO tradePaidMemberUserDO = tradePaidMemberUserMapper.selectOne( new LambdaQueryWrapperX().eqIfPresent(TradePaidMemberUserDO::getPayOrderId,payOrderId)); - if (tradePaidMemberUserDO == null) { - throw exception(PAID_MEMBER_ORDER_NOT_EXISTS); - } return tradePaidMemberUserDO; } diff --git a/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/order/TradeOrderUpdateServiceImpl.java b/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/order/TradeOrderUpdateServiceImpl.java index 880d53a..fd2c3f5 100644 --- a/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/order/TradeOrderUpdateServiceImpl.java +++ b/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/order/TradeOrderUpdateServiceImpl.java @@ -340,7 +340,7 @@ public class TradeOrderUpdateServiceImpl implements TradeOrderUpdateService { //会员用户信息，支付状态修改 TradeMemberUserDO tradeMemberUserDO = tradeMemberUserService.getUser(getLoginUserId()); TradePaidMemberUserDO tradePaidMemberUserDO = tradePaidMemberUserService.getByPayOrderId(payOrderId); - if(tradePaidMemberUserDO != null && tradeMemberUserDO != null){ + if(tradePaidMemberUserDO != null ){ System.out.println("进入会员支付修改操作paid："+tradePaidMemberUserDO+"和member："+tradeMemberUserDO); tradePaidMemberUserDO.setPayTime(LocalDateTime.now()); tradePaidMemberUserDO.setPaid(true); diff --git a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/user/PaidMemberUserService.java b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/user/PaidMemberUserService.java index 6561e8b..8cf0fac 100644 --- a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/user/PaidMemberUserService.java +++ b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/user/PaidMemberUserService.java @@ -8,6 +8,7 @@ import cn.iocoder.yudao.module.member.dal.dataobject.user.MemberUserDO; import cn.iocoder.yudao.module.member.dal.dataobject.user.PaidMemberUserDO; import cn.iocoder.yudao.framework.common.pojo.PageResult; import cn.iocoder.yudao.framework.common.pojo.PageParam; +import cn.iocoder.yudao.module.trade.dal.dataobject.order.TradeOrderDO; /** * 会员 Service 接口 @@ -86,4 +87,9 @@ public interface PaidMemberUserService { PaidMemberUserDO getByPayOrderId(Long payOrderId); + /*** + * 创建交易订单 + */ + public Long buildTradeOrder(PaidMemberUserDO updateReqVO); + } \ No newline at end of file diff --git a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/user/PaidMemberUserServiceImpl.java b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/user/PaidMemberUserServiceImpl.java index 256fbde..8d28e1e 100644 --- a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/user/PaidMemberUserServiceImpl.java +++ b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/user/PaidMemberUserServiceImpl.java @@ -6,6 +6,13 @@ import cn.iocoder.yudao.framework.common.util.date.DateUtils; import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX; import cn.iocoder.yudao.module.member.dal.dataobject.user.MemberUserDO; import cn.iocoder.yudao.module.member.service.membercardtype.PaidMemberCardTypeService; +import cn.iocoder.yudao.module.trade.dal.dataobject.order.TradeOrderDO; +import cn.iocoder.yudao.module.trade.dal.mysql.order.TradeOrderMapper; +import cn.iocoder.yudao.module.trade.enums.delivery.DeliveryTypeEnum; +import cn.iocoder.yudao.module.trade.enums.order.TradeOrderRefundStatusEnum; +import cn.iocoder.yudao.module.trade.enums.order.TradeOrderStatusEnum; +import cn.iocoder.yudao.module.trade.enums.order.TradeOrderTypeEnum; +import cn.iocoder.yudao.module.trade.service.order.TradeOrderUpdateService; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import org.springframework.stereotype.Service; import javax.annotation.Resource; @@ -25,7 +32,9 @@ import cn.iocoder.yudao.framework.common.util.object.BeanUtils; import cn.iocoder.yudao.module.member.dal.mysql.user.PaidMemberUserMapper; import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception; +import static cn.iocoder.yudao.framework.common.util.servlet.ServletUtils.getClientIP; import static cn.iocoder.yudao.framework.security.core.util.SecurityFrameworkUtils.getLoginUserId; +import static cn.iocoder.yudao.framework.web.core.util.WebFrameworkUtils.getTerminal; import static cn.iocoder.yudao.module.member.enums.ErrorCodeConstants.*; /** @@ -43,6 +52,11 @@ public class PaidMemberUserServiceImpl implements PaidMemberUserService { @Resource private PaidMemberCardTypeService memberCardTypeService; + @Resource + private TradeOrderUpdateService tradeOrderUpdateService; + + @Resource + private TradeOrderMapper tradeOrderMapper; @Override @@ -195,4 +209,22 @@ public class PaidMemberUserServiceImpl implements PaidMemberUserService { return paidMemberUserDO; } + @Override + public Long buildTradeOrder(PaidMemberUserDO updateReqVO) { + TradeOrderDO orderDO = new TradeOrderDO(); + orderDO.setType(TradeOrderTypeEnum.NORMAL.getType()); + orderDO.setNo(updateReqVO.getOrderNo()); + orderDO.setStatus(TradeOrderStatusEnum.UNPAID.getStatus()); + orderDO.setRefundStatus(TradeOrderRefundStatusEnum.NONE.getStatus()); + orderDO.setProductCount(1); + orderDO.setUserIp(getClientIP()).setTerminal(getTerminal()); + orderDO.setPayOrderId(updateReqVO.getPayOrderId()); + orderDO.setPayChannelCode(updateReqVO.getPayChannel()); + orderDO.setDeliveryType(DeliveryTypeEnum.EXPRESS.getType()); + tradeOrderMapper.insert(orderDO); +// orderDO = tradeOrderMapper.s + return orderDO.getId(); + } + + } \ No newline at end of file diff --git a/yudao-module-pay/yudao-module-pay-biz/src/main/java/cn/iocoder/yudao/module/pay/controller/app/member/AppPaidMembeController.java b/yudao-module-pay/yudao-module-pay-biz/src/main/java/cn/iocoder/yudao/module/pay/controller/app/member/AppPaidMembeController.java index 1cf5851..75d1636 100644 --- a/yudao-module-pay/yudao-module-pay-biz/src/main/java/cn/iocoder/yudao/module/pay/controller/app/member/AppPaidMembeController.java +++ b/yudao-module-pay/yudao-module-pay-biz/src/main/java/cn/iocoder/yudao/module/pay/controller/app/member/AppPaidMembeController.java @@ -139,7 +139,7 @@ public class AppPaidMembeController { Long id = paidMemberUserService.createMemberUser(paidMemberUserSaveReqVO); //查询新增的会员订单记录 paidMemberUserDO = paidMemberUserService.getMemberUser(id); - // 创建支付订单号 + //创建支付订单号 payOrderId = payOrderService.createOrder(new PayOrderCreateReqDTO() .setAppId(1L).setUserIp(getClientIP()) .setMerchantOrderId(""+paidMemberUserDO.getId()) -- 2.45.2