From 11acaaf1e2e5e71dff57a788fb26b263bcd117b7 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期五, 01 十一月 2024 20:16:31 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/TShoppingOrderController.java | 12 +++++++++---
1 files changed, 9 insertions(+), 3 deletions(-)
diff --git a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/TShoppingOrderController.java b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/TShoppingOrderController.java
index 68f7c00..f7268d3 100644
--- a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/TShoppingOrderController.java
+++ b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/TShoppingOrderController.java
@@ -82,6 +82,13 @@
private SysUserClient sysUserClient;
@Resource
private TShoppingOrderRefundService shoppingOrderRefundService;
+ @Resource
+ private AppUserAddressClient appUserAddressClient;
+
+
+
+
+
/**
* 远程管理后台取消订单后退款回调
*/
@@ -184,7 +191,7 @@
// todo 根据支付方式 取消订单
byId.setCancellationId(userid);
byId.setCancellationTime(LocalDateTime.now());
- byId.setStatus(4);
+ byId.setStatus(5);
SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMddHHmmssSSS");
TShoppingOrderRefund tShoppingOrderRefund = new TShoppingOrderRefund();
tShoppingOrderRefund.setPayTime(byId.getPayTime());
@@ -350,8 +357,7 @@
return AjaxResult.success(list);
}
- @Resource
- private AppUserAddressClient appUserAddressClient;
+
@PostMapping("/create")
public R<TShoppingOrder> shopCreate(@RequestBody ExchangeDto exchangeDto) {
TShoppingOrder shoppingOrder = new TShoppingOrder();
--
Gitblit v1.7.1