完成部分TODO

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

@@ -75,7 +75,7 @@
         select
         <include refid="baseColumn"/>
         from xfsg_acceptance_info
-        where shop_id = #{shopId}
+        where shop_id = #{shopId} and deleted = 0
     </select>
     <select id="selectListByActualEntryTime" resultType="com.cool.store.entity.AcceptanceInfoDO">
         select
@@ -83,5 +83,17 @@
         from xfsg_acceptance_info
         where actual_entry_time is null
     </select>
+    <select id="selectByShopIds" resultType="com.cool.store.entity.AcceptanceInfoDO">
+        select
+        <include refid="baseColumn"/>
+        from xfsg_acceptance_info
+        where deleted = 0
+        <if test="shopIds != null and shopIds.size()>0">
+            and shop_id in
+        <foreach collection="shopIds" item="shopId" open="(" separator="," close=")">
+            #{shopId}
+        </foreach>
+        </if>
+    </select>
 
 </mapper>

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

@@ -58,10 +58,6 @@
       <foreach collection="AssessmentDataDOS" separator=" " item="item">
         WHEN #{item.id} THEN #{item.qualified}
       </foreach>,
-      score = CASE id
-      <foreach collection="AssessmentDataDOS" separator=" " item="item">
-        WHEN #{item.id} THEN #{item.score}
-      </foreach>,
       reason = CASE id
       <foreach collection="AssessmentDataDOS" separator=" " item="item">
         WHEN #{item.id} THEN #{item.reason}
@@ -78,12 +74,10 @@
     </foreach>
     )
   </update>
-  <delete id="deleteByShopId">
-    DELETE FROM xfsg_assessment_data WHERE shop_id = #{shopId}
-  </delete>
+
   <select id="selectListByShopId" resultType="com.cool.store.entity.AssessmentDataDO">
     select *
     from xfsg_assessment_data
-    where shop_id = #{shopId}
+    where shop_id = #{shopId} and template_id >=75 and template_id &lt;= 108
   </select>
 </mapper>

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

@@ -23,11 +23,12 @@
         <result column="update_user_id" jdbcType="VARCHAR" property="updateUserId"/>
         <result column="deleted" jdbcType="BIT" property="deleted"/>
         <result column="pay_business_type" jdbcType="TINYINT" property="payBusinessType"/>
+        <result column="amount" jdbcType="VARCHAR" property="amount"/>
     </resultMap>
     <sql id="Base_Column_List">
         id,shop_id, partner_id, line_id, pay_status, pay_type, pay_user_name, pay_account, bank_code,
     bank_name, branch_bank_code, branch_bank_name, pay_time, pay_pic, promise_pic, create_time, 
-    update_time, create_user_id, update_user_id, deleted,pay_business_type
+    update_time, create_user_id, update_user_id, deleted,pay_business_type,amount
     </sql>
     <select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="BaseResultMap">
         select
@@ -106,6 +107,9 @@
             <if test="shopId !=null">
                 shop_id,
             </if>
+            <if test="amount != null">
+                amount,
+            </if>
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="partnerId != null">
@@ -168,6 +172,9 @@
             <if test="shopId !=null">
                 #{shopId},
             </if>
+            <if test="amount !=null">
+                #{amount},
+            </if>
         </trim>
     </insert>
     <update id="updateByPrimaryKeySelective" parameterType="com.cool.store.entity.LinePayDO">
@@ -227,6 +234,9 @@
             <if test="deleted != null">
                 deleted = #{deleted,jdbcType=BIT},
             </if>
+            <if test="amount != null">
+                amount = #{amount,jdbcType=VARCHAR},
+            </if>
         </set>
         where id = #{id,jdbcType=BIGINT}
     </update>