feat:租赁合同新增审批记录
* cc_20250512_uploadRentContract: (100 commits squashed)
- fix:计划闭店时间修改
- Merge branch 'cc_20250922_closeStore_w' into cc_20250514_common_bak
- feat:新签调整
- Merge branch 'cc_20260506_newsign' into cc_20250514_common_bak
# Conflicts:
#	coolstore-partner-common/src/main/java/com/cool/store/enums/UserRoleEnum.java
- fix:闭店信息新增初审、复审、终审时间字段;闭店管理列表新增返回字段
- Merge branch 'cc_20250922_closeStore_w' into cc_20250514_common_bak
- feat:招商
- Merge branch 'cc_20260506_newsign' into cc_20250514_common_bak
# Conflicts:
#	coolstore-partner-common/src/main/java/com/cool/store/enums/UserRoleEnum.java
- feat:招商
- feat:招商
- feat:招商
- fix:删除字段
- Merge branch 'cc_20250922_closeStore_w' into cc_20250514_common_bak
- feat:招商
- Merge branch 'cc_20260506_newsign' into cc_20250514_common_bak
- Merge remote-tracking branch 'origin/cc_20250514_common_bak' into cc_20250514_common_bak
- feat:数据同步 名称新增MX 等前缀
- feat:上海魔盒未来食品有限公司
- fix:修改查询逻辑
- Merge branch 'cc_20260428_store_report' into cc_20250514_common_bak
# Conflicts:
#	coolstore-partner-web/src/main/java/com/cool/store/job/XxlJobHandler.java
- feat:id
- Merge branch 'cc_20260506_newsign' into cc_20250514_common_bak
- Merge remote-tracking branch 'origin/cc_20250514_common_bak' into cc_20250514_common_bak
- Merge branch 'cc_20260507_smz' into cc_20250514_common_bak
# Conflicts:
#	coolstore-partner-service/src/main/java/com/cool/store/service/impl/SyncDataServiceImpl.java
- Merge remote-tracking branch 'origin/cc_20250514_common_bak' into cc_20250514_common_bak
- feat:翻新
- feat:用户列表为空
- Merge branch 'cc_20260427_rnewal' into cc_20250514_common_bak
- feat:用户列表为空
- Merge branch 'cc_20260427_rnewal' into cc_20250514_common_bak
- feat:RenewalRenovateApprovalVO
- Merge branch 'cc_20260427_rnewal' into cc_20250514_common_bak
- feat:招商副总裁
- Merge branch 'cc_20260427_rnewal' into cc_20250514_common_bak
# Conflicts:
#	coolstore-partner-common/src/main/java/com/cool/store/enums/point/ShopSubStageStatusEnum.java
- feat:招商副总裁审核
- Merge branch 'cc_20260506_newsign' into cc_20250514_common_bak
- feat:费用单调整
- feat:招商经理
- feat:招商经理
- Merge branch 'cc_20260506_newsign' into cc_20250514_common_bak
- feat:费用调整
- Merge branch 'master' into cc_20260226_fix
- fix:bug修复
- fix:未开业门店试营业日期
- Merge branch 'cc_20260508_open_store_req' into cc_20250514_common_bak
# Conflicts:
#	coolstore-partner-dao/src/main/java/com/cool/store/dao/StoreDao.java
#	coolstore-partner-dao/src/main/java/com/cool/store/mapper/StoreMapper.java
#	coolstore-partner-dao/src/main/resources/mapper/StoreMapper.xml
#	coolstore-partner-web/src/main/java/com/cool/store/job/XxlJobHandler.java
- feat:新增审批
- fix:开业日期报备不同步门店状态
- Merge branch 'cc_20260508_open_store_req' into cc_20250514_common_bak
- fix:字段名称修改
- Merge branch 'cc_20250922_closeStore_w' into cc_20250514_common_bak
- fix:闭店中止新增审批记录
- Merge branch 'cc_20250922_closeStore_w' into cc_20250514_common_bak
- feat:费用调整单
- feat:招商大区总审核 或者 分部内勤审核 其他状态不能审核
- Merge branch 'cc_20260506_newsign' into cc_20250514_common_bak
- feat:调整单
- feat:SHOP_SUB_STAGE_STATUS_150_5
- Merge branch 'cc_20260506_newsign' into cc_20250514_common_bak
- fix:试营业测试接口
- Merge remote-tracking branch 'origin/cc_20250514_common_bak' into cc_20250514_common_bak
- Merge branch 'master' into cc_20250514_common_bak
- feat:page
- feat:自动分账
- Merge branch 'master' into cc_20250514_common_bak
- fix:私域二维码门店绑定关系缓存改为7天
- Merge branch 'cc_20260226_fix' into cc_20250514_common_bak
- feat:getAuthRegionIdAndSubRegionIdExcludeStoreByUserId 优化开店管理查询
- Merge branch 'cc_20260509_fix' into cc_20250514_common_bak
- fix:修改门店开业日期判断条件修改
- Merge branch 'cc_20260508_open_store_req' into cc_20250514_common_bak
- feat:填写添加门店
- feat:建店代办处理
- Merge branch 'cc_20260506_newsign' into cc_20250514_common_bak
- Merge branch 'cc_20260508_adjustment' into cc_20250514_common_bak
- feat:userAuthMappingService
- feat:addShopDecorationLog
- Merge branch 'cc_20260506_newsign' into cc_20250514_common_bak
- feat:待采购确认 审批流程
- feat:问题修复
- Merge branch 'cc_20260511_fix' into cc_20250514_common_bak
# Conflicts:
#	coolstore-partner-dao/src/main/java/com/cool/store/dao/ShopStageInfoDAO.java
#	coolstore-partner-dao/src/main/java/com/cool/store/dao/StoreDao.java
#	coolstore-partner-dao/src/main/java/com/cool/store/mapper/ShopStageInfoMapper.java
#	coolstore-partner-dao/src/main/java/com/cool/store/mapper/StoreMapper.java
#	coolstore-partner-dao/src/main/resources/mapper/ShopStageInfoMapper.xml
#	coolstore-partner-dao/src/main/resources/mapper/StoreMapper.xml
#	coolstore-partner-service/src/main/java/com/cool/store/service/impl/PointServiceImpl.java
#	coolstore-partner-service/src/main/java/com/cool/store/service/impl/SignFranchiseServiceImpl.java
#	coolstore-partner-web/src/main/java/com/cool/store/job/XxlJobHandler.java
- feat:问题修复
- feat:问题修复
- feat:流水查询条件
- Merge branch 'master' into cc_20260508_adjustment
- feat:费用流水筛选条件
- fix:歇业管理逻辑修改
- Merge branch 'cc_20260508_adjustment' into cc_20250514_common_bak
- feat:getAdjustAmount
- Merge branch 'cc_20260511_close_up_modify' into cc_20260408_close_up
# Conflicts:
#	coolstore-partner-common/src/main/java/com/cool/store/enums/ErrorCodeEnum.java
#	coolstore-partner-common/src/main/java/com/cool/store/enums/RocketMqGroupEnum.java
#	coolstore-partner-common/src/main/java/com/cool/store/enums/RocketMqTagEnum.java
#	coolstore-partner-common/src/main/java/com/cool/store/enums/closeup/CloseUpPlatformEnum.java
#	coolstore-partner-dao/src/main/java/com/cool/store/dao/closeup/CloseUpPlatformDAO.java
#	coolstore-partner-dao/src/main/java/com/cool/store/mapper/StoreMapper.java
#	coolstore-partner-dao/src/main/java/com/cool/store/mapper/closeup/CloseUpPlatformMapper.java
#	coolstore-partner-dao/src/main/resources/mapper/StoreMapper.xml
#	coolstore-partner-dao/src/main/resources/mapper/closeup/CloseUpApplyFormMapper.xml
#	coolstore-partner-dao/src/main/resources/mapper/closeup/CloseUpPlatformMapper.xml
#	coolstore-partner-model/src/main/java/com/cool/store/entity/closeup/CloseUpApplyFormDO.java
#	coolstore-partner-model/src/main/java/com/cool/store/entity/closeup/CloseUpPlatformDO.java
#	coolstore-partner-service/src/main/java/com/cool/store/mq/consumer/ConsumerClient.java
#	coolstore-partner-service/src/main/java/com/cool/store/service/closeup/CloseUpService.java
#	coolstore-partner-service/src/main/java/com/cool/store/service/closeup/impl/CloseUpServiceImpl.java
#	coolstore-partner-web/src/main/java/com/cool/store/controller/webb/PCTestController.java
#	coolstore-partner-web/src/main/java/com/cool/store/job/XxlJobHandler.java
#	coolstore-partner-web/src/main/resources/application-ab.properties
#	coolstore-partner-web/src/main/resources/application-local.properties
#	coolstore-partner-web/src/main/resources/application-online.properties
#	coolstore-partner-web/src/main/resources/application-test.properties
- fix:合并冲突
- Merge branch 'cc_20260408_close_up' into cc_20250514_common_bak
# Conflicts:
#	coolstore-partner-common/src/main/java/com/cool/store/enums/ErrorCodeEnum.java
#	coolstore-partner-dao/src/main/java/com/cool/store/dao/StoreDao.java
#	coolstore-partner-service/src/main/java/com/cool/store/service/closeup/impl/CloseUpServiceImpl.java
#	coolstore-partner-web/src/main/java/com/cool/store/controller/webb/PCTestController.java
#	coolstore-partner-web/src/main/java/com/cool/store/job/XxlJobHandler.java
- fix:合并冲突
- Merge branch 'cc_20260508_adjustment' into cc_20250514_common_bak
- Merge branch 'master' into cc_20260408_close_up
- fix:火码歇业时机修改
- Merge branch 'cc_20260408_close_up' into cc_20250514_common_bak
- feat:租赁合同新增审批记录
- Merge branch 'master' into cc_20250512_uploadRentContract
# Conflicts:
#	coolstore-partner-service/src/main/java/com/cool/store/service/closeup/impl/CloseUpServiceImpl.java
#	coolstore-partner-service/src/main/java/com/cool/store/service/impl/PointServiceImpl.java
#	coolstore-partner-web/src/main/java/com/cool/store/controller/webb/PCTestController.java
- feat:merge冲突
- feat:merge冲突
Signed-off-by: 正新 <accounts_6964c7bcd2a2c377c5bbd01b@mail.teambition.com>
Merged-by: 正新 <accounts_6964c7bcd2a2c377c5bbd01b@mail.teambition.com>
CR-link: https://codeup.aliyun.com/692ea314dec569489f6f167c/hangzhou/java/custom_zxjp/change/128
93 lines
3.8 KiB
XML
93 lines
3.8 KiB
XML
<?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.FranchiseFeeMapper">
|
|
<update id="updateDataHandleServiceV25">
|
|
update xfsg_franchise_fee
|
|
set first_year_fee = "6000",
|
|
first_year_manage_fee = "7200"
|
|
</update>
|
|
<update id="updateBill">
|
|
<foreach collection="list" item="item" index="index" separator=";">
|
|
update xfsg_franchise_fee
|
|
<set>
|
|
<if test="item.yearFranchiseFee !=null and item.yearFranchiseFee!=''">
|
|
year_franchise_fee = #{item.yearFranchiseFee},
|
|
</if>
|
|
<if test="item.firstYearManageFee !=null and item.firstYearManageFee!=''">
|
|
first_year_manage_fee = #{item.firstYearManageFee},
|
|
</if>
|
|
<if test="item.firstYearFee!=null and item.firstYearFee!=''">
|
|
first_year_fee= #{item.firstYearFee},
|
|
</if>
|
|
<if test="item.loanMargin !=null and item.loanMargin!=''">
|
|
loan_margin = #{item.loanMargin},
|
|
</if>
|
|
<if test="item.performanceBond !=null and item.performanceBond!=''">
|
|
performance_bond = #{item.performanceBond},
|
|
</if>
|
|
<if test="item.discountReason !=null and item.discountReason!=''">
|
|
discount_reason = #{item.discountReason},
|
|
</if>
|
|
</set>
|
|
where shop_id = #{item.shopId}
|
|
</foreach>
|
|
</update>
|
|
<update id="batchUpdateXgjCollectionStatus">
|
|
update xfsg_franchise_fee
|
|
set xgj_collection_status = #{collectionStatus}
|
|
where shop_id in
|
|
<foreach collection="shopIds" item="shopId" open="(" separator="," close=")">
|
|
#{shopId}
|
|
</foreach>
|
|
</update>
|
|
<update id="batchUpdateXgjCollectionStatusAndXgjFeesPaid">
|
|
<foreach collection="list" separator=";" item="item">
|
|
update xfsg_franchise_fee
|
|
set xgj_collection_status = #{item.xgjCollectionStatus},
|
|
xgj_fees_paid = #{item.xgjFeesPaid}
|
|
where shop_id = #{item.shopId}
|
|
</foreach>
|
|
</update>
|
|
<update id="updatePayType">
|
|
update xfsg_franchise_fee
|
|
set pay_type = #{payType}
|
|
where shop_id = #{shopId}
|
|
</update>
|
|
|
|
<select id="selectByShopId" resultType="com.cool.store.entity.FranchiseFeeDO">
|
|
select *
|
|
from xfsg_franchise_fee
|
|
where shop_id = #{shopId}
|
|
order by create_time desc
|
|
limit 1
|
|
</select>
|
|
<select id="getPayTimeByShopIds" resultType="com.cool.store.dto.FranchiseFeeDTO">
|
|
select a.shop_id AS shopId ,
|
|
b.pay_time as payTime,
|
|
b.combined_field as combinedField,
|
|
a.year_franchise_fee as yearFranchiseFee,
|
|
a.first_year_manage_fee as firstYearManagementFee,
|
|
a.loan_margin as loanMargin,
|
|
a.first_year_start_time as firstYearStartTime,
|
|
a.first_year_end_time as firstYearEndTime,
|
|
a.first_year_fee as firstYearFee,
|
|
a.performance_bond as performanceBond,
|
|
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
|
|
<foreach collection="shopIds" item="shopId" open="(" separator="," close=")">
|
|
#{shopId}
|
|
</foreach>
|
|
</select>
|
|
<select id="getFranchiseFeeByShopIds" resultType="com.cool.store.entity.FranchiseFeeDO">
|
|
select *
|
|
from xfsg_franchise_fee
|
|
where shop_id in
|
|
<foreach collection="shopIds" item="shopId" open="(" separator="," close=")">
|
|
#{shopId}
|
|
</foreach>
|
|
</select>
|
|
|
|
</mapper> |