Commits · b4a10e8f3358a2e19e21f1e2538c3a88ea1c3fc3 · pseer / gxpt_ht · GitLab

09 Sep, 2024 8 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
- 优化后台管理系统查询 · 071f1c82
  吕明尚 authored Sep 09, 2024
  
  071f1c82 Browse Files
- Merge branch 'refs/heads/dev' into test-lms · a4cacd20
  吕明尚 authored Sep 09, 2024
  
  a4cacd20 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
30 Aug, 2024 5 commits
- 修改自动生成优惠卷购买金额开始 · 732f140d
  吕明尚 authored Aug 30, 2024
  
  732f140d Browse Files
- 修改自动生成优惠卷购买金额开始 · ca8501ee
  吕明尚 authored Aug 30, 2024
  
  ca8501ee Browse Files
- 修改验券，修改自动生成补充优惠卷购买金额 · 0186a3e5
  吕明尚 authored Aug 30, 2024
  
  0186a3e5 Browse Files
- 权益订单回调增加赠送积分的逻辑 · 13f950ee
  吕明尚 authored Aug 30, 2024
  
  13f950ee Browse Files
- 权益会员配置增加赠送积分 · 2a2b97e0
  吕明尚 authored Aug 30, 2024
  
  2a2b97e0 Browse Files
29 Aug, 2024 6 commits
- 权益会员配置增加字段，数据统计增加默认值 · 117891fc
  吕明尚 authored Aug 29, 2024
  
  117891fc Browse Files
- Merge remote-tracking branch 'origin/dev' into dev · f2385f3e
  YG8429 authored Aug 29, 2024
  
  f2385f3e Browse Files
- 定时修改设备密码排除卫生间、设备间，增加人工修改密码接口 · 096c9769
  YG8429 authored Aug 29, 2024
  
  096c9769 Browse Files
- 微信商户转账到零钱接口 · 8cb185e9
  liwenjun authored Aug 29, 2024
  
  8cb185e9 Browse Files
- 保洁、管理员、客服短信和公众号消息分开 · 34209c26
  吕明尚 authored Aug 29, 2024
  
  34209c26 Browse Files
- 门店用户关系表增加短信和公众号控制 · 07bc5910
  吕明尚 authored Aug 29, 2024
  
  07bc5910 Browse Files
28 Aug, 2024 2 commits
- 实体类增加表命 · ced29ffd
  吕明尚 authored Aug 28, 2024
  
  ced29ffd Browse Files
- 增加次卡购买 · 300b1541
  吕明尚 authored Aug 28, 2024
  
  300b1541 Browse Files
27 Aug, 2024 2 commits
- 修改月卡后台管理系统 · 0046f57c
  吕明尚 authored Aug 27, 2024
  
  0046f57c Browse Files
- 新增月卡后台管理系统 · 4610898b
  吕明尚 authored Aug 27, 2024
  
  4610898b Browse Files