Commits · 042e8a9c21294c6ec5390c2c84a5356c8572f546 · pseer / gxpt_ht · GitLab

12 Sep, 2024 11 commits
- Merge branch 'refs/heads/test' into test-lms · 042e8a9c
```
# Conflicts:
#	share-system/src/main/java/share/system/service/impl/SOrderServiceImpl.java
```
  吕明尚 authored Sep 12, 2024
  042e8a9c Browse Files
- Merge branch 'refs/heads/dev' into test · 04476972
  吕明尚 authored Sep 12, 2024
  
  04476972 Browse Files
- 修改订单价格计算 · 747e6f47
  吕明尚 authored Sep 12, 2024
  
  747e6f47 Browse Files
- 小程序查询权益金记录列表 · 67f45a36
  YG8429 authored Sep 12, 2024
  
  67f45a36 Browse Files
- 修改用户会员字段，修改会员配置字段 · 739e74c2
  吕明尚 authored Sep 12, 2024
  
  739e74c2 Browse Files
- 修改权益会员绑定逻辑。权益会员返佣逻辑 · 6e26c088
  YG8429 authored Sep 12, 2024
  
  6e26c088 Browse Files
- 修改权益会员绑定逻辑。权益会员返佣逻辑 · a81e99d0
  YG8429 authored Sep 12, 2024
  
  a81e99d0 Browse Files
- 修改权益会员绑定逻辑。权益会员返佣逻辑 · 4e26a05c
  YG8429 authored Sep 12, 2024
  
  4e26a05c Browse Files
- Merge branch 'refs/heads/test' into test-lms · d8b12a0a
  吕明尚 authored Sep 12, 2024
  
  d8b12a0a Browse Files
- Merge branch 'refs/heads/dev' into test · f1892cf6
  吕明尚 authored Sep 12, 2024
  
  f1892cf6 Browse Files
- 会员日活动判断只判断开始时间 · f5558b68
  吕明尚 authored Sep 12, 2024
  
  f5558b68 Browse Files
11 Sep, 2024 1 commit
- 新增权益分享绑定，微信支付回调新增充值、权益消费验证是否绑定活动并返利3%并增加日志 · 6c2bec7c
  YG8429 authored Sep 11, 2024
  
  6c2bec7c Browse Files
10 Sep, 2024 1 commit
- 定时修改设备密码，添加延迟 · c3ced9b9
  liwenjun authored Sep 10, 2024
  
  c3ced9b9 Browse Files
09 Sep, 2024 10 commits
- 下单计算月卡，次卡 · b4a10e8f
  吕明尚 authored Sep 09, 2024
  
  b4a10e8f Browse Files
- Merge branch 'refs/heads/dev' into test-lms · 06d6a649
  吕明尚 authored Sep 09, 2024
  
  06d6a649 Browse Files
- Merge branch 'refs/heads/dev' into test · 9af0f9c3
  吕明尚 authored Sep 09, 2024
  
  9af0f9c3 Browse Files
- 优化后台管理系统查询 · 071f1c82
  吕明尚 authored Sep 09, 2024
  
  071f1c82 Browse Files
- Merge branch 'refs/heads/dev' into test-lms · a4cacd20
  吕明尚 authored Sep 09, 2024
  
  a4cacd20 Browse Files
- Merge branch 'refs/heads/dev' into test · 5f0b8cc0
  吕明尚 authored Sep 09, 2024
  
  5f0b8cc0 Browse Files
- 订单下单查询预约时间增加查询情况 · a074d36b
  吕明尚 authored Sep 09, 2024
  
  a074d36b Browse Files
- 订单下单查询预约时间增加查询情况 · 7b06fa9c
  吕明尚 authored Sep 09, 2024
  
  7b06fa9c Browse Files
- 订单下单查询预约时间增加查询情况 · f4ea9d48
  吕明尚 authored Sep 09, 2024
  
  f4ea9d48 Browse Files
- 增加月卡和次卡的计算逻辑 · b7df3c45
  吕明尚 authored Sep 09, 2024
  
  b7df3c45 Browse Files
06 Sep, 2024 5 commits
- 用户信息增加次卡，月卡,订单表增加次卡，月卡id · 480ec261
  吕明尚 authored Sep 06, 2024
  
  480ec261 Browse Files
- 订单计算，增加次卡，月卡计算逻辑，增加自动删除月卡，次卡定时任务 · 4b7ff02e
  吕明尚 authored Sep 06, 2024
  
  4b7ff02e Browse Files
- Merge branch 'refs/heads/test' into test-lms · c29a6e2e
  吕明尚 authored Sep 06, 2024
  
  c29a6e2e Browse Files
- 修改差异 · af462e53
  吕明尚 authored Sep 06, 2024
  
  af462e53 Browse Files
- Merge branch 'refs/heads/dev' into test · e942d99d
```
# Conflicts:
#	share-system/src/main/java/share/system/service/impl/RoomStatusServiceImpl.java
#	share-system/src/main/java/share/system/service/impl/SOrderServiceImpl.java
```
  吕明尚 authored Sep 06, 2024
  e942d99d Browse Files
05 Sep, 2024 10 commits
- 修改充值回调 · cbd67306
  吕明尚 authored Sep 05, 2024
  
  cbd67306 Browse Files
- 修改充值回调 · f322ac4b
  吕明尚 authored Sep 05, 2024
  
  f322ac4b Browse Files
- 修改充值回调 · c38cd095
  吕明尚 authored Sep 05, 2024
  
  c38cd095 Browse Files
- 修改充值回调 · aefc088e
  吕明尚 authored Sep 05, 2024
  
  aefc088e Browse Files
- 修改充值回调 · 69b42cea
  吕明尚 authored Sep 05, 2024
  
  69b42cea Browse Files
- 修改累计消费进行积分 · 806663f8
  吕明尚 authored Sep 05, 2024
  
  806663f8 Browse Files
- 修改累计消费进行积分 · 833cfe68
  吕明尚 authored Sep 05, 2024
  
  833cfe68 Browse Files
- 修改累计消费进行积分 · af415ead
  吕明尚 authored Sep 05, 2024
  
  af415ead Browse Files
- 用户成为充值会员或者权益会员时，前三个月的累计消费进行积分 · e22fd60d
  吕明尚 authored Sep 05, 2024
  
  e22fd60d Browse Files
- 修改定时任务，房间状态 · 4dfba59d
  吕明尚 authored Sep 05, 2024
  
  4dfba59d Browse Files
02 Sep, 2024 2 commits
- 分享新用户注册时增加绑定记录，订单结束时有上级时长自动增加1小时 · ecd35dd7
  YG8429 authored Sep 02, 2024
  
  ecd35dd7 Browse Files
- 订单中的保洁时间由前端进行计算 · 81bb964f
  吕明尚 authored Sep 02, 2024
  
  81bb964f Browse Files