BJ_ZTEITS-Developers / parking-cloud-yudao

Commit 6fc724545ba8e68423fbc6b3230a826a1b4cc216

Authored by YunaiV
1 parent 6206dd94

mall + trade： 

1、取消订单 mock 接口
2、删除订单 mock 接口
Inline Side-by-side
Showing 8 changed files with 29 additions and 10 deletions
yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/admin/order/vo/TradeOrderBaseVO.java
  View file @6fc7245
... ... @@ -62,7 +62,7 @@ public class TradeOrderBaseVO {
62 62 private Long payOrderId;
63 63  
64 64 @Schema(description = "是否已支付", requiredMode = Schema.RequiredMode.REQUIRED, example = "true")
65   - private Boolean payed;
  65 + private Boolean payStatus;
66 66  
67 67 @Schema(description = "付款时间")
68 68 private LocalDateTime payTime;
... ...
yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/app/order/AppTradeOrderController.java
  View file @6fc7245
... ... @@ -127,6 +127,22 @@ public class AppTradeOrderController {
127 127 return success(orderCount);
128 128 }
129 129  
  130 + @DeleteMapping("/cancel")
  131 + @Operation(summary = "取消交易订单")
  132 + @Parameter(name = "id", description = "交易订单编号")
  133 + public CommonResult<Boolean> cancelOrder(@RequestParam("id") Long id) {
  134 + // TODO @芋艿：未实现，mock 用
  135 + return success(true);
  136 + }
  137 +
  138 + @DeleteMapping("/delete")
  139 + @Operation(summary = "删除交易订单")
  140 + @Parameter(name = "id", description = "交易订单编号")
  141 + public CommonResult<Boolean> deleteOrder(@RequestParam("id") Long id) {
  142 + // TODO @芋艿：未实现，mock 用
  143 + return success(true);
  144 + }
  145 +
130 146 // ========== 订单项 ==========
131 147  
132 148 @GetMapping("/item/get")
... ...
yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/app/order/vo/AppTradeOrderDetailRespVO.java
  View file @6fc7245
... ... @@ -44,7 +44,7 @@ public class AppTradeOrderDetailRespVO {
44 44 // ========== 价格 + 支付基本信息 ==========
45 45  
46 46 @Schema(description = "是否已支付", requiredMode = Schema.RequiredMode.REQUIRED, example = "true")
47   - private Boolean payed;
  47 + private Boolean payStatus;
48 48  
49 49 @Schema(description = "支付订单编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "1024")
50 50 private Long payOrderId;
... ...
yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/app/order/vo/AppTradeOrderPageItemRespVO.java
  View file @6fc7245
... ... @@ -34,6 +34,9 @@ public class AppTradeOrderPageItemRespVO {
34 34  
35 35 // ========== 价格 + 支付基本信息 ==========
36 36  
  37 + @Schema(description = "支付订单编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "1024")
  38 + private Long payOrderId;
  39 +
37 40 @Schema(description = "应付金额，单位：分", requiredMode = Schema.RequiredMode.REQUIRED, example = "1000")
38 41 private Integer payPrice;
39 42  
... ...
yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/dal/dataobject/order/TradeOrderDO.java
  View file @6fc7245
... ... @@ -116,7 +116,7 @@ public class TradeOrderDO extends BaseDO {
116 116 * true - 已经支付过
117 117 * false - 没有支付过
118 118 */
119   - private Boolean payed;
  119 + private Boolean payStatus;
120 120 /**
121 121 * 付款时间
122 122 */
... ...
yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/order/TradeOrderServiceImpl.java
  View file @6fc7245
... ... @@ -195,7 +195,7 @@ public class TradeOrderServiceImpl implements TradeOrderService {
195 195 order.setProductCount(getSumValue(calculateRespBO.getItems(), TradePriceCalculateRespBO.OrderItem::getCount, Integer::sum));
196 196 order.setTerminal(TerminalEnum.H5.getTerminal()); // todo 数据来源?
197 197 // 支付信息
198   - order.setAdjustPrice(0).setPayed(false);
  198 + order.setAdjustPrice(0).setPayStatus(false);
199 199 // 物流信息 TODO 芋艿：暂时写死物流方式；应该是前端选择的
200 200 order.setDeliveryType(DeliveryTypeEnum.EXPRESS.getMode()).setDeliveryStatus(TradeOrderDeliveryStatusEnum.UNDELIVERED.getStatus());
201 201 // 退款信息
... ... @@ -262,7 +262,7 @@ public class TradeOrderServiceImpl implements TradeOrderService {
262 262  
263 263 // 更新 TradeOrderDO 状态为已支付，等待发货
264 264 int updateCount = tradeOrderMapper.updateByIdAndStatus(id, order.getStatus(),
265   - new TradeOrderDO().setStatus(TradeOrderStatusEnum.UNDELIVERED.getStatus()).setPayed(true)
  265 + new TradeOrderDO().setStatus(TradeOrderStatusEnum.UNDELIVERED.getStatus()).setPayStatus(true)
266 266 .setPayTime(LocalDateTime.now()).setPayChannelCode(payOrder.getChannelCode()));
267 267 if (updateCount == 0) {
268 268 throw exception(ORDER_UPDATE_PAID_STATUS_NOT_UNPAID);
... ... @@ -292,7 +292,7 @@ public class TradeOrderServiceImpl implements TradeOrderService {
292 292 throw exception(ORDER_NOT_FOUND);
293 293 }
294 294 // 校验订单未支付
295   - if (!TradeOrderStatusEnum.isUnpaid(order.getStatus()) || order.getPayed()) {
  295 + if (!TradeOrderStatusEnum.isUnpaid(order.getStatus()) || order.getPayStatus()) {
296 296 log.error("[validateOrderPaid][order({}) 不处于待支付状态，请进行处理！order 数据是：{}]",
297 297 id, JsonUtils.toJsonString(order));
298 298 throw exception(ORDER_UPDATE_PAID_STATUS_NOT_UNPAID);
... ...
yudao-module-mall/yudao-module-trade-biz/src/test/java/cn/iocoder/yudao/module/trade/service/order/TradeOrderServiceTest.java
  View file @6fc7245
... ... @@ -168,7 +168,7 @@ public class TradeOrderServiceTest extends BaseDbUnitTest {
168 168 assertNull(tradeOrderDO.getCancelType());
169 169 assertEquals(tradeOrderDO.getUserRemark(), "我是备注");
170 170 assertNull(tradeOrderDO.getRemark());
171   - assertFalse(tradeOrderDO.getPayed());
  171 + assertFalse(tradeOrderDO.getPayStatus());
172 172 assertNull(tradeOrderDO.getPayTime());
173 173 assertEquals(tradeOrderDO.getTotalPrice(), 230);
174 174 assertEquals(tradeOrderDO.getDiscountPrice(), 0);
... ... @@ -249,7 +249,7 @@ public class TradeOrderServiceTest extends BaseDbUnitTest {
249 249 // mock 数据（TradeOrder）
250 250 TradeOrderDO order = randomPojo(TradeOrderDO.class, o -> {
251 251 o.setId(1L).setStatus(TradeOrderStatusEnum.UNPAID.getStatus());
252   - o.setPayOrderId(10L).setPayed(false).setPayPrice(100).setPayTime(null);
  252 + o.setPayOrderId(10L).setPayStatus(false).setPayPrice(100).setPayTime(null);
253 253 });
254 254 tradeOrderMapper.insert(order);
255 255 // 准备参数
... ... @@ -265,7 +265,7 @@ public class TradeOrderServiceTest extends BaseDbUnitTest {
265 265 // 断言
266 266 TradeOrderDO dbOrder = tradeOrderMapper.selectById(id);
267 267 assertEquals(dbOrder.getStatus(), TradeOrderStatusEnum.UNDELIVERED.getStatus());
268   - assertTrue(dbOrder.getPayed());
  268 + assertTrue(dbOrder.getPayStatus());
269 269 assertNotNull(dbOrder.getPayTime());
270 270 assertEquals(dbOrder.getPayChannelCode(), "wx_pub");
271 271 }
... ...
yudao-module-mall/yudao-module-trade-biz/src/test/resources/sql/create_tables.sql
  View file @6fc7245
... ... @@ -10,7 +10,7 @@ CREATE TABLE IF NOT EXISTS &quot;trade_order&quot; (
10 10 "product_count" int NOT NULL,
11 11 "cancel_type" int,
12 12 "remark" varchar,
13   - "payed" bit NOT NULL,
  13 + "pay_status" bit NOT NULL,
14 14 "pay_time" datetime,
15 15 "finish_time" datetime,
16 16 "cancel_time" datetime,
... ...