From dbaa3cf85ea15db9756fa6d7ffd959c7f8df1ef2 Mon Sep 17 00:00:00 2001
From: wangwei <1610949092@qq.com>
Date: Fri, 28 Apr 2023 14:52:06 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=20=20=E7=BB=B4=E6=8A=A4?=
 =?UTF-8?q?=E5=BE=80=E6=9D=A5id=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../api/controller/basic/UdiRelevanceController.java     | 2 +-
 .../java/com/glxp/api/entity/basic/UdiRlSupEntity.java   | 2 +-
 .../java/com/glxp/api/res/basic/UdiRlSupResponse.java    | 2 +-
 .../api/service/basic/CompanyProductsRelService.java     | 9 +++------
 src/main/resources/mybatis/mapper/basic/UdiRlSupDao.xml  | 4 ++--
 5 files changed, 8 insertions(+), 11 deletions(-)

diff --git a/src/main/java/com/glxp/api/controller/basic/UdiRelevanceController.java b/src/main/java/com/glxp/api/controller/basic/UdiRelevanceController.java
index f91c78a85..dc559a097 100644
--- a/src/main/java/com/glxp/api/controller/basic/UdiRelevanceController.java
+++ b/src/main/java/com/glxp/api/controller/basic/UdiRelevanceController.java
@@ -675,7 +675,7 @@ public class UdiRelevanceController extends BaseController {
             UdiRlSupEntity udiRlSupEntity = new UdiRlSupEntity();
             udiRlSupEntity.setUpdateTime(new Date());
             udiRlSupEntity.setPrice(new BigDecimal(udiProductEntity.getPrice()));
-            udiRlSupEntity.setId(udiProductEntity.getRelSupId());
+            udiRlSupEntity.setId(Long.valueOf(udiProductEntity.getRelSupId()));
             udiRlSupService.updateCompanyProductRelevance(udiRlSupEntity);
         }
         if (falg) {
diff --git a/src/main/java/com/glxp/api/entity/basic/UdiRlSupEntity.java b/src/main/java/com/glxp/api/entity/basic/UdiRlSupEntity.java
index 74874e17b..cbdb02e7f 100644
--- a/src/main/java/com/glxp/api/entity/basic/UdiRlSupEntity.java
+++ b/src/main/java/com/glxp/api/entity/basic/UdiRlSupEntity.java
@@ -11,7 +11,7 @@ import java.util.Date;
 @Data
 public class UdiRlSupEntity {
 
-    private Integer id;
+    private Long id;
     private String customerId;
     private String productId;
     private String enterpriseId;
diff --git a/src/main/java/com/glxp/api/res/basic/UdiRlSupResponse.java b/src/main/java/com/glxp/api/res/basic/UdiRlSupResponse.java
index 9e8edf8a7..dcf95d039 100644
--- a/src/main/java/com/glxp/api/res/basic/UdiRlSupResponse.java
+++ b/src/main/java/com/glxp/api/res/basic/UdiRlSupResponse.java
@@ -5,7 +5,7 @@ import lombok.Data;
 @Data
 public class UdiRlSupResponse {
 
-    private int id;
+    private Long id;
     private Integer rlId;
     private String thirdId;
     private String thirdName;
diff --git a/src/main/java/com/glxp/api/service/basic/CompanyProductsRelService.java b/src/main/java/com/glxp/api/service/basic/CompanyProductsRelService.java
index 4feabb70c..7d270fc47 100644
--- a/src/main/java/com/glxp/api/service/basic/CompanyProductsRelService.java
+++ b/src/main/java/com/glxp/api/service/basic/CompanyProductsRelService.java
@@ -1,17 +1,13 @@
 package com.glxp.api.service.basic;
 
-import cn.hutool.core.util.StrUtil;
-import com.glxp.api.entity.basic.CompanyProductRelevanceEntity;
-import com.glxp.api.entity.basic.UdiRlSupEntity;
+import cn.hutool.core.util.IdUtil;
 import com.glxp.api.entity.basic.UdiRelevanceEntity;
+import com.glxp.api.entity.basic.UdiRlSupEntity;
 import com.glxp.api.req.basic.UdiInfoExportRequest;
-import com.glxp.api.req.basic.UdiInfoRequest;
-import org.springframework.beans.BeanUtils;
 import org.springframework.scheduling.annotation.Async;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
-import java.math.BigDecimal;
 import java.util.Date;
 import java.util.List;
 
@@ -39,6 +35,7 @@ public class CompanyProductsRelService {
                 udiRlSupEntity.setUnitFk(udiInfoExportRequest.getUnitFk());
                 udiRlSupEntity.setUdiRlIdFk(uuid);
                 udiRlSupEntity.setCustomerId(udiInfoExportRequest.getUnitFk());
+                udiRlSupEntity.setId(IdUtil.getSnowflakeNextId());
                 boolean b = udiRlSupService.insertCompanyProductRelevance(udiRlSupEntity);
             }
 
diff --git a/src/main/resources/mybatis/mapper/basic/UdiRlSupDao.xml b/src/main/resources/mybatis/mapper/basic/UdiRlSupDao.xml
index 6ce578a88..5a6074221 100644
--- a/src/main/resources/mybatis/mapper/basic/UdiRlSupDao.xml
+++ b/src/main/resources/mybatis/mapper/basic/UdiRlSupDao.xml
@@ -285,10 +285,10 @@
     <insert id="insertCompanyProductRelevance"
             parameterType="com.glxp.api.entity.basic.UdiRlSupEntity">
         replace
-        INTO company_product_relevance(customerId, productId, enterpriseId, registrationId,
+        INTO company_product_relevance(id,customerId, productId, enterpriseId, registrationId,
         createTime, updateTime, auditStatus, productUuid, udiRlIdFk, unitFk,
         price, createUser, updateUser)
-        values (#{customerId},
+        values (#{id},#{customerId},
         #{productId},
         #{enterpriseId},
         #{registrationId},