Commit Graph

23 Commits

Author SHA1 Message Date
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
636f20fb29 微信退款、退款回调 2024-12-06 10:13:43 +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
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
68c69a0a49 添加首页、景区相关接口Controller 2024-12-05 10:37:17 +08:00
longbinbin
c123cb486e 添加移动端订单相关接口 2024-12-04 17:30:45 +08:00
longbinbin
100debbf8d 添加移动端用户和人脸相关接口 2024-12-04 17:07:12 +08:00