171 Commits

Author SHA1 Message Date
longbinbin
5e6a52536a 修改商品信息查询以及订单新增订单接口逻辑 2024-12-06 16:11:36 +08:00
longbinbin
1488a6dd33 Merge remote-tracking branch 'origin/master' 2024-12-06 15:30:05 +08:00
longbinbin
47c5f38ac8 修改 2024-12-06 15:29:47 +08:00
songmingsong
961df0a151 发起退款、审核退款 2024-12-06 15:18:53 +08:00
songmingsong
be5811ea6e 补充下单逻辑 2024-12-06 14:51:36 +08:00
songmingsong
5fc610e438 Merge remote-tracking branch 'origin/master' 2024-12-06 14:49:59 +08:00
songmingsong
fcfb46fed7 补充下单逻辑 2024-12-06 14:49:42 +08:00
longbinbin
1304cf329e Merge remote-tracking branch 'origin/master' 2024-12-06 14:48:38 +08:00
longbinbin
4a4019334e 修改 2024-12-06 14:47:39 +08:00
songmingsong
6e343ab42e 微信订单关闭 2024-12-06 13:56:05 +08:00
songmingsong
d18f370b12 Merge remote-tracking branch 'origin/master' 2024-12-06 11:14:41 +08:00
songmingsong
c062952ae6 微信模板消息通知、微信获取AccessToken 2024-12-06 11:14:23 +08:00
longbinbin
6076809948 Merge remote-tracking branch 'origin/master' 2024-12-06 10:56:06 +08:00
longbinbin
2b919a3c9f 查询景区信息和机位接口实现 2024-12-06 10:55:49 +08:00
songmingsong
e1c95fb137 Merge remote-tracking branch 'origin/master' 2024-12-06 10:14:01 +08:00
songmingsong
636f20fb29 微信退款、退款回调 2024-12-06 10:13:43 +08:00
66e43f3c90 阿里云人脸检测结果返回 2024-12-06 09:22:47 +08:00
19fcebf32c 阿里云人脸检测配置 2024-12-06 09:22:06 +08:00
1915d45d20 阿里云人脸检测 2024-12-05 18:43:38 +08:00
aaa29c36d8 阿里云对象存储 2024-12-05 18:37:55 +08:00
longbinbin
6bfd3d2f45 Merge remote-tracking branch 'origin/master'
# Conflicts:
#	src/main/resources/application.yml
2024-12-05 18:07:46 +08:00
longbinbin
5732208c7d 添加oss人脸上传逻辑 2024-12-05 18:06:27 +08:00
3f3c239627 人脸检测逻辑 2024-12-05 18:00:44 +08:00
bf73241bf4 后台部分修改 2024-12-05 18:00:42 +08:00
songmingsong
569c038072 Merge remote-tracking branch 'origin/master'
# Conflicts:
#	src/main/java/com/ycwl/basic/service/impl/pc/OrderServiceImpl.java
#	src/main/java/com/ycwl/basic/service/pc/OrderService.java
2024-12-05 17:34:37 +08:00
songmingsong
ffc9fcb95c 微信支付、回调、订单查询;
微信用户登录、用户信息查询、修改用户信息、同意用户协议;
文件OSS上传、删除接口;
2024-12-05 17:33:25 +08:00
longbinbin
92dfc1ceff 实现商品信息查询和商品价格查询逻辑 2024-12-05 17:05:59 +08:00
longbinbin
3114fc7046 实现移动端订单列表和订单详情接口 2024-12-05 14:46:07 +08:00
longbinbin
4822174c5e Merge remote-tracking branch 'origin/master' 2024-12-05 10:37:33 +08:00
longbinbin
68c69a0a49 添加首页、景区相关接口Controller 2024-12-05 10:37:17 +08:00
songmingsong
bef334fdd7 修改 2024-12-05 10:11:39 +08:00
songmingsong
de07d87775 Merge remote-tracking branch 'origin/master' 2024-12-05 10:10:21 +08:00
songmingsong
883216b44c 新增mobile包 2024-12-05 10:10:01 +08:00
c1a0d6b377 避免前端精度丢失,直接把long变成string返回 2024-12-04 17:47:42 +08:00
longbinbin
c123cb486e 添加移动端订单相关接口 2024-12-04 17:30:45 +08:00
longbinbin
3ec99816d6 Merge remote-tracking branch 'origin/master' 2024-12-04 17:08:18 +08:00
longbinbin
100debbf8d 添加移动端用户和人脸相关接口 2024-12-04 17:07:12 +08:00
58301128fa 添加阿里云OSS、人脸检索SDK 2024-12-04 16:47:16 +08:00
8c0c2dce34 pom修改 2024-12-04 09:24:25 +08:00
2239c6556c 后台接口修改 2024-12-04 09:24:25 +08:00
longbinbin
6abf428236 补充添加接口描述 2024-12-03 17:00:48 +08:00
longbinbin
78ce483c0d 添加"成片"的基础业务接口和实现 2024-12-03 16:51:03 +08:00
longbinbin
816501a374 添加"模版"的基础业务接口和实现 2024-12-03 16:27:31 +08:00
longbinbin
fd21dbab1d 添加"模版"的基础业务接口和实现 2024-12-03 16:24:12 +08:00
longbinbin
ff347e534c 添加"任务列表"的基础业务接口和实现 2024-12-03 16:10:32 +08:00
longbinbin
769856f02a 添加"视频源"的基础业务接口和实现 2024-12-03 15:57:20 +08:00
longbinbin
c925798fbc 添加"景区"的基础业务接口和实现 2024-12-03 15:45:02 +08:00
longbinbin
2e4ae11c2f 添加"渲染机"的基础业务接口和实现 2024-12-03 15:16:23 +08:00
longbinbin
4bac7d10f9 添加"订单"的基础业务接口和实现 2024-12-03 14:58:55 +08:00
longbinbin
e599004c92 添加"系统菜单"的基础业务接口和实现 2024-12-03 13:48:29 +08:00