Merge remote-tracking branch 'origin/dev' into dev

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

@@ -25,6 +25,7 @@ public class OrderPo {
     private String outNumber;
     private String tableName;
     private List<SkuInfoPo> skuInfos;
+    private String remark;
 
 
 }

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

@@ -2,11 +2,15 @@ package com.chaozhanggui.system.cashierservice.entity.po;
 
 import lombok.Data;
 
+import java.math.BigDecimal;
+
 @Data
 public class SkuInfoPo {
 
     private String productName;
     private String productSkuName;
     private Integer num;
+    private BigDecimal priceAmount;
+    private BigDecimal packAmount;
     private String categoryId;
 }

src/main/java/com/chaozhanggui/system/cashierservice/rabbit/ConsMsgConsumer.java

@@ -120,7 +120,6 @@ public class ConsMsgConsumer {
                     tbConsInfo.getConWarning(),tbConsInfo.getStockNumber().subtract(tbConsInfo.getStockConsume()).abs());
             if (N.egt(tbConsInfo.getConWarning(), tbConsInfo.getStockNumber().subtract(tbConsInfo.getStockConsume()).abs())) {
 
-
                     List<TbUserShopMsg> tbUserShopMsgs = tbUserShopMsgMapper.selectAllByShopId(tbConsInfo.getShopId());
                     if (Objects.nonNull(tbUserShopMsgs) && tbUserShopMsgs.size()>0) {
                         tbUserShopMsgs.parallelStream().forEach(tbUserShopMsg->{

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

@@ -111,7 +111,7 @@ public class DataService {
 
         HandoverInfo handoverInfo=new HandoverInfo(tbShopInfo.getShopName(),
                 ObjectUtil.isNotEmpty(shopUserDuty.getLoginTime())? DateUtils.getTime(shopUserDuty.getLoginTime()):null,
-                ObjectUtil.isNotEmpty(shopUserDuty.getLoginOutTime())?DateUtils.getTime(shopUserDuty.getLoginOutTime()):"",
+                DateUtils.getTime(new Date()),
                 ObjectUtil.isNull(shopStaff.getName())?"":shopStaff.getName(),
                 list,memberData,shopUserDuty.getAmount().add(ObjectUtil.isNull(shopUserDuty.getQuickAmount())?BigDecimal.ZERO:shopUserDuty.getQuickAmount()).toPlainString(),
                 "0",

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

@@ -124,6 +124,7 @@ public class LoginService {
         accountMap.put("accountId", account.getId());
         accountMap.put("merchantName", account.getAccount());
         accountMap.put("loginName", tbPlussShopStaff.getAccount());
+        accountMap.put("loginAccount",tbPlussShopStaff.getName());
         accountMap.put("clientType", loginReq.getClientType());
         accountMap.put("shopId", account.getShopId());
         accountMap.put("staffId", tbPlussShopStaff.getId());

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

@@ -987,7 +987,7 @@ public class PayService {
 
         //修改耗材数据
         JSONObject jsonObject1=new JSONObject();
-        jsonObject1.put("orderId",orderInfo.getId());
+        jsonObject1.put("orderId",newOrderInfo.getId());
         jsonObject1.put("type","delete");
         producer.cons(jsonObject1.toString());
 

src/main/resources/mapper/TbOrderInfoMapper.xml

@@ -75,7 +75,10 @@
         GROUP_CONCAT(tod.product_name)  AS productName,
         toi.STATUS,
         toi.out_number AS outNumber,
-        toi.table_name AS tableName
+        toi.table_name AS tableName,
+        toi.remark,
+        toi.master_id as masterId
+
 
         FROM
         tb_order_info toi
@@ -592,7 +595,9 @@ select * from tb_order_info where trade_day = #{day} and table_id = #{masterId}
             d.product_name AS productName,
             d.num,
             d.product_sku_name AS productSkuName,
-            c.category_id AS categoryId
+            c.category_id AS categoryId,
+            d.price_amount as priceAmount,
+            d.pack_amount as packAmount
         FROM
             tb_order_detail d
                 LEFT JOIN tb_cashier_cart c ON d.order_id = c.order_id