Merge remote-tracking branch 'origin/busUser' into busUser

api-admin/src/main/java/com/glxp/sale/admin/controller/basic/UdiContrastController.java

@@ -152,15 +152,17 @@ public class UdiContrastController {
         }
         List<UdiInfoEntity> udiInfoEntities = udiDlHttpClient.getUdiByUuid(combineRequest.getKeys().get(0));
 
-        udiInfoService.deleteByUuid(udiRelevanceEntity.getUuid());
+//        udiInfoService.deleteByUuid(udiRelevanceEntity.getUuid());
         for (UdiInfoEntity udiInfoEntity : udiInfoEntities) {
             udiInfoEntity.setUuid(udiRelevanceEntity.getUuid());
             udiInfoEntity.setProductType(ConstantStatus.PRODUCT_TYPE_UDI);
-
+            UdiInfoUtil.initUdiInfoEntity(udiInfoEntity);
-
+            UdiInfoReqeust udiInfoReqeust = new UdiInfoReqeust();
+            BeanUtils.copyProperties(udiInfoEntity, udiInfoReqeust);
+            udiInfoService.updateUdiInfo(udiInfoReqeust);
         }
         udiInfoService.insertUdiInfos(UdiInfoUtil.initUdiInfoEntitys(udiInfoEntities));
-//        udiRelevanceEntity.setUuid(udiInfoEntities.get(0).getUuid());
+        udiRelevanceEntity.setUuid(udiInfoEntities.get(0).getUuid());
         String time = DateUtil.formatDateTime(new Date());
         udiRelevanceEntity.setUpdateTime(time);
         udiRelevanceEntity.setModifyTime(time);

api-admin/src/main/java/com/glxp/sale/admin/controller/basic/UdiRelevanceController.java

@@ -301,9 +301,6 @@ public class UdiRelevanceController {
                 companyProductRelevanceService.updateCompanyProductRelevance(companyProductRelevanceEntity);
             }
         }
-
-
-
         UdiInfoReqeust udiInfoEntity = new UdiInfoReqeust();
         udiInfoEntity.setSptm(udiRelevanceResponse.getSptm());
         udiInfoEntity.setNameCode(udiRelevanceResponse.getNameCode());
@@ -327,7 +324,6 @@ public class UdiRelevanceController {
         if (StrUtil.isNotEmpty(udiRelevanceResponse.getOriginUuid())) {
             udiInfoEntity.setProductType(ConstantStatus.PRODUCT_TYPE_UDI);
         }
-
         udiInfoEntity.setUuid(udiRelevanceResponse.getUuid());
         udiInfoService.updateUdiInfo(udiInfoEntity);
         return ResultVOUtils.success("更新成功");

api-admin/src/main/java/com/glxp/sale/admin/service/basic/UdiRelevanceService.java

@@ -57,6 +57,7 @@ public interface UdiRelevanceService {
 
     boolean updateUdiRelevance(UdiRelevanceRequest udiRelevanceRequest);
 
+
     boolean deleteById(String id);
 
     boolean deleteByIds(List<String> id);