建店阶段审批流

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

@@ -25,7 +25,8 @@
         a.first_year_end_time as firstYearEndTime,
         a.first_year_fee as firstYearFee,
         a.performance_bond as performanceBond,
-        b.pay_user_name as payUserName
+        b.pay_user_name as payUserName,
+        a.discount_reason as discountReason
         from xfsg_franchise_fee a
         LEFT JOIN xfsg_line_pay b ON b.id = a.pay_id
         where a.shop_id in

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

@@ -289,7 +289,8 @@
         a.create_time as createTime,
         a.join_mode as joinMode,
         a.franchise_brand as franchiseBrand,
-        a.shop_status as shopStatus
+        a.shop_status as shopStatus,
+        a.detail_address as shopAddress
         from xfsg_shop_info a left join xfsg_line_info b on a.line_id = b.id
         where a.deleted = 0
         <if test="request.partnerKeyword != null and request.partnerKeyword != ''">