Merge #99 into master from cc_20260408_close_up
feat:歇业管理
* cc_20260408_close_up: (18 commits squashed)
- fix:歇业管理(部分)
- fix:歇业管理(部分)
- fix:审批逻辑修改;拒绝审批实现
- fix:恢复开业申请及审批
- fix:主流程补充
- fix:主流程补充
- fix:字段补充及逻辑修改
- fix:字段补充
- fix
- fix:平台处理新增字段
- fix
- Merge remote-tracking branch 'origin/cc_20260408_close_up' into cc_20260408_close_up
- fix:歇业营业发送短信
- fix:排序
- fix:详情接口新增加盟商手机号字段;申请单日期和已有申请单存在交集时申请失败
- fix:申请单详情接口新增品牌字段
- fix:新增列表筛选条件;审批单状态校验
- Merge branch 'master' into cc_20260408_close_up
# Conflicts:
#	coolstore-partner-common/src/main/java/com/cool/store/enums/ErrorCodeEnum.java
Signed-off-by: 王非凡 <accounts_67eba0c5fee9c49c80c8e2b4@mail.teambition.com>
Merged-by: 正新 <accounts_6964c7bcd2a2c377c5bbd01b@mail.teambition.com>
CR-link: https://codeup.aliyun.com/692ea314dec569489f6f167c/hangzhou/java/custom_zxjp/change/99
This commit is contained in:
@@ -302,6 +302,12 @@
|
||||
WHERE store_id = #{storeId} AND is_delete = 'effective'
|
||||
</update>
|
||||
|
||||
<update id="updateStatus">
|
||||
UPDATE store_${enterpriseId}
|
||||
SET store_status = #{storeStatus}
|
||||
WHERE store_id = #{storeId} AND is_delete = 'effective'
|
||||
</update>
|
||||
|
||||
<update id="closeStore">
|
||||
UPDATE store_${enterpriseId}
|
||||
SET store_status = 'closed',
|
||||
@@ -317,6 +323,13 @@
|
||||
close_nature = VALUES(close_nature)
|
||||
</insert>
|
||||
|
||||
<insert id="insertOrUpdateCloseUpReason">
|
||||
INSERT INTO store_extend_info_${enterpriseId}(store_id, close_up_reason)
|
||||
VALUES(#{storeId}, #{closeUpReason})
|
||||
ON DUPLICATE KEY UPDATE
|
||||
close_up_reason = VALUES(close_up_reason)
|
||||
</insert>
|
||||
|
||||
<select id="getNoOrderStore" resultType="com.cool.store.entity.StoreDO">
|
||||
SELECT * FROM store_${enterpriseId} a
|
||||
LEFT JOIN store_extend_info_${enterpriseId} b ON a.store_id = b.store_id
|
||||
|
||||
Reference in New Issue
Block a user