From 9df0ee52ec98ed72138ce47a9a5d4c6a309284f3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BC=A0=E6=9D=BE?= <8605635+zhang3064194730@user.noreply.gitee.com> Date: Wed, 26 Nov 2025 14:39:50 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B5=B7=E8=8F=9C=E4=B8=8A=E8=8F=9C=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/application-dev.yml | 2 +- .../src/main/resources/application-prod.yml | 5 ++-- .../admin/AdminOrderController.java | 8 +++++ .../src/main/resources/application-prod.yml | 6 ++-- .../src/main/resources/application-dev.yml | 5 ++-- .../src/main/resources/application-dev.yml | 2 +- .../src/main/resources/application-prod.yml | 5 ++-- .../czg/order/dto/OrderDetailStatusDTO.java | 22 ++++++++++++++ .../czg/order/service/OrderInfoService.java | 2 ++ .../service/impl/OrderInfoServiceImpl.java | 29 +++++++++++++++++-- 10 files changed, 74 insertions(+), 12 deletions(-) create mode 100644 cash-common/cash-common-service/src/main/java/com/czg/order/dto/OrderDetailStatusDTO.java diff --git a/cash-api/account-server/src/main/resources/application-dev.yml b/cash-api/account-server/src/main/resources/application-dev.yml index a07b7f122..e17de7fd2 100644 --- a/cash-api/account-server/src/main/resources/application-dev.yml +++ b/cash-api/account-server/src/main/resources/application-dev.yml @@ -31,7 +31,7 @@ dubbo: qos-enable: true registry: address: nacos://121.40.109.122:8848 # Nacos 服务地址 - group: server-dev + group: server-zs protocol: threads: 20 name: dubbo diff --git a/cash-api/account-server/src/main/resources/application-prod.yml b/cash-api/account-server/src/main/resources/application-prod.yml index d03cf5109..4d8513b1f 100644 --- a/cash-api/account-server/src/main/resources/application-prod.yml +++ b/cash-api/account-server/src/main/resources/application-prod.yml @@ -2,7 +2,8 @@ spring: datasource: driver-class-name: com.mysql.cj.jdbc.Driver - url: jdbc:mysql://rm-bp1b572nblln4jho2.mysql.rds.aliyuncs.com:3306/czg_cashier?useUnicode=true&characterEncoding=utf-8 +# url: jdbc:mysql://rm-bp1b572nblln4jho2.mysql.rds.aliyuncs.com:3306/czg_cashier?useUnicode=true&characterEncoding=utf-8 + url: jdbc:mysql://rm-bp1b572nblln4jho2po.mysql.rds.aliyuncs.com:3306/czg_cashier?useUnicode=true&characterEncoding=utf-8 username: root password: Czg666888 @@ -32,7 +33,7 @@ dubbo: qos-enable: true registry: address: nacos://121.40.109.122:8848 # Nacos 服务地址 - group: server-prod + group: server-prod-zs protocol: threads: 20 port: 10103 diff --git a/cash-api/order-server/src/main/java/com/czg/controller/admin/AdminOrderController.java b/cash-api/order-server/src/main/java/com/czg/controller/admin/AdminOrderController.java index ca24c976c..4b780d53f 100644 --- a/cash-api/order-server/src/main/java/com/czg/controller/admin/AdminOrderController.java +++ b/cash-api/order-server/src/main/java/com/czg/controller/admin/AdminOrderController.java @@ -75,6 +75,14 @@ public class AdminOrderController { return CzgResult.success(orderInfoService.createOrder(addDto)); } + /** + * 起菜, 上菜 + */ + @PutMapping("/upOrderDetail") + public CzgResult upOrderDetail(@RequestBody OrderDetailStatusDTO detailStatusDTO) { + return CzgResult.success(orderInfoService.upOrderDetail(StpKit.USER.getShopId(), detailStatusDTO)); + } + /** * 转桌 */ diff --git a/cash-api/order-server/src/main/resources/application-prod.yml b/cash-api/order-server/src/main/resources/application-prod.yml index dd0544613..fb7be1d22 100644 --- a/cash-api/order-server/src/main/resources/application-prod.yml +++ b/cash-api/order-server/src/main/resources/application-prod.yml @@ -2,7 +2,8 @@ spring: datasource: driver-class-name: com.mysql.cj.jdbc.Driver - url: jdbc:mysql://rm-bp1b572nblln4jho2.mysql.rds.aliyuncs.com:3306/czg_cashier?useUnicode=true&characterEncoding=utf-8 +# url: jdbc:mysql://rm-bp1b572nblln4jho2.mysql.rds.aliyuncs.com:3306/czg_cashier?useUnicode=true&characterEncoding=utf-8 + url: jdbc:mysql://rm-bp1b572nblln4jho2po.mysql.rds.aliyuncs.com:3306/czg_cashier?useUnicode=true&characterEncoding=utf-8 username: root password: Czg666888 @@ -36,7 +37,8 @@ dubbo: environment: test registry: address: nacos://121.40.109.122:8848 # Nacos 服务地址 - group: server-prod + group: server-prod-zs + simplified: true protocol: port: 10203 threads: 20 diff --git a/cash-api/product-server/src/main/resources/application-dev.yml b/cash-api/product-server/src/main/resources/application-dev.yml index f5ffe3754..c113b0044 100644 --- a/cash-api/product-server/src/main/resources/application-dev.yml +++ b/cash-api/product-server/src/main/resources/application-dev.yml @@ -38,7 +38,8 @@ dubbo: qos-enable: true registry: address: nacos://121.40.109.122:8848 # Nacos 服务地址 - group: server-dev + group: server-zs + simplified: true protocol: port: 10301 threads: 20 @@ -53,4 +54,4 @@ seata: nacos: server-addr: 121.40.109.122:8848 namespace: - group: group_seata \ No newline at end of file + group: group_seata diff --git a/cash-api/system-server/src/main/resources/application-dev.yml b/cash-api/system-server/src/main/resources/application-dev.yml index 5492bd057..74ec06c0a 100644 --- a/cash-api/system-server/src/main/resources/application-dev.yml +++ b/cash-api/system-server/src/main/resources/application-dev.yml @@ -39,7 +39,7 @@ dubbo: qos-enable: true registry: address: nacos://121.40.109.122:8848 # Nacos 服务地址 - group: server-dev + group: server-zs protocol: port: 10401 threads: 20 diff --git a/cash-api/system-server/src/main/resources/application-prod.yml b/cash-api/system-server/src/main/resources/application-prod.yml index 21024df25..e19a77f48 100644 --- a/cash-api/system-server/src/main/resources/application-prod.yml +++ b/cash-api/system-server/src/main/resources/application-prod.yml @@ -2,7 +2,8 @@ spring: datasource: driver-class-name: com.mysql.cj.jdbc.Driver - url: jdbc:mysql://rm-bp1b572nblln4jho2.mysql.rds.aliyuncs.com:3306/czg_cashier?useUnicode=true&characterEncoding=utf-8 +# url: jdbc:mysql://rm-bp1b572nblln4jho2.mysql.rds.aliyuncs.com:3306/czg_cashier?useUnicode=true&characterEncoding=utf-8 + url: jdbc:mysql://rm-bp1b572nblln4jho2po.mysql.rds.aliyuncs.com:3306/czg_cashier?useUnicode=true&characterEncoding=utf-8 username: root password: Czg666888 @@ -39,7 +40,7 @@ dubbo: qos-enable: true registry: address: nacos://121.40.109.122:8848 # Nacos 服务地址 - group: server-prod + group: server-prod-zs protocol: port: 10403 threads: 20 diff --git a/cash-common/cash-common-service/src/main/java/com/czg/order/dto/OrderDetailStatusDTO.java b/cash-common/cash-common-service/src/main/java/com/czg/order/dto/OrderDetailStatusDTO.java new file mode 100644 index 000000000..4abe40b8e --- /dev/null +++ b/cash-common/cash-common-service/src/main/java/com/czg/order/dto/OrderDetailStatusDTO.java @@ -0,0 +1,22 @@ +package com.czg.order.dto; + +import lombok.Data; + +/** + * @author Administrator + */ +@Data +public class OrderDetailStatusDTO { + /** + * 订单id + */ + private Long orderId; + /** + * 订单详情id + */ + private Long orderDetailId; + /** + * 0起菜 1上菜 + */ + private Integer type; +} diff --git a/cash-common/cash-common-service/src/main/java/com/czg/order/service/OrderInfoService.java b/cash-common/cash-common-service/src/main/java/com/czg/order/service/OrderInfoService.java index 294497179..d6bc3962e 100644 --- a/cash-common/cash-common-service/src/main/java/com/czg/order/service/OrderInfoService.java +++ b/cash-common/cash-common-service/src/main/java/com/czg/order/service/OrderInfoService.java @@ -71,4 +71,6 @@ public interface OrderInfoService extends IService { void updateOrderDetailStatus(Long orderDetailId); + Boolean upOrderDetail(Long shopId, OrderDetailStatusDTO detailStatusDTO); + } diff --git a/cash-service/order-service/src/main/java/com/czg/service/order/service/impl/OrderInfoServiceImpl.java b/cash-service/order-service/src/main/java/com/czg/service/order/service/impl/OrderInfoServiceImpl.java index 509a13583..9f9d68a51 100644 --- a/cash-service/order-service/src/main/java/com/czg/service/order/service/impl/OrderInfoServiceImpl.java +++ b/cash-service/order-service/src/main/java/com/czg/service/order/service/impl/OrderInfoServiceImpl.java @@ -293,7 +293,9 @@ public class OrderInfoServiceImpl extends ServiceImpl orderDetails = cartService.getCartByTableCode(shopInfo.getId(), param.getTableCode(), param.getPlaceNum()); -// if (param.) + if (StrUtil.isNotBlank(param.getSubStatus())) { + + } AssertUtil.isListEmpty(orderDetails, "下单失败 购物车为空"); processOrderDetails(orderDetails, param.getLimitRate()); //生成订单 @@ -1750,7 +1752,30 @@ public class OrderInfoServiceImpl extends ServiceImpl