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

api-admin/src/main/java/com/glxp/api/admin/dao/basic/UdiInfoDao.java

@@ -51,4 +51,11 @@ public interface UdiInfoDao {
     void importUdiInfo(@Param("udiInfoEntities") List<UdiInfoEntity> udiInfoEntities);
 
 
+    /**
+     * 根据UUID更新产品信息
+     *
+     * @param udiInfoEntity
+     */
+    void updateUdiInfoByUuid(UdiInfoEntity udiInfoEntity);
+
 }

api-admin/src/main/java/com/glxp/api/admin/entity/basic/UdiRelevanceEntity.java

@@ -35,6 +35,11 @@ public class UdiRelevanceEntity {
     private String price;
     private String modifyTime;//修改时间
 
+    private Boolean isCheck;
+    private boolean allowNoBatch;
+    private boolean allowNoExpire;
+    private boolean allowNoProduct;
+
     public Integer getLockStatus() {
         if (lockStatus == null)
             return 1;

api-admin/src/main/java/com/glxp/api/admin/service/basic/impl/UdiRelevanceServiceImpl.java

@@ -2,6 +2,7 @@ package com.glxp.api.admin.service.basic.impl;
 
 import com.github.pagehelper.PageHelper;
 import com.glxp.api.admin.constant.ConstantStatus;
+import com.glxp.api.admin.dao.basic.UdiInfoDao;
 import com.glxp.api.admin.dao.basic.UdiRelevanceDao;
 import com.glxp.api.admin.entity.basic.BasicThirdSysEntity;
 import com.glxp.api.admin.entity.basic.UdiInfoEntity;
@@ -9,7 +10,6 @@ import com.glxp.api.admin.entity.basic.UdiRelevanceEntity;
 import com.glxp.api.admin.req.basic.FilterUdiInfoRequest;
 import com.glxp.api.admin.res.basic.UdiRelevanceResponse;
 import com.glxp.api.admin.service.basic.BasicThirdSysService;
-import com.glxp.api.admin.service.basic.UdiInfoService;
 import com.glxp.api.admin.service.basic.UdiRelevanceService;
 import org.springframework.stereotype.Service;
 
@@ -24,7 +24,7 @@ public class UdiRelevanceServiceImpl implements UdiRelevanceService {
     @Resource
     BasicThirdSysService basicThirdSysService;
     @Resource
-    UdiInfoService udiInfoService;
+    private UdiInfoDao udiInfoDao;
 
     @Override
     public List<UdiRelevanceResponse> filterUdiRelevance(FilterUdiInfoRequest filterUdiInfoRequest) {
@@ -272,6 +272,13 @@ public class UdiRelevanceServiceImpl implements UdiRelevanceService {
             udiRelevanceEntity.setMainId(udiRelevanceEntity.getThirdId4());
             udiRelevanceEntity.setMainName(udiRelevanceEntity.getThirdName4());
         }
+
+        UdiInfoEntity udiInfoEntity = new UdiInfoEntity();
+        udiInfoEntity.setAllowNoBatch(udiRelevanceEntity.isAllowNoBatch());
+        udiInfoEntity.setAllowNoExpire(udiRelevanceEntity.isAllowNoExpire());
+        udiInfoEntity.setAllowNoProduct(udiRelevanceEntity.isAllowNoProduct());
+        udiInfoEntity.setUuid(udiRelevanceEntity.getUuid());
+        udiInfoDao.updateUdiInfoByUuid(udiInfoEntity);
         return udiRelevanceDao.updateUdiRelevance(udiRelevanceEntity);
     }
 

api-admin/src/main/resources/mybatis/mapper/basic/UdiInfoDao.xml

@@ -268,6 +268,16 @@
         WHERE nameCode = #{nameCode}
     </update>
 
+    <update id="updateUdiInfoByUuid" parameterType="com.glxp.api.admin.entity.basic.UdiInfoEntity">
+        update basic_products
+            <trim prefix="set" suffixOverrides=",">
+                <if test="allowNoBatch != null">allowNoBatch=#{allowNoBatch},</if>
+                <if test="allowNoExpire != null">allowNoExpire=#{allowNoExpire},</if>
+                <if test="allowNoProduct != null">allowNoProduct=#{allowNoProduct},</if>
+            </trim>
+        where uuid = #{uuid}
+    </update>
+
     <select id="batchSelectByUuid" resultType="com.glxp.api.admin.entity.basic.UdiInfoEntity">
         select *
         from basic_products where uuid in