BJ_ZTEITS-Developers / parking-cloud-yudao

Commit 6206dd94e2c6e09803091c911322e6e72defce3e

Authored by YunaiV
1 parent 0a20f7fe

mall + trade： 

1、获取订单结算信息，增加门店自提编号
Inline Side-by-side
Showing 6 changed files with 27 additions and 7 deletions
yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/app/order/AppTradeOrderController.java
  View file @6206dd9
... ... @@ -66,9 +66,9 @@ public class AppTradeOrderController {
66 66 @PostMapping("/create")
67 67 @Operation(summary = "创建订单")
68 68 @PreAuthenticated
69   - public CommonResult<Long> createOrder(@RequestBody AppTradeOrderCreateReqVO createReqVO) {
70   - Long orderId = tradeOrderService.createOrder(getLoginUserId(), getClientIP(), createReqVO);
71   - return success(orderId);
  69 + public CommonResult<AppTradeOrderCreateRespVO> createOrder(@RequestBody AppTradeOrderCreateReqVO createReqVO) {
  70 + TradeOrderDO order = tradeOrderService.createOrder(getLoginUserId(), getClientIP(), createReqVO);
  71 + return success(new AppTradeOrderCreateRespVO().setId(order.getId()).setPayOrderId(order.getPayOrderId()));
72 72 }
73 73  
74 74 @PostMapping("/update-paid")
... ...
yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/app/order/vo/AppTradeOrderCreateRespVO.java 0 → 100644
  View file @6206dd9
  1 +package cn.iocoder.yudao.module.trade.controller.app.order.vo;
  2 +
  3 +import io.swagger.v3.oas.annotations.media.Schema;
  4 +import lombok.Data;
  5 +
  6 +@Schema(description = "用户 App - 交易订单创建 Response VO")
  7 +@Data
  8 +public class AppTradeOrderCreateRespVO {
  9 +
  10 + @Schema(description = "订单编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "1024")
  11 + private Long id;
  12 +
  13 + @Schema(description = "支付订单编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "1024")
  14 + private Long payOrderId;
  15 +
  16 +}
... ...
yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/app/order/vo/AppTradeOrderSettlementReqVO.java
  View file @6206dd9
... ... @@ -43,6 +43,8 @@ public class AppTradeOrderSettlementReqVO {
43 43 @Schema(description = "收件地址编号", example = "1")
44 44 private Long addressId;
45 45  
  46 + @Schema(description = "自提门店编号", example = "1088")
  47 + private Long pickupStoreId;
46 48 @Schema(description = "收件人名称", example = "芋艿") // 选择门店自提时，该字段为联系人名
47 49 private String receiverName;
48 50 @Schema(description = "收件人手机", example = "15601691300") // 选择门店自提时，该字段为联系人手机
... ...
yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/dal/dataobject/order/TradeOrderDO.java
  View file @6206dd9
... ... @@ -197,6 +197,7 @@ public class TradeOrderDO extends BaseDO {
197 197 */
198 198 private LocalDateTime deliveryTime;
199 199  
  200 + // TODO @芋艿：pickUpStoreId;
200 201 /**
201 202 * 收货时间
202 203 */
... ...
yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/order/TradeOrderService.java
  View file @6206dd9
... ... @@ -40,9 +40,9 @@ public interface TradeOrderService {
40 40 * @param userId 登录用户
41 41 * @param userIp 用户 IP 地址
42 42 * @param createReqVO 创建交易订单请求模型
43   - * @return 交易订单的编号
  43 + * @return 交易订单的
44 44 */
45   - Long createOrder(Long userId, String userIp, AppTradeOrderCreateReqVO createReqVO);
  45 + TradeOrderDO createOrder(Long userId, String userIp, AppTradeOrderCreateReqVO createReqVO);
46 46  
47 47 /**
48 48 * 更新交易订单已支付
... ...
yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/order/TradeOrderServiceImpl.java
  View file @6206dd9
... ... @@ -152,7 +152,7 @@ public class TradeOrderServiceImpl implements TradeOrderService {
152 152  
153 153 @Override
154 154 @Transactional(rollbackFor = Exception.class)
155   - public Long createOrder(Long userId, String userIp, AppTradeOrderCreateReqVO createReqVO) {
  155 + public TradeOrderDO createOrder(Long userId, String userIp, AppTradeOrderCreateReqVO createReqVO) {
156 156 // 1. 用户收件地址的校验
157 157 AddressRespDTO address = validateAddress(userId, createReqVO.getAddressId());
158 158  
... ... @@ -167,7 +167,7 @@ public class TradeOrderServiceImpl implements TradeOrderService {
167 167 // 订单创建完后的逻辑
168 168 afterCreateTradeOrder(userId, createReqVO, order, orderItems, calculateRespBO);
169 169 // TODO @LeeYan9: 是可以思考下, 订单的营销优惠记录, 应该记录在哪里, 微信讨论起来!
170   - return order.getId();
  170 + return order;
171 171 }
172 172  
173 173 /**
... ... @@ -250,6 +250,7 @@ public class TradeOrderServiceImpl implements TradeOrderService {
250 250  
251 251 // 更新到交易单上
252 252 tradeOrderMapper.updateById(new TradeOrderDO().setId(order.getId()).setPayOrderId(payOrderId));
  253 + order.setPayOrderId(payOrderId);
253 254 }
254 255  
255 256 @Override
... ...