Merge branch 'ww' into test

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

@@ -2,6 +2,7 @@ package com.chaozhanggui.system.cashierservice.entity;
 
 import java.io.Serializable;
 import java.math.BigDecimal;
+import java.util.Date;
 
 public class    TbShopUser implements Serializable {
     private Integer id;
@@ -61,6 +62,7 @@ public class    TbShopUser implements Serializable {
     private Long updatedAt;
 
     private String miniOpenId;
+    private Date joinTime;
 
     private static final long serialVersionUID = 1L;
 
@@ -295,4 +297,12 @@ public class    TbShopUser implements Serializable {
     public void setDynamicCode(String dynamicCode) {
         this.dynamicCode = dynamicCode;
     }
+
+    public Date getJoinTime() {
+        return joinTime;
+    }
+
+    public void setJoinTime(Date joinTime) {
+        this.joinTime = joinTime;
+    }
 }

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

@@ -143,6 +143,7 @@ public class MemberService {
             tbShopUser.setLevel(Byte.parseByte(String.valueOf(map.get("level"))));
             tbShopUser.setIsVip(Byte.parseByte("1"));
             tbShopUser.setUpdatedAt(System.currentTimeMillis());
+            tbShopUser.setJoinTime(new Date());
             tbShopUserMapper.updateByPrimaryKeySelective(tbShopUser);
             return Result.success(CodeEnum.SUCCESS);
         }
@@ -168,6 +169,7 @@ public class MemberService {
         tbShopUser.setCode(code);
         tbShopUser.setIsVip(Byte.parseByte("1"));
         tbShopUser.setCreatedAt(System.currentTimeMillis());
+        tbShopUser.setJoinTime(new Date());
         tbShopUserMapper.insert(tbShopUser);
         return Result.success(CodeEnum.SUCCESS);
     }

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

@@ -204,7 +204,7 @@ public class ProductService {
 
         if (product.getIsDistribute() != 1 && product.getTypeEnum().equals("sku")) {
             throw new MsgException("多规格非共享商品暂不支持修改库存");
-        }else {
+        } else {
             tbProductMapper.updateStock(productStockDTO.getShopId(), productStockDTO.getProductId(), productStockDTO.getStock());
             tbProductSkuMapper.updateStock(productStockDTO.getShopId(), productStockDTO.getProductId(), productStockDTO.getStock());
 
@@ -213,9 +213,15 @@ public class ProductService {
             data.put("shopId", productStockDTO.getShopId());
             data.put("skuId", tbProductSkus.isEmpty() ? null : tbProductSkus.get(0).getId());
             data.put("productId", productStockDTO.getProductId());
-            data.put("type", "pc收银机修改库存");
+//            data.put("type", "pc收银机修改库存");
             data.put("subType", product.getStockNumber() > productStockDTO.getStock() ? -1 : 1);
-            data.put("number",productStockDTO.getStock() - product.getStockNumber());
+            data.put("number", productStockDTO.getStock() - product.getStockNumber());
+            data.put("remark", "pc收银机修改库存");
+            if (product.getStockNumber() > productStockDTO.getStock()) {
+                data.put("type", "盘点出库");
+            }else {
+                data.put("type", "盘点入库");
+            }
             producer.sendStockRecordMsg(data);
         }
     }