sku同步唯一键、每日库存计算更改

data-base/base-sync-sku/src/main/java/com/bailuntec/job/SkuMSSyncJob.java

@@ -122,7 +122,7 @@ public class SkuMSSyncJob extends PointJob {
                         }
                     }
                     dcBaseSku.setGmtModified(LocalDateTime.now());
-                    int v = mapper.updateByExampleSelective(dcBaseSku, DcBaseSkuExample.newAndCreateCriteria().andBailunSkuEqualTo(dcBaseSku.getBailunSku()).andCompanyIdEqualTo(dcBaseSku.getCompanyId()).example());
+                    int v = mapper.updateByExampleSelective(dcBaseSku, DcBaseSkuExample.newAndCreateCriteria().andBailunSkuEqualTo(dcBaseSku.getBailunSku()).example());
                     if (v == 0) {
                         mapper.insertSelective(dcBaseSku);
                     }

data-common/src/main/java/com/bailuntec/domain/entity/DcBaseStock.java

@@ -2,6 +2,7 @@ package com.bailuntec.domain.entity;
 
 import lombok.Data;
 
+import java.math.BigDecimal;
 import java.time.LocalDateTime;
 
 @Data
@@ -330,6 +331,8 @@ public class DcBaseStock {
      */
     private String suppliersName;
 
+    private BigDecimal unitPrice;
+
     /**
      * This method was generated by MyBatis Generator.
      * This method corresponds to the database table dc_base_stock

data-common/src/main/java/com/bailuntec/mapper/DcBaseStockMapper.xml

@@ -1149,39 +1149,41 @@
 
   <select id="selectStock" resultType="com.bailuntec.domain.entity.DcBaseStock">
     SELECT
-        `bailun_sku`,
-        `warehouse_code`,
-        `owner_code`,
-        `quantity_reservation`,
-        `quantity_transport`,
-        `quantity_transfer`,
-        `quantity_freeze`,
-        `quantity_supplier`,
-        `quantity_presell`,
-        `quantity_defective`,
-        `quantity_transit`,
-        `wait_check`,
-        `wait_putaway`,
-        `usable_stock`,
-        `usable_sales`,
-        `usable_sales_private`,
-        `usable_sales_share`,
-        `in_warehouse_share`,
-        `in_warehouse_private`,
-        `in_warehouse`,
-        `occupy_stock_share`,
-        `occupy_stock_private`,
-        `occupy_stock`,
-        `occupy_activity`,
-        `occupy_order_private`,
-        `occupy_order_share`,
-        `occupy_order`,
-        `gmt_create`,
-        `gmt_modified`,
-        `create_time`,
-        `update_time`
+        dc0.bailun_sku,
+        dc0.warehouse_code,
+        dc0.owner_code,
+        dc0.quantity_reservation,
+        dc0.quantity_transport,
+        dc0.quantity_transfer,
+        dc0.quantity_freeze,
+        dc0.quantity_supplier,
+        dc0.quantity_presell,
+        dc0.quantity_defective,
+        dc0.quantity_transit,
+        dc0.wait_check,
+        dc0.wait_putaway,
+        dc0.usable_stock,
+        dc0.usable_sales,
+        dc0.usable_sales_private,
+        dc0.usable_sales_share,
+        dc0.in_warehouse_share,
+        dc0.in_warehouse_private,
+        dc0.in_warehouse,
+        dc0.occupy_stock_share,
+        dc0.occupy_stock_private,
+        dc0.occupy_stock,
+        dc0.occupy_activity,
+        dc0.occupy_order_private,
+        dc0.occupy_order_share,
+        dc0.occupy_order,
+        dc0.gmt_create,
+        dc0.gmt_modified,
+        dc0.create_time,
+        dc0.update_time,
+        dc1.unit_price
         FROM
-	    dc_base_stock
+	    dc_base_stock dc0
+	    left join dc_base_sku dc1 on dc0.bailun_sku = dc1.bailun_sku
 	    limit #{pageIndex}, #{pageSize}
   </select>
 
@@ -1190,7 +1192,7 @@
   </select>
 
   <insert id="insertDailyStock">
-    INSERT INTO dc_daily_stock (
+    INSERT INTO dc_daily_stock_temp (
             `bailun_sku`,
             `warehouse_code`,
             `owner_code`,
@@ -1222,12 +1224,13 @@
             `gmt_modified`,
             `record_time`,
             `create_time`,
-            `update_time`
+            `update_time`,
+            unit_price
         )
         values(
         #{bailunSku}, #{warehouseCode}, #{ownerCode}, #{quantityReservation}, #{quantityTransport}, #{quantityTransfer}, #{quantityFreeze}, #{quantitySupplier}, #{quantityPresell}, #{quantityDefective}, #{quantityTransit}
         ,#{waitCheck}, #{waitPutaway}, #{usableStock}, #{usableSales}, #{usableSalesPrivate}, #{usableSalesShare}, #{inWarehouseShare}, #{inWarehousePrivate}, #{inWarehouse}, #{occupyStockShare}, #{occupyStockPrivate}, #{occupyStock}
-        ,#{occupyActivity}, #{occupyOrderPrivate}, #{occupyOrderShare}, #{occupyOrder}, #{gmtCreate}, #{gmtModified}, DATE_SUB( CURDATE( ), INTERVAL 1 DAY ), #{createTime}, #{updateTime}
+        ,#{occupyActivity}, #{occupyOrderPrivate}, #{occupyOrderShare}, #{occupyOrder}, #{gmtCreate}, #{gmtModified}, DATE_SUB( CURDATE( ), INTERVAL 1 DAY ), #{createTime}, #{updateTime}, #{unitPrice}
         )
   </insert>
 

data-mid/mid-daily-stock/src/main/java/com/bailuntec/job/DailyStockJob.java

@@ -7,6 +7,7 @@ import com.dangdang.ddframe.job.api.ShardingContext;
 import com.dangdang.ddframe.job.api.simple.SimpleJob;
 import lombok.extern.slf4j.Slf4j;
 
+import java.math.BigDecimal;
 import java.util.List;
 
 @Slf4j
@@ -22,12 +23,15 @@ public class DailyStockJob implements SimpleJob {
             do{
                 List<DcBaseStock> dcBaseStockList = mapper.selectStock((pageIndex - 1) * pageSize, pageSize);
                 for(DcBaseStock dcBaseStock : dcBaseStockList) {
+                    log.warn("bailunSku: " + dcBaseStock.getBailunSku() + "  unionPrice:" + dcBaseStock.getUnitPrice());
+                    if(dcBaseStock.getUnitPrice() == null) {
+                        dcBaseStock.setUnitPrice(BigDecimal.ZERO);
+                    }
                     DcBaseStockMapper dcBaseStockMapper = SessionUtil.getSession().getMapper(DcBaseStockMapper.class);
                     dcBaseStockMapper.insertDailyStock(dcBaseStock);
                 }
                 pageIndex = pageIndex + 1;
             }while(pageIndex <= stockPage);
-            mapper.updateSkuUnitPrice();
         } catch (Exception e) {
             e.printStackTrace();
             throw new RuntimeException("MYBATIS操作DB失败", e);