UDI
/
udiwms-java
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

选入DI同步三期设置

Browse Source
master
anthonyywj2 3 years ago
parent f2d12b3cb2
commit f8cda1703c
4 changed files with 52 additions and 4 deletions
Show Stats Download Patch File Download Diff File

7
api-admin/src/main/java/com/glxp/api/admin/controller/basic/UdiContrastController.java
Unescape Escape View File

@ -21,6 +21,7 @@ import com.glxp.api.admin.service.thrsys.ThrProductsService;
import com.glxp.api.admin.util.CustomUtil;
import com.glxp.api.admin.util.DateUtil;
import com.glxp.api.admin.util.GennerOrderUtils;
import com.glxp.api.admin.util.UdiInfoUtil;
import com.glxp.api.common.res.BaseResponse;
import com.glxp.api.common.util.ResultVOUtils;
import org.springframework.beans.BeanUtils;
@ -114,7 +115,7 @@ public class UdiContrastController {
for (UdiInfoEntity udiInfoEntity : udiInfoEntities) {
udiInfoEntity.setUuid(udiRelevanceEntity.getUuid());
}
udiInfoService.insertUdiInfos(udiInfoEntities);
udiInfoService.insertUdiInfos(UdiInfoUtil.initUdiInfoEntitys(udiInfoEntities));
// udiRelevanceEntity.setUuid(udiInfoEntities.get(0).getUuid());
udiRelevanceEntity.setUpdateTime(DateUtil.formatDateTime(new Date()));
udiRelevanceService.updateUdiRelevance(udiRelevanceEntity);
@ -293,6 +294,7 @@ public class UdiContrastController {
udiInfoEntity.setUuid(udiRelevanceEntity.getUuid());
udiInfoEntity.setProductType(ConstantStatus.PRODUCT_TYPE_THIRD);
udiInfoEntity.setDiType(1);
udiInfoEntity = UdiInfoUtil.initUdiInfoEntity(udiInfoEntity);
udiInfoService.insertUdiInfo(udiInfoEntity);
}
@ -354,8 +356,9 @@ public class UdiContrastController {
public void insertUdiInfos(List<UdiInfoEntity> udiInfoEntities) {
if (CollUtil.isNotEmpty(udiInfoEntities)) {
UdiInfoEntity udiInfoEntity = udiInfoService.findByUuid(udiInfoEntities.get(0).getUuid());
if (udiInfoEntity == null) {
udiInfoService.insertUdiInfos(udiInfoEntities);
udiInfoService.insertUdiInfos(UdiInfoUtil.initUdiInfoEntitys(udiInfoEntities));
}
}
}

3
api-admin/src/main/java/com/glxp/api/admin/controller/inout/utils/InoutUtils.java
Unescape Escape View File

@ -14,6 +14,7 @@ import com.glxp.api.admin.service.inout.OrderService;
import com.glxp.api.admin.util.DateUtil;
import com.glxp.api.admin.util.FilterUdiUtils;
import com.glxp.api.admin.util.GennerOrderUtils;
import com.glxp.api.admin.util.UdiInfoUtil;
import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Service;
@ -57,7 +58,7 @@ public class InoutUtils {
if (udiInfoEntity == null) {
List<UdiInfoEntity> froms = udiDlHttpClient.getUdiByDi(prefix);
if (froms != null && !froms.isEmpty()) {
udiInfoService.insertUdiInfos(froms);
udiInfoService.insertUdiInfos(UdiInfoUtil.initUdiInfoEntitys(froms));
udiInfoEntity = udiInfoService.findByNameCode(prefix);
UdiRelevanceEntity udiRelevanceEntity = new UdiRelevanceEntity();
udiRelevanceEntity.setUuid(udiInfoEntity.getUuid());

2
api-admin/src/main/java/com/glxp/api/admin/thread/BasicUpdateProductService.java
Unescape Escape View File

@ -224,7 +224,7 @@ public class BasicUpdateProductService {
productInfoFilterRequest.setLimit(limit);
List<UdiInfoEntity> udiInfoEntities = getUdiInfoEntity(productInfoFilterRequest);
if (udiInfoEntities != null && udiInfoEntities.size() > 0) {
udiInfoService.insertUdiInfos(udiInfoEntities);
udiInfoService.insertUdiInfos(UdiInfoUtil.initUdiInfoEntitys(udiInfoEntities));
for (UdiInfoEntity udiInfoEntity : udiInfoEntities) {
UdiRelevanceEntity udiRelevanceEntity = new UdiRelevanceEntity();
udiRelevanceEntity.setUpdateTime(DateUtil.getDateTime());

44
api-admin/src/main/java/com/glxp/api/admin/util/UdiInfoUtil.java
Unescape Escape View File

@ -0,0 +1,44 @@
package com.glxp.api.admin.util;
import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.util.StrUtil;
import com.glxp.api.admin.entity.basic.UdiInfoEntity;
import java.util.List;
public class UdiInfoUtil {
public static UdiInfoEntity initUdiInfoEntity(UdiInfoEntity udiInfoEntity) {
if (StrUtil.isNotEmpty(udiInfoEntity.getScbssfbhph()) && "否".equals(udiInfoEntity.getScbssfbhph())) {
udiInfoEntity.setAllowNoBatch(true);
}
if (StrUtil.isNotEmpty(udiInfoEntity.getScbssfbhscrq()) && "否".equals(udiInfoEntity.getScbssfbhscrq())) {
udiInfoEntity.setAllowNoProduct(true);
}
if (StrUtil.isNotEmpty(udiInfoEntity.getScbssfbhsxrq()) && "否".equals(udiInfoEntity.getScbssfbhsxrq())) {
udiInfoEntity.setAllowNoExpire(true);
}
return udiInfoEntity;
}
public static List<UdiInfoEntity> initUdiInfoEntitys(List<UdiInfoEntity> udiInfoEntitys) {
if (CollUtil.isNotEmpty(udiInfoEntitys)) {
for (UdiInfoEntity udiInfoEntity : udiInfoEntitys) {
if (StrUtil.isNotEmpty(udiInfoEntity.getScbssfbhph()) && "否".equals(udiInfoEntity.getScbssfbhph())) {
udiInfoEntity.setAllowNoBatch(true);
}
if (StrUtil.isNotEmpty(udiInfoEntity.getScbssfbhscrq()) && "否".equals(udiInfoEntity.getScbssfbhscrq())) {
udiInfoEntity.setAllowNoProduct(true);
}
if (StrUtil.isNotEmpty(udiInfoEntity.getScbssfbhsxrq()) && "否".equals(udiInfoEntity.getScbssfbhsxrq())) {
udiInfoEntity.setAllowNoExpire(true);
}
}
}
return udiInfoEntitys;
}
}
Write Preview
Loading…
Cancel
Save