From 79aebca90280ae4d4b25ed6ba6267128cdb61d3a Mon Sep 17 00:00:00 2001
From: rk <94314517@qq.com>
Date: 星期六, 25 四月 2026 14:26:37 +0800
Subject: [PATCH] 代码生成
---
server/services/src/main/java/com/doumee/dao/vo/ActiveOrderTipVO.java | 3 +++
server/web/src/main/java/com/doumee/api/web/ShopInfoApi.java | 2 +-
server/services/src/main/java/com/doumee/service/business/impl/OrdersServiceImpl.java | 1 +
server/web/src/main/resources/application.yml | 2 +-
4 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/server/services/src/main/java/com/doumee/dao/vo/ActiveOrderTipVO.java b/server/services/src/main/java/com/doumee/dao/vo/ActiveOrderTipVO.java
index 0bb3995..9d2084c 100644
--- a/server/services/src/main/java/com/doumee/dao/vo/ActiveOrderTipVO.java
+++ b/server/services/src/main/java/com/doumee/dao/vo/ActiveOrderTipVO.java
@@ -21,6 +21,9 @@
@ApiModelProperty(value = "璁㈠崟鐘舵��")
private Integer status;
+ @ApiModelProperty(value = "璁㈠崟鐘舵�佹枃妗�")
+ private String statusDesc;
+
@ApiModelProperty(value = "鐘舵�佹彁绀烘枃妗�")
private String tip;
diff --git a/server/services/src/main/java/com/doumee/service/business/impl/OrdersServiceImpl.java b/server/services/src/main/java/com/doumee/service/business/impl/OrdersServiceImpl.java
index 6198ee9..98de8c6 100644
--- a/server/services/src/main/java/com/doumee/service/business/impl/OrdersServiceImpl.java
+++ b/server/services/src/main/java/com/doumee/service/business/impl/OrdersServiceImpl.java
@@ -3624,6 +3624,7 @@
ActiveOrderTipVO vo = new ActiveOrderTipVO();
vo.setOrderId(order.getId());
vo.setStatus(order.getStatus());
+ vo.setStatusDesc(Constants.OrderStatus.getDescByKey(order.getStatus(), order.getType()));
// 鏋勫缓鎻愮ず鏂囨
boolean isLocal = Constants.equalsInteger(order.getType(), Constants.ZERO);
diff --git a/server/web/src/main/java/com/doumee/api/web/ShopInfoApi.java b/server/web/src/main/java/com/doumee/api/web/ShopInfoApi.java
index a9fe8f5..3b5a48a 100644
--- a/server/web/src/main/java/com/doumee/api/web/ShopInfoApi.java
+++ b/server/web/src/main/java/com/doumee/api/web/ShopInfoApi.java
@@ -108,7 +108,7 @@
@ApiOperation("缁存姢闂ㄥ簵淇℃伅锛堟敮浠樻娂閲戝悗锛�")
@PostMapping("/maintain")
public ApiResponse maintain(@RequestBody ShopInfoMaintainDTO dto) {
- shopInfoService.maintainShopInfo(this.getMemberId(), dto);
+ shopInfoService.maintainShopInfo(this.getShopId(), dto);
return ApiResponse.success("鎿嶄綔鎴愬姛");
}
diff --git a/server/web/src/main/resources/application.yml b/server/web/src/main/resources/application.yml
index c4b6cec..3591080 100644
--- a/server/web/src/main/resources/application.yml
+++ b/server/web/src/main/resources/application.yml
@@ -12,7 +12,7 @@
spring:
profiles:
- active: dev
+ active: pro
# JSON杩斿洖閰嶇疆
jackson:
# 榛樿鏃跺尯
--
Gitblit v1.9.3