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

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

@@ -74,4 +74,26 @@ public class RegionDAO {
         return regionMapper.getRegionInfoByRegionId(regionId);
     }
 
+    /**
+     * 判断一个节点是否是叶子节点
+     * @param regionId
+     * @return
+     */
+    public boolean isLeafNode(String regionId){
+        Integer subCount = regionMapper.getSubNodeCountByRegionId(regionId);
+        return subCount <= CommonConstants.ZERO;
+    }
+
+    /**
+     * 删除区域
+     * @param regionId
+     * @return
+     */
+    public Integer deleteRegionByRegionId(String regionId){
+        if(StringUtils.isBlank(regionId)){
+            return CommonConstants.ZERO;
+        }
+        return regionMapper.deleteRegionByRegionId(regionId);
+    }
+
 }

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

@@ -58,4 +58,17 @@ public interface RegionMapper {
      * @return
      */
     RegionDO getRegionInfoByRegionId(@Param("regionId") String regionId);
+
+    /**
+     * 获取区域的子节点个数
+     * @return
+     */
+    Integer getSubNodeCountByRegionId(@Param("regionId") String regionId);
+
+    /**
+     * 删除区域
+     * @param regionId
+     * @return
+     */
+    Integer deleteRegionByRegionId(@Param("regionId") String regionId);
 }

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

@@ -208,10 +208,10 @@
   update hy_partner_base_info
     <set>
     <if test="userName != null and userName!=''">
-      username = #{record.username},
+      username = #{userName},
     </if>
     <if test="mobile != null and mobile!=''">
-      mobile = #{record.mobile},
+      mobile = #{mobile},
     </if>
       where partner_id = #{partnerId}
     </set>

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

@@ -246,7 +246,7 @@
   </select>
 
   <select id="getInterviewList" resultType="com.cool.store.vo.interview.InterviewVO">
-    select hpip.id          as interviewId,
+    select hpip.id   as interviewPlanId,
     hpui.username    as partnerName,
     hpui.mobile      as partnerMobile,
     hpip.room_id     as roomId,

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

@@ -196,4 +196,12 @@
         where
             deleted = 0 and region_id= #{regionId}
     </select>
+    
+    <select id="getSubNodeCountByRegionId" resultType="integer">
+        select count(1) from region where deleted = 0 and parent_id = #{regionId}
+    </select>
+
+    <update id="deleteRegionByRegionId">
+        update region set deleted = 1 where region_id = #{regionId}
+    </update>
 </mapper>