From 26d23af14a830bcb3f28b6551568fcd33908cdae Mon Sep 17 00:00:00 2001
From: wangwei <1610949092@qq.com>
Date: Fri, 2 Aug 2024 16:23:05 +0800
Subject: [PATCH] =?UTF-8?q?8/02=20=E9=80=89=E5=85=A5=E6=94=B6=E8=B4=B9?=
 =?UTF-8?q?=E9=A1=B9=E7=9B=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/glxp/api/req/basic/AddProductRequest.java     | 5 +++++
 .../com/glxp/api/req/basic/UdiRelevanceSaveRequest.java    | 6 ++++++
 .../java/com/glxp/api/res/basic/UdiRelevanceResponse.java  | 7 +++----
 .../java/com/glxp/api/service/basic/UdiProductService.java | 5 ++++-
 .../resources/mybatis/mapper/basic/UdiRelevanceDao.xml     | 7 +++++--
 5 files changed, 23 insertions(+), 7 deletions(-)

diff --git a/src/main/java/com/glxp/api/req/basic/AddProductRequest.java b/src/main/java/com/glxp/api/req/basic/AddProductRequest.java
index 805508356..d983b9598 100644
--- a/src/main/java/com/glxp/api/req/basic/AddProductRequest.java
+++ b/src/main/java/com/glxp/api/req/basic/AddProductRequest.java
@@ -272,5 +272,10 @@ public class AddProductRequest {
     private String useLevelUnit;
     private Integer useLeverCount;
 
+    /**
+     * 收费编码
+     */
+    private String payFeeCode;
+
 
 }
diff --git a/src/main/java/com/glxp/api/req/basic/UdiRelevanceSaveRequest.java b/src/main/java/com/glxp/api/req/basic/UdiRelevanceSaveRequest.java
index 4d4cfdc3f..6cce467e0 100644
--- a/src/main/java/com/glxp/api/req/basic/UdiRelevanceSaveRequest.java
+++ b/src/main/java/com/glxp/api/req/basic/UdiRelevanceSaveRequest.java
@@ -151,5 +151,11 @@ public class UdiRelevanceSaveRequest {
     @ApiModelProperty(value="耗材材质")
     private String matrial;
 
+    /**
+     * 收费项目编码
+     */
+
+    private String payFeeCode;
+
     private Integer requireScanCode;
 }
diff --git a/src/main/java/com/glxp/api/res/basic/UdiRelevanceResponse.java b/src/main/java/com/glxp/api/res/basic/UdiRelevanceResponse.java
index 7b3e81baa..1f576c845 100644
--- a/src/main/java/com/glxp/api/res/basic/UdiRelevanceResponse.java
+++ b/src/main/java/com/glxp/api/res/basic/UdiRelevanceResponse.java
@@ -242,6 +242,8 @@ public class UdiRelevanceResponse {
     private String useLevelUnit;
     private Integer useLeverCount;
 
+    private String payFeeCode;
+
 
     public int getBhzxxsbzsl() {
         if (bhzxxsbzsl == null || bhzxxsbzsl == 0) {
@@ -283,8 +285,5 @@ public class UdiRelevanceResponse {
     }
 
 
-    /**
-     * 收费项目编码
-     */
-    private String payFeeCode;
+
 }
diff --git a/src/main/java/com/glxp/api/service/basic/UdiProductService.java b/src/main/java/com/glxp/api/service/basic/UdiProductService.java
index 03651297b..c86c46f04 100644
--- a/src/main/java/com/glxp/api/service/basic/UdiProductService.java
+++ b/src/main/java/com/glxp/api/service/basic/UdiProductService.java
@@ -230,6 +230,7 @@ public class UdiProductService {
         udiRelevanceEntity.setPurType(1);
         udiRelevanceEntity.setAttributeType(addProductRequest.getAttributeType());
         udiRelevanceEntity.setHcType(addProductRequest.getHcType());
+        udiRelevanceEntity.setPayFeeCode(addProductRequest.getPayFeeCode());
         // TODO: 2024/2/27 初始化其他字段
         setUpdateInfo(udiProductEntity, udiRelevanceEntity);
         //处理是否需要扫码字段
@@ -263,7 +264,7 @@ public class UdiProductService {
                 if (IntUtil.value(udiProductEntity.getPackLevel()) == 1) {
                     udiProductEntity.setDiType(1);
                 }
-                udiProductDao.updateById(udiProductEntity);
+                udiProductDao.updateUdiInfo(udiProductEntity);
 
                 //修改关联表
                 udiRelevanceEntity.setUseLeverCount(addProductRequest.getUseLeverCount());
@@ -272,6 +273,7 @@ public class UdiProductService {
                 udiRelevanceEntity.setDistributeLevelDi(addProductRequest.getDistributeLevelDi());
                 udiRelevanceEntity.setDistributeLevelUnit(addProductRequest.getDistributeLevelUnit());
                 udiRelevanceEntity.setDistributeLevelCount(addProductRequest.getDistributeLevelCount());
+                udiRelevanceEntity.setPayFeeCode(addProductRequest.getPayFeeCode());
                 udiRelevanceDao.updateById(udiRelevanceEntity);
 
             }
@@ -286,6 +288,7 @@ public class UdiProductService {
             udiRelevanceEntity.setProductsType(2);
             udiRelevanceEntity.setAttributeType(addProductRequest.getAttributeType());
             udiRelevanceEntity.setHcType(addProductRequest.getHcType());
+            udiRelevanceEntity.setPayFeeCode(addProductRequest.getPayFeeCode());
 
             if (CollUtil.isNotEmpty(addProductRequest.getDrugLevelLists())) {
                 for (UpdateLevelDrugRequest updateLevelDrugRequest : addProductRequest.getDrugLevelLists()) {
diff --git a/src/main/resources/mybatis/mapper/basic/UdiRelevanceDao.xml b/src/main/resources/mybatis/mapper/basic/UdiRelevanceDao.xml
index 12a9accd2..3e4ddbf41 100644
--- a/src/main/resources/mybatis/mapper/basic/UdiRelevanceDao.xml
+++ b/src/main/resources/mybatis/mapper/basic/UdiRelevanceDao.xml
@@ -1278,7 +1278,7 @@
         updateTime, modifyTime,
         createUser,
         updateUser,
-        remark, useExpireTime, dispatch, groupBuy, needCert)
+        remark, useExpireTime, dispatch,payFeeCode, groupBuy, needCert)
         values (#{id},
         #{uuid},
         #{mainId},
@@ -1301,7 +1301,7 @@
         #{modifyTime},
         #{createUser},
         #{updateUser},
-        #{remark}, #{useExpireTime}, #{dispatch}, #{groupBuy}, #{needCert})
+        #{remark}, #{useExpireTime}, #{dispatch},#{payFeeCode}, #{groupBuy}, #{needCert})
     </insert>
 
     <insert id="insertUdiRelevanceignore"
@@ -1466,6 +1466,9 @@
             <if test="needCert != null">
                 needCert=#{needCert},
             </if>
+            <if test="payFeeCode != null">
+                payFeeCode=#{payFeeCode},
+            </if>
         </trim>
         WHERE id = #{id}
     </update>