Commit Graph

745 Commits

Author SHA1 Message Date
shuo.wang
a357730c1a fix 2025-07-03 16:03:10 +08:00
shuo.wang
fe0c4e2ef7 成功开店代码改造 2025-07-03 10:59:41 +08:00
shuo.wang
8a4dd5693e 成功开店代码改造 2025-07-03 10:58:37 +08:00
shuo.wang
80966b3ddb 成功开店代码改造 2025-07-02 18:45:54 +08:00
shuo.wang
04a29c03cc 成功开店代码改造 2025-07-02 18:24:30 +08:00
shuo.wang
cb69bef277 成功开店代码改造 2025-07-02 17:53:46 +08:00
苏竹红
e41a7eb288 Merge branch 'cc_20250620_pre_fly' into 'master'
Cc 20250620 pre fly

See merge request hangzhou/java/custom_zxjp!122
2025-07-01 10:52:35 +00:00
苏竹红
b70cdb0498 feat:销售完成 2025-06-26 14:52:33 +08:00
苏竹红
eeb9bdc3ad feat:销售完成 2025-06-26 14:47:08 +08:00
shuo.wang
47a0eadff1 Merge branch 'master' into cc_20250623_desk 2025-06-26 14:30:46 +08:00
苏竹红
f50b9e1a57 Merge branch 'cc_20250620_pre_fly' into 'master'
Cc 20250620 pre fly

See merge request hangzhou/java/custom_zxjp!118
2025-06-25 13:10:46 +00:00
苏竹红
84574c905a feat:applyType 2025-06-24 18:08:34 +08:00
苏竹红
2ae54ccc20 feat:applyType 2025-06-24 18:06:51 +08:00
苏竹红
7eb5bf8059 feat:预炸 2025-06-24 11:34:43 +08:00
苏竹红
1dab792aad feat:预炸 2025-06-23 21:41:41 +08:00
苏竹红
09e4226077 feat:预炸 2025-06-23 20:25:32 +08:00
苏竹红
2c8061f532 feat:预炸 2025-06-23 17:12:39 +08:00
shuo.wang
868343b9b5 数据库地址更改 2025-06-23 16:03:16 +08:00
shuo.wang
8a143ea816 desk 部分接口改造 2025-06-23 14:25:47 +08:00
苏竹红
1ca98f41ce feat:预炸 2025-06-23 10:41:33 +08:00
苏竹红
9147a67b07 feat:预炸 2025-06-21 18:39:29 +08:00
苏竹红
2571ed2956 feat:oss配置 2025-06-17 14:56:51 +08:00
shuo.wang
529e41a0af 修改设计师和设计组接口 2025-06-16 15:24:50 +08:00
shuo.wang
53ed63596e mini加接口 2025-06-12 16:09:10 +08:00
苏竹红
31e09c0e3f Merge branch 'cc_20250609_takeoutBuild' into 'master'
Cc 20250609 takeout build

See merge request hangzhou/java/custom_zxjp!113
2025-06-11 10:29:48 +00:00
shuo.wang
b2b694fd46 Merge branch 'master' into cc_20250609_takeoutBuild
# Conflicts:
#	coolstore-partner-service/src/main/java/com/cool/store/service/impl/BuildInformationServiceImpl.java
2025-06-10 15:44:00 +08:00
shuo.wang
3fe7d80d8f Merge branch 'master' into cc_20250605_shopReport 2025-06-10 15:42:39 +08:00
shuo.wang
e4fe4368fd 修改结算人信息接口 2025-06-10 14:02:58 +08:00
苏竹红
7d28b7f739 Merge branch 'cc_20250529_franchise_fee' into 'master'
Cc 20250529 franchise fee

See merge request hangzhou/java/custom_zxjp!109
2025-06-09 08:30:02 +00:00
shuo.wang
aa789e1e93 fix 2025-06-09 14:30:02 +08:00
苏竹红
09d6fcc6d8 feat:franchiseFeeDataHandler 2025-06-09 13:37:47 +08:00
shuo.wang
7d88be8a1d 导出接口 2025-06-09 10:28:56 +08:00
shuo.wang
f19507e153 add 接口 2025-06-05 17:22:02 +08:00
苏竹红
423b2b921a feat:环境切换 2025-06-05 16:56:22 +08:00
苏竹红
197e833f90 feat:环境切换 2025-06-05 15:50:24 +08:00
shuo.wang
0d389a9e89 门店明细表 2025-06-05 15:07:05 +08:00
苏竹红
8dad6016ec feat:加盟费 2025-06-05 11:30:28 +08:00
shuo.wang
2c50b237f8 增加接口获取店铺某阶段状态 2025-06-04 17:18:31 +08:00
shuo.wang
d3bc5baa0a Merge remote-tracking branch 'origin/cc_20250529_franchise_fee' into cc_20250529_franchise_fee 2025-06-04 16:58:43 +08:00
shuo.wang
86611d2178 数据处理代码 2025-06-04 16:58:16 +08:00
苏竹红
143df4138a feat:xxl 2025-06-04 16:50:26 +08:00
苏竹红
61ebca6b92 feat:阶段完成 2025-06-04 15:14:21 +08:00
shuo.wang
2788afba17 处理冲突 2025-06-04 14:35:28 +08:00
shuo.wang
e14806db30 数据处理 2025-06-04 14:30:04 +08:00
苏竹红
747858b9cf feat:回调 2025-06-04 14:29:20 +08:00
shuo.wang
eaf416ad5e 接口移出 2025-06-04 11:30:15 +08:00
shuo.wang
735e595631 fix 2025-06-04 10:24:41 +08:00
苏竹红
08afc93c94 feat:订单编号生成 订单编号 2025-06-03 15:08:25 +08:00
shuo.wang
c014841e8c 加盟费改造 2025-05-30 18:17:57 +08:00
苏竹红
43f9475549 Merge branch 'master' into cc_20250529_login
# Conflicts:
#	coolstore-partner-common/src/main/java/com/cool/store/enums/ErrorCodeEnum.java
2025-05-30 13:40:53 +08:00