Merge branch 'master-fix' into release

yudao-module-product/yudao-module-product-core/src/main/java/cn/iocoder/yudao/module/product/service/product/impl/ProductPriceServiceImpl.java

@@ -133,7 +133,7 @@ public class ProductPriceServiceImpl extends AbstractService<ProductPriceMapper,
 //    private ZTestMapper3 zTestMapper;
 
 
-    private static final String PREFIX = "price_batch_update_";
+    private static final String PREFIX = "price_batch_update:";
     private static final Integer DATA_THRESHOLD = 30;
 
     private static final String BATCH_DEL_SCRIPT = "for k,v in  pairs(ARGV) do \n " +
@@ -699,7 +699,7 @@ public class ProductPriceServiceImpl extends AbstractService<ProductPriceMapper,
         List<Long> dbStepIdList = dbStepList.stream()
                 .map(ProductPriceStepDO::getId)
                 .collect(toList());
-        if (!batchUpdate) {
+//        if (!batchUpdate) {
             List<Long> updateIdList = updateList.stream()
                     .map(ProductPriceStepDO::getId)
                     .collect(toList());
@@ -708,7 +708,7 @@ public class ProductPriceServiceImpl extends AbstractService<ProductPriceMapper,
             if (CollectionUtil.isNotEmpty(dbIdList)) {
                 productPriceStepMapper.physicsDeleteById(Joiner.on(",").join(dbIdList));
             }
-        }
+//        }
 
         insertList1.addAll(updateList);
         List<ProductPriceStepSpecialDO> allUpdateStepSpecialList = insertList1.stream()
@@ -902,15 +902,15 @@ public class ProductPriceServiceImpl extends AbstractService<ProductPriceMapper,
                     .collect(toList());
             productPriceStepPackagingMapper.deleteBatchIds(dIdList);
         }
-        if (!batchUpdate) {
-            List<Long> updateIdList = packagingUpdateList.stream()
+//        if (!batchUpdate) {
+            List<Long> updatePackingIdList = packagingUpdateList.stream()
                     .map(ProductPriceStepPackagingDO::getId)
                     .collect(toList());
-            dbPackingIdList.removeAll(updateIdList);
+            dbPackingIdList.removeAll(updatePackingIdList);
             if (CollectionUtil.isNotEmpty(dbPackingIdList)) {
                 productPriceStepPackagingMapper.physicsDeleteById(Joiner.on(",").join(dbPackingIdList));
             }
-        }
+//        }
     }
 
     private void initBasePackagingPrice(BasePackagingPrice basePackagingPrice, String transportType) {

yudao-module-shipment/yudao-module-shipment-core/src/main/java/cn/iocoder/yudao/module/shipment/dal/mysql/BoxMapper.java

@@ -621,20 +621,20 @@ public interface BoxMapper extends AbstractMapper<BoxDO> {
         }
         String beginDaogangTime =null ;
         String endDaogangTime =null ;
-        if(vo.getBeginDaogangTime()!=null ){
+        if(vo.getBeginDaogangTime()!=null && vo.getEndDaogangTime() != null){
             beginDaogangTime = DateUtil.format(vo.getBeginDaogangTime(), "yyyy-MM-dd HH:mm:ss");
             endDaogangTime = DateUtil.format(vo.getEndDaogangTime(), "yyyy-MM-dd HH:mm:ss");
         }
         String beginQingguanTime = null ;
         String endQingguanTime =null ;
-        if(vo.getBeginQingguanTime()!=null ){
+        if(vo.getBeginQingguanTime()!=null && vo.getEndQingguanTime() != null){
             beginQingguanTime = DateUtil.format(vo.getBeginQingguanTime(), "yyyy-MM-dd HH:mm:ss");
             endQingguanTime = DateUtil.format(vo.getEndQingguanTime(), "yyyy-MM-dd HH:mm:ss");
         }
 
         String beginUlWarehouseTime = null ;
         String endUlWarehouseTime =null ;
-        if(vo.getBeginQingguanTime()!=null ){
+        if(vo.getBeginUlWarehouseTime()!=null && vo.getEndUlWarehouseTime() != null){
             beginUlWarehouseTime = DateUtil.format(vo.getBeginUlWarehouseTime(), "yyyy-MM-dd HH:mm:ss");
             endUlWarehouseTime = DateUtil.format(vo.getEndUlWarehouseTime(), "yyyy-MM-dd HH:mm:ss");
         }
@@ -658,7 +658,7 @@ public interface BoxMapper extends AbstractMapper<BoxDO> {
             "</when>",
 
             "<when test = 'beginUlWarehouseTime != null or endUlWarehouseTime != null'>",
-            ", ecw_box_clearance clearance ",
+            ", ecw_box_cabinet_unload unload ",
             "</when>",
 
             "WHERE",
@@ -669,7 +669,7 @@ public interface BoxMapper extends AbstractMapper<BoxDO> {
             "</when>",
 
             "<when test = 'beginUlWarehouseTime != null or endUlWarehouseTime != null'>",
-            "and box.id = clearance.shipment_id and clearance.deleted = 0",
+            "and box.id = unload.shipment_id and unload.deleted = 0",
             "</when>",
 
             "<when test = 'beginJsDate != null'>",
@@ -698,11 +698,11 @@ public interface BoxMapper extends AbstractMapper<BoxDO> {
             "</when>",
 
             "<when test = 'beginUlWarehouseTime != null'>",
-            "and clearance.cl_clear_time &gt;= #{beginUlWarehouseTime}",
+            "and unload.ul_warehouse_time &gt;= #{beginUlWarehouseTime}",
             "</when>",
 
             "<when test = 'endUlWarehouseTime != null'>",
-            "and clearance.cl_clear_time &lt;= #{endUlWarehouseTime}",
+            "and unload.ul_warehouse_time &lt;= #{endUlWarehouseTime}",
             "</when>",
 
             "<when test = 'selfNo != null and selfNo != \"\" '>",