From 0f9c3701181889d03993d79cb7fb5b1229e2f408 Mon Sep 17 00:00:00 2001 From: SongZhang <2064194730@qq.com> Date: Thu, 12 Sep 2024 14:38:45 +0800 Subject: [PATCH] =?UTF-8?q?1.=E4=BB=A3=E5=AE=A2=E4=B8=8B=E5=8D=95=20?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E8=B4=AD=E7=89=A9=E8=BD=A6=E6=96=B0=E5=A2=9E?= =?UTF-8?q?=E5=8D=95=E5=93=81=E5=A4=87=E6=B3=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ysk/cashier/dto/shoptable/AddCartDTO.java | 2 +- .../ysk/cashier/pojo/order/TbCashierCart.java | 2 ++ .../ysk/cashier/pojo/order/TbOrderDetail.java | 3 +++ .../impl/shopimpl/TbShopTableServiceImpl.java | 22 +++++++++++++------ .../service/shop/TbShopTableService.java | 3 +-- 5 files changed, 22 insertions(+), 10 deletions(-) diff --git a/eladmin-system/src/main/java/cn/ysk/cashier/dto/shoptable/AddCartDTO.java b/eladmin-system/src/main/java/cn/ysk/cashier/dto/shoptable/AddCartDTO.java index c64b654c..0107c9aa 100644 --- a/eladmin-system/src/main/java/cn/ysk/cashier/dto/shoptable/AddCartDTO.java +++ b/eladmin-system/src/main/java/cn/ysk/cashier/dto/shoptable/AddCartDTO.java @@ -25,5 +25,5 @@ public class AddCartDTO { private boolean isPack; private boolean isGift; private Integer cartId; - + private String note; } diff --git a/eladmin-system/src/main/java/cn/ysk/cashier/pojo/order/TbCashierCart.java b/eladmin-system/src/main/java/cn/ysk/cashier/pojo/order/TbCashierCart.java index b87e46bf..788b041d 100644 --- a/eladmin-system/src/main/java/cn/ysk/cashier/pojo/order/TbCashierCart.java +++ b/eladmin-system/src/main/java/cn/ysk/cashier/pojo/order/TbCashierCart.java @@ -157,6 +157,8 @@ public class TbCashierCart implements Serializable { private String skuName; @Column(name = "`place_num`") private Integer placeNum; + @Column(name = "`note`") + private String note; public void copy(TbCashierCart source){ BeanUtil.copyProperties(source,this, CopyOptions.create().setIgnoreNullValue(true)); diff --git a/eladmin-system/src/main/java/cn/ysk/cashier/pojo/order/TbOrderDetail.java b/eladmin-system/src/main/java/cn/ysk/cashier/pojo/order/TbOrderDetail.java index 60437fcc..379db52a 100644 --- a/eladmin-system/src/main/java/cn/ysk/cashier/pojo/order/TbOrderDetail.java +++ b/eladmin-system/src/main/java/cn/ysk/cashier/pojo/order/TbOrderDetail.java @@ -113,6 +113,9 @@ public class TbOrderDetail implements Serializable { @ApiModelProperty(value = "place_num") private Integer placeNum; + @Column(name = "`note`") + private String note; + public void copy(TbOrderDetail source){ BeanUtil.copyProperties(source,this, CopyOptions.create().setIgnoreNullValue(true)); } diff --git a/eladmin-system/src/main/java/cn/ysk/cashier/service/impl/shopimpl/TbShopTableServiceImpl.java b/eladmin-system/src/main/java/cn/ysk/cashier/service/impl/shopimpl/TbShopTableServiceImpl.java index ba90ce14..213cb88e 100644 --- a/eladmin-system/src/main/java/cn/ysk/cashier/service/impl/shopimpl/TbShopTableServiceImpl.java +++ b/eladmin-system/src/main/java/cn/ysk/cashier/service/impl/shopimpl/TbShopTableServiceImpl.java @@ -28,7 +28,6 @@ import cn.ysk.cashier.enums.ShopWxMsgTypeEnum; import cn.ysk.cashier.enums.TableStateEnum; import cn.ysk.cashier.exception.BadRequestException; import cn.ysk.cashier.mybatis.entity.TbShopOpenId; -import cn.ysk.cashier.mybatis.entity.TbShopUserFlow; import cn.ysk.cashier.mybatis.mapper.*; import cn.ysk.cashier.mybatis.service.MpShopTableService; import cn.ysk.cashier.pojo.TbShopPayType; @@ -49,7 +48,6 @@ import cn.ysk.cashier.repository.shop.TbShopInfoRepository; import cn.ysk.cashier.service.impl.TbPayServiceImpl; import cn.ysk.cashier.utils.*; import cn.ysk.cashier.vo.PendingCountVO; -import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; @@ -72,12 +70,12 @@ import org.springframework.data.domain.Pageable; import java.math.BigDecimal; import java.math.RoundingMode; -import java.sql.Timestamp; import java.time.Instant; import java.util.*; import java.io.IOException; import java.util.concurrent.CompletableFuture; import java.util.concurrent.TimeUnit; +import java.util.concurrent.atomic.AtomicReference; import java.util.stream.Collectors; import javax.servlet.http.HttpServletResponse; @@ -437,9 +435,11 @@ public class TbShopTableServiceImpl implements TbShopTableService { tbCashierCart.setTotalNumber(addCartDTO.getNum()); tbCashierCart.setNumber(addCartDTO.getNum()); tbCashierCart.setCategoryId(product.getCategoryId()); + tbCashierCart.setNote(addCartDTO.getNote()); cashierCartRepository.save(tbCashierCart); } else { + tbCashierCart.setNote(addCartDTO.getNote()); tbCashierCart.setTotalAmount(new BigDecimal(addCartDTO.getNum()).multiply(productSku.getSalePrice())); if (!addCartDTO.isPack()) { @@ -619,8 +619,8 @@ public class TbShopTableServiceImpl implements TbShopTableService { } @Override - public com.baomidou.mybatisplus.extension.plugins.pagination.Page getCart(Long tableId, Integer page, - Integer size, Integer shopId, Integer vipUserId, String masterId) { + public Map getCart(Long tableId, Integer page, + Integer size, Integer shopId, Integer vipUserId, String masterId) { LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper() .eq(TbCashierCart::getTableId, tableId) .in(TbCashierCart::getStatus, "create", "refund", "return") @@ -653,6 +653,7 @@ public class TbShopTableServiceImpl implements TbShopTableService { }); + AtomicReference mealCashierCart = new AtomicReference<>(); if (!skuIds.isEmpty()) { List skuList = productSkuRepository.findAllById(skuIds); HashMap skuMap = new HashMap<>(); @@ -660,6 +661,10 @@ public class TbShopTableServiceImpl implements TbShopTableService { ArrayList> infos = new ArrayList<>(); records.forEach(item -> { + if (item.getProductId().equals("-999")) { + mealCashierCart.set(item); + return; + } Map map = BeanUtil.beanToMap(item, false, false); TbProductSku tbProductSku = skuMap.get(item.getSkuId()); map.put("specSnap", tbProductSku != null ? tbProductSku.getSpecSnap() : null); @@ -681,10 +686,12 @@ public class TbShopTableServiceImpl implements TbShopTableService { list.add(item); }); copyPage.setRecords(list); - return copyPage; + Map map = BeanUtil.beanToMap(copyPage, false, false); + map.put("seatFee", mealCashierCart); + return map; } - return cartPage; + return BeanUtil.beanToMap(cartPage); } @Override @@ -1051,6 +1058,7 @@ public class TbShopTableServiceImpl implements TbShopTableService { orderDetail.setProductSkuName(productSku.getSpecSnap()); } + orderDetail.setNote(cashierCart.getNote()); orderDetail.setCreateTime(DateUtil.date().toTimestamp()); orderDetail.setNum(cashierCart.getNumber()); orderDetail.setPrice(cashierCart.getSalePrice()); diff --git a/eladmin-system/src/main/java/cn/ysk/cashier/service/shop/TbShopTableService.java b/eladmin-system/src/main/java/cn/ysk/cashier/service/shop/TbShopTableService.java index 64f76194..5cf3c63e 100644 --- a/eladmin-system/src/main/java/cn/ysk/cashier/service/shop/TbShopTableService.java +++ b/eladmin-system/src/main/java/cn/ysk/cashier/service/shop/TbShopTableService.java @@ -21,7 +21,6 @@ import cn.ysk.cashier.pojo.shop.TbShopTable; import cn.ysk.cashier.dto.shop.TbShopTableDto; import cn.ysk.cashier.dto.shop.TbShopTableQueryCriteria; import com.alibaba.fastjson.JSONObject; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import org.springframework.data.domain.Pageable; import java.util.Map; import java.util.List; @@ -105,7 +104,7 @@ public interface TbShopTableService { void clearCart(ClearCartDTO clearCartDTO); - Page getCart(Long tableId, Integer page, Integer size, Integer shopId, Integer vipUserId, String masterId); + Map getCart(Long tableId, Integer page, Integer size, Integer shopId, Integer vipUserId, String masterId); TbCashierCart updateCart(UpdateCartDTO updateCartDTO);