Merge remote-tracking branch 'xfsg/cc_partner_init' into cc_partner_init

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

@@ -17,7 +17,7 @@
     <result column="update_time" jdbcType="TIMESTAMP" property="updateTime" />
   </resultMap>
   <select id="selectByShopId" resultType="com.cool.store.dto.openPreparation.FirstOrderDTO">
-    select total_order_deposit as totalOrderDeposit, latest_payment_date as latestPaymentDate ,
+    select id, total_order_deposit as totalOrderDeposit, latest_payment_date as latestPaymentDate ,
       estimated_cost as estimatedCost ,fruits_cost as fruitsCost
     from xfsg_first_order
     where shop_id = #{shopId}

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

@@ -2,4 +2,9 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.cool.store.mapper.FranchiseFeeMapper">
 
+    <select id="selectByShopId" resultType="com.cool.store.entity.FranchiseFeeDO">
+        select *
+        from xfsg_franchise_fee
+        where shop_id = #{shopId}
+    </select>
 </mapper>

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

@@ -101,7 +101,10 @@
                 deleted,
             </if>
             <if test="payBusinessType !=null">
-                pay_business_type
+                pay_business_type,
+            </if>
+            <if test="shopId !=null">
+                shop_id,
             </if>
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
@@ -160,7 +163,10 @@
                 #{deleted,jdbcType=BIT},
             </if>
             <if test="payBusinessType !=null">
-                #{payBusinessType,jdbcType=TINYINT}
+                #{payBusinessType,jdbcType=TINYINT},
+            </if>
+            <if test="shopId !=null">
+                #{shopId},
             </if>
         </trim>
     </insert>

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

@@ -161,7 +161,7 @@
         </foreach>
       </if>
       AND xssi.shop_sub_stage_status != -100
-      and xssi.shop_sub_stage in (120,130)
+      and xssi.shop_sub_stage = 120
       <if test="status != null">
           and xssi.shop_sub_stage_status = #{status}
       </if>