Merge #144 into master from cc_20260520_unify_merge
0520需求汇总
* cc_20260520_unify_merge: (22 commits squashed)
- fix:正新鸡排信发自动开通改造
- fix:环境配置
- fix
- fix:信发门店设备信息接口入参修改
- fix:信发门店设备信息接口入参修改
- fix:新增根据门店id查询设备接口
- fix
- fix:限制设备数量
- fix:问题修复
- fix:网点信息获取转义;网点/设备创建异常抛出
- fix:更新开业报备流程完成日期、首次在营业状态时间
- fix
- fix:云流水&新管家账号关闭接口传入闭店原因;新增闭店原因违约闭店
- fix:闭店信息新增字段
- Merge branch 'master' into cc_20260518_store_date
- fix:开店流程完成状态判断排除食安阶段
- fix
- fix
- Merge branch 'cc_20260514_xinfa_modify' into cc_20260520_unify_merge
# Conflicts:
#	coolstore-partner-common/src/main/java/com/cool/store/enums/ErrorCodeEnum.java
- Merge branch 'cc_20260518_store_date' into cc_20260520_unify_merge
- Merge branch 'cc_20260520_close_store_optimize' into cc_20260520_unify_merge
- Merge remote-tracking branch 'origin/cc_20260518_close_reason' into cc_20260520_unify_merge
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/144
This commit is contained in:
@@ -467,13 +467,14 @@
|
||||
</select>
|
||||
|
||||
<insert id="insertOrUpdateSoftOpenDate">
|
||||
INSERT INTO store_extend_info_${enterpriseId}(store_id, soft_open_date)
|
||||
INSERT INTO store_extend_info_${enterpriseId}(store_id, soft_open_date, soft_open_job_time)
|
||||
VALUES
|
||||
<foreach collection="list" item="item" separator=",">
|
||||
(#{item.storeId}, #{item.softOpenDate})
|
||||
(#{item.storeId}, #{item.softOpenDate}, now())
|
||||
</foreach>
|
||||
ON DUPLICATE KEY UPDATE
|
||||
soft_open_date = VALUES(soft_open_date)
|
||||
soft_open_date = VALUES(soft_open_date),
|
||||
soft_open_job_time = VALUES(soft_open_job_time)
|
||||
</insert>
|
||||
|
||||
<update id="updateStatusBatch">
|
||||
@@ -484,4 +485,12 @@
|
||||
#{item}
|
||||
</foreach>
|
||||
</update>
|
||||
|
||||
<insert id="insertOrUpdateOpenReportTime">
|
||||
INSERT INTO store_extend_info_${enterpriseId}(store_id, open_report_time)
|
||||
VALUES
|
||||
(#{storeId}, #{openReportTime})
|
||||
ON DUPLICATE KEY UPDATE
|
||||
open_report_time = VALUES(open_report_time)
|
||||
</insert>
|
||||
</mapper>
|
||||
|
||||
Reference in New Issue
Block a user