调整订单逻辑，增加店内外带用餐方式，增加多次下单标记

src/main/java/com/chaozhanggui/system/cashierservice/bean/OrderUseTypeEnum.java

@@ -0,0 +1,15 @@
+package com.chaozhanggui.system.cashierservice.bean;
+
+import lombok.Getter;
+
+@Getter
+public enum OrderUseTypeEnum {
+    TAKEOUT("takeout"),
+    DINE_IN_AFTER("dine-in-after"),
+    DINE_IN_BEFORE("dine-in-before");
+    private final String value;
+
+    OrderUseTypeEnum(String value) {
+        this.value = value;
+    }
+}

src/main/java/com/chaozhanggui/system/cashierservice/bean/ShopInfoEatModelEnum.java

@@ -0,0 +1,16 @@
+package com.chaozhanggui.system.cashierservice.bean;
+
+import lombok.EqualsAndHashCode;
+import lombok.Getter;
+
+@Getter
+public enum ShopInfoEatModelEnum {
+    TAKE_OUT("take-out"),
+    DINE_IN("dine-in");
+
+    private final String value;
+
+    ShopInfoEatModelEnum(String value) {
+        this.value = value;
+    }
+}

src/main/java/com/chaozhanggui/system/cashierservice/bean/ShopInfoRegisterlEnum.java

@@ -0,0 +1,17 @@
+package com.chaozhanggui.system.cashierservice.bean;
+
+import lombok.Getter;
+
+@Getter
+public enum ShopInfoRegisterlEnum {
+    // 快餐版
+    MUNCHIES("munchies"),
+    // 餐饮版
+    RESTAURANT("restaurant");
+
+    private final String value;
+
+    ShopInfoRegisterlEnum(String value) {
+        this.value = value;
+    }
+}

src/main/java/com/chaozhanggui/system/cashierservice/controller/OrderController.java

@@ -3,12 +3,12 @@ package com.chaozhanggui.system.cashierservice.controller;
 import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.StrUtil;
 import com.alibaba.fastjson.JSONObject;
-import com.chaozhanggui.system.cashierservice.annotation.MyLog;
-import com.chaozhanggui.system.cashierservice.bean.LogTag;
 import com.chaozhanggui.system.cashierservice.entity.OrderVo;
+import com.chaozhanggui.system.cashierservice.entity.dto.ChoseCountDTO;
 import com.chaozhanggui.system.cashierservice.entity.dto.UpdateVipDTO;
 import com.chaozhanggui.system.cashierservice.entity.vo.CartVo;
 import com.chaozhanggui.system.cashierservice.service.OrderService;
+import com.chaozhanggui.system.cashierservice.sign.CodeEnum;
 import com.chaozhanggui.system.cashierservice.sign.Result;
 import com.chaozhanggui.system.cashierservice.util.TokenUtil;
 import lombok.extern.slf4j.Slf4j;
@@ -28,7 +28,6 @@ public class OrderController {
     private OrderService orderService;
 
     @PutMapping("/updateVip")
-    @MyLog(value = "代客下单 修改会员", tag = LogTag.PLACE)
     public ResponseEntity<Object> updateVip(
             @Validated @RequestBody UpdateVipDTO updateVipDTO
     ) {
@@ -39,100 +38,106 @@ public class OrderController {
     public Result createCart(@RequestHeader("token") String token,
                              @RequestHeader("loginName") String loginName,
                              @RequestHeader("clientType") String clientType,
-                             @RequestBody CartVo cartVo
+                             @Validated @RequestBody CartVo cartVo
-                             ){
+    ) {
-        JSONObject jsonObject  = TokenUtil.parseParamFromToken(token);
+        JSONObject jsonObject = TokenUtil.parseParamFromToken(token);
         String userId = jsonObject.getString("accountId");
-        return orderService.createCart(cartVo.getMasterId(),cartVo.getProductId(),cartVo.getShopId(),
+        return orderService.createCart(cartVo.getMasterId(), cartVo.getProductId(), cartVo.getShopId(),
-                cartVo.getSkuId(),cartVo.getNumber(),userId,clientType,cartVo.getCartId(),cartVo.getIsGift(),
+                cartVo.getSkuId(), cartVo.getNumber(), userId, clientType, cartVo.getCartId(), cartVo.getIsGift(),
-                cartVo.getIsPack(),cartVo.getUuid(),cartVo.getType(), cartVo.getTableId());
+                cartVo.getIsPack(), cartVo.getUuid(), cartVo.getType(), cartVo.getTableId());
     }
 
-    @MyLog(value = "查询购物车信息", tag = LogTag.CART)
     @GetMapping("/queryCart")
     public Result queryCart(@RequestHeader("token") String token,
-                             @RequestHeader("loginName") String loginName,
+                            @RequestHeader("loginName") String loginName,
-                             @RequestHeader("clientType") String clientType,
+                            @RequestHeader("clientType") String clientType,
-                             @RequestParam(value = "masterId", required = false) String masterId,
+                            @RequestParam(value = "masterId", required = false) String masterId,
-                             @RequestParam(required = false) String tableId,
+                            @RequestParam(required = false) String tableId,
-                             @RequestParam("shopId") String shopId
+                            @RequestParam("shopId") String shopId
-    ){
+    ) {
         if (tableId == null && StrUtil.isBlank(masterId)) {
             return Result.fail("masterId和tableId不能同时为空");
         }
-        return orderService.queryCart(masterId,shopId, tableId);
+        return orderService.queryCart(masterId, shopId, tableId);
     }
 
 
     @GetMapping("/delCart")
     public Result delCart(@RequestHeader("token") String token,
-                            @RequestHeader("loginName") String loginName,
+                          @RequestHeader("loginName") String loginName,
-                            @RequestHeader("clientType") String clientType,
+                          @RequestHeader("clientType") String clientType,
-                            @RequestParam(required = false) String tableId,
+                          @RequestParam(required = false) String tableId,
-                            @RequestParam(value = "masterId", required = false) String masterId,
+                          @RequestParam(value = "masterId", required = false) String masterId,
-                            @RequestParam("cartId") Integer cartId
+                          @RequestParam("cartId") Integer cartId
-    ){
+    ) {
-        return orderService.delCart(masterId,cartId);
+        return orderService.delCart(masterId, cartId);
     }
+
     @GetMapping("/createCode")
     public Result createCode(@RequestHeader("token") String token,
-                            @RequestHeader("loginName") String loginName,
+                             @RequestHeader("loginName") String loginName,
-                            @RequestHeader("clientType") String clientType,
+                             @RequestHeader("clientType") String clientType,
-                            @RequestParam("shopId") String shopId,
+                             @RequestParam("shopId") String shopId,
                              @RequestParam(required = false) String tableId,
                              String type
-    ){
+    ) {
-        JSONObject jsonObject  = TokenUtil.parseParamFromToken(token);
-        String userId = jsonObject.getString("accountId");
-        return orderService.createCode(shopId,clientType,userId,type, tableId);
-    }
-    @GetMapping("/getCartList")
-    public Result getCart(@RequestHeader("token") String token, @RequestHeader("loginName") String loginName,
-                          @RequestHeader("clientType") String clientType,  @RequestParam("shopId") Integer shopId){
-        return orderService.getCartList(shopId);
-    }
-    @GetMapping("/getCartPrductSpec")
-    public Result getCartPrductSpec(@RequestHeader("token") String token, @RequestHeader("loginName") String loginName,
-                          @RequestHeader("clientType") String clientType,  @RequestParam("cartId") Integer cartId){
-        return orderService.getCartPrductSpec(cartId);
-    }
-    @PostMapping("/cartStatus")
-    public Result cartStatus(@RequestHeader("token") String token, @RequestHeader("loginName") String loginName,
-                          @RequestHeader("clientType") String clientType,  @RequestBody CartVo cartVo){
         JSONObject jsonObject = TokenUtil.parseParamFromToken(token);
         String userId = jsonObject.getString("accountId");
-        String code = jsonObject.getString("code");
+        return orderService.createCode(shopId, clientType, userId, type, tableId);
-        return orderService.cartStatus(Integer.valueOf(cartVo.getShopId()),cartVo.getMasterId(),
-                cartVo.getStatus(),userId,cartVo.getUuid(),clientType, cartVo.getVipUserId(), cartVo.getTableId());
     }
+
+    @GetMapping("/getCartList")
+    public Result getCart(@RequestHeader("token") String token, @RequestHeader("loginName") String loginName,
+                          @RequestHeader("clientType") String clientType, @RequestParam("shopId") Integer shopId) {
+        return orderService.getCartList(shopId);
+    }
+
+    @GetMapping("/getCartPrductSpec")
+    public Result getCartPrductSpec(@RequestHeader("token") String token, @RequestHeader("loginName") String loginName,
+                                    @RequestHeader("clientType") String clientType, @RequestParam("cartId") Integer cartId) {
+        return orderService.getCartPrductSpec(cartId);
+    }
+
+    @PostMapping("/cartStatus")
+    public Result cartStatus(@RequestHeader("token") String token, @RequestHeader("loginName") String loginName,
+                             @RequestHeader("clientType") String clientType, @RequestBody CartVo cartVo) {
+        JSONObject jsonObject = TokenUtil.parseParamFromToken(token);
+        String userId = jsonObject.getString("accountId");
+        return orderService.cartStatus(cartVo.getShopId(), cartVo.getMasterId(),
+                cartVo.getStatus(), userId, cartVo.getUuid(), clientType, cartVo.getTableId(), token, cartVo.getOrderId());
+    }
+
     @PostMapping("/createOrder")
     public Result createOrder(@RequestHeader("token") String token, @RequestHeader("loginName") String loginName,
-                              @RequestHeader("clientType") String clientType, @RequestBody OrderVo orderVo){
+                              @RequestHeader("clientType") String clientType, @RequestBody OrderVo orderVo) {
-        JSONObject jsonObject  = TokenUtil.parseParamFromToken(token);
+        JSONObject jsonObject = TokenUtil.parseParamFromToken(token);
         String userId = jsonObject.getString("accountId");
         orderVo.setMerchantId(Integer.valueOf(userId));
         orderVo.setUserId(jsonObject.getString("staffId"));
-        return orderService.createOrder(orderVo,clientType,token, null, orderVo.getType() != null && orderVo.getType().equals(0));
+        return orderService.createOrder(orderVo, clientType, token, null);
     }
+
     @PostMapping("/createBackOrder")
     public Result createBackOrder(@RequestHeader("token") String token, @RequestHeader("loginName") String loginName,
-                              @RequestHeader("clientType") String clientType, @RequestBody OrderVo orderVo){
+                                  @RequestHeader("clientType") String clientType, @RequestBody OrderVo orderVo) {
-        JSONObject jsonObject  = TokenUtil.parseParamFromToken(token);
+        JSONObject jsonObject = TokenUtil.parseParamFromToken(token);
         String userId = jsonObject.getString("accountId");
         orderVo.setMerchantId(Integer.valueOf(userId));
         orderVo.setUserId(jsonObject.getString("staffId"));
-        return orderService.createBackOrder(orderVo,clientType,token);
+        return orderService.createBackOrder(orderVo, clientType, token);
     }
+
     @PostMapping("/packall")
     public Result packall(@RequestHeader("token") String token, @RequestHeader("loginName") String loginName,
-                              @RequestHeader("clientType") String clientType, @RequestBody CartVo cartVo){
+                          @RequestHeader("clientType") String clientType, @RequestBody CartVo cartVo) {
-        JSONObject jsonObject  = TokenUtil.parseParamFromToken(token);
+        JSONObject jsonObject = TokenUtil.parseParamFromToken(token);
         String userId = jsonObject.getString("accountId");
         return orderService.packall(cartVo);
     }
+
     @PostMapping("/clearCart")
     public Result clearCart(@RequestHeader("token") String token, @RequestHeader("loginName") String loginName,
-                          @RequestHeader("clientType") String clientType, @RequestBody CartVo cartVo){
+                            @RequestHeader("clientType") String clientType, @RequestBody CartVo cartVo) {
         return orderService.clearCart(cartVo);
     }
 
@@ -144,45 +149,51 @@ public class OrderController {
                             @RequestParam(value = "startTime", required = false) String startTime,
                             @RequestParam(value = "endTime", required = false) String endTime,
                             @RequestParam(value = "page", required = false, defaultValue = "1") Integer page,
-                            @RequestParam(value = "size", required = false, defaultValue = "1") Integer size){
+                            @RequestParam(value = "size", required = false, defaultValue = "1") Integer size) {
-        return orderService.findOrder(shopId,status,page,size,orderNo, DateUtil.parse(startTime), DateUtil.parse(endTime));
+        return orderService.findOrder(shopId, status, page, size, orderNo, DateUtil.parse(startTime), DateUtil.parse(endTime));
     }
 
     @GetMapping("/orderDetail")
     public Result orderDetail(@RequestHeader("token") String token, @RequestHeader("loginName") String loginName,
-                            @RequestHeader("clientType") String clientType, @RequestParam("shopId") Integer shopId,
+                              @RequestHeader("clientType") String clientType, @RequestParam("shopId") Integer shopId,
-                            @RequestParam("id") Integer id){
+                              @RequestParam("id") Integer id) {
-        JSONObject jsonObject  = TokenUtil.parseParamFromToken(token);
+        JSONObject jsonObject = TokenUtil.parseParamFromToken(token);
         String userId = jsonObject.getString("accountId");
-        return orderService.orderDetail(shopId,id, clientType, token, userId, jsonObject.getString("staffId"));
+        return orderService.orderDetail(shopId, id, clientType, token, userId, jsonObject.getString("staffId"));
     }
 
 
     @RequestMapping(value = "sendMessage")
     public Result sendMessage(@RequestHeader("token") String token, @RequestHeader("loginName") String loginName,
-                              @RequestHeader("clientType") String clientType,@RequestParam("orderId") String orderId){
+                              @RequestHeader("clientType") String clientType, @RequestParam("orderId") String orderId) {
         return orderService.sendMassage(orderId);
     }
 
 
     @GetMapping(value = "scanSendMessage")
     public Result scanSendMessage(@RequestHeader("token") String token, @RequestHeader("loginName") String loginName,
-                                  @RequestHeader("clientType") String clientType,@RequestParam("outNumber") String outNumber,@RequestParam("shopId") String shopId){
+                                  @RequestHeader("clientType") String clientType, @RequestParam("outNumber") String outNumber, @RequestParam("shopId") String shopId) {
-        return orderService.scanSendMessage(outNumber,shopId);
+        return orderService.scanSendMessage(outNumber, shopId);
     }
 
 
     @GetMapping(value = "getsendMessage")
     public Result getsendMessage(@RequestHeader("token") String token, @RequestHeader("loginName") String loginName,
-                                 @RequestHeader("clientType") String clientType,@RequestParam("shopId") String shopId,@RequestParam("page") int page,
+                                 @RequestHeader("clientType") String clientType, @RequestParam("shopId") String shopId, @RequestParam("page") int page,
-                                 @RequestParam("pageSize") int pageSize){
+                                 @RequestParam("pageSize") int pageSize) {
-        return orderService.getOutNumber(shopId,page,pageSize);
+        return orderService.getOutNumber(shopId, page, pageSize);
     }
 
 
-
     @GetMapping("getOrderById")
-    public Result getOrderById(@RequestParam("orderId") Integer orderId){
+    public Result getOrderById(@RequestParam("orderId") Integer orderId) {
-            return orderService.getOrder(orderId);
+        return orderService.getOrder(orderId);
+    }
+
+    @PutMapping("/choseCount")
+    public Result choseCount(
+            @Validated @RequestBody ChoseCountDTO choseCountDTO
+    ) {
+        return Result.success(CodeEnum.SUCCESS, orderService.choseCount(choseCountDTO));
     }
 }

src/main/java/com/chaozhanggui/system/cashierservice/entity/OrderVo.java

@@ -2,6 +2,7 @@ package com.chaozhanggui.system.cashierservice.entity;
 
 import lombok.Data;
 
+import javax.validation.constraints.NotBlank;
 import java.util.List;
 
 @Data
@@ -17,4 +18,7 @@ public class OrderVo {
     private Integer type;
 
     private String sendType;
+
+    @NotBlank
+    private String eatModel;
 }

src/main/java/com/chaozhanggui/system/cashierservice/entity/TbCashierCart.java

@@ -58,6 +58,8 @@ public class TbCashierCart implements Serializable {
     private Long updatedAt;
     private Integer userId;
     private String tableId;
+    private String useType;
+    private Integer placeNum;
 
     @TableField(exist = false)
     private TbProductSpec tbProductSpec;

src/main/java/com/chaozhanggui/system/cashierservice/entity/TbOrderDetail.java

@@ -41,5 +41,9 @@ public class TbOrderDetail implements Serializable {
     @TableField(exist = false)
     private String remark;
 
+    private Integer cartId;
+    private Integer placeNum;
+    private String useType;
+
     private static final long serialVersionUID = 1L;
 }

src/main/java/com/chaozhanggui/system/cashierservice/entity/TbOrderInfo.java

@@ -1,5 +1,6 @@
 package com.chaozhanggui.system.cashierservice.entity;
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import lombok.Data;
 
 import java.io.Serializable;
@@ -45,6 +46,7 @@ public class TbOrderInfo implements Serializable {
     private String sendType;
 
     private String orderType;
+    @TableField(exist = false)
     private Integer tokenId;
 
     private String productType;
@@ -60,11 +62,15 @@ public class TbOrderInfo implements Serializable {
     private Byte isVip;
 
     private String memberId;
+    @TableField(exist = false)
     private String userName;
+    @TableField(exist = false)
     private String memberName;
+    @TableField(exist = false)
     private String zdNo;
 
     private String userId;
+    @TableField(exist = false)
     private String imgUrl;
 
     private Integer productScore;
@@ -96,6 +102,7 @@ public class TbOrderInfo implements Serializable {
     private Integer source;
     private String remark;
     private String masterId;
+    @TableField(exist = false)
     private List<TbOrderDetail> detailList;
 
     private String outNumber;
@@ -103,6 +110,8 @@ public class TbOrderInfo implements Serializable {
     private Integer staffId;
 
     private String useType;
+    private Integer placeNum;
+
 
     private static final long serialVersionUID = 1L;
     public TbOrderInfo(){

src/main/java/com/chaozhanggui/system/cashierservice/entity/TbProduct.java

@@ -1,10 +1,13 @@
 package com.chaozhanggui.system.cashierservice.entity;
 
+import com.baomidou.mybatisplus.annotation.TableField;
+import lombok.Data;
 import org.springframework.data.annotation.Transient;
 
 import java.io.Serializable;
 import java.math.BigDecimal;
 
+@Data
 public class TbProduct implements Serializable {
     private Integer id;
 
@@ -132,527 +135,20 @@ public class TbProduct implements Serializable {
     private Integer stockNumber;
 
     @Transient
+    @TableField(exist = false)
     private int orderCount;
 
 
     @Transient
+    @TableField(exist = false)
     private TbProductSpec tbProductSpec;
 
     @Transient
+    @TableField(exist = false)
     private TbProductSkuResult productSkuResult;
 
 
     private static final long serialVersionUID = 1L;
 
-    public Integer getId() {
-        return id;
-    }
 
-    public void setId(Integer id) {
-        this.id = id;
-    }
-
-    public String getCategoryId() {
-        return categoryId;
-    }
-
-    public void setCategoryId(String categoryId) {
-        this.categoryId = categoryId == null ? null : categoryId.trim();
-    }
-
-    public Integer getSpecId() {
-        return specId;
-    }
-
-    public void setSpecId(Integer specId) {
-        this.specId = specId;
-    }
-
-    public String getSourcePath() {
-        return sourcePath;
-    }
-
-    public void setSourcePath(String sourcePath) {
-        this.sourcePath = sourcePath == null ? null : sourcePath.trim();
-    }
-
-    public Integer getBrandId() {
-        return brandId;
-    }
-
-    public void setBrandId(Integer brandId) {
-        this.brandId = brandId;
-    }
-
-    public String getMerchantId() {
-        return merchantId;
-    }
-
-    public void setMerchantId(String merchantId) {
-        this.merchantId = merchantId == null ? null : merchantId.trim();
-    }
-
-    public String getShopId() {
-        return shopId;
-    }
-
-    public void setShopId(String shopId) {
-        this.shopId = shopId == null ? null : shopId.trim();
-    }
-
-    public String getName() {
-        return name;
-    }
-
-    public void setName(String name) {
-        this.name = name == null ? null : name.trim();
-    }
-
-    public String getShortTitle() {
-        return shortTitle;
-    }
-
-    public void setShortTitle(String shortTitle) {
-        this.shortTitle = shortTitle == null ? null : shortTitle.trim();
-    }
-
-    public String getType() {
-        return type;
-    }
-
-    public void setType(String type) {
-        this.type = type == null ? null : type.trim();
-    }
-
-    public BigDecimal getPackFee() {
-        return packFee;
-    }
-
-    public void setPackFee(BigDecimal packFee) {
-        this.packFee = packFee;
-    }
-
-    public BigDecimal getLowPrice() {
-        return lowPrice;
-    }
-
-    public void setLowPrice(BigDecimal lowPrice) {
-        this.lowPrice = lowPrice;
-    }
-
-    public BigDecimal getLowMemberPrice() {
-        return lowMemberPrice;
-    }
-
-    public void setLowMemberPrice(BigDecimal lowMemberPrice) {
-        this.lowMemberPrice = lowMemberPrice;
-    }
-
-    public String getUnitId() {
-        return unitId;
-    }
-
-    public void setUnitId(String unitId) {
-        this.unitId = unitId == null ? null : unitId.trim();
-    }
-
-    public String getUnitSnap() {
-        return unitSnap;
-    }
-
-    public void setUnitSnap(String unitSnap) {
-        this.unitSnap = unitSnap == null ? null : unitSnap.trim();
-    }
-
-    public String getCoverImg() {
-        return coverImg;
-    }
-
-    public void setCoverImg(String coverImg) {
-        this.coverImg = coverImg == null ? null : coverImg.trim();
-    }
-
-    public String getShareImg() {
-        return shareImg;
-    }
-
-    public void setShareImg(String shareImg) {
-        this.shareImg = shareImg == null ? null : shareImg.trim();
-    }
-
-    public String getVideoCoverImg() {
-        return videoCoverImg;
-    }
-
-    public void setVideoCoverImg(String videoCoverImg) {
-        this.videoCoverImg = videoCoverImg == null ? null : videoCoverImg.trim();
-    }
-
-    public Integer getSort() {
-        return sort;
-    }
-
-    public void setSort(Integer sort) {
-        this.sort = sort;
-    }
-
-    public Integer getLimitNumber() {
-        return limitNumber;
-    }
-
-    public void setLimitNumber(Integer limitNumber) {
-        this.limitNumber = limitNumber;
-    }
-
-    public Integer getProductScore() {
-        return productScore;
-    }
-
-    public void setProductScore(Integer productScore) {
-        this.productScore = productScore;
-    }
-
-    public Byte getStatus() {
-        return status;
-    }
-
-    public void setStatus(Byte status) {
-        this.status = status;
-    }
-
-    public String getFailMsg() {
-        return failMsg;
-    }
-
-    public void setFailMsg(String failMsg) {
-        this.failMsg = failMsg == null ? null : failMsg.trim();
-    }
-
-    public Byte getIsRecommend() {
-        return isRecommend;
-    }
-
-    public void setIsRecommend(Byte isRecommend) {
-        this.isRecommend = isRecommend;
-    }
-
-    public Byte getIsHot() {
-        return isHot;
-    }
-
-    public void setIsHot(Byte isHot) {
-        this.isHot = isHot;
-    }
-
-    public Byte getIsNew() {
-        return isNew;
-    }
-
-    public void setIsNew(Byte isNew) {
-        this.isNew = isNew;
-    }
-
-    public Byte getIsOnSale() {
-        return isOnSale;
-    }
-
-    public void setIsOnSale(Byte isOnSale) {
-        this.isOnSale = isOnSale;
-    }
-
-    public Byte getIsShow() {
-        return isShow;
-    }
-
-    public void setIsShow(Byte isShow) {
-        this.isShow = isShow;
-    }
-
-    public String getTypeEnum() {
-        return typeEnum;
-    }
-
-    public void setTypeEnum(String typeEnum) {
-        this.typeEnum = typeEnum == null ? null : typeEnum.trim();
-    }
-
-    public Byte getIsDistribute() {
-        return isDistribute;
-    }
-
-    public void setIsDistribute(Byte isDistribute) {
-        this.isDistribute = isDistribute;
-    }
-
-    public Byte getIsDel() {
-        return isDel;
-    }
-
-    public void setIsDel(Byte isDel) {
-        this.isDel = isDel;
-    }
-
-    public Byte getIsStock() {
-        return isStock;
-    }
-
-    public void setIsStock(Byte isStock) {
-        this.isStock = isStock;
-    }
-
-    public Byte getIsPauseSale() {
-        return isPauseSale;
-    }
-
-    public void setIsPauseSale(Byte isPauseSale) {
-        this.isPauseSale = isPauseSale;
-    }
-
-    public Byte getIsFreeFreight() {
-        return isFreeFreight;
-    }
-
-    public void setIsFreeFreight(Byte isFreeFreight) {
-        this.isFreeFreight = isFreeFreight;
-    }
-
-    public Long getFreightId() {
-        return freightId;
-    }
-
-    public void setFreightId(Long freightId) {
-        this.freightId = freightId;
-    }
-
-    public String getStrategyType() {
-        return strategyType;
-    }
-
-    public void setStrategyType(String strategyType) {
-        this.strategyType = strategyType == null ? null : strategyType.trim();
-    }
-
-    public Integer getStrategyId() {
-        return strategyId;
-    }
-
-    public void setStrategyId(Integer strategyId) {
-        this.strategyId = strategyId;
-    }
-
-    public Byte getIsVip() {
-        return isVip;
-    }
-
-    public void setIsVip(Byte isVip) {
-        this.isVip = isVip;
-    }
-
-    public Byte getIsDelete() {
-        return isDelete;
-    }
-
-    public void setIsDelete(Byte isDelete) {
-        this.isDelete = isDelete;
-    }
-
-    public Long getCreatedAt() {
-        return createdAt;
-    }
-
-    public void setCreatedAt(Long createdAt) {
-        this.createdAt = createdAt;
-    }
-
-    public Long getUpdatedAt() {
-        return updatedAt;
-    }
-
-    public void setUpdatedAt(Long updatedAt) {
-        this.updatedAt = updatedAt;
-    }
-
-    public Double getBaseSalesNumber() {
-        return baseSalesNumber;
-    }
-
-    public void setBaseSalesNumber(Double baseSalesNumber) {
-        this.baseSalesNumber = baseSalesNumber;
-    }
-
-    public Integer getRealSalesNumber() {
-        return realSalesNumber;
-    }
-
-    public void setRealSalesNumber(Integer realSalesNumber) {
-        this.realSalesNumber = realSalesNumber;
-    }
-
-    public Integer getSalesNumber() {
-        return salesNumber;
-    }
-
-    public void setSalesNumber(Integer salesNumber) {
-        this.salesNumber = salesNumber;
-    }
-
-    public Integer getThumbCount() {
-        return thumbCount;
-    }
-
-    public void setThumbCount(Integer thumbCount) {
-        this.thumbCount = thumbCount;
-    }
-
-    public Integer getStoreCount() {
-        return storeCount;
-    }
-
-    public void setStoreCount(Integer storeCount) {
-        this.storeCount = storeCount;
-    }
-
-    public Integer getFurnishMeal() {
-        return furnishMeal;
-    }
-
-    public void setFurnishMeal(Integer furnishMeal) {
-        this.furnishMeal = furnishMeal;
-    }
-
-    public Integer getFurnishExpress() {
-        return furnishExpress;
-    }
-
-    public void setFurnishExpress(Integer furnishExpress) {
-        this.furnishExpress = furnishExpress;
-    }
-
-    public Integer getFurnishDraw() {
-        return furnishDraw;
-    }
-
-    public void setFurnishDraw(Integer furnishDraw) {
-        this.furnishDraw = furnishDraw;
-    }
-
-    public Integer getFurnishVir() {
-        return furnishVir;
-    }
-
-    public void setFurnishVir(Integer furnishVir) {
-        this.furnishVir = furnishVir;
-    }
-
-    public Byte getIsCombo() {
-        return isCombo;
-    }
-
-    public void setIsCombo(Byte isCombo) {
-        this.isCombo = isCombo;
-    }
-
-    public Byte getIsShowCash() {
-        return isShowCash;
-    }
-
-    public void setIsShowCash(Byte isShowCash) {
-        this.isShowCash = isShowCash;
-    }
-
-    public Byte getIsShowMall() {
-        return isShowMall;
-    }
-
-    public void setIsShowMall(Byte isShowMall) {
-        this.isShowMall = isShowMall;
-    }
-
-    public Byte getIsNeedExamine() {
-        return isNeedExamine;
-    }
-
-    public void setIsNeedExamine(Byte isNeedExamine) {
-        this.isNeedExamine = isNeedExamine;
-    }
-
-    public Byte getShowOnMallStatus() {
-        return showOnMallStatus;
-    }
-
-    public void setShowOnMallStatus(Byte showOnMallStatus) {
-        this.showOnMallStatus = showOnMallStatus;
-    }
-
-    public Long getShowOnMallTime() {
-        return showOnMallTime;
-    }
-
-    public void setShowOnMallTime(Long showOnMallTime) {
-        this.showOnMallTime = showOnMallTime;
-    }
-
-    public String getShowOnMallErrorMsg() {
-        return showOnMallErrorMsg;
-    }
-
-    public void setShowOnMallErrorMsg(String showOnMallErrorMsg) {
-        this.showOnMallErrorMsg = showOnMallErrorMsg == null ? null : showOnMallErrorMsg.trim();
-    }
-
-    public Byte getEnableLabel() {
-        return enableLabel;
-    }
-
-    public void setEnableLabel(Byte enableLabel) {
-        this.enableLabel = enableLabel;
-    }
-
-    public String getTaxConfigId() {
-        return taxConfigId;
-    }
-
-    public void setTaxConfigId(String taxConfigId) {
-        this.taxConfigId = taxConfigId == null ? null : taxConfigId.trim();
-    }
-
-    public String getSpecTableHeaders() {
-        return specTableHeaders;
-    }
-
-    public void setSpecTableHeaders(String specTableHeaders) {
-        this.specTableHeaders = specTableHeaders == null ? null : specTableHeaders.trim();
-    }
-
-    public TbProductSpec getTbProductSpec() {
-        return tbProductSpec;
-    }
-
-    public void setTbProductSpec(TbProductSpec tbProductSpec) {
-        this.tbProductSpec = tbProductSpec;
-    }
-
-    public TbProductSkuResult getProductSkuResult() {
-        return productSkuResult;
-    }
-
-    public void setProductSkuResult(TbProductSkuResult productSkuResult) {
-        this.productSkuResult = productSkuResult;
-    }
-
-    public int getOrderCount() {
-        return orderCount;
-    }
-
-    public void setOrderCount(int orderCount) {
-        this.orderCount = orderCount;
-    }
-
-    public Integer getStockNumber() {
-        return stockNumber;
-    }
-
-    public void setStockNumber(Integer stockNumber) {
-        this.stockNumber = stockNumber;
-    }
 }

src/main/java/com/chaozhanggui/system/cashierservice/entity/TbShopInfo.java

@@ -1,8 +1,11 @@
 package com.chaozhanggui.system.cashierservice.entity;
 
+import lombok.Data;
+
 import java.io.Serializable;
 import java.math.BigDecimal;
 
+@Data
 public class TbShopInfo implements Serializable {
     private Integer id;
 
@@ -119,427 +122,5 @@ public class TbShopInfo implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
-    public Integer getId() {
-        return id;
-    }
 
-    public void setId(Integer id) {
+}
-        this.id = id;
-    }
-
-    public String getAccount() {
-        return account;
-    }
-
-    public void setAccount(String account) {
-        this.account = account == null ? null : account.trim();
-    }
-
-    public String getShopCode() {
-        return shopCode;
-    }
-
-    public void setShopCode(String shopCode) {
-        this.shopCode = shopCode == null ? null : shopCode.trim();
-    }
-
-    public String getSubTitle() {
-        return subTitle;
-    }
-
-    public void setSubTitle(String subTitle) {
-        this.subTitle = subTitle == null ? null : subTitle.trim();
-    }
-
-    public String getMerchantId() {
-        return merchantId;
-    }
-
-    public void setMerchantId(String merchantId) {
-        this.merchantId = merchantId == null ? null : merchantId.trim();
-    }
-
-    public String getShopName() {
-        return shopName;
-    }
-
-    public void setShopName(String shopName) {
-        this.shopName = shopName == null ? null : shopName.trim();
-    }
-
-    public String getChainName() {
-        return chainName;
-    }
-
-    public void setChainName(String chainName) {
-        this.chainName = chainName == null ? null : chainName.trim();
-    }
-
-    public String getBackImg() {
-        return backImg;
-    }
-
-    public void setBackImg(String backImg) {
-        this.backImg = backImg == null ? null : backImg.trim();
-    }
-
-    public String getFrontImg() {
-        return frontImg;
-    }
-
-    public void setFrontImg(String frontImg) {
-        this.frontImg = frontImg == null ? null : frontImg.trim();
-    }
-
-    public String getContactName() {
-        return contactName;
-    }
-
-    public void setContactName(String contactName) {
-        this.contactName = contactName == null ? null : contactName.trim();
-    }
-
-    public String getPhone() {
-        return phone;
-    }
-
-    public void setPhone(String phone) {
-        this.phone = phone == null ? null : phone.trim();
-    }
-
-    public String getLogo() {
-        return logo;
-    }
-
-    public void setLogo(String logo) {
-        this.logo = logo == null ? null : logo.trim();
-    }
-
-    public Byte getIsDeposit() {
-        return isDeposit;
-    }
-
-    public void setIsDeposit(Byte isDeposit) {
-        this.isDeposit = isDeposit;
-    }
-
-    public Byte getIsSupply() {
-        return isSupply;
-    }
-
-    public void setIsSupply(Byte isSupply) {
-        this.isSupply = isSupply;
-    }
-
-    public String getCoverImg() {
-        return coverImg;
-    }
-
-    public void setCoverImg(String coverImg) {
-        this.coverImg = coverImg == null ? null : coverImg.trim();
-    }
-
-    public String getShareImg() {
-        return shareImg;
-    }
-
-    public void setShareImg(String shareImg) {
-        this.shareImg = shareImg == null ? null : shareImg.trim();
-    }
-
-    public String getDetail() {
-        return detail;
-    }
-
-    public void setDetail(String detail) {
-        this.detail = detail == null ? null : detail.trim();
-    }
-
-    public String getLat() {
-        return lat;
-    }
-
-    public void setLat(String lat) {
-        this.lat = lat == null ? null : lat.trim();
-    }
-
-    public String getLng() {
-        return lng;
-    }
-
-    public void setLng(String lng) {
-        this.lng = lng == null ? null : lng.trim();
-    }
-
-    public String getMchId() {
-        return mchId;
-    }
-
-    public void setMchId(String mchId) {
-        this.mchId = mchId == null ? null : mchId.trim();
-    }
-
-    public String getRegisterType() {
-        return registerType;
-    }
-
-    public void setRegisterType(String registerType) {
-        this.registerType = registerType == null ? null : registerType.trim();
-    }
-
-    public Byte getIsWxMaIndependent() {
-        return isWxMaIndependent;
-    }
-
-    public void setIsWxMaIndependent(Byte isWxMaIndependent) {
-        this.isWxMaIndependent = isWxMaIndependent;
-    }
-
-    public String getAddress() {
-        return address;
-    }
-
-    public void setAddress(String address) {
-        this.address = address == null ? null : address.trim();
-    }
-
-    public String getCity() {
-        return city;
-    }
-
-    public void setCity(String city) {
-        this.city = city == null ? null : city.trim();
-    }
-
-    public String getType() {
-        return type;
-    }
-
-    public void setType(String type) {
-        this.type = type == null ? null : type.trim();
-    }
-
-    public String getIndustry() {
-        return industry;
-    }
-
-    public void setIndustry(String industry) {
-        this.industry = industry == null ? null : industry.trim();
-    }
-
-    public String getIndustryName() {
-        return industryName;
-    }
-
-    public void setIndustryName(String industryName) {
-        this.industryName = industryName == null ? null : industryName.trim();
-    }
-
-    public String getBusinessTime() {
-        return businessTime;
-    }
-
-    public void setBusinessTime(String businessTime) {
-        this.businessTime = businessTime == null ? null : businessTime.trim();
-    }
-
-    public String getPostTime() {
-        return postTime;
-    }
-
-    public void setPostTime(String postTime) {
-        this.postTime = postTime == null ? null : postTime.trim();
-    }
-
-    public BigDecimal getPostAmountLine() {
-        return postAmountLine;
-    }
-
-    public void setPostAmountLine(BigDecimal postAmountLine) {
-        this.postAmountLine = postAmountLine;
-    }
-
-    public Byte getOnSale() {
-        return onSale;
-    }
-
-    public void setOnSale(Byte onSale) {
-        this.onSale = onSale;
-    }
-
-    public Byte getSettleType() {
-        return settleType;
-    }
-
-    public void setSettleType(Byte settleType) {
-        this.settleType = settleType;
-    }
-
-    public String getSettleTime() {
-        return settleTime;
-    }
-
-    public void setSettleTime(String settleTime) {
-        this.settleTime = settleTime == null ? null : settleTime.trim();
-    }
-
-    public Integer getEnterAt() {
-        return enterAt;
-    }
-
-    public void setEnterAt(Integer enterAt) {
-        this.enterAt = enterAt;
-    }
-
-    public Long getExpireAt() {
-        return expireAt;
-    }
-
-    public void setExpireAt(Long expireAt) {
-        this.expireAt = expireAt;
-    }
-
-    public Byte getStatus() {
-        return status;
-    }
-
-    public void setStatus(Byte status) {
-        this.status = status;
-    }
-
-    public Float getAverage() {
-        return average;
-    }
-
-    public void setAverage(Float average) {
-        this.average = average;
-    }
-
-    public Integer getOrderWaitPayMinute() {
-        return orderWaitPayMinute;
-    }
-
-    public void setOrderWaitPayMinute(Integer orderWaitPayMinute) {
-        this.orderWaitPayMinute = orderWaitPayMinute;
-    }
-
-    public Integer getSupportDeviceNumber() {
-        return supportDeviceNumber;
-    }
-
-    public void setSupportDeviceNumber(Integer supportDeviceNumber) {
-        this.supportDeviceNumber = supportDeviceNumber;
-    }
-
-    public Byte getDistributeLevel() {
-        return distributeLevel;
-    }
-
-    public void setDistributeLevel(Byte distributeLevel) {
-        this.distributeLevel = distributeLevel;
-    }
-
-    public Long getCreatedAt() {
-        return createdAt;
-    }
-
-    public void setCreatedAt(Long createdAt) {
-        this.createdAt = createdAt;
-    }
-
-    public Long getUpdatedAt() {
-        return updatedAt;
-    }
-
-    public void setUpdatedAt(Long updatedAt) {
-        this.updatedAt = updatedAt;
-    }
-
-    public String getProxyId() {
-        return proxyId;
-    }
-
-    public void setProxyId(String proxyId) {
-        this.proxyId = proxyId == null ? null : proxyId.trim();
-    }
-
-    public String getView() {
-        return view;
-    }
-
-    public void setView(String view) {
-        this.view = view == null ? null : view.trim();
-    }
-
-    public String getIsCustom() {
-        return isCustom;
-    }
-
-    public void setIsCustom(String isCustom) {
-        this.isCustom = isCustom;
-    }
-
-    public String getIsReturn() {
-        return isReturn;
-    }
-
-    public void setIsReturn(String isReturn) {
-        this.isReturn = isReturn;
-    }
-
-    public String getIsMemberIn() {
-        return isMemberIn;
-    }
-
-    public void setIsMemberIn(String isMemberIn) {
-        this.isMemberIn = isMemberIn;
-    }
-
-    public String getIsMemberReturn() {
-        return isMemberReturn;
-    }
-
-    public void setIsMemberReturn(String isMemberReturn) {
-        this.isMemberReturn = isMemberReturn;
-    }
-
-    public Integer getIsTableFee() {
-        return isTableFee;
-    }
-
-    public void setIsTableFee(Integer isTableFee) {
-        this.isTableFee = isTableFee;
-    }
-
-    public BigDecimal getTableFee() {
-        return tableFee;
-    }
-
-    public void setTableFee(BigDecimal tableFee) {
-        this.tableFee = tableFee;
-    }
-
-    public String getEatModel() {
-        return eatModel;
-    }
-
-    public void setEatModel(String eatModel) {
-        this.eatModel = eatModel;
-    }
-
-    public String getSmallQrcode() {
-        return smallQrcode;
-    }
-
-    public void setSmallQrcode(String smallQrcode) {
-        this.smallQrcode = smallQrcode;
-    }
-
-    public String getPaymentQrcode() {
-        return paymentQrcode;
-    }
-
-    public void setPaymentQrcode(String paymentQrcode) {
-        this.paymentQrcode = paymentQrcode;
-    }
-}

src/main/java/com/chaozhanggui/system/cashierservice/entity/dto/ChoseCountDTO.java

@@ -0,0 +1,20 @@
+package com.chaozhanggui.system.cashierservice.entity.dto;
+
+import lombok.Data;
+
+import javax.validation.constraints.Min;
+import javax.validation.constraints.NotEmpty;
+import javax.validation.constraints.NotNull;
+
+@Data
+public class ChoseCountDTO {
+    @NotEmpty
+    private String masterId;
+    @NotNull
+    private Integer shopId;
+    @NotEmpty
+    private String tableId;
+    @NotNull
+    @Min(1)
+    private Integer num;
+}

src/main/java/com/chaozhanggui/system/cashierservice/entity/dto/ShopEatTypeInfoDTO.java

@@ -0,0 +1,16 @@
+package com.chaozhanggui.system.cashierservice.entity.dto;
+
+import com.chaozhanggui.system.cashierservice.entity.TbShopInfo;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+
+@Data
+@AllArgsConstructor
+public class ShopEatTypeInfoDTO {
+    private boolean isTakeout;
+    private boolean isMunchies;
+    private boolean isDineInAfter;
+    private boolean isDineInBefore;
+    private TbShopInfo shopInfo;
+    private String useType;
+}

src/main/java/com/chaozhanggui/system/cashierservice/entity/po/CartPo.java

@@ -12,4 +12,5 @@ public class CartPo {
     private Integer shopId;
     private Long pendingAt;
     private BigDecimal totalAmount;
+    private Integer orderId;
 }

src/main/java/com/chaozhanggui/system/cashierservice/entity/vo/CartVo.java

@@ -2,11 +2,17 @@ package com.chaozhanggui.system.cashierservice.entity.vo;
 
 import lombok.Data;
 
+import javax.validation.constraints.Min;
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+
 @Data
 public class CartVo {
-    private String productId;
+    private Integer productId;
-    private String shopId;
+    @NotNull
+    private Integer shopId;
     private Integer skuId;
+    @Min(1)
     private Integer number;
     private String isPack;
     private String isGift;
@@ -16,5 +22,5 @@ public class CartVo {
     private Integer cartId;
     private String masterId;
     private String tableId;
-    private Integer vipUserId;
+    private Integer orderId;
 }

src/main/java/com/chaozhanggui/system/cashierservice/exception/NotPrintException.java

@@ -0,0 +1,16 @@
+package com.chaozhanggui.system.cashierservice.exception;
+
+import cn.hutool.core.util.StrUtil;
+import com.chaozhanggui.system.cashierservice.util.Utils;
+import lombok.extern.slf4j.Slf4j;
+
+@Slf4j
+public class NotPrintException extends RuntimeException{
+
+    public NotPrintException(String format, Object... args) {
+        super(StrUtil.format(format, args));
+        StringBuilder builder = new StringBuilder();
+        Utils.recursiveReversePrintStackCause(this, 2, new Utils.ForwardCounter(0), 2, builder);
+        log.warn("异常信息: {}", builder);
+    }
+}

src/main/java/com/chaozhanggui/system/cashierservice/mybatis/MPOrderInfoMapper.java

@@ -0,0 +1,8 @@
+package com.chaozhanggui.system.cashierservice.mybatis;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.chaozhanggui.system.cashierservice.entity.TbOrderDetail;
+import com.chaozhanggui.system.cashierservice.entity.TbOrderInfo;
+
+public interface MPOrderInfoMapper extends BaseMapper<TbOrderInfo> {
+}

src/main/java/com/chaozhanggui/system/cashierservice/mybatis/MpProductMapper.java

@@ -0,0 +1,9 @@
+package com.chaozhanggui.system.cashierservice.mybatis;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.chaozhanggui.system.cashierservice.dao.TbProductMapper;
+import com.chaozhanggui.system.cashierservice.entity.TbProduct;
+import com.chaozhanggui.system.cashierservice.entity.TbShopInfo;
+
+public interface MpProductMapper extends BaseMapper<TbProduct> {
+}

src/main/java/com/chaozhanggui/system/cashierservice/mybatis/MpShopInfoMapper.java

@@ -0,0 +1,8 @@
+package com.chaozhanggui.system.cashierservice.mybatis;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.chaozhanggui.system.cashierservice.entity.TbShopInfo;
+import com.chaozhanggui.system.cashierservice.entity.TbShopTable;
+
+public interface MpShopInfoMapper extends BaseMapper<TbShopInfo> {
+}

src/main/java/com/chaozhanggui/system/cashierservice/service/MpCashierCartService.java

@@ -0,0 +1,16 @@
+package com.chaozhanggui.system.cashierservice.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.chaozhanggui.system.cashierservice.entity.TbCashierCart;
+import com.chaozhanggui.system.cashierservice.entity.TbOrderDetail;
+
+/**
+ * (TbShopPermission)表服务接口
+ *
+ * @author makejava
+ * @since 2024-09-14 17:08:48
+ */
+public interface MpCashierCartService extends IService<TbCashierCart> {
+
+}
+

src/main/java/com/chaozhanggui/system/cashierservice/service/MpOrderDetailService.java

@@ -0,0 +1,17 @@
+package com.chaozhanggui.system.cashierservice.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.chaozhanggui.system.cashierservice.entity.TbOrderDetail;
+import com.chaozhanggui.system.cashierservice.entity.TbShopPermission;
+import com.chaozhanggui.system.cashierservice.sign.Result;
+
+/**
+ * (TbShopPermission)表服务接口
+ *
+ * @author makejava
+ * @since 2024-09-14 17:08:48
+ */
+public interface MpOrderDetailService extends IService<TbOrderDetail> {
+
+}
+

src/main/java/com/chaozhanggui/system/cashierservice/service/impl/MpCashierCartServiceImpl.java

@@ -0,0 +1,22 @@
+package com.chaozhanggui.system.cashierservice.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.chaozhanggui.system.cashierservice.entity.TbCashierCart;
+import com.chaozhanggui.system.cashierservice.entity.TbOrderDetail;
+import com.chaozhanggui.system.cashierservice.mybatis.MPCashierCartMapper;
+import com.chaozhanggui.system.cashierservice.mybatis.MPOrderDetailMapper;
+import com.chaozhanggui.system.cashierservice.service.MpCashierCartService;
+import com.chaozhanggui.system.cashierservice.service.MpOrderDetailService;
+import org.springframework.stereotype.Service;
+
+/**
+ * (TbShopPermission)表服务实现类
+ *
+ * @author makejava
+ * @since 2024-09-14 17:08:49
+ */
+@Service
+public class MpCashierCartServiceImpl extends ServiceImpl<MPCashierCartMapper, TbCashierCart> implements MpCashierCartService {
+
+}
+

src/main/java/com/chaozhanggui/system/cashierservice/service/impl/MpOrderDetailServiceImpl.java

@@ -0,0 +1,30 @@
+package com.chaozhanggui.system.cashierservice.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.chaozhanggui.system.cashierservice.dao.TbOrderDetailMapper;
+import com.chaozhanggui.system.cashierservice.dao.TbShopPermissionDao;
+import com.chaozhanggui.system.cashierservice.entity.TbOrderDetail;
+import com.chaozhanggui.system.cashierservice.entity.TbShopPermission;
+import com.chaozhanggui.system.cashierservice.entity.TbShopStaffPermission;
+import com.chaozhanggui.system.cashierservice.mybatis.MPOrderDetailMapper;
+import com.chaozhanggui.system.cashierservice.service.MpOrderDetailService;
+import com.chaozhanggui.system.cashierservice.service.TbShopPermissionService;
+import com.chaozhanggui.system.cashierservice.service.TbShopStaffPermissionService;
+import com.chaozhanggui.system.cashierservice.sign.CodeEnum;
+import com.chaozhanggui.system.cashierservice.sign.Result;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Primary;
+import org.springframework.stereotype.Service;
+
+/**
+ * (TbShopPermission)表服务实现类
+ *
+ * @author makejava
+ * @since 2024-09-14 17:08:49
+ */
+@Service
+public class MpOrderDetailServiceImpl extends ServiceImpl<MPOrderDetailMapper, TbOrderDetail> implements MpOrderDetailService {
+
+}
+

src/main/resources/mapper/TbCashierCartMapper.xml

@@ -80,7 +80,7 @@
         select shop_Id as shopId,master_id as masterId,uuid,
         TRIM(TRAILING ', ' FROM GROUP_CONCAT(name ORDER BY id SEPARATOR ', ')) AS productName,
         pending_at as pendingAt,
-        ifnull(sum(total_amount),0) as totalAmount
+        ifnull(sum(total_amount),0) as totalAmount, order_id as orderId
         from tb_cashier_cart where shop_id = #{shopId} and status = 'refund' group by shop_Id, master_id order by trade_day desc
     </select>
     <select id="selectAllCreateOrder" resultType="com.chaozhanggui.system.cashierservice.entity.TbCashierCart">