czg_team/wx-cashier-service
7
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

创建订单修改

Browse Source
This commit is contained in:
SongZhang
2024-09-26 14:21:42 +08:00
parent 225611a07f
commit 34173023bc
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/com/chaozhanggui/system/cashierservice/service/CartService.java
View File

@@ -853,7 +853,7 @@ public class CartService {
// 设置餐位费 // 设置餐位费
TbShopInfo shopInfo = mpShopInfoMapper.selectById(shopId); TbShopInfo shopInfo = mpShopInfoMapper.selectById(shopId);
if (!shopEatTypeInfoDTO.isTakeout() && shopInfo.getIsTableFee() != null && shopInfo.getIsTableFee() == 0 if (!shopEatTypeInfoDTO.isTakeout() && shopInfo.getIsTableFee() != null && shopInfo.getIsTableFee() == 0
&& (orderInfo == null || orderInfo.getSeatCount() == null)) { && (orderInfo != null && orderInfo.getSeatCount() == null)) {
seatNum = jsonObject.getInteger("dinersNum"); seatNum = jsonObject.getInteger("dinersNum");
if (seatNum == null) { if (seatNum == null) {
MsgException.throwException("dinersNum不能为空"); MsgException.throwException("dinersNum不能为空");

3
src/main/java/com/chaozhanggui/system/cashierservice/service/OrderService.java
View File

@@ -1,6 +1,7 @@
package com.chaozhanggui.system.cashierservice.service; package com.chaozhanggui.system.cashierservice.service;
import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.date.DateUtil;
import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.ObjectUtil;
import cn.hutool.core.util.StrUtil; import cn.hutool.core.util.StrUtil;
import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.JSONObject;
@@ -484,7 +485,7 @@ public class OrderService {
groupedByPlaceNum.forEach((k, v) -> { groupedByPlaceNum.forEach((k, v) -> {
HashMap<String, Object> item = new HashMap<>(); HashMap<String, Object> item = new HashMap<>();
item.put("placeNum", k); item.put("placeNum", k);
item.put("placeTime", v.isEmpty() ? null : v.get(0).getCreateTime()); item.put("placeTime", v.isEmpty() ? null : DateUtil.format(v.get(0).getCreateTime(), "yyyy-MM-dd HH:mm:ss"));
item.put("info", v); item.put("info", v);
BigDecimal totalPrice = BigDecimal.ZERO; BigDecimal totalPrice = BigDecimal.ZERO;
for (TbOrderDetail d : v) { for (TbOrderDetail d : v) {