Merge branch 'cc_20230520_partner' of http://gitlab.coolcollege.cn/hangzhou/java/coolstore-partner-manage into cc_20230520_partner

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

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

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

@@ -0,0 +1,41 @@
+package com.cool.store.dao;
+
+import com.cool.store.entity.HyPartnerBaseInfoDO;
+import com.cool.store.mapper.HyPartnerBaseInfoMapper;
+import org.apache.ibatis.annotations.Param;
+import org.springframework.stereotype.Repository;
+
+import javax.annotation.Resource;
+
+/**
+ * @Author suzhuhong
+ * @Date 2023/6/13 20:25
+ * @Version 1.0
+ */
+@Repository
+public class HyPartnerBaseInfoDAO {
+
+
+    @Resource
+    HyPartnerBaseInfoMapper hyPartnerBaseInfoMapper;
+
+
+
+    public  int insertSelective( HyPartnerBaseInfoDO record){
+       return hyPartnerBaseInfoMapper.insertSelective(record);
+    }
+
+    /**
+     *
+     * 默认更新方法，根据主键更新，不会把null值更新到数据库，避免覆盖之前有值的
+     * dateTime:2023-05-29 03:51
+     */
+    public int updateByPrimaryKeySelective(HyPartnerBaseInfoDO record){
+        return hyPartnerBaseInfoMapper.updateByPrimaryKeySelective(record);
+    }
+
+    public int updateByPartnerId(String userName,String mobile,String partnerId){
+        return hyPartnerBaseInfoMapper.updateByPartnerId(userName,mobile,partnerId);
+    }
+
+}

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

@@ -125,4 +125,7 @@ public class HyPartnerLineInfoDAO {
         return hyPartnerLineInfoMapper.joinAndRemoveBlack(lineId,status,joinReason,removeReason);
     }
 
+
+
+
 }

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

@@ -24,6 +24,11 @@ public class HyPartnerUserInfoDAO {
     HyPartnerUserInfoMapper hyPartnerUserInfoMapper;
 
 
+    public int updateByPrimaryKeySelective(HyPartnerUserInfoDO hyPartnerUserInfoDO){
+        return hyPartnerUserInfoMapper.updateByPrimaryKeySelective(hyPartnerUserInfoDO);
+    }
+
+
     /**
      * 根据PartnerId查询用户
      * @param partnerId

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

@@ -39,7 +39,7 @@ public interface HyOpenAreaInfoMapper {
      * 查询所有
      * @return
      */
-    List<HyOpenAreaInfoDO> queryByKeyword(@Param("keyword") String keyword);
+    List<HyOpenAreaInfoDO> queryByKeyword(@Param("keyword") String keyword, @Param("filterData") Boolean filterData);
 
     /**
      * 查询所有一级城市 (所有省份+直辖市)

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

@@ -22,4 +22,15 @@ public interface HyPartnerBaseInfoMapper {
      * dateTime:2023-05-29 03:51
      */
     int updateByPrimaryKeySelective(@Param("record") HyPartnerBaseInfoDO record);
+
+    /**
+     * 根据加盟商ID修改用户名称与手机号
+     * @param userName
+     * @param mobile
+     * @param partnerId
+     * @return
+     */
+    int updateByPartnerId(@Param("userName") String userName,
+                          @Param("mobile") String mobile,
+                          @Param("partnerId") String partnerId);
 }

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

@@ -133,6 +133,9 @@
     select * from
     hy_open_area_info
     where area_path like  concat('%',#{keyword},'%')
+    <if test="filterData!=null and filterData==true">
+      and province_city_flag = 1
+    </if>
   </select>
 
 

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

@@ -202,4 +202,18 @@
     </set>
     where id = #{record.id}
   </update>
+
+
+  <update id="updateByPartnerId">
+  update hy_partner_base_info
+    <set>
+    <if test="userName != null and userName!=''">
+      username = #{record.username},
+    </if>
+    <if test="mobile != null and mobile!=''">
+      mobile = #{record.mobile},
+    </if>
+      where partner_id = #{partnerId}
+    </set>
+  </update>
 </mapper>

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

@@ -295,7 +295,8 @@
       a.workflow_status as workflowStatus,
       a.partner_id as partnerUserId,
       a.investment_manager as investmentManager,
-      b.user_portrait as user_portrait
+      b.user_portrait as user_portrait,
+      b.id as partnerBaseInfoId
     from hy_partner_line_info a inner join hy_partner_base_info b
     on a.id = b.partner_line_id
     <where>