1.同步老系统盘点任务bug修复

blade-service-api/logpm-patch-api/src/main/java/com/logpm/patch/entity/SyncInventoryEntity.java

@@ -7,7 +7,6 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import org.springblade.core.tenant.mp.TenantEntity;
-import org.springframework.format.annotation.DateTimeFormat;
 
 import java.util.Date;
 
@@ -52,18 +51,12 @@ public class SyncInventoryEntity extends TenantEntity {
 	private Integer inventoryId;
 
 	@ApiModelProperty(value = "同步开始时间")
-	@DateTimeFormat(
-		pattern = "yyyy-MM-dd HH:mm:ss"
-	)
 	@JsonFormat(
 		pattern = "yyyy-MM-dd HH:mm:ss"
 	)
 	private Date syncStartDate;
 
 	@ApiModelProperty(value = "同步结束时间")
-	@DateTimeFormat(
-		pattern = "yyyy-MM-dd HH:mm:ss"
-	)
 	@JsonFormat(
 		pattern = "yyyy-MM-dd HH:mm:ss"
 	)

blade-service/logpm-patch/src/main/java/com/logpm/patch/service/impl/AsyncDataServiceImpl.java

@@ -70,7 +70,7 @@ public class AsyncDataServiceImpl implements IAsyncDataService {
 			currentPage = one.getCurrentPage();
 		}else{
 			//查询本次同步一共多少的个订单
-			Integer totalNum = orderClient.getTotalCountBy(null,oldWarehouseId);
+			Integer totalNum = orderClient.getTotalCountBy("",oldWarehouseId);
 			if(totalNum == 0){
 				log.info("################syncOrderInfo: 暂无需要执行的数据");
 				throw new CustomerException(403,"暂无需要执行的数据");
@@ -104,7 +104,7 @@ public class AsyncDataServiceImpl implements IAsyncDataService {
 		for (int j = currentPage; j < totalPage; j++) {
 			log.info("##################syncOrderInfo: 当前同步的第{}页的数据",j+1);
 			try{
-				List<String> orderCodeList = orderClient.findOrderCodeListByPage(null,oldWarehouseId,j,pageSize);
+				List<String> orderCodeList = orderClient.findOrderCodeListByPage("",oldWarehouseId,j,pageSize);
 
 				syncOrderInfoService.handleData(orderCodeList,oldWarehouseId,newWarehouseId,inventoryId);