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

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

@@ -112,6 +112,16 @@ public class TbShopInfo implements Serializable {
     private String districts;
 
     private String isCustom;
+    //是否开启桌位费 0否1是
+    private Integer isTableFee;
+    //桌位费
+    private BigDecimal tableFee;
+    //就餐模式  堂食 dine-in  外带 take-out
+    private String eatModel;
+    //程序码(零点八零首页)
+    private String smallQrcode;
+    //店铺收款码
+    private String paymentQrcode;
 
     private static final long serialVersionUID = 1L;
 

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

@@ -390,6 +390,11 @@ public class ProductService {
     public List<TbProduct> handleDate(List<TbProduct> products,boolean check,Integer isSale,boolean isVip){
         if (!CollectionUtils.isEmpty(products)) {
             products.parallelStream().forEach(it -> {
+                TbShopUnit tbShopUnit = unitMapper.selectByPrimaryKey(Integer.valueOf(it.getUnitId()));
+                if (it.getName().equals("烤牛肉")) {
+                    System.out.println("单位："+tbShopUnit.getName());
+                }
+                it.setUnitSnap(tbShopUnit != null ? tbShopUnit.getName() : "");
                 if(check){
                     List<TbProductGroup> tbProductGroups = tbProductGroupMapper.selectByProductId(it.getShopId(), it.getId().toString());
                     for (TbProductGroup g : tbProductGroups) {
@@ -403,8 +408,6 @@ public class ProductService {
                 }else {
                     it.setIsSale(isSale);
                 }
-                TbShopUnit tbShopUnit = unitMapper.selectByPrimaryKey(Integer.valueOf(it.getUnitId()));
-                it.setUnitSnap(tbShopUnit != null ? tbShopUnit.getName() : "");
                 //购物车数量
                 it.setCartNumber("0");
                 List<TbProductSku> tbProductSkus = tbProductSkuMapper.selectGroundingByProId(it.getId());