From aaeec20300b29ffb7095dd74f6cbc74f005f54f6 Mon Sep 17 00:00:00 2001 From: wuxicheng <1441859745@qq.com> Date: Thu, 4 May 2023 09:54:26 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9orderId=E5=AD=97=E6=AE=B5?= =?UTF-8?q?=EF=BC=8C=E9=81=BF=E5=85=8D=E5=AD=97=E6=AE=B5=E5=90=8D=E6=AD=A7?= =?UTF-8?q?=E4=B9=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../bnyer/img/api/dto/QueryVipOrderDto.java | 4 ++-- .../java/com/bnyer/img/api/vo/VipOrderVo.java | 4 ++-- .../com/bnyer/common/core/domain/PayInfo.java | 8 +++---- .../common/core/domain/UserVipRecord.java | 11 ++++------ .../bnyer/common/core/domain/VipOrder.java | 8 +++---- .../common/core/dto/AddUserVipRecordDto.java | 4 ++-- .../bnyer/common/core/utils/OrderUtil.java | 4 ++-- .../bnyer/img/mapper/UserVipRecordMapper.xml | 4 ++-- .../order/controller/VipOrderController.java | 4 ++-- .../com/bnyer/order/dto/QueryVipOrderDto.java | 4 ++-- .../listener/vip/VipOrderCancelConsumer.java | 6 ++--- .../vip/VipOrderPayNotifyConsumer.java | 8 +++---- .../bnyer/order/mapper/VipOrderMapper.java | 8 +++---- .../bnyer/order/service/VipOrderService.java | 4 ++-- .../service/impl/VipOrderServiceImpl.java | 22 +++++++++---------- .../java/com/bnyer/order/vo/VipOrderVo.java | 4 ++-- .../com/bnyer/order/mapper/VipOrderMapper.xml | 16 +++++++------- .../java/com/bnyer/pay/dto/AddPayInfoDto.java | 2 +- .../pay/service/impl/PayInfoServiceImpl.java | 10 ++++----- 19 files changed, 66 insertions(+), 69 deletions(-) diff --git a/bnyer-api/bnyer-api-img/src/main/java/com/bnyer/img/api/dto/QueryVipOrderDto.java b/bnyer-api/bnyer-api-img/src/main/java/com/bnyer/img/api/dto/QueryVipOrderDto.java index 4ed8962..3a182f0 100644 --- a/bnyer-api/bnyer-api-img/src/main/java/com/bnyer/img/api/dto/QueryVipOrderDto.java +++ b/bnyer-api/bnyer-api-img/src/main/java/com/bnyer/img/api/dto/QueryVipOrderDto.java @@ -17,7 +17,7 @@ import java.io.Serializable; @NoArgsConstructor public class QueryVipOrderDto implements Serializable { - @ApiModelProperty(value="订单id") - private String orderId; + @ApiModelProperty(value="订单号") + private String orderNo; } diff --git a/bnyer-api/bnyer-api-img/src/main/java/com/bnyer/img/api/vo/VipOrderVo.java b/bnyer-api/bnyer-api-img/src/main/java/com/bnyer/img/api/vo/VipOrderVo.java index e13fb7c..05757dc 100644 --- a/bnyer-api/bnyer-api-img/src/main/java/com/bnyer/img/api/vo/VipOrderVo.java +++ b/bnyer-api/bnyer-api-img/src/main/java/com/bnyer/img/api/vo/VipOrderVo.java @@ -23,8 +23,8 @@ public class VipOrderVo { @ApiModelProperty(value="主键") private Long id; - @ApiModelProperty(value="订单id") - private String orderId; + @ApiModelProperty(value="订单号") + private String orderNo; @ApiModelProperty(value="手机号") private String phone; diff --git a/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/domain/PayInfo.java b/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/domain/PayInfo.java index 428d86e..913f9b4 100644 --- a/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/domain/PayInfo.java +++ b/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/domain/PayInfo.java @@ -38,11 +38,11 @@ public class PayInfo extends BaseDomain { private String payId; /** - * 业务主订单id：关联内部业务订单表 + * 业务主订单号：关联内部业务订单表 */ - @TableField(value = "order_id") - @ApiModelProperty(value="业务主订单id：关联内部业务订单表") - private String orderId; + @TableField(value = "order_no") + @ApiModelProperty(value="业务主订单号：关联内部业务订单表") + private String orderNo; /** * 支付状态：1000未支付;1001支付成功 ;1002支付失败 diff --git a/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/domain/UserVipRecord.java b/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/domain/UserVipRecord.java index c0fb19d..0bb7f43 100644 --- a/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/domain/UserVipRecord.java +++ b/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/domain/UserVipRecord.java @@ -1,15 +1,12 @@ package com.bnyer.common.core.domain; -import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.*; -import java.math.BigDecimal; import java.util.Date; @ApiModel(value="com-bnyer-common-core-domain-UserVipRecord") @@ -22,11 +19,11 @@ import java.util.Date; public class UserVipRecord extends BaseDomain { /** - * 订单id + * 订单号 */ - @TableField(value = "order_id") - @ApiModelProperty(value="订单id") - private String orderId; + @TableField(value = "order_no") + @ApiModelProperty(value="订单号") + private String orderNo; /** * 用户id diff --git a/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/domain/VipOrder.java b/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/domain/VipOrder.java index b103165..7f50451 100644 --- a/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/domain/VipOrder.java +++ b/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/domain/VipOrder.java @@ -32,11 +32,11 @@ import lombok.ToString; public class VipOrder extends BaseDomain { /** - * 订单id + * 订单号 */ - @TableField(value = "order_id") - @ApiModelProperty(value="订单id") - private String orderId; + @TableField(value = "order_no") + @ApiModelProperty(value="订单号") + private String orderNo; /** * 用户手机号 diff --git a/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/AddUserVipRecordDto.java b/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/AddUserVipRecordDto.java index cb6c5a5..091f238 100644 --- a/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/AddUserVipRecordDto.java +++ b/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/AddUserVipRecordDto.java @@ -13,8 +13,8 @@ import java.util.Date; @NoArgsConstructor public class AddUserVipRecordDto { - @ApiModelProperty(value="订单id") - private String orderId; + @ApiModelProperty(value="订单号") + private String orderNo; @ApiModelProperty(value="用户id") private Long userId; diff --git a/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/utils/OrderUtil.java b/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/utils/OrderUtil.java index 338a91b..562ad5b 100644 --- a/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/utils/OrderUtil.java +++ b/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/utils/OrderUtil.java @@ -12,7 +12,7 @@ public class OrderUtil { * @frontStr 费用类型 RV=充值会员 * @return 2费用类型+14时间+2客户端类型+11userId+3随机位 */ - public static String getOrderId(String frontStr, Date curTime, String userClientType, String userId) { + public static String getOrderNo(String frontStr, Date curTime, String userClientType, String userId) { SimpleDateFormat simple = new SimpleDateFormat("yyyyMMddHHmmss"); String ms = simple.format(curTime); @@ -25,6 +25,6 @@ public class OrderUtil { } public static void main(String[] args) { - System.out.println(getOrderId("RV",new Date(),"DU","12345678910")); + System.out.println(getOrderNo("RV",new Date(),"DU","12345678910")); } } diff --git a/bnyer-services/bnyer-img/src/main/resources/com/bnyer/img/mapper/UserVipRecordMapper.xml b/bnyer-services/bnyer-img/src/main/resources/com/bnyer/img/mapper/UserVipRecordMapper.xml index 99bdc1b..a037825 100644 --- a/bnyer-services/bnyer-img/src/main/resources/com/bnyer/img/mapper/UserVipRecordMapper.xml +++ b/bnyer-services/bnyer-img/src/main/resources/com/bnyer/img/mapper/UserVipRecordMapper.xml @@ -5,7 +5,7 @@ - + @@ -22,7 +22,7 @@ - id,order_id,user_id , phone,vip_name,vip_type_name,user_client_type,status, vip_id, start_time, end_time, is_show, create_time, update_time, + id,order_no,user_id , phone,vip_name,vip_type_name,user_client_type,status, vip_id, start_time, end_time, is_show, create_time, update_time, sort diff --git a/bnyer-services/bnyer-order/src/main/java/com/bnyer/order/controller/VipOrderController.java b/bnyer-services/bnyer-order/src/main/java/com/bnyer/order/controller/VipOrderController.java index b47dcc5..107c996 100644 --- a/bnyer-services/bnyer-order/src/main/java/com/bnyer/order/controller/VipOrderController.java +++ b/bnyer-services/bnyer-order/src/main/java/com/bnyer/order/controller/VipOrderController.java @@ -37,8 +37,8 @@ public class VipOrderController extends BaseController { @PostMapping("/addVipOrder") @Operation(summary = "生成会员订单，返回订单号" , description = "生成会员订单，返回订单号，通过订单号调用支付接口") public R addVipOrder(@Valid @RequestBody AddVipOrderDto addVipOrderDto) { - String orderId = vipOrderService.addVipOrder(addVipOrderDto); - return R.ok(orderId); + String orderNo = vipOrderService.addVipOrder(addVipOrderDto); + return R.ok(orderNo); } /** diff --git a/bnyer-services/bnyer-order/src/main/java/com/bnyer/order/dto/QueryVipOrderDto.java b/bnyer-services/bnyer-order/src/main/java/com/bnyer/order/dto/QueryVipOrderDto.java index d3ba880..74bd07c 100644 --- a/bnyer-services/bnyer-order/src/main/java/com/bnyer/order/dto/QueryVipOrderDto.java +++ b/bnyer-services/bnyer-order/src/main/java/com/bnyer/order/dto/QueryVipOrderDto.java @@ -17,7 +17,7 @@ import java.io.Serializable; @NoArgsConstructor public class QueryVipOrderDto implements Serializable { - @ApiModelProperty(value="订单id") - private String orderId; + @ApiModelProperty(value="订单号") + private String orderNo; } diff --git a/bnyer-services/bnyer-order/src/main/java/com/bnyer/order/listener/vip/VipOrderCancelConsumer.java b/bnyer-services/bnyer-order/src/main/java/com/bnyer/order/listener/vip/VipOrderCancelConsumer.java index 9f7bfce..028cdf4 100644 --- a/bnyer-services/bnyer-order/src/main/java/com/bnyer/order/listener/vip/VipOrderCancelConsumer.java +++ b/bnyer-services/bnyer-order/src/main/java/com/bnyer/order/listener/vip/VipOrderCancelConsumer.java @@ -23,9 +23,9 @@ public class VipOrderCancelConsumer implements RocketMQListener { private VipOrderService vipOrderService; @Override - public void onMessage(String orderId) { - log.info("收到消息：{}", orderId); + public void onMessage(String orderNo) { + log.info("收到消息：{}", orderNo); // 如果订单未支付的话，将订单设为取消状态 - vipOrderService.cancelVipOrder(Lists.newArrayList(orderId),0); + vipOrderService.cancelVipOrder(Lists.newArrayList(orderNo),0); } } diff --git a/bnyer-services/bnyer-order/src/main/java/com/bnyer/order/listener/vip/VipOrderPayNotifyConsumer.java b/bnyer-services/bnyer-order/src/main/java/com/bnyer/order/listener/vip/VipOrderPayNotifyConsumer.java index 882e3de..33b4a2d 100644 --- a/bnyer-services/bnyer-order/src/main/java/com/bnyer/order/listener/vip/VipOrderPayNotifyConsumer.java +++ b/bnyer-services/bnyer-order/src/main/java/com/bnyer/order/listener/vip/VipOrderPayNotifyConsumer.java @@ -43,10 +43,10 @@ public class VipOrderPayNotifyConsumer implements RocketMQListener { //修改订单并添加会员记录 VipOrderService vipOrderService = SpringUtils.getBean(VipOrderService.class); JSONObject orderObj = JSON.parseObject(message); - String orderId = orderObj.getString("orderId"); - VipOrder vipOrder = vipOrderMapper.selectOne(new LambdaQueryWrapper().eq(VipOrder::getOrderId, orderId)); + String orderNo = orderObj.getString("orderNo"); + VipOrder vipOrder = vipOrderMapper.selectOne(new LambdaQueryWrapper().eq(VipOrder::getOrderNo, orderNo)); if (Objects.isNull(vipOrder)){ - log.error("订单不存在，订单id:{}",orderId); + log.error("订单不存在，订单号:{}",orderNo); return; } //修改订单表状态为已支付 @@ -67,7 +67,7 @@ public class VipOrderPayNotifyConsumer implements RocketMQListener { */ private String buildVipRecordMsg(VipOrder vipOrder) { JSONObject jsonObject = new JSONObject(); - jsonObject.put("orderId",vipOrder.getOrderId()); + jsonObject.put("orderNo",vipOrder.getOrderNo()); jsonObject.put("startTime",vipOrder.getStartTime()); jsonObject.put("endTime",vipOrder.getEndTime()); jsonObject.put("vipId",vipOrder.getVipId()); diff --git a/bnyer-services/bnyer-order/src/main/java/com/bnyer/order/mapper/VipOrderMapper.java b/bnyer-services/bnyer-order/src/main/java/com/bnyer/order/mapper/VipOrderMapper.java index f7bbb27..750e432 100644 --- a/bnyer-services/bnyer-order/src/main/java/com/bnyer/order/mapper/VipOrderMapper.java +++ b/bnyer-services/bnyer-order/src/main/java/com/bnyer/order/mapper/VipOrderMapper.java @@ -24,13 +24,13 @@ public interface VipOrderMapper extends BaseMapper { /** * 取消订单 - * @param orderIds + * @param orderNos */ - void cancelVipOrder(@Param("orderIds") List orderIds, @Param("closeType") Integer closeType); + void cancelVipOrder(@Param("orderNos") List orderNos, @Param("closeType") Integer closeType); /** * 修改订单表状态为已支付 - * @param orderId + * @param orderNo */ - void updateByToPaySuccess(@Param("orderId") String orderId); + void updateByToPaySuccess(@Param("orderNo") String orderNo); } diff --git a/bnyer-services/bnyer-order/src/main/java/com/bnyer/order/service/VipOrderService.java b/bnyer-services/bnyer-order/src/main/java/com/bnyer/order/service/VipOrderService.java index 80d0d19..83e70f1 100644 --- a/bnyer-services/bnyer-order/src/main/java/com/bnyer/order/service/VipOrderService.java +++ b/bnyer-services/bnyer-order/src/main/java/com/bnyer/order/service/VipOrderService.java @@ -25,10 +25,10 @@ public interface VipOrderService extends IService { /** * 取消订单 - * @param orderIds 订单号 + * @param orderNos 订单号 * @param closeType 订单关闭原因类型 */ - void cancelVipOrder(List orderIds,Integer closeType); + void cancelVipOrder(List orderNos,Integer closeType); /** * 查询会员订单列表信息 diff --git a/bnyer-services/bnyer-order/src/main/java/com/bnyer/order/service/impl/VipOrderServiceImpl.java b/bnyer-services/bnyer-order/src/main/java/com/bnyer/order/service/impl/VipOrderServiceImpl.java index 96b7966..3019041 100644 --- a/bnyer-services/bnyer-order/src/main/java/com/bnyer/order/service/impl/VipOrderServiceImpl.java +++ b/bnyer-services/bnyer-order/src/main/java/com/bnyer/order/service/impl/VipOrderServiceImpl.java @@ -79,16 +79,16 @@ public class VipOrderServiceImpl extends ServiceImpl i //构建订单 VipOrder vipOrder = buildVipOrder(addVipOrderDto); vipOrderMapper.insert(vipOrder); - String orderId = vipOrder.getOrderId(); + String orderNo = vipOrder.getOrderNo(); //发送消息，如果三十分钟后没有支付，则取消订单 - SendStatus sendStatus = orderCancelMqTemplate.syncSend(RocketMqConstant.VIP_ORDER_CANCEL_TOPIC, new GenericMessage<>(orderId), RocketMqConstant.TIMEOUT, RocketMqConstant.CANCEL_ORDER_DELAY_LEVEL).getSendStatus(); + SendStatus sendStatus = orderCancelMqTemplate.syncSend(RocketMqConstant.VIP_ORDER_CANCEL_TOPIC, new GenericMessage<>(orderNo), RocketMqConstant.TIMEOUT, RocketMqConstant.CANCEL_ORDER_DELAY_LEVEL).getSendStatus(); if (!Objects.equals(sendStatus,SendStatus.SEND_OK)) { // 消息发不出去就抛异常，发的出去无所谓 throw new ServiceException(ResponseEnum.SERVER_ERROR); }else { log.info("消息发送成功,topic:{}",RocketMqConstant.VIP_ORDER_CANCEL_TOPIC); } - return orderId; + return orderNo; } /** @@ -151,7 +151,7 @@ public class VipOrderServiceImpl extends ServiceImpl i //开通的天数 vipOrder.setDays((int) DateUtil.betweenDay(vipOrder.getStartTime(), vipOrder.getEndTime(), true)); vipOrder.setUserClientType(addVipOrderDto.getUserClientType()); - vipOrder.setOrderId(OrderUtil.getOrderId("RV",nowDate, EnumUserClientType.getCodeByType(addVipOrderDto.getUserClientType()),String.valueOf(userId))); + vipOrder.setOrderNo(OrderUtil.getOrderNo("RV",nowDate, EnumUserClientType.getCodeByType(addVipOrderDto.getUserClientType()),String.valueOf(userId))); vipOrder.setCreateTime(nowDate); return vipOrder; } @@ -159,22 +159,22 @@ public class VipOrderServiceImpl extends ServiceImpl i /** * 取消订单 - * @param orderIds 订单id + * @param orderNos 订单id * @param closeType 订单关闭原因类型 */ @Transactional(rollbackFor = Exception.class) @Override - public void cancelVipOrder(List orderIds,Integer closeType) { - List vipOrderList = vipOrderMapper.selectList(new LambdaQueryWrapper().in(VipOrder::getOrderId, orderIds)); + public void cancelVipOrder(List orderNos,Integer closeType) { + List vipOrderList = vipOrderMapper.selectList(new LambdaQueryWrapper().in(VipOrder::getOrderNo, orderNos)); if (CollUtil.isEmpty(vipOrderList)){ return; } - List cancelOrderIds = vipOrderList.stream().filter(vipOrder -> Objects.nonNull(vipOrder.getOrderStatus()) && EnumVipOrderStatus.FAILS.getStatus() - != vipOrder.getOrderStatus()).map(VipOrder::getOrderId).collect(Collectors.toList()); - if (CollUtil.isEmpty(cancelOrderIds)){ + List cancelOrderNos = vipOrderList.stream().filter(vipOrder -> Objects.nonNull(vipOrder.getOrderStatus()) && EnumVipOrderStatus.FAILS.getStatus() + != vipOrder.getOrderStatus()).map(VipOrder::getOrderNo).collect(Collectors.toList()); + if (CollUtil.isEmpty(cancelOrderNos)){ return; } - vipOrderMapper.cancelVipOrder(cancelOrderIds,closeType); + vipOrderMapper.cancelVipOrder(cancelOrderNos,closeType); } diff --git a/bnyer-services/bnyer-order/src/main/java/com/bnyer/order/vo/VipOrderVo.java b/bnyer-services/bnyer-order/src/main/java/com/bnyer/order/vo/VipOrderVo.java index 3c436b3..cf40fc4 100644 --- a/bnyer-services/bnyer-order/src/main/java/com/bnyer/order/vo/VipOrderVo.java +++ b/bnyer-services/bnyer-order/src/main/java/com/bnyer/order/vo/VipOrderVo.java @@ -24,8 +24,8 @@ public class VipOrderVo { @ApiModelProperty(value="主键") private Long id; - @ApiModelProperty(value="订单id") - private String orderId; + @ApiModelProperty(value="订单号") + private String orderNo; @ApiModelProperty(value="手机号") private String phone; diff --git a/bnyer-services/bnyer-order/src/main/resources/com/bnyer/order/mapper/VipOrderMapper.xml b/bnyer-services/bnyer-order/src/main/resources/com/bnyer/order/mapper/VipOrderMapper.xml index b6c3038..1a20417 100644 --- a/bnyer-services/bnyer-order/src/main/resources/com/bnyer/order/mapper/VipOrderMapper.xml +++ b/bnyer-services/bnyer-order/src/main/resources/com/bnyer/order/mapper/VipOrderMapper.xml @@ -5,7 +5,7 @@ - + @@ -32,7 +32,7 @@ o.id, - o.order_id, + o.order_no, o.phone, o.user_id, o.vip_id, @@ -64,8 +64,8 @@ from order_vip_order o where o.is_show = '1' - - and o.order_id = #{orderId,jdbcType=VARCHAR} + + and o.order_no = #{orderNo,jdbcType=VARCHAR} @@ -77,9 +77,9 @@ close_type = #{closeType,jdbcType=VARCHAR}, cancel_time = now(), update_time=now() - where pay_status = 1000 and order_id in - - #{orderId} + where pay_status = 1000 and order_no in + + #{orderNo} @@ -89,6 +89,6 @@ pay_status = 1001, pay_time = now(), update_time = now() - where order_id = #{orderId} + where order_no = #{orderNo} diff --git a/bnyer-services/bnyer-pay/src/main/java/com/bnyer/pay/dto/AddPayInfoDto.java b/bnyer-services/bnyer-pay/src/main/java/com/bnyer/pay/dto/AddPayInfoDto.java index 2bbdf5e..0efbeed 100644 --- a/bnyer-services/bnyer-pay/src/main/java/com/bnyer/pay/dto/AddPayInfoDto.java +++ b/bnyer-services/bnyer-pay/src/main/java/com/bnyer/pay/dto/AddPayInfoDto.java @@ -20,7 +20,7 @@ public class AddPayInfoDto { @NotBlank(message = "业务主订单号不能为空") @ApiModelProperty(value="业务主订单号：关联内部业务订单表",required = true) - private String orderId; + private String orderNo; @NotBlank(message = "支付场景不能为空") @ApiModelProperty(value="支付场景：1.会员充值",required = true) diff --git a/bnyer-services/bnyer-pay/src/main/java/com/bnyer/pay/service/impl/PayInfoServiceImpl.java b/bnyer-services/bnyer-pay/src/main/java/com/bnyer/pay/service/impl/PayInfoServiceImpl.java index d3fc09d..0544772 100644 --- a/bnyer-services/bnyer-pay/src/main/java/com/bnyer/pay/service/impl/PayInfoServiceImpl.java +++ b/bnyer-services/bnyer-pay/src/main/java/com/bnyer/pay/service/impl/PayInfoServiceImpl.java @@ -80,7 +80,7 @@ public class PayInfoServiceImpl extends ServiceImpl impl //会员充值场景 case VIP_RECHARGE: QueryVipOrderDto queryVipOrderDto = new QueryVipOrderDto(); - queryVipOrderDto.setOrderId(dto.getOrderId()); + queryVipOrderDto.setOrderNo(dto.getOrderNo()); //查询会员业务订单信息 R> vipOrderVoListR = remoteVipOrderService.getVipOrderList(queryVipOrderDto); if (!vipOrderVoListR.isSuccess()){ @@ -89,7 +89,7 @@ public class PayInfoServiceImpl extends ServiceImpl impl VipOrderVo vipOrderVo = vipOrderVoListR.getData().get(0); payAmount = vipOrderVo.getPayAmount().toString(); goodsType = KSPayConstants.GOODS_TYPE_VIP; - payId = OrderUtil.getOrderId("RV",new Date(), EnumUserClientType.getCodeByType(vipOrderVo.getUserClientType()) + payId = OrderUtil.getOrderNo("RV",new Date(), EnumUserClientType.getCodeByType(vipOrderVo.getUserClientType()) ,String.valueOf(vipOrderVo.getUserId())); break; default: @@ -119,7 +119,7 @@ public class PayInfoServiceImpl extends ServiceImpl impl */ private PayInfo buildPayInfo(PayInOrderVo payInOrderVo, UnifiedOrderDto unifiedOrderDto, AddPayInfoDto dto) { PayInfo payInfo = new PayInfo(); - payInfo.setOrderId(dto.getOrderId()); + payInfo.setOrderNo(dto.getOrderNo()); payInfo.setSceneCode(dto.getSceneCode()); payInfo.setRemark(dto.getRemark()); payInfo.setPayType(dto.getPayType()); @@ -183,14 +183,14 @@ public class PayInfoServiceImpl extends ServiceImpl impl //支付场景 Integer sceneCode = payInfo.getSceneCode(); //关联的订单表id - String orderId = payInfo.getOrderId(); + String orderNo = payInfo.getOrderNo(); EnumSceneCode enumSceneCode = EnumSceneCode.getSceneCodeByCode(sceneCode); switch (enumSceneCode){ //会员充值场景 case VIP_RECHARGE: // 发送消息，订单支付成功 JSONObject vipRechargeMsgObj = new JSONObject(); - vipRechargeMsgObj.put("orderId",orderId); + vipRechargeMsgObj.put("orderNo",orderNo); String vipRechargeMsgStr = JSON.toJSONString(vipRechargeMsgObj); // TODO: 2023/04/23可优化为：添加一张消息日志表，字段：topicName，消息内容，消息状态(发送中、成功、失败),错误信息 // vipOrderPayNotifyMqTemplate.asyncSend(RocketMqConstant.VIP_ORDER_PAY_NOTIFY_TOPIC,vipRechargeMsgStr,new SendCallback() {