战区

coolstore-partner-dao/src/main/java/com/cool/store/dao/HyOpenAreaInfoDAO.java

@@ -30,9 +30,6 @@ public class HyOpenAreaInfoDAO {
     }
 
     public List<HyOpenAreaInfoDO> queryByKeyword(String keyword,Boolean filterData){
-        if (StringUtils.isEmpty(keyword)){
-            return new ArrayList<>();
-        }
         return hyOpenAreaInfoMapper.queryByKeyword(keyword,filterData);
     }
 

coolstore-partner-dao/src/main/resources/mapper/HyAdvancedSettingMapper.xml

@@ -84,7 +84,7 @@
         partner_url = #{record.partnerUrl},
         tencent_video_account = #{record.tencentVideoAccount},
         tencent_video_key = #{record.tencentVideoKey},
-        update_user_id = #{record.updateUserId},
+        update_user_id = #{record.updateUserId}
     where id = #{record.id}
   </update>
 </mapper>

coolstore-partner-dao/src/main/resources/mapper/HyIntendDevelopementMappingMapper.xml

@@ -112,7 +112,7 @@
     <foreach collection="recordList" item="record" separator=",">
       (#{record.mappingId},
       #{record.openAreaMappingId},
-      #{record.type}
+      #{record.type})
     </foreach>
   </insert>
 

coolstore-partner-dao/src/main/resources/mapper/HyOpenAreaInfoMapper.xml

@@ -185,10 +185,14 @@
   <select id="queryByKeyword" resultMap="BaseResultMap">
     select * from
     hy_open_area_info
-    where area_path like  concat('%',#{keyword},'%')
+    <where>
+      <if test="keyword!=null and keyword!=''">
+        and area_path like  concat('%',#{keyword},'%')
+      </if>
       <if test="filterData!=null and filterData==true">
         and province_city_flag = 1
       </if>
+    </where>
   </select>
 
 

coolstore-partner-service/src/main/java/com/cool/store/service/impl/AdvanceSettingServiceImpl.java

@@ -26,6 +26,7 @@ public class AdvanceSettingServiceImpl implements AdvanceSettingService {
         if (advancedSettingRequest.getId()!=null){
             //修改
             updateAdvanceSetting(userId,advancedSettingRequest);
+            return Boolean.TRUE;
         }
         HyAdvancedSettingDO hyAdvancedSettingDO = new HyAdvancedSettingDO();
         hyAdvancedSettingDO.setCreateUserId(userId);
@@ -38,7 +39,7 @@ public class AdvanceSettingServiceImpl implements AdvanceSettingService {
 
     private Boolean updateAdvanceSetting(String userId, AdvancedSettingRequest advancedSettingRequest) {
         HyAdvancedSettingDO hyAdvancedSettingDO = new HyAdvancedSettingDO();
-        hyAdvancedSettingDO.setCreateUserId(userId);
+        hyAdvancedSettingDO.setUpdateUserId(userId);
         hyAdvancedSettingDO.setId(advancedSettingRequest.getId());
         hyAdvancedSettingDO.setPartnerUrl(advancedSettingRequest.getPartnerUrl());
         hyAdvancedSettingDO.setTencentVideoAccount(advancedSettingRequest.getTencentVideoAccount());

coolstore-partner-service/src/main/java/com/cool/store/service/impl/OpenAreaServiceImpl.java

@@ -41,6 +41,8 @@ public class OpenAreaServiceImpl implements OpenAreaService {
         List<HyOpenAreaInfoDO> hyOpenAreaInfoDOS = hyOpenAreaInfoDAO.queryByKeyword(keyword,flag);
         Set<Long> longSet = hyOpenAreaInfoDOS.stream().map(HyOpenAreaInfoDO::getId).collect(Collectors.toSet());
 
+        List<HyOpenAreaInfoDO> result = new ArrayList<>();
+        result.addAll(hyOpenAreaInfoDOS);
         hyOpenAreaInfoDOS.stream().forEach(x->{
             Long parentId = x.getParentId();
 
@@ -48,11 +50,11 @@ public class OpenAreaServiceImpl implements OpenAreaService {
                 //添加到集合中
                 longSet.add(x.getParentId());
                 HyOpenAreaInfoDO hyOpenAreaInfoDO = longHyOpenAreaInfoDOMap.get(parentId);
-                hyOpenAreaInfoDOS.add(hyOpenAreaInfoDO);
+                result.add(hyOpenAreaInfoDO);
             }
         });
 
-        JSONArray objects = buildTree(JSONArray.parseArray(JSONObject.toJSONString(hyOpenAreaInfoDOS)), "id", "parentId","childNode" );
+        JSONArray objects = buildTree(JSONArray.parseArray(JSONObject.toJSONString(result)), "id", "parentId","childNode" );
         List<OpenAreaTreeVO> openAreaTreeVOS = JSONObject.parseArray(objects.toJSONString(), OpenAreaTreeVO.class);
         return openAreaTreeVOS;
     }