Commits · ac44ca4c061ad5961454d994e5a21a3031bfd51a · fitness-server / fit-finance · GitLab

25 Jun, 2024 2 commits
- Merge branch 'master' into release/rc · ac44ca4c
  程裕兵 committed Jun 25, 2024
  
  ac44ca4c Browse Files
- feat:refund statistic · 072d62ef
  程裕兵 committed Jun 25, 2024
  
  072d62ef Browse Files
24 Jun, 2024 5 commits
- Merge branch 'master' into release/rc · 23e545c9
  程裕兵 committed Jun 24, 2024
  
  23e545c9 Browse Files
- feat:refund message format · 75d37e07
  程裕兵 committed Jun 24, 2024
  
  75d37e07 Browse Files
- Merge branch 'feature/yangpeifeng' into release/rc · cbfe2d16
  程裕兵 committed Jun 24, 2024
  
  cbfe2d16 Browse Files
- feat:upgrade api maven version 0.0.1 -> 0.0.2 · 4be40f50
  程裕兵 committed Jun 24, 2024
  
  4be40f50 Browse Files
- feat:app pay and native pay · e304fefc
  程裕兵 committed Jun 24, 2024
  
  e304fefc Browse Files
20 Jun, 2024 5 commits
- Merge branch 'master' into release/rc · 667a4aa8
  程裕兵 committed Jun 20, 2024
  
  667a4aa8 Browse Files
- feat:refund message · 65a27cdb
  程裕兵 committed Jun 20, 2024
  
  65a27cdb Browse Files
- log · 8aa07bdf
  程裕兵 committed Jun 20, 2024
  
  8aa07bdf Browse Files
- Merge branch 'master' into release/rc · 6344e798
  程裕兵 committed Jun 20, 2024
  
  6344e798 Browse Files
- feat:refund check fail message · 88e7a9a5
  程裕兵 committed Jun 20, 2024
  
  88e7a9a5 Browse Files
18 Jun, 2024 3 commits
- Merge branch 'master' into release/rc · d245929f
```
# Conflicts:
#	service/src/main/java/com/jiejing/fitness/finance/service/pay/impl/RefundServiceImpl.java
```
  程裕兵 committed Jun 18, 2024
  d245929f Browse Files
- feat:fix repeat process pay callback and trigger cashier event · f9254b34
  程裕兵 committed Jun 18, 2024
  
  f9254b34 Browse Files
- feat:fix repeat process refund callback and trigger cashier event · 6a7ec088
  程裕兵 committed Jun 18, 2024
  
  6a7ec088 Browse Files
17 Jun, 2024 8 commits
- feat:send wx · fd76e201
  程裕兵 committed Jun 17, 2024
  
  fd76e201 Browse Files
- feat:log · 15aa665a
  程裕兵 committed Jun 17, 2024
  
  15aa665a Browse Files
- Merge branch 'master' into release/rc · b142fab9
```
# Conflicts:
#	service/src/main/java/com/jiejing/fitness/finance/service/pay/impl/RefundServiceImpl.java
```
  程裕兵 committed Jun 17, 2024
  b142fab9 Browse Files
- feat:send member refund wx message · 0aabb108
  程裕兵 committed Jun 17, 2024
  
  0aabb108 Browse Files
- Merge branch 'master' into release/rc · f976d6c0
  程裕兵 committed Jun 17, 2024
  
  f976d6c0 Browse Files
- feat:send memeber message · 3e4db98f
  程裕兵 committed Jun 17, 2024
  
  3e4db98f Browse Files
- feat:log · 40fe3394
  程裕兵 committed Jun 17, 2024
  
  40fe3394 Browse Files
- feat:log · b3d712b2
  程裕兵 committed Jun 17, 2024
  
  b3d712b2 Browse Files
15 Jun, 2024 6 commits
- feat:send member message · 6ef0b8fe
  程裕兵 committed Jun 15, 2024
  
  6ef0b8fe Browse Files
- feat:CashierEvent · cccf78c7
  程裕兵 committed Jun 15, 2024
  
  cccf78c7 Browse Files
- feat:CashierEvent · fb429e15
  程裕兵 committed Jun 15, 2024
  
  fb429e15 Browse Files
- feat:batch save class · a1ed70ab
  程裕兵 committed Jun 15, 2024
  
  a1ed70ab Browse Files
- feat:pay message · 79a27bc1
  程裕兵 committed Jun 15, 2024
  
  79a27bc1 Browse Files
- feat:refund statistic · 853516d0
  程裕兵 committed Jun 15, 2024
  
  853516d0 Browse Files
14 Jun, 2024 3 commits
- feat:refund · 86d119d0
  程裕兵 committed Jun 14, 2024
  
  86d119d0 Browse Files
- feat:settle · 9923b7b1
  程裕兵 committed Jun 14, 2024
  
  9923b7b1 Browse Files
- feat:refund fail message change · 5632199b
  程裕兵 committed Jun 14, 2024
  
  5632199b Browse Files
13 Jun, 2024 5 commits
- feat:statistic · 47299126
  程裕兵 committed Jun 13, 2024
  
  47299126 Browse Files
- feat:statistic · 91df4af7
  程裕兵 committed Jun 13, 2024
  
  91df4af7 Browse Files
- feat:refund · dcb71385
  程裕兵 committed Jun 13, 2024
  
  dcb71385 Browse Files
- feat:refund · c8bb1dbc
  程裕兵 committed Jun 13, 2024
  
  c8bb1dbc Browse Files
- feat:MEMBER_REFUND_SUCCESS · 599c15b5
  程裕兵 committed Jun 13, 2024
  
  599c15b5 Browse Files
12 Jun, 2024 3 commits
- feat:list cashier record by ids · 4555e8a8
  程裕兵 committed Jun 12, 2024
  
  4555e8a8 Browse Files
- feat:third trans no · 327d50de
```
of refund record
```
  程裕兵 committed Jun 12, 2024
  327d50de Browse Files
- feat:refund · d1525ee6
  程裕兵 committed Jun 12, 2024
  
  d1525ee6 Browse Files