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

src/main/java/com/glxp/api/service/basic/BasicBackUpdateProductService.java

@@ -1,5 +1,6 @@
 package com.glxp.api.service.basic;
 
+import cn.hutool.core.util.IdUtil;
 import com.glxp.api.common.res.BaseResponse;
 import com.glxp.api.constant.ConstantStatus;
 import com.glxp.api.entity.basic.UdiProductEntity;
@@ -14,10 +15,7 @@ import com.glxp.api.res.thrsys.ThrProductsResponse;
 import com.glxp.api.service.system.SystemParamConfigService;
 import com.glxp.api.service.thrsys.ThrProductsService;
 import com.glxp.api.service.thrsys.ThrSystemService;
-import com.glxp.api.util.CustomUtil;
+import com.glxp.api.util.*;
-import com.glxp.api.util.DateUtil;
-import com.glxp.api.util.GennerOrderUtils;
-import com.glxp.api.util.RedisUtil;
 import org.springframework.beans.BeanUtils;
 import org.springframework.scheduling.annotation.Async;
 import org.springframework.stereotype.Service;
@@ -242,6 +240,7 @@ public class BasicBackUpdateProductService {
                         udiRelevanceEntity1.setThirdId(thrProductsEntity.getCode());
                         udiRelevanceEntity1.setUpdateTime(new Date());
                         udiRelevanceEntity1.setModifyTime(new Date());
+                        udiRelevanceEntity1.setId(IdUtil.getSnowflakeNextId());
                         udiRelevanceService.insertUdiRelevanceignore(udiRelevanceEntity1);
                     }
                 }

src/main/resources/mybatis/mapper/basic/UdiProductDao.xml

@@ -162,7 +162,7 @@
         WHERE (nameCode = #{nameCode})
         limit 1
     </select>
-    <insert id="insertUdiInfo" keyProperty="id" parameterType="com.glxp.api.entity.basic.UdiProductEntity">
+    <insert id="insertUdiInfo"  parameterType="com.glxp.api.entity.basic.UdiProductEntity">
         replace
                 INTO basic_products
                 (id, uuid, originUuid, nameCode, deviceRecordKey, packRatio, packLevel, packUnit, bhxjsl, bhzxxsbzsl,

src/main/resources/mybatis/mapper/basic/UdiRelevanceDao.xml

@@ -804,7 +804,7 @@
                 #{remark}, #{useExpireTime}, #{dispatch}, #{groupBuy}, #{needCert})
     </insert>
 
-    <insert id="insertUdiRelevanceignore" keyProperty="id"
+    <insert id="insertUdiRelevanceignore"
             parameterType="com.glxp.api.entity.basic.UdiRelevanceEntity">
         insert
                 ignore