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

mall-miniapp-service/src/main/java/com/gree/mall/miniapp/logic/material/stock/MaterialGoodsStockLogic.java

@@ -152,7 +152,9 @@ public class MaterialGoodsStockLogic {
         Integer materialSalesCount = websitNormRecordService.query()
                 .select("DISTINCT ref_order")
                 .eq("goods_type", "M")
-                .eq("worker_id", wechat.getUser().getWorkerNumber())
+                .and(v -> v.eq("worker_id", wechat.getUser().getUserId())
+                        .or()
+                        .eq("worker_number", wechat.getUser().getWorkerNumber()))
                 .between("create_time", curDate + " 00:00:00", curDate + " 23:59:59")
                 .count();
         List<WebsitNormRecord> normRecords1 = websitNormRecordService.lambdaQuery()

mall-miniapp-service/src/main/java/com/gree/mall/miniapp/logic/order/PayOrderLogic.java

@@ -630,7 +630,7 @@ public class PayOrderLogic {
         Map<String, WorkerNormStockBean> workerStockMap = new HashMap<>();
         for (WorkerOrderItem item : workerOrderItems) {
             WebsitNormCharge websitNormCharge = websitNormChargeService.getById(item.getGoodsId());
-            if (websitNormCharge.getNormType().equals(NormTypeEnum.M.getKey())) {
+            if (Objects.nonNull(websitNormCharge) && websitNormCharge.getNormType().equals(NormTypeEnum.M.getKey())) {
                 // 获取当前关联师傅库存记录
                 List<WorkerNormStockBean> stockBeanList = materialMapper.queryWorkerStockQty(item.getGoodsId(), workerOrder.getIdentity());
                 if (CollectionUtil.isNotEmpty(stockBeanList)) {
@@ -805,7 +805,8 @@ public class PayOrderLogic {
             websitNormRecord.setCompanyWechatId(workerOrder.getCompanyWechatId());
             websitNormRecord.setCompanyWechatName(workerOrder.getCompanyWechatName());
             websitNormRecord.setGoodsType(workerOrder.getGoodsType());
-            websitNormRecord.setWorkerId(workerOrder.getWorkerId());
+            websitNormRecord.setWorkerId(workerOrder.getUserId());
+            websitNormRecord.setWorkerNumber(workerOrder.getWorkerId());
             websitNormRecord.setWorkerName(workerOrder.getWorkerName());
             websitNormRecord.setOrderId(workerOrder.getWorkerOrderId());
             websitNormRecord.setRefOrder(workerOrder.getOrderId());

mall-miniapp-service/src/main/java/com/gree/mall/miniapp/logic/user/UserLogic.java

@@ -688,6 +688,7 @@ public class UserLogic {
         userWxBean.setToken(token);
         userWxBean.setShoppingCartNums(shoppingCartLogic.total(userWxBean.getUserId()));
         redisUtil.set(Constant.RedisPrefix.TOKEN_WX + token, userWxBean.getUserId(), 7 * 24 * 60 * 60 * 1000);
+        log.info("小程序登录用户token : {} : {}", userWxBean.getNickName(), userWxBean.getToken());
         return userWxBean;
     }
 

mall-server-api/src/main/java/com/gree/mall/manager/bean/admin/AdminDeptWebsitVO.java

@@ -5,7 +5,6 @@ import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.gree.mall.manager.annotation.ZfireField;
-import com.gree.mall.manager.plus.entity.AdminDeptWebsit;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -44,8 +43,8 @@ public class AdminDeptWebsitVO   {
     @TableField(fill = FieldFill.INSERT_UPDATE)
     private Date updateTime;
 
-    @ZfireField(hide = true)
-    @ApiModelProperty(value = "网点商户id")
+//    @ZfireField(hide = true)
+    @ApiModelProperty(value = "网点编号")
     private String websitId;
 
     @ApiModelProperty(value = "网点名称")

mall-server-api/src/main/java/com/gree/mall/manager/bean/listvo/material/WebsitStockAccPVO.java

@@ -22,7 +22,8 @@ public class WebsitStockAccPVO {
 //    private String companyWechatId;
 //    @ApiModelProperty("所属商户")
 //    private String companyWechatName;
-    @ZfireField(hide = true)
+//    @ZfireField(hide = true)
+    @ApiModelProperty("网点编号")
     private String websitId;
     @ApiModelProperty("网点名称")
     private String websitName;

mall-server-api/src/main/java/com/gree/mall/manager/bean/listvo/material/WebsitStockAccVO.java

@@ -21,7 +21,8 @@ public class WebsitStockAccVO {
 //    private String companyWechatId;
 //    @ApiModelProperty("所属商户")
 //    private String companyWechatName;
-    @ZfireField(hide = true)
+//    @ZfireField(hide = true)
+    @ApiModelProperty("网点编号")
     private String websitId;
     @ApiModelProperty("网点名称")
     private String websitName;

mall-server-api/src/main/java/com/gree/mall/manager/bean/listvo/material/WebsitStockPVO.java

@@ -21,7 +21,8 @@ public class WebsitStockPVO {
 //    private String companyWechatId;
 //    @ApiModelProperty("所属商户")
 //    private String companyWechatName;
-    @ZfireField(hide = true)
+//    @ZfireField(hide = true)
+    @ApiModelProperty("网点编号")
     private String websitId;
     @ApiModelProperty("网点名称")
     private String websitName;

mall-server-api/src/main/java/com/gree/mall/manager/bean/listvo/material/WebsitStockVO.java

@@ -21,7 +21,8 @@ public class WebsitStockVO {
 //    private String companyWechatId;
 //    @ApiModelProperty("所属商户")
 //    private String companyWechatName;
-    @ZfireField(hide = true)
+//    @ZfireField(hide = true)
+    @ApiModelProperty("网点编号")
     private String websitId;
     @ApiModelProperty("网点名称")
     private String websitName;

mall-server-api/src/main/java/com/gree/mall/manager/bean/listvo/material/WorkerStockAccPVO.java

@@ -23,7 +23,8 @@ public class WorkerStockAccPVO {
 //    private String companyWechatId;
 //    @ApiModelProperty("所属商户")
 //    private String companyWechatName;
-    @ZfireField(hide = true)
+//    @ZfireField(hide = true)
+    @ApiModelProperty("网点编号")
     private String websitId;
     @ApiModelProperty("网点名称")
     private String websitName;

mall-server-api/src/main/java/com/gree/mall/manager/bean/listvo/material/WorkerStockAccVO.java

@@ -21,7 +21,8 @@ public class WorkerStockAccVO {
 //    private String companyWechatId;
 //    @ApiModelProperty("所属商户")
 //    private String companyWechatName;
-    @ZfireField(hide = true)
+//    @ZfireField(hide = true)
+    @ApiModelProperty("网点编号")
     private String websitId;
     @ApiModelProperty("网点名称")
     private String websitName;

mall-server-api/src/main/java/com/gree/mall/manager/bean/listvo/material/WorkerStockPVO.java

@@ -21,7 +21,8 @@ public class WorkerStockPVO {
 //    private String companyWechatId;
 //    @ApiModelProperty("所属商户")
 //    private String companyWechatName;
-    @ZfireField(hide = true)
+//    @ZfireField(hide = true)
+    @ApiModelProperty("网点编号")
     private String websitId;
     @ApiModelProperty("网点名称")
     private String websitName;

mall-server-api/src/main/java/com/gree/mall/manager/bean/material/manage/WebsitPartsCreditItemVO.java

@@ -29,7 +29,7 @@ public class WebsitPartsCreditItemVO {
     @ApiModelProperty("申请类别")
     private PartsApplyCategoryEnum applyCategory;
 
-    @ZfireField(hide = true)
+//    @ZfireField(hide = true)
     @ApiModelProperty(value = "网点编号")
     private String websitId;
 

mall-server-api/src/main/java/com/gree/mall/manager/bean/material/manage/WebsitPartsCreditVO.java

@@ -13,7 +13,7 @@ import java.util.Date;
 @ZfireField(tbName = "a")
 public class WebsitPartsCreditVO {
 
-    @ZfireField(hide = true)
+//    @ZfireField(hide = true)
     @ApiModelProperty(value = "网点编号")
     private String websitId;
 

mall-server-api/src/main/java/com/gree/mall/manager/bean/material/manage/WebsitPartsSalesVO.java

@@ -26,7 +26,7 @@ public class WebsitPartsSalesVO {
     @ApiModelProperty("申请类别")
     private PartsApplyCategoryEnum applyCategory;
 
-    @ZfireField(hide = true)
+//    @ZfireField(hide = true)
     @ApiModelProperty(value = "网点编号")
     private String websitId;
 

mall-server-api/src/main/java/com/gree/mall/manager/bean/material/manage/WebsitPartsSalesWVO.java

@@ -25,7 +25,7 @@ public class WebsitPartsSalesWVO {
     @ApiModelProperty("申请类别")
     private PartsApplyCategoryEnum applyCategory;
 
-    @ZfireField(hide = true)
+//    @ZfireField(hide = true)
     @ApiModelProperty(value = "网点编号")
     private String websitId;
 

mall-server-api/src/main/java/com/gree/mall/manager/bean/material/manage/WebsitPurchaseAdjustmentVO.java

@@ -19,7 +19,7 @@ public class WebsitPurchaseAdjustmentVO {
 //    @ApiModelProperty(value = "商户名称")
 //    private String companyWechatName;
 
-    @ZfireField(hide = true)
+//    @ZfireField(hide = true)
     @ApiModelProperty(value = "网点编号")
     private String websitId;
 

mall-server-api/src/main/java/com/gree/mall/manager/bean/material/manage/WebsitPurchaseOrderVO.java

@@ -20,7 +20,7 @@ public class WebsitPurchaseOrderVO {
 //    @ApiModelProperty(value = "商户名称")
 //    private String companyWechatName;
 
-    @ZfireField(hide = true)
+//    @ZfireField(hide = true)
     @ApiModelProperty(value = "网点编号")
     private String websitId;
 

mall-server-api/src/main/java/com/gree/mall/manager/bean/material/manage/WebsitPurchaseRetVO.java

@@ -20,7 +20,7 @@ public class WebsitPurchaseRetVO {
 //    @ApiModelProperty(value = "商户名称")
 //    private String companyWechatName;
 
-    @ZfireField(hide = true)
+//    @ZfireField(hide = true)
     @ApiModelProperty(value = "网点编号")
     private String websitId;
 

mall-server-api/src/main/java/com/gree/mall/manager/bean/material/manage/WebsitPurchaseVO.java

@@ -20,7 +20,7 @@ public class WebsitPurchaseVO {
 //    @ApiModelProperty(value = "商户名称")
 //    private String companyWechatName;
 
-    @ZfireField(hide = true)
+//    @ZfireField(hide = true)
     @ApiModelProperty(value = "网点编号")
     private String websitId;
 

mall-server-api/src/main/java/com/gree/mall/manager/bean/material/manage/WebsitSalesVO.java

@@ -21,7 +21,7 @@ public class WebsitSalesVO {
     @ApiModelProperty(value = "单号")
     private String salesId;
 
-    @ZfireField(hide = true)
+//    @ZfireField(hide = true)
     @ApiModelProperty(value = "网点编号")
     private String websitId;
 

mall-server-api/src/main/java/com/gree/mall/manager/bean/material/manage/WebsitTradeVO.java

@@ -37,7 +37,7 @@ public class WebsitTradeVO {
     @ApiModelProperty(value = "订单来源")
     private SalesPayOrderSourceEnum orderSource;
 
-    @ZfireField(hide = true)
+//    @ZfireField(hide = true)
     @ApiModelProperty(value = "网点编号")
     private String websitId;
 

mall-server-api/src/main/java/com/gree/mall/manager/bean/settle/SettleExpenseItemVO.java

@@ -34,7 +34,7 @@ public class SettleExpenseItemVO {
 //    @ApiModelProperty(value = "商户名称")
 //    private String companyWechatName;
 
-    @ZfireField(hide = true)
+//    @ZfireField(hide = true)
     @ApiModelProperty(value = "网点编号")
     private String websitId;
 

mall-server-api/src/main/java/com/gree/mall/manager/bean/settle/SettleExpenseVO.java

@@ -25,6 +25,9 @@ public class SettleExpenseVO {
 //    @ApiModelProperty(value = "所属商户")
 //    private String companyWechatName;
 
+    @ApiModelProperty(value = "网点编号")
+    private String websitId;
+
     @ApiModelProperty(value = "网点名称")
     private String websitName;
 

mall-server-api/src/main/java/com/gree/mall/manager/bean/settle/repair/DailyBankAccountVO.java

@@ -15,6 +15,9 @@ public class DailyBankAccountVO {
     @ApiModelProperty(value = "银行账户id")
     private String id;
 
+    @ApiModelProperty(value = "网点编号")
+    private String websitId;
+
     @ApiModelProperty(value = "网点名称")
     private String websitName;
 

mall-server-api/src/main/java/com/gree/mall/manager/logic/websit/SettlementOrderLogic.java

@@ -564,7 +564,7 @@ public class SettlementOrderLogic {
         Map<String, WorkerNormStockBean> workerStockMap = new HashMap<>();
         for (WorkerOrderItem item : workerOrderItems) {
             WebsitNormCharge websitNormCharge = websitNormChargeService.getById(item.getGoodsId());
-            if (websitNormCharge.getNormType().equals(NormTypeEnum.M.getKey())) {
+            if (Objects.nonNull(websitNormCharge) && websitNormCharge.getNormType().equals(NormTypeEnum.M.getKey())) {
                 // 获取当前关联师傅库存记录
                 List<WorkerNormStockBean> stockBeanList = materialMapper.queryWorkerStockQty(item.getGoodsId(), workerOrder.getIdentity());
                 if (CollectionUtil.isNotEmpty(stockBeanList)) {
@@ -634,7 +634,8 @@ public class SettlementOrderLogic {
             websitNormRecord.setCompanyWechatId(workerOrder.getCompanyWechatId());
             websitNormRecord.setCompanyWechatName(workerOrder.getCompanyWechatName());
             websitNormRecord.setGoodsType(workerOrder.getGoodsType());
-            websitNormRecord.setWorkerId(workerOrder.getWorkerId());
+            websitNormRecord.setWorkerId(workerOrder.getUserId());
+            websitNormRecord.setWorkerNumber(workerOrder.getWorkerId());
             websitNormRecord.setWorkerName(workerOrder.getWorkerName());
             websitNormRecord.setOrderId(workerOrder.getWorkerOrderId());
             websitNormRecord.setRefOrder(workerOrder.getOrderId());