Merge branch 'developer' of http://115.159.76.241/base_platform_enterprise/gic-store into developer

gic-store-api/src/main/java/com/gic/store/constant/StoreESFieldsEnum.java

@@ -32,6 +32,8 @@ public enum StoreESFieldsEnum {
     BUSSINESSTIME("businessTimeList", "门店营业时间"),
     ADDRESS("address", "门店详细地址"),
     LOCATION("location", "经纬度"),
+    SCORE("score", "分数"),
+    EVALUATECOUNT("evaluateCount", "评价分数"),
     C1("c1", "自定义字段1"),
     C2("c2", "自定义字段2"),
     C3("c3", "自定义字段3"),

gic-store-api/src/main/java/com/gic/store/dto/ProcessBatchStoreDTO.java

@@ -36,6 +36,10 @@ public class ProcessBatchStoreDTO implements Serializable {
     private String conactsPhone;
 
     /**
+     * 店招品牌id
+     */
+    private Integer brandId;
+    /**
      * 店招品牌
      */
     private String brandName;
@@ -209,4 +213,12 @@ public class ProcessBatchStoreDTO implements Serializable {
     public void setStoreGroupName(String storeGroupName) {
         this.storeGroupName = storeGroupName;
     }
+
+    public Integer getBrandId() {
+        return brandId;
+    }
+
+    public void setBrandId(Integer brandId) {
+        this.brandId = brandId;
+    }
 }

gic-store-api/src/main/java/com/gic/store/dto/StoreBrandDTO.java

@@ -58,6 +58,8 @@ public class StoreBrandDTO implements Serializable {
 
     private Integer seq;
 
+    private Integer hasRel;
+
     public Integer getStoreBrandId() {
         return storeBrandId;
     }
@@ -145,4 +147,12 @@ public class StoreBrandDTO implements Serializable {
     public void setStoreBrandCategoryCode(String storeBrandCategoryCode) {
         this.storeBrandCategoryCode = storeBrandCategoryCode;
     }
+
+    public Integer getHasRel() {
+        return hasRel;
+    }
+
+    public void setHasRel(Integer hasRel) {
+        this.hasRel = hasRel;
+    }
 }

gic-store-api/src/main/java/com/gic/store/dto/StoreDTO.java

@@ -39,6 +39,7 @@ public class StoreDTO extends StoreInfoDTO implements Serializable {
     private Integer fromEnterpriseId;
     private String fromEnterpriseName;
     private Double score;
+    private Integer evaluateCount;
 
     /**
      * 事由   1:web后台操作   2:外部触发   3:订单同步  4:会员同步  5:系统配置触发
@@ -167,4 +168,12 @@ public class StoreDTO extends StoreInfoDTO implements Serializable {
     public void setScore(Double score) {
         this.score = score;
     }
+
+    public Integer getEvaluateCount() {
+        return evaluateCount;
+    }
+
+    public void setEvaluateCount(Integer evaluateCount) {
+        this.evaluateCount = evaluateCount;
+    }
 }
\ No newline at end of file

gic-store-api/src/main/java/com/gic/store/dto/StoreEsDTO.java

@@ -33,6 +33,7 @@ public class StoreEsDTO implements Serializable {
     private String location;
     private String address;
     private Double score;
+    private Integer evaluateCount;
 
     public Integer getStoreId() {
         return storeId;
@@ -265,4 +266,12 @@ public class StoreEsDTO implements Serializable {
     public void setScore(Double score) {
         this.score = score;
     }
+
+    public void setEvaluateCount(Integer evaluateCount) {
+        this.evaluateCount = evaluateCount;
+    }
+
+    public Integer getEvaluateCount() {
+        return evaluateCount;
+    }
 }

gic-store-api/src/main/java/com/gic/store/service/StoreApiService.java

@@ -293,4 +293,18 @@ public interface StoreApiService {
      * @throws
      */
     ServiceResponse<String> importStoreForOperation(ProcessBatchStoreDTO processBatchStoreDTO);
+
+    /**
+     * 更新门店分数
+     * @Title: updateScore
+     * @Description:
+     * @author zhiwj
+     * @param enterpriseId
+     * @param storeId
+     * @param storeScore
+     * @param evaluateCount
+     * @return void
+     * @throws
+     */
+    ServiceResponse<Void> updateScore(Integer enterpriseId, Integer storeId, double storeScore, Integer evaluateCount);
 }

gic-store-api/src/main/java/com/gic/store/service/StoreBrandApiService.java

@@ -114,4 +114,16 @@ public interface StoreBrandApiService {
      * @throws
      */
     ServiceResponse<StoreBrandDTO> getById(Integer storeBrandId);
+
+    /**
+     * 更新是否和实施运维平台有关联
+     * @Title: updateRelByOperation
+     * @Description:
+     * @author zhiwj
+     * @param storeBrandId
+     * @param hasRel
+     * @return com.gic.api.base.commons.ServiceResponse<java.lang.Void>
+     * @throws
+     */
+    ServiceResponse<Void> updateRelByOperation(Integer storeBrandId, Integer hasRel);
 }

gic-store-service/src/main/java/com/gic/store/entity/TabStore.java

@@ -61,6 +61,8 @@ public class TabStore {
      */
     private Double score;
 
+    private Integer evaluateCount;
+
     public Integer getStoreId() {
         return storeId;
     }
@@ -148,4 +150,12 @@ public class TabStore {
     public void setScore(Double score) {
         this.score = score;
     }
+
+    public Integer getEvaluateCount() {
+        return evaluateCount;
+    }
+
+    public void setEvaluateCount(Integer evaluateCount) {
+        this.evaluateCount = evaluateCount;
+    }
 }
\ No newline at end of file

gic-store-service/src/main/java/com/gic/store/entity/TabStoreBrand.java

@@ -7,7 +7,7 @@ import java.util.Date;
  */
 public class TabStoreBrand {
     /**
-     *
+     * 
      */
     private Integer storeBrandId;
 
@@ -37,25 +37,30 @@ public class TabStoreBrand {
     private Double sort;
 
     /**
-     *
+     * 
      */
     private Integer enterpriseId;
 
     /**
-     *
+     * 
      */
     private Integer status;
 
     /**
-     *
+     * 
      */
     private Date createTime;
 
     /**
-     *
+     * 
      */
     private Date updateTime;
 
+    /**
+     * 关联标识   1有 0没有  是否在实时运维平台有关联
+     */
+    private Integer hasRel;
+
     public Integer getStoreBrandId() {
         return storeBrandId;
     }
@@ -135,4 +140,12 @@ public class TabStoreBrand {
     public void setUpdateTime(Date updateTime) {
         this.updateTime = updateTime;
     }
+
+    public Integer getHasRel() {
+        return hasRel;
+    }
+
+    public void setHasRel(Integer hasRel) {
+        this.hasRel = hasRel;
+    }
 }
\ No newline at end of file

gic-store-service/src/main/java/com/gic/store/service/StoreBrandService.java

@@ -42,4 +42,6 @@ public interface StoreBrandService {
     List<TabStoreBrand> listStoreBrandByIds(List<Integer> brandIdList);
 
     TabStoreBrand getById(Integer storeBrandId);
+
+    int updateRelByOperation(Integer storeBrandId, Integer hasRel);
 }

gic-store-service/src/main/java/com/gic/store/service/StoreService.java

@@ -2,6 +2,7 @@ package com.gic.store.service;
 
 import com.gic.store.dto.StoreDTO;
 import com.gic.store.dto.StoreSearchDBDTO;
+import com.gic.store.entity.TabStore;
 import com.github.pagehelper.Page;
 
 import java.util.List;
@@ -123,4 +124,8 @@ public interface StoreService {
      * @return 
     */
     List<String> listAllCityId(Integer enterpriseId, Integer storeBrandId);
+
+    void updateStore(StoreDTO storeDTO);
+
+    TabStore getByStoreCodeAndRegionId(Integer enterpriseId, Integer regionId, String storeCode);
 }

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

@@ -37,6 +37,7 @@ public class StoreBrandServiceImpl implements StoreBrandService {
         storeBrand.setEnterpriseId(copy.getEnterpriseId());
         storeBrand.setStatus(GlobalInfo.DATA_STATUS_NORMAL);
         storeBrand.setCreateTime(new Date());
+        storeBrand.setHasRel(GlobalInfo.DATA_STATUS_DELETE);
 
         Double sort = tabStoreBrandMapper.getMinSort(copy.getEnterpriseId());
         storeBrand.setSort(sort == null ? 1d : sort - 1d);
@@ -188,4 +189,12 @@ public class StoreBrandServiceImpl implements StoreBrandService {
     public TabStoreBrand getById(Integer storeBrandId) {
         return tabStoreBrandMapper.selectByPrimaryKey(storeBrandId);
     }
+
+    @Override
+    public int updateRelByOperation(Integer storeBrandId, Integer hasRel) {
+        TabStoreBrand tabStoreBrand = new TabStoreBrand();
+        tabStoreBrand.setStoreBrandId(storeBrandId);
+        tabStoreBrand.setHasRel(hasRel);
+        return tabStoreBrandMapper.updateByPrimaryKeySelective(tabStoreBrand);
+    }
 }

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

@@ -17,6 +17,15 @@ public class StoreIndexLogServiceImpl implements StoreIndexLogService {
     private TabStoreIndexLogMapper tabStoreIndexLogMapper;
 
     @Override
+    public int updateStoreIndexLog(Integer logId, String result) {
+        TabStoreIndexLog log = new TabStoreIndexLog();
+        log.setStoreIndexId(logId);
+        log.setResult(result);
+        int i = this.tabStoreIndexLogMapper.updateByPrimaryKeySelective(log);
+        return i;
+    }
+
+    @Override
     public int saveStoreIndexLog(Integer enterpriseId, Integer storeId) {
         TabStoreIndexLog log = new TabStoreIndexLog();
         log.setUpdateTime(new Date());
@@ -26,13 +35,4 @@ public class StoreIndexLogServiceImpl implements StoreIndexLogService {
         this.tabStoreIndexLogMapper.insertSelective(log);
         return log.getStoreIndexId();
     }
-
-    @Override
-    public int updateStoreIndexLog(Integer logId, String result) {
-        TabStoreIndexLog log = new TabStoreIndexLog();
-        log.setStoreIndexId(logId);
-        log.setResult(result);
-        int i = this.tabStoreIndexLogMapper.updateByPrimaryKeySelective(log);
-        return i;
-    }
 }

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

@@ -141,6 +141,8 @@ public class StoreServiceImpl implements StoreService {
             storeDTO.setStoreId(tabStore.getStoreId());
             storeDTO.setOwnType(tabStore.getOwnType());
             storeDTO.setFromEnterpriseId(tabStore.getFromEnterpriseId());
+            storeDTO.setScore(tabStore.getScore());
+            storeDTO.setEvaluateCount(tabStore.getEvaluateCount());
             return storeDTO;
         }
         return null;
@@ -474,4 +476,34 @@ public class StoreServiceImpl implements StoreService {
         return this.tabStoreMapper.listAllCityId(enterpriseId, storeBrandId);
     }
 
+    @Override
+    public void updateStore(StoreDTO storeDTO) {
+        TabStore tabStore = new TabStore();
+        tabStore.setStoreId(storeDTO.getStoreId());
+        tabStore.setScore(storeDTO.getScore());
+        tabStore.setEvaluateCount(storeDTO.getEvaluateCount());
+        this.tabStoreMapper.updateByPrimaryKeySelective(tabStore);
+    }
+
+    @Override
+    public TabStore getByStoreCodeAndRegionId(Integer enterpriseId, Integer regionId, String storeCode) {
+        StoreDTO storeDTO = new StoreDTO();
+        storeDTO.setEnterpriseId(enterpriseId);
+        storeDTO.setRegionId(regionId);
+        storeDTO.setStoreCode(storeCode);
+        TabStoreInfo store = this.tabStoreInfoMapper.getByStore(storeDTO);
+        if (store == null) {
+            return null;
+        }
+        List<TabStore> storeNoStatus = this.tabStoreMapper.getStoreNoStatus(enterpriseId, store.getStoreInfoId());
+        if (CollectionUtils.isNotEmpty(storeNoStatus)) {
+            TabStore tabStore = storeNoStatus.get(0);
+            if (com.gic.enterprise.constants.Constants.NORMAL_STATUS.equals(tabStore.getStatus())) {
+                return tabStore;
+            }
+        }
+
+        return null;
+    }
+
 }

gic-store-service/src/main/java/com/gic/store/service/outer/impl/ClerkApiServiceImpl.java

@@ -369,6 +369,8 @@ public class ClerkApiServiceImpl implements ClerkApiService {
             return responseErrorElement(ImportClerkBatchResultEnum.D3);
         }
         ClerkDTO clerkDTO = EntityUtil.changeEntityNew(ClerkDTO.class, clerkInfo);
+        clerkDTO.setStoreInfoId(storeInfoId);
+        clerkDTO.setStoreName(storeDTO.getStoreName());
         Integer id = clerkService.save(clerkDTO);
         clerkLogService.saveClerkLogBySaveClerk(enterpriseId, id, clerkDTO.getReason(),
                 clerkDTO.getRemark(), clerkDTO.getOperatorId(), clerkDTO.getOperatorName());

gic-store-service/src/main/java/com/gic/store/service/outer/impl/StoreApiServiceImpl.java

@@ -647,13 +647,28 @@ public class StoreApiServiceImpl implements StoreApiService {
             return responseErrorElement(ImportStoreBatchResultEnum.A4);
         }
         storeDTO.setStoreCode(processBatchStoreDTO.getStoreCode());
-        if (StringUtils.isNotBlank(processBatchStoreDTO.getBrandName())) {
+
+
+        TabStore oldStore = this.storeService.getByStoreCodeAndRegionId(processBatchStoreDTO.getEnterpriseId(), processBatchStoreDTO.getRegionId(), processBatchStoreDTO.getStoreCode());
+        if (oldStore != null) {
+            storeDTO.setStoreId(oldStore.getStoreId());
+        }
+
+        // 店招品牌
+        if (processBatchStoreDTO.getBrandId() != null) {
+            TabStoreBrand storeBrand = storeBrandService.getById(processBatchStoreDTO.getBrandId());
+            if (storeBrand == null) {
+                return responseErrorElement(ImportStoreBatchResultEnum.B1);
+            }
+            storeDTO.setBrandIds(processBatchStoreDTO.getBrandId().toString());
+        }else if (StringUtils.isNotBlank(processBatchStoreDTO.getBrandName())) {
             TabStoreBrand storeBrand = storeBrandService.getByStoreBrandName(processBatchStoreDTO.getEnterpriseId(), processBatchStoreDTO.getBrandName());
             if (storeBrand == null) {
                 return responseErrorElement(ImportStoreBatchResultEnum.B1);
             }
             storeDTO.setBrandIds(storeBrand.getStoreBrandId().toString());
         }
+        // 门店类型
         if (StringUtils.isNotBlank(processBatchStoreDTO.getStoreType())) {
             ServiceResponse<List<StoreDictDTO>> serviceResponse = storeDictApiService.listStoreType(processBatchStoreDTO.getEnterpriseId());
             if (serviceResponse.isSuccess()) {
@@ -752,6 +767,17 @@ public class StoreApiServiceImpl implements StoreApiService {
     }
 
     @Override
+    public ServiceResponse<Void> updateScore(Integer enterpriseId, Integer storeId, double storeScore, Integer evaluateCount) {
+        StoreDTO storeDTO = new StoreDTO();
+        storeDTO.setEnterpriseId(enterpriseId);
+        storeDTO.setStoreId(storeId);
+        storeDTO.setScore(storeScore);
+        storeDTO.setEvaluateCount(evaluateCount);
+        this.storeService.updateStore(storeDTO);
+        return EnterpriseServiceResponse.success();
+    }
+
+    @Override
     public ServiceResponse<StoreDTO> getStoreById(Integer enterpriseId, Integer storeId) {
         String key = Constants.STORE_KEY + enterpriseId + ":" + storeId;
 
@@ -1073,6 +1099,7 @@ public class StoreApiServiceImpl implements StoreApiService {
     }
 
     private DynamicDocDTO buildStoreDocDto(Integer enterpriseId, Integer storeId) {
+        refreshCache(enterpriseId, storeId);
         ServiceResponse<StoreDTO> response = this.getStoreById(enterpriseId, storeId);
         if (response.isSuccess()) {
             StoreDTO dto = response.getResult();
@@ -1105,6 +1132,7 @@ public class StoreApiServiceImpl implements StoreApiService {
             esDTO.setPhotoList(dto.getPhotoList());
             esDTO.setAddress(dto.getAddress());
             esDTO.setScore(dto.getScore());
+            esDTO.setEvaluateCount(dto.getEvaluateCount());
             Double[] location = {Double.valueOf(StringUtils.isBlank(dto.getLongitude())? "0" : dto.getLongitude()),Double.valueOf(StringUtils.isBlank(dto.getLatitude())? "0":dto.getLatitude())};
             JSONObject jsonObject = JSON.parseObject(JSON.toJSONString(esDTO));
             jsonObject.put("location", location);

gic-store-service/src/main/java/com/gic/store/service/outer/impl/StoreBrandApiServiceImpl.java

@@ -6,7 +6,9 @@ import com.gic.api.base.commons.ServiceResponse;
 import com.gic.commons.util.EntityUtil;
 import com.gic.commons.util.GlobalInfo;
 import com.gic.commons.util.PageHelperUtils;
+import com.gic.enterprise.constants.Constants;
 import com.gic.enterprise.error.ErrorCode;
+import com.gic.enterprise.response.EnterpriseServiceResponse;
 import com.gic.enterprise.service.EnterpriseInitApiService;
 import com.gic.enterprise.service.PlatformBrandApiService;
 import com.gic.store.dto.StoreBrandDTO;
@@ -119,6 +121,11 @@ public class StoreBrandApiServiceImpl implements StoreBrandApiService {
                         Integer count = storeService.countByBrandId(id);
                         if (count > 0) {
                             notDelList.add(id);
+                        } else {
+                            TabStoreBrand tabStoreBrand = this.storeBrandService.getById(id);
+                            if (Constants.NORMAL_STATUS.equals(tabStoreBrand.getHasRel())) {
+                                notDelList.add(id);
+                            }
                         }
                         return count == 0;
                     })
@@ -177,6 +184,12 @@ public class StoreBrandApiServiceImpl implements StoreBrandApiService {
         return ServiceResponse.success(EntityUtil.changeEntityByJSON(StoreBrandDTO.class, storeBrand));
     }
 
+    @Override
+    public ServiceResponse<Void> updateRelByOperation(Integer storeBrandId, Integer hasRel) {
+        this.storeBrandService.updateRelByOperation(storeBrandId, hasRel);
+        return EnterpriseServiceResponse.success();
+    }
+
     private void addRef(StoreBrandDTO storeBrandDTO) {
         ServiceResponse<Integer> serviceResponse = platformBrandApiService.addRef(storeBrandDTO.getEnterpriseId(), storeBrandDTO.getStoreBrandId(), storeBrandDTO.getStoreBrandName(), storeBrandDTO.getStoreBrandCode(), storeBrandDTO.getStoreBrandCategoryCode());
         if (serviceResponse.isSuccess() && serviceResponse.getResult() != null) {

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

@@ -12,10 +12,11 @@
     <result column="status" jdbcType="INTEGER" property="status" />
     <result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
     <result column="update_time" jdbcType="TIMESTAMP" property="updateTime" />
+    <result column="has_rel" jdbcType="INTEGER" property="hasRel" />
   </resultMap>
   <sql id="Base_Column_List">
     store_brand_id, store_brand_code, store_brand_name, store_brand_category_code, store_brand_category, 
-    sort, enterprise_id, status, create_time, update_time
+    sort, enterprise_id, status, create_time, update_time, has_rel
   </sql>
   <select id="selectByPrimaryKey" parameterType="java.lang.Integer" resultMap="BaseResultMap">
     select 
@@ -31,11 +32,13 @@
     insert into tab_store_brand (store_brand_id, store_brand_code, store_brand_name, 
       store_brand_category_code, store_brand_category, 
       sort, enterprise_id, status, 
-      create_time, update_time)
+      create_time, update_time, has_rel
+      )
     values (#{storeBrandId,jdbcType=INTEGER}, #{storeBrandCode,jdbcType=VARCHAR}, #{storeBrandName,jdbcType=VARCHAR}, 
       #{storeBrandCategoryCode,jdbcType=VARCHAR}, #{storeBrandCategory,jdbcType=VARCHAR}, 
       #{sort,jdbcType=DOUBLE}, #{enterpriseId,jdbcType=INTEGER}, #{status,jdbcType=INTEGER}, 
-      #{createTime,jdbcType=TIMESTAMP}, #{updateTime,jdbcType=TIMESTAMP})
+      #{createTime,jdbcType=TIMESTAMP}, #{updateTime,jdbcType=TIMESTAMP}, #{hasRel,jdbcType=INTEGER}
+      )
   </insert>
   <insert id="insertSelective" parameterType="com.gic.store.entity.TabStoreBrand">
     <selectKey keyProperty="storeBrandId" order="AFTER" resultType="java.lang.Integer">
@@ -73,6 +76,9 @@
       <if test="updateTime != null">
         update_time,
       </if>
+      <if test="hasRel != null">
+        has_rel,
+      </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides=",">
       <if test="storeBrandId != null">
@@ -105,6 +111,9 @@
       <if test="updateTime != null">
         #{updateTime,jdbcType=TIMESTAMP},
       </if>
+      <if test="hasRel != null">
+        #{hasRel,jdbcType=INTEGER},
+      </if>
     </trim>
   </insert>
   <update id="updateByPrimaryKeySelective" parameterType="com.gic.store.entity.TabStoreBrand">
@@ -137,6 +146,9 @@
       <if test="updateTime != null">
         update_time = #{updateTime,jdbcType=TIMESTAMP},
       </if>
+      <if test="hasRel != null">
+        has_rel = #{hasRel,jdbcType=INTEGER},
+      </if>
     </set>
     where store_brand_id = #{storeBrandId,jdbcType=INTEGER}
   </update>
@@ -150,9 +162,11 @@
       enterprise_id = #{enterpriseId,jdbcType=INTEGER},
       status = #{status,jdbcType=INTEGER},
       create_time = #{createTime,jdbcType=TIMESTAMP},
-      update_time = #{updateTime,jdbcType=TIMESTAMP}
+      update_time = #{updateTime,jdbcType=TIMESTAMP},
+      has_rel = #{hasRel,jdbcType=INTEGER}
     where store_brand_id = #{storeBrandId,jdbcType=INTEGER}
   </update>
+
   <select id="getMinSort" resultType="java.lang.Double">
     select sort from tab_store_brand where status = 1 and enterprise_id = #{enterpriseId} order by sort limit 0, 1
   </select>
@@ -165,9 +179,9 @@
     <if test="enterpriseId != null ">
       and enterprise_id = #{enterpriseId}
     </if>
-<!--    <if test="storeBrandCode != null and storeBrandCode != '' ">-->
+<!--    &lt;if test="storeBrandCode != null and storeBrandCode != '' "&gt;-->
 <!--      and store_brand_code = #{storeBrandCode}-->
-<!--    </if>-->
+<!--    &lt;/if&gt;-->
     <if test="storeBrandName != null and storeBrandName != '' ">
       and store_brand_name = #{storeBrandName}
     </if>

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

@@ -13,10 +13,11 @@
     <result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
     <result column="update_time" jdbcType="TIMESTAMP" property="updateTime" />
     <result column="score" jdbcType="DOUBLE" property="score" />
+    <result column="evaluate_count" jdbcType="INTEGER" property="evaluateCount" />
   </resultMap>
   <sql id="Base_Column_List">
     store_id, store_info_id, enterprise_id, from_enterprise_id, store_group_id, is_edit_store_group, 
-    own_type, status, create_time, update_time, score
+    own_type, status, create_time, update_time, score, evaluate_count
   </sql>
   <select id="selectByPrimaryKey" parameterType="java.lang.Integer" resultMap="BaseResultMap">
     select 
@@ -32,11 +33,11 @@
     insert into tab_store (store_id, store_info_id, enterprise_id, 
       from_enterprise_id, store_group_id, is_edit_store_group, 
       own_type, status, create_time, 
-      update_time, score)
+      update_time, score, evaluate_count)
     values (#{storeId,jdbcType=INTEGER}, #{storeInfoId,jdbcType=INTEGER}, #{enterpriseId,jdbcType=INTEGER}, 
       #{fromEnterpriseId,jdbcType=INTEGER}, #{storeGroupId,jdbcType=INTEGER}, #{isEditStoreGroup,jdbcType=INTEGER}, 
       #{ownType,jdbcType=INTEGER}, #{status,jdbcType=INTEGER}, #{createTime,jdbcType=TIMESTAMP}, 
-      #{updateTime,jdbcType=TIMESTAMP}, #{score,jdbcType=DOUBLE})
+      #{updateTime,jdbcType=TIMESTAMP}, #{score,jdbcType=DOUBLE}, #{evaluateCount,jdbcType=INTEGER})
   </insert>
   <insert id="insertSelective" parameterType="com.gic.store.entity.TabStore">
     insert into tab_store
@@ -74,6 +75,9 @@
       <if test="score != null">
         score,
       </if>
+      <if test="evaluateCount != null">
+        evaluate_count,
+      </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides=",">
       <if test="storeId != null">
@@ -109,6 +113,9 @@
       <if test="score != null">
         #{score,jdbcType=DOUBLE},
       </if>
+      <if test="evaluateCount != null">
+        #{evaluateCount,jdbcType=INTEGER},
+      </if>
     </trim>
   </insert>
   <update id="updateByPrimaryKeySelective" parameterType="com.gic.store.entity.TabStore">
@@ -144,6 +151,9 @@
       <if test="score != null">
         score = #{score,jdbcType=DOUBLE},
       </if>
+      <if test="evaluateCount != null">
+        evaluate_count = #{evaluateCount,jdbcType=INTEGER},
+      </if>
     </set>
     where store_id = #{storeId,jdbcType=INTEGER}
   </update>
@@ -158,7 +168,8 @@
       status = #{status,jdbcType=INTEGER},
       create_time = #{createTime,jdbcType=TIMESTAMP},
       update_time = #{updateTime,jdbcType=TIMESTAMP},
-      score = #{score,jdbcType=DOUBLE}
+      score = #{score,jdbcType=DOUBLE},
+      evaluate_count = #{evaluateCount,jdbcType=INTEGER}
     where store_id = #{storeId,jdbcType=INTEGER}
   </update>
     <update id="updateGroupId">

gic-store-web/src/main/java/com/gic/store/web/controller/StoreController.java

@@ -81,6 +81,10 @@ public class StoreController extends DownloadUtils {
     private WeixinWxaFunService weixinWxaFunService;
     @Autowired
     private DownloadReportApiService downloadReportApiService;
+    @Autowired
+    private StoreTagApiService storeTagApiService;
+    @Autowired
+    private StoreWidgetApiService storeWidgetApiService;
 
     private Map<Integer, SimpleDateFormat> map = new ConcurrentHashMap<>();
     private Map<Integer, SimpleDateFormat> map1 = new ConcurrentHashMap<>();
@@ -134,7 +138,7 @@ public class StoreController extends DownloadUtils {
     }
 
     @RequestMapping("/store-list")
-    public RestResponse storeList(@RequestBody StoreSearchDTO storeSearchDTO) {
+    public RestResponse storeList(@RequestBody StoreSearchDTO storeSearchDTO, Integer storeTagId) {
         logger.info("查询条件：{}", JSON.toJSONString(storeSearchDTO));
         Integer enterpriseId = UserDetailUtils.getUserDetail().getEnterpriseId();
         Integer userId = UserDetailUtils.getUserDetail().getUserId();
@@ -142,6 +146,13 @@ public class StoreController extends DownloadUtils {
         if(UserDetailUtils.getUserDetail().getUserResourceInfo() != null){
             storeSearchDTO.setStoreResource(UserDetailUtils.getUserDetail().getUserResourceInfo().getStoreResource());
         }
+
+        //门店标签
+        ServiceResponse<StoreTagDTO> storeTagResult = storeTagApiService.getByStoreTagId(storeTagId);
+        if (storeTagResult.isSuccess()) {
+            storeSearchDTO.setStoreResource(Long.parseLong(storeTagResult.getResult().getStoreWidgetId().toString()));
+        }
+
         String key = StoreRedisKeyUtils.getStoreListSourceKey(enterpriseId, userId);
         Object obj = RedisUtil.getCache(key);
         String returnFileds = StoreESFieldsEnum.STOREID.getField();
@@ -428,6 +439,8 @@ public class StoreController extends DownloadUtils {
         list.add(new StoreListSourceVO(StoreESFieldsEnum.REGIONNAME.getField(), StoreESFieldsEnum.REGIONNAME.getDesc()));
         list.add(new StoreListSourceVO(StoreESFieldsEnum.ERPSTATUS.getField(), StoreESFieldsEnum.ERPSTATUS.getDesc()));
         list.add(new StoreListSourceVO(StoreESFieldsEnum.STORETYPE.getField(), StoreESFieldsEnum.STORETYPE.getDesc()));
+        list.add(new StoreListSourceVO(StoreESFieldsEnum.SCORE.getField(), StoreESFieldsEnum.SCORE.getDesc()));
+        list.add(new StoreListSourceVO(StoreESFieldsEnum.EVALUATECOUNT.getField(), StoreESFieldsEnum.EVALUATECOUNT.getDesc()));
         list.add(new StoreListSourceVO(StoreESFieldsEnum.STOREID.getField(), StoreESFieldsEnum.STOREID.getDesc(),1));
         return list;
     }

gic-store-web/src/main/java/com/gic/store/web/vo/StoreTagVO.java

@@ -21,6 +21,11 @@ public class StoreTagVO implements Serializable{
      */
     private String storeTagName;
 
+    /**
+     * 门店选择器id
+     */
+    private Integer storeWidgetId;
+
     public Integer getStoreTagId() {
         return storeTagId;
     }
@@ -36,4 +41,12 @@ public class StoreTagVO implements Serializable{
     public void setStoreTagName(String storeTagName) {
         this.storeTagName = storeTagName;
     }
+
+    public Integer getStoreWidgetId() {
+        return storeWidgetId;
+    }
+
+    public void setStoreWidgetId(Integer storeWidgetId) {
+        this.storeWidgetId = storeWidgetId;
+    }
 }