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

Merge branch 'master' into prod

Browse Source
This commit is contained in:
wangw
2025-04-01 16:55:28 +08:00
parent c3a1c547b1 5a200566d5
commit ce3fe5b4dd
3 changed files with 12 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
cash-common/cash-common-mq/src/main/java/com/czg/config/RabbitPublisher.java
View File

@@ -55,7 +55,9 @@ public class RabbitPublisher {
//厨房票 //厨房票
sendMsg(RabbitConstants.Queue.ORDER_MACHINE_PRINT_QUEUE, new JSONObject().fluentPut("orderId", orderId).fluentPut("printOrder", printOrder).toString()); sendMsg(RabbitConstants.Queue.ORDER_MACHINE_PRINT_QUEUE, new JSONObject().fluentPut("orderId", orderId).fluentPut("printOrder", printOrder).toString());
//前台票 //前台票
sendMsg(RabbitConstants.Queue.ORDER_PRINT_QUEUE, orderId); if (printOrder) {
sendMsg(RabbitConstants.Queue.ORDER_PRINT_QUEUE, orderId);
}
} }
/** /**

3
cash-common/cash-common-sa-token/src/main/java/com/czg/config/SaTokenConfigure.java
View File

@@ -30,6 +30,8 @@ public class SaTokenConfigure implements WebMvcConfigurer {
adminConfig.setTokenStyle("simple-uuid"); adminConfig.setTokenStyle("simple-uuid");
adminConfig.setIsConcurrent(true); adminConfig.setIsConcurrent(true);
adminConfig.setIsShare(false); adminConfig.setIsShare(false);
adminConfig.setTimeout(-1);
adminConfig.setActiveTimeout(72 * 60 * 60);
MyStpLogic.ADMIN_LOGIC.setConfig(adminConfig); MyStpLogic.ADMIN_LOGIC.setConfig(adminConfig);
// 小程序配置 // 小程序配置
@@ -38,6 +40,7 @@ public class SaTokenConfigure implements WebMvcConfigurer {
userConfig.setIsConcurrent(true); userConfig.setIsConcurrent(true);
userConfig.setIsShare(true); userConfig.setIsShare(true);
// config2.setTimeout(2000); // config2.setTimeout(2000);
adminConfig.setActiveTimeout(60 * 60);
userConfig.setTokenStyle("simple-uuid"); userConfig.setTokenStyle("simple-uuid");
MyStpLogic.CLIENT_LOGIC.setConfig(userConfig); MyStpLogic.CLIENT_LOGIC.setConfig(userConfig);
} }

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

@@ -32,6 +32,7 @@ import com.czg.order.service.OrderInfoService;
import com.czg.order.service.OrderPaymentService; import com.czg.order.service.OrderPaymentService;
import com.czg.order.vo.*; import com.czg.order.vo.*;
import com.czg.resp.CzgResult; import com.czg.resp.CzgResult;
import com.czg.sa.StpKit;
import com.czg.service.RedisService; import com.czg.service.RedisService;
import com.czg.service.order.enums.OrderStatusEnums; import com.czg.service.order.enums.OrderStatusEnums;
import com.czg.service.order.mapper.OrderInfoMapper; import com.czg.service.order.mapper.OrderInfoMapper;
@@ -111,7 +112,9 @@ public class OrderInfoServiceImpl extends ServiceImpl<OrderInfoMapper, OrderInfo
.eq(OrderDetail::getShopId, param.getShopId()) .eq(OrderDetail::getShopId, param.getShopId())
.like(OrderDetail::getProductName, productName).listAs(Long.class); .like(OrderDetail::getProductName, productName).listAs(Long.class);
} }
if (CollUtil.isEmpty(like)) {
return new Page<>();
}
QueryWrapper queryWrapper = PageUtil.buildSortQueryWrapper(); QueryWrapper queryWrapper = PageUtil.buildSortQueryWrapper();
queryWrapper.eq(OrderInfo::getShopId, param.getShopId()) queryWrapper.eq(OrderInfo::getShopId, param.getShopId())
@@ -165,7 +168,7 @@ public class OrderInfoServiceImpl extends ServiceImpl<OrderInfoMapper, OrderInfo
.eq(OrderInfo::getTradeDay, historyOrderVo.getTradeDay()) .eq(OrderInfo::getTradeDay, historyOrderVo.getTradeDay())
.eq(OrderInfo::getStatus, OrderStatusEnums.DONE.getCode()) .eq(OrderInfo::getStatus, OrderStatusEnums.DONE.getCode())
.eq(OrderInfo::getShopId, historyOrderVo.getShopId()) .eq(OrderInfo::getShopId, historyOrderVo.getShopId())
.le(OrderInfo::getCreateTime,historyOrderVo.getCreateTime()).count(); .le(OrderInfo::getCreateTime, historyOrderVo.getCreateTime()).count();
historyOrderVo.setOrderNum(count); historyOrderVo.setOrderNum(count);
return CzgResult.success(historyOrderVo); return CzgResult.success(historyOrderVo);
} }
@@ -179,6 +182,7 @@ public class OrderInfoServiceImpl extends ServiceImpl<OrderInfoMapper, OrderInfo
if (orderId == null) { if (orderId == null) {
historyOrderVo = queryChain() historyOrderVo = queryChain()
.select() .select()
.eq(OrderInfo::getShopId, StpKit.USER.getShopId())
.eq(OrderInfo::getTableCode, tableCode) .eq(OrderInfo::getTableCode, tableCode)
.eq(OrderInfo::getStatus, OrderStatusEnums.UNPAID.getCode()) .eq(OrderInfo::getStatus, OrderStatusEnums.UNPAID.getCode())
.gt(OrderInfo::getCreateTime, DateUtil.offsetDay(new Date(), -1)) .gt(OrderInfo::getCreateTime, DateUtil.offsetDay(new Date(), -1))