同步数据bug相关修复

master
anthonywj 2 years ago
parent 19d156e2c4
commit 4318495bac

@ -36,7 +36,7 @@ public class BasicProcessStatus {
* *
*/ */
public static final String OTHER_DATA = "22"; public static final String OTHER_DATA = "22";
public static final String ALL_BUS_ORDER = "11"; public static final String ALL_BUS_ORDER = "业务单据";
public static final String NEW_ALL_DI = "10"; public static final String NEW_ALL_DI = "10";
public static final String NEW_ALL_THR_DATA = "12"; //所有第三方基础数据 public static final String NEW_ALL_THR_DATA = "12"; //所有第三方基础数据
public static final String NEW_ALL_THR_PRODUCTS = "13"; //所有第三方产品数据 public static final String NEW_ALL_THR_PRODUCTS = "13"; //所有第三方产品数据

@ -4,6 +4,7 @@ import com.glxp.api.entity.inout.*;
import lombok.Data; import lombok.Data;
import java.util.List; import java.util.List;
//同步扫码单据相关 //同步扫码单据相关
@Data @Data
public class SpsSyncOrderResponse extends BaseSyncResponse { public class SpsSyncOrderResponse extends BaseSyncResponse {
@ -14,5 +15,4 @@ public class SpsSyncOrderResponse extends BaseSyncResponse {
List<IoOrderDetailCodeEntity> orderDetailCodeEntities; List<IoOrderDetailCodeEntity> orderDetailCodeEntities;
List<IoOrderDetailResultEntity> orderDetailResultEntities; List<IoOrderDetailResultEntity> orderDetailResultEntities;
List<IoOrderInvoiceEntity> orderInvoiceEntities; List<IoOrderInvoiceEntity> orderInvoiceEntities;
} }

@ -135,6 +135,7 @@ public class HeartService {
basicExportStatusTimeEntity.setLastUpdateTime(DateUtil.formatDate(System.currentTimeMillis(), "yyyy-MM-dd HH:mm:ss")); basicExportStatusTimeEntity.setLastUpdateTime(DateUtil.formatDate(System.currentTimeMillis(), "yyyy-MM-dd HH:mm:ss"));
basicExportStatusTimeEntity.setKey(ConstantStatus.SYNC_SCAN_ORDER); basicExportStatusTimeEntity.setKey(ConstantStatus.SYNC_SCAN_ORDER);
spsSyncOrderResponse.setTaskId(basicExportStatusEntity1.getId()); spsSyncOrderResponse.setTaskId(basicExportStatusEntity1.getId());
spsSyncOrderResponse.setType(BasicProcessStatus.NEW_ALL_ORDER);
BaseResponse<String> baseResponse1 = spGetHttp.postAllOrder(spsSyncOrderResponse); BaseResponse<String> baseResponse1 = spGetHttp.postAllOrder(spsSyncOrderResponse);
if (baseResponse1.getCode() == 20000) { if (baseResponse1.getCode() == 20000) {
basicExportStatusEntity1.setStatus(2); basicExportStatusEntity1.setStatus(2);
@ -194,6 +195,7 @@ public class HeartService {
basicExportStatusTimeEntity.setLastUpdateTime(DateUtil.formatDate(System.currentTimeMillis(), "yyyy-MM-dd HH:mm:ss")); basicExportStatusTimeEntity.setLastUpdateTime(DateUtil.formatDate(System.currentTimeMillis(), "yyyy-MM-dd HH:mm:ss"));
basicExportStatusTimeEntity.setKey(ConstantStatus.SYNC_BUS_ORDER); basicExportStatusTimeEntity.setKey(ConstantStatus.SYNC_BUS_ORDER);
spsSyncOrderResponse.setTaskId(basicExportStatusEntity1.getId()); spsSyncOrderResponse.setTaskId(basicExportStatusEntity1.getId());
spsSyncOrderResponse.setType(BasicProcessStatus.ALL_BUS_ORDER);
BaseResponse<String> baseResponse1 = spGetHttp.postAllBusOrder(spsSyncOrderResponse); BaseResponse<String> baseResponse1 = spGetHttp.postAllBusOrder(spsSyncOrderResponse);
if (baseResponse1.getCode() == 20000) { if (baseResponse1.getCode() == 20000) {
basicExportStatusEntity1.setStatus(ConstantStatus.SYNC_STATUS_SUCCESS); basicExportStatusEntity1.setStatus(ConstantStatus.SYNC_STATUS_SUCCESS);
@ -254,7 +256,6 @@ public class HeartService {
uploadData(exportType, taskId, x -> x.getSysSettingData(info, taskId, now, syncTime)); uploadData(exportType, taskId, x -> x.getSysSettingData(info, taskId, now, syncTime));
} }
break; break;
case COUNTRY_DI_DATA:
} }
} }
@ -410,6 +411,7 @@ public class HeartService {
} }
if (dataResponse != null) { if (dataResponse != null) {
dataResponse.setTaskId(taskId); dataResponse.setTaskId(taskId);
dataResponse.setType(BasicExportTypeEnum.BASIC_DATA.getRemark());
} }
return dataResponse; return dataResponse;
@ -470,6 +472,7 @@ public class HeartService {
} }
if (dataResponse != null) { if (dataResponse != null) {
dataResponse.setTaskId(taskId); dataResponse.setTaskId(taskId);
dataResponse.setType(BasicExportTypeEnum.OTHER_DATA.getRemark());
} }
return dataResponse; return dataResponse;
@ -578,6 +581,8 @@ public class HeartService {
if (dataResponse != null) { if (dataResponse != null) {
dataResponse.setTaskId(taskId); dataResponse.setTaskId(taskId);
dataResponse.setType(BasicExportTypeEnum.DOCUMENT_TYPE_DATA.getRemark());
} }
return dataResponse; return dataResponse;
} }
@ -723,6 +728,7 @@ public class HeartService {
if (dataResponse != null) { if (dataResponse != null) {
dataResponse.setTaskId(taskId); dataResponse.setTaskId(taskId);
dataResponse.setType(BasicExportTypeEnum.USER_DATA.getRemark());
} }
return dataResponse; return dataResponse;
} }
@ -830,6 +836,7 @@ public class HeartService {
if (dataResponse != null) { if (dataResponse != null) {
dataResponse.setTaskId(taskId); dataResponse.setTaskId(taskId);
dataResponse.setType(BasicExportTypeEnum.THIRD_DATA.getRemark());
} }
return dataResponse; return dataResponse;
} }
@ -1012,6 +1019,7 @@ public class HeartService {
if (dataResponse != null) { if (dataResponse != null) {
dataResponse.setTaskId(taskId); dataResponse.setTaskId(taskId);
dataResponse.setType(BasicExportTypeEnum.SYS_SET_DATA.getRemark());
} }
return dataResponse; return dataResponse;
} }

Loading…
Cancel
Save