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

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

@@ -82,19 +82,19 @@
                 booking_user  =#{bookingUser},
             </if>
             <if test="planExitTime !=null">
-                plan_exit_time =#{planExitTime}
+                plan_exit_time =#{planExitTime},
             </if>
             <if test="ksAccount !=null">
-                ks_account =#{ksAccount}
+                ks_account =#{ksAccount},
             </if>
             <if test="verificationMobile !=null">
-                verification_mobile =#{verificationMobile}
+                verification_mobile =#{verificationMobile},
             </if>
             <if test="shopLocationScreenshots !=null">
-                shop_location_screenshots =#{shopLocationScreenshots}
+                shop_location_screenshots =#{shopLocationScreenshots},
             </if>
             <if test="shopDoorwayPhoto !=null">
-                shop_doorway_photo =#{shopDoorwayPhoto}
+                shop_doorway_photo =#{shopDoorwayPhoto},
             </if>
             <if test="shopInteriorPhoto !=null">
                 shop_interior_photo =#{shopInteriorPhoto}

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

@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<!--mybatis-3-mapper.dtd:约束文件的名称，限制和检查在当前文件中出现的标签和属性符合mybatis的要求-->
+<!--namespace：命名空间，要有唯一的值，要求使用dao接口的权限定名称（一个dao接口对应一个mapper，namespace指明对应哪个dao接口）-->
+<mapper namespace="com.cool.store.mapper.OldShopMapper">
+    <resultMap id="BaseResultMap" type="com.cool.store.entity.OldShopDO">
+        <result column="id" property="id" jdbcType="BIGINT"/>
+        <result column="shop_code" property="shopCode" jdbcType="VARCHAR"/>
+        <result column="shop_name" property="shopName" jdbcType="VARCHAR"/>
+        <result column="mobile" property="mobile" jdbcType="VARCHAR"/>
+        <result column="create_time" property="createTime" jdbcType="TIMESTAMP"/>
+        <result column="update_time" property="updateTime" jdbcType="TIMESTAMP"/>
+    </resultMap>
+    <sql id="Base_Column_List">
+        id, shop_code, shop_name,mobile, create_time, update_time
+    </sql>
+</mapper>

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

@@ -33,6 +33,7 @@
         <result column="province_code" jdbcType="VARCHAR" property="provinceCode"/>
         <result column="city_code" jdbcType="VARCHAR" property="cityCode"/>
         <result column="district_code" jdbcType="VARCHAR" property="districtCode"/>
+        <result column="point_location" jdbcType="VARCHAR" property="pointLocation"/>
     </resultMap>
 
     <sql id="allColumn">
@@ -41,7 +42,7 @@
         development_time, point_status, point_score, select_status, submit_audit_count, point_source, deleted,
         create_time, update_time,
         province, city, district, township, opportunity_point_code, opportunity_point_name,
-        province_code, city_code, district_code
+        province_code, city_code, district_code, point_location
     </sql>
 
     <select id="getMyPointData" resultType="com.cool.store.vo.point.PointHomePageDataVO">
@@ -330,7 +331,13 @@
         city = #{request.city},
         district = #{request.district},
         township = #{request.township},
-        point_score = #{request.pointScore}
+        point_score = #{request.pointScore},
+        opportunity_point_code = #{request.opportunityPointCode},
+        opportunity_point_name = #{request.opportunityPointName},
+        province_code = #{request.provinceCode},
+        city_code = #{request.cityCode},
+        district_code = #{request.districtCode},
+        point_location = #{request.pointLocation}
         where id = #{request.id}
     </update>
 

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

@@ -126,7 +126,8 @@
         p.create_time as createTime,
         p.opportunity_point_code as opportunityPointCode,
         p.opportunity_point_name as opportunityPointName,
-        c.picture_obj as pictureObj
+        c.picture_obj as pictureObj,
+        pr.status as recommendStatus
         from
         xfsg_point_recommend pr
         inner join xfsg_point_info p on p.id = pr.point_id

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

@@ -111,7 +111,7 @@
     SET
     account = #{account},
     password = #{password},
-    status = #{status},
+    status = #{status}
     WHERE
     shop_id = #{shopId}
     AND system_name = #{systemName}

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

@@ -222,11 +222,13 @@
         xsi.deleted = 0
         and xssi.shop_stage = 3
         and xssi.shop_sub_stage_status != -100
-        and
-        xsi.region_id in
-        <foreach collection="list" open="(" separator="," close=")" index="index" item="item">
-            #{item}
-        </foreach>
+        <if test="list !=null and list.size >0">
+            and
+                xsi.region_id in
+                <foreach collection="list" open="(" separator="," close=")" index="index" item="item">
+                    #{item}
+                </foreach>
+        </if>
         <if test="request.shopKeyword != null and request.shopKeyword != ''">
             and (xsi.shop_name like concat("%",#{request.shopKeyword},"%") or xsi.shop_code like
             concat("%",#{request.shopKeyword},"%"))