czg_team/cashier_server
7
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

起菜上菜接口

Browse Source
This commit is contained in:
张松
2025-11-26 14:39:50 +08:00
parent 8cd2bbf3d8
commit 9df0ee52ec
10 changed files with 74 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
cash-api/account-server/src/main/resources/application-dev.yml
View File

@@ -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

5
cash-api/account-server/src/main/resources/application-prod.yml
View File

@@ -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

8
cash-api/order-server/src/main/java/com/czg/controller/admin/AdminOrderController.java
View File

@@ -75,6 +75,14 @@ public class AdminOrderController {
return CzgResult.success(orderInfoService.createOrder(addDto));
}
/**
* 起菜, 上菜
*/
@PutMapping("/upOrderDetail")
public CzgResult<Boolean> upOrderDetail(@RequestBody OrderDetailStatusDTO detailStatusDTO) {
return CzgResult.success(orderInfoService.upOrderDetail(StpKit.USER.getShopId(), detailStatusDTO));
}
/**
* 转桌
*/

6
cash-api/order-server/src/main/resources/application-prod.yml
View File

@@ -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

5
cash-api/product-server/src/main/resources/application-dev.yml
View File

@@ -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
group: group_seata

2
cash-api/system-server/src/main/resources/application-dev.yml
View File

@@ -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

5
cash-api/system-server/src/main/resources/application-prod.yml
View File

@@ -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

22
cash-common/cash-common-service/src/main/java/com/czg/order/dto/OrderDetailStatusDTO.java Normal file
View File

@@ -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;
}

2
cash-common/cash-common-service/src/main/java/com/czg/order/service/OrderInfoService.java
View File

@@ -71,4 +71,6 @@ public interface OrderInfoService extends IService<OrderInfo> {
void updateOrderDetailStatus(Long orderDetailId);
Boolean upOrderDetail(Long shopId, OrderDetailStatusDTO detailStatusDTO);
}

29
cash-service/order-service/src/main/java/com/czg/service/order/service/impl/OrderInfoServiceImpl.java
View File

@@ -293,7 +293,9 @@ public class OrderInfoServiceImpl extends ServiceImpl<OrderInfoMapper, OrderInfo
}
}
List<OrderDetail> 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<OrderInfoMapper, OrderInfo
}
orderDetailService.updateById(orderDetail);
}
@Override
public Boolean upOrderDetail(Long shopId, OrderDetailStatusDTO detailStatusDTO) {
// 起菜
if (detailStatusDTO.getType() == 0) {
AssertUtil.isNull(detailStatusDTO.getOrderDetailId(), "订单详情id不能为空");
OrderDetail detail = orderDetailService.getOne(new QueryWrapper().eq(OrderDetail::getId, detailStatusDTO.getOrderDetailId())
.eq(OrderDetail::getShopId, shopId));
AssertUtil.isNull(detail, "订单详情不存在");
orderDetailService.updateChain().set(OrderDetail::getSubStatus, TableValueConstant.OrderDetail.SubStatus.READY_TO_SERVE.getCode())
.eq(OrderDetail::getId, detailStatusDTO.getOrderDetailId()).update();
// 上菜
}else {
if (detailStatusDTO.getOrderId() != null) {
orderDetailService.updateChain().eq(OrderDetail::getSubStatus, TableValueConstant.OrderDetail.SubStatus.READY_TO_SERVE.getCode())
.set(OrderDetail::getSubStatus, TableValueConstant.OrderDetail.SubStatus.SENT_OUT.getCode())
.eq(OrderDetail::getOrderId, detailStatusDTO.getOrderId()).update();
}else {
orderDetailService.updateChain().eq(OrderDetail::getSubStatus, TableValueConstant.OrderDetail.SubStatus.READY_TO_SERVE.getCode())
.set(OrderDetail::getSubStatus, TableValueConstant.OrderDetail.SubStatus.SENT_OUT.getCode())
.eq(OrderDetail::getId, detailStatusDTO.getOrderDetailId()).update();
}
}
return true;
}
}