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

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

@@ -1,10 +1,44 @@
 <?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">
 <mapper namespace="com.cool.store.mapper.ApplyLicenseMapper">
+
+
+    <sql id="baseColumn">
+        id,
+        shop_id,
+        business_license,
+        license_type,
+        license_legal_person,
+        credit_code,
+        credit_url,
+        license_address,
+        issueTime,
+        validity,
+        id_card_positive_credit_url,
+        id_card_negative_credit_url,
+        food_business_license_code,
+        main_business,
+        operator,
+        food_license_legal_person,
+        business_project,
+        food_license_address,
+        food_business_start_time,
+        food_business_end_time,
+        food_business_license_url,
+        remark,
+        remark_url,
+        submit_status,
+        create_time,
+        update_time,
+        deleted
+    </sql>
     <update id="updateByShopId">
         update xfsg_license_transact
         set submit_status = #{entity.submitStatus}
         where shop_id = #{entity.shopId}
+        <if test="entity.deleted != null">
+            and deleted = #{entity.deleted}
+        </if>
     </update>
 
 
@@ -26,6 +60,7 @@
         LEFT JOIN xfsg_shop_info s ON o.shop_id = s.id
         LEFT JOIN xfsg_line_info l ON l.id = s.line_id
         <where>
+        o.deleted = 0
             <if test="userId != null and userId != ''">
                 and s.supervisor_user_id = #{userId}
             </if>
@@ -52,8 +87,9 @@
 
   </select>
     <select id="selectByShopId" resultType="com.cool.store.entity.LicenseTransactDO">
-        select *
+        select <include refid="baseColumn"/>
         from xfsg_license_transact
         where shop_id = #{shopId}
+        and deleted = 0
     </select>
 </mapper>

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

@@ -52,10 +52,11 @@
       from xfsg_opening_operation_plan op
       join xfsg_shop_info si on si.id = op.shop_id
       where 1=1
+
       <if test="request.shopName != null and request.shopName != '' ">
           AND si.shop_name like concat('%', #{request.shopName}, '%')
       </if>
-      <if test="request.resultType != null and request.resultType != ''">
+      <if test="request.resultType != null ">
           AND op.result_type = #{request.resultType}
       </if>
       <if test="request.planStartDate == null and request.planEndDate == null">