no message

mall-miniapp-service/src/main/java/com/gree/mall/miniapp/bean/material/stock/WorkerStockDTO.java

@@ -125,9 +125,8 @@ public class WorkerStockDTO {
         WorkerStock workerStock = new WorkerStock();
         BeanUtils.copyProperties(this, workerStock);
         workerStock.setId(null)
-                //.setWebsitId(this.workerWebsitId)
-                //.setWebsitName(this.workerWebsitName)
-                .setWayQty(BigDecimal.ZERO)
+                .setWebsitId(this.workerWebsitId)
+                .setWebsitName(this.workerWebsitName)
                 .setQty(BigDecimal.ZERO)
                 .setOldQty(BigDecimal.ZERO)
                 .setCreateBy(this.operateBy)
@@ -158,17 +157,15 @@ public class WorkerStockDTO {
         BeanUtils.copyProperties(this, workerStockAcc);
         workerStockAcc.setQty(qty)
                 .setCloseQty(closeQty)
-                .setCreateBy(this.operateBy)
-                .setCreateTime(this.operateTime);
+                .setOperBy(this.operateBy)
+                .setOperTime(this.operateTime);
         // 注入库存
         if (this.partsAttr.equals(PartsAttrEnum.NEW.toString())) {
             workerStock.setQty(closeQty);
         } else if (this.partsAttr.equals(PartsAttrEnum.OLD.toString())) {
             workerStock.setOldQty(closeQty);
-        } else {
-            workerStock.setWayQty(closeQty);
         }
-        workerStock.setUpdateBy(this.operateBy)
-                .setUpdateTime(this.operateTime);
+        workerStock.setOperBy(this.operateBy)
+                .setOperTime(this.operateTime);
     }
 }

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

@@ -110,8 +110,8 @@ public class WorkerStockLogic {
                 .eq(StringUtils.isNotBlank(directFlag),WorkerStockAcc::getDirectFlag,directFlag)
                 .eq(WorkerStockAcc::getWorkerId, currentCompanyWechat.getUserId())
                 .eq(WorkerStockAcc::getGoodsId, websitGoodsId)
-                .between(startTime != null && endTime != null ,WorkerStockAcc::getCreateTime, startTime, endTime)
-                .orderByDesc(WorkerStockAcc::getCreateTime).page(new Page<>(pageNum, pageSize));
+                .between(startTime != null && endTime != null ,WorkerStockAcc::getOperTime, startTime, endTime)
+                .orderByDesc(WorkerStockAcc::getOperTime).page(new Page<>(pageNum, pageSize));
 
         List<WorkerStockAccBean> workerStockAccBeans = BeanUtil.copyToList(page.getRecords(), WorkerStockAccBean.class);
         for(WorkerStockAccBean workerStockAccBean : workerStockAccBeans){