门店导入

gic-store-service/src/main/java/com/gic/store/dao/mapper/TabStoreExtendMapper.java

@@ -63,4 +63,6 @@ public interface TabStoreExtendMapper {
     int countExtendByValue(@Param("storeFieldId") Integer storeFieldId, @Param("value") String value, @Param("storeExtendId") Integer storeExtendId);
 
     void delete(@Param("enterpriseId") Integer enterpriseId, @Param("storeInfoId") Integer storeInfoId);
+
+    void insertNotRepeat(TabStoreExtend tabStoreExtend);
 }
\ No newline at end of file

gic-store-service/src/main/java/com/gic/store/service/impl/StoreExtendServiceImpl.java

@@ -13,7 +13,6 @@ import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
 
 import java.util.Collections;
 import java.util.Date;
@@ -33,7 +32,6 @@ public class StoreExtendServiceImpl implements StoreExtendService {
     private StoreFieldService storeFieldService;
 
     @Override
-    @Transactional(rollbackFor = Exception.class)
     public String saveOrUpdate(Integer enterpriseId, Integer storeInfoId, List<StoreExtendDTO> storeExtendList) {
         if (CollectionUtils.isNotEmpty(storeExtendList)) {
 
@@ -44,25 +42,21 @@ public class StoreExtendServiceImpl implements StoreExtendService {
                 TabStoreField field = storeFieldService.getStoreFieldById(tabStoreExtend.getStoreFieldId());
                 String fieldDetail = field.getStoreFieldDetail();
                 FieldBase fieldBase = JSON.parseObject(fieldDetail, FieldBase.class);
+                tabStoreExtend.setEnterpriseId(enterpriseId);
+                tabStoreExtend.setStoreInfoId(storeInfoId);
+                tabStoreExtend.setCreateTime(new Date());
                 if (!fieldBase.getAllowRepeat()) {
                     // 不允许重复
                     if (StringUtils.isNotBlank(tabStoreExtend.getValue())) {
-                        int count = tabStoreExtendMapper.countExtendByValue(field.getStoreFieldId(), tabStoreExtend.getValue(), tabStoreExtend.getStoreExtendId());
-                        if (count > 0) {
-                            return field.getStoreFieldName() + "不允许重复";
-                        }
+//                        int count = tabStoreExtendMapper.countExtendByValue(field.getStoreFieldId(), tabStoreExtend.getValue(), tabStoreExtend.getStoreExtendId());
+//                        if (count > 0) {
+//                            return field.getStoreFieldName() + "不允许重复";
+//                        }
+                        tabStoreExtendMapper.insertNotRepeat(tabStoreExtend);
                     }
+                } else {
+                    tabStoreExtendMapper.insertSelective(tabStoreExtend);
                 }
-
-                tabStoreExtend.setEnterpriseId(enterpriseId);
-                tabStoreExtend.setStoreInfoId(storeInfoId);
-//                if (tabStoreExtend.getStoreExtendId() == null) {
-                tabStoreExtend.setCreateTime(new Date());
-                tabStoreExtendMapper.insertSelective(tabStoreExtend);
-
-//                } else {
-//                    tabStoreExtendMapper.updateByPrimaryKeySelective(tabStoreExtend);
-//                }
             }
         }
         return null;

gic-store-service/src/main/resources/mapper/TabStoreExtendMapper.xml

@@ -168,4 +168,76 @@
   <delete id="delete">
     delete from tab_store_extend where enterprise_id = #{enterpriseId} and store_info_id = #{storeInfoId}
   </delete>
+  <insert id="insertNotRepeat">
+    insert into tab_store_extend
+    <trim prefix="(" suffix=")" suffixOverrides=",">
+      <if test="storeExtendId != null">
+        store_extend_id,
+      </if>
+      <if test="storeInfoId != null">
+        store_info_id,
+      </if>
+      <if test="enterpriseId != null">
+        enterprise_id,
+      </if>
+      <if test="storeFieldId != null">
+        store_field_id,
+      </if>
+      <if test="value != null">
+        value,
+      </if>
+      <if test="sort != null">
+        sort,
+      </if>
+      <if test="createTime != null">
+        create_time,
+      </if>
+      <if test="updateTime != null">
+        update_time,
+      </if>
+      <if test="isSearch != null">
+        is_search,
+      </if>
+    </trim>
+    <trim prefix="select " suffix="" suffixOverrides=",">
+      <if test="storeExtendId != null">
+        #{storeExtendId,jdbcType=INTEGER},
+      </if>
+      <if test="storeInfoId != null">
+        #{storeInfoId,jdbcType=INTEGER},
+      </if>
+      <if test="enterpriseId != null">
+        #{enterpriseId,jdbcType=INTEGER},
+      </if>
+      <if test="storeFieldId != null">
+        #{storeFieldId,jdbcType=INTEGER},
+      </if>
+      <if test="value != null">
+        #{value,jdbcType=VARCHAR},
+      </if>
+      <if test="sort != null">
+        #{sort,jdbcType=DOUBLE},
+      </if>
+      <if test="createTime != null">
+        #{createTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="updateTime != null">
+        #{updateTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="isSearch != null">
+        #{isSearch,jdbcType=INTEGER},
+      </if>
+    </trim>
+    from dual
+    where not exists(
+        select
+        1
+        from
+        tab_store_extend
+        where store_field_id = #{storeFieldId} and value = #{value}
+        <if test="storeExtendId != null">
+            and store_extend_id &lt;&gt; #{storeExtendId}
+        </if>
+    )
+  </insert>
 </mapper>
\ No newline at end of file