Commit Graph

243 Commits

Author SHA1 Message Date
wangh
1956d1a25b 自定义充值bug处理+pom引入rocket和rdisson+rocketmq配置+aes加密测试(前后端) 2023-12-14 13:36:36 +08:00
wangh
e96aac959e 修改充值流程-适配mq+rocketutil 2023-12-14 13:28:36 +08:00
wangh
8021669f4c rockermq记录表的增删改查+rocket引入+redis锁 2023-12-14 13:25:11 +08:00
wangh
0fab8cd1d4 订单详情页 2023-12-11 09:21:21 +08:00
wangh
841b823692 Merge branch 'master' of https://gitee.com/nny_1/oilSystem
# Conflicts:
#	fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardValue/mapper/xml/CardValueRecordMapper.xml
#	fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardValue/service/impl/CardValueRecordServiceImpl.java
2023-12-09 15:27:17 +08:00
wangh
e09841a85a 信息统计 2023-12-09 15:23:37 +08:00
e7299b6613 礼品卡兑换记录 2023-12-09 09:33:48 +08:00
e7f8a5bfc9 礼品卡兑换记录 2023-12-08 17:01:33 +08:00
7799b6451d Merge remote-tracking branch 'origin/master' 2023-12-08 16:21:43 +08:00
785c2eb517 礼品卡兑换记录 2023-12-08 16:21:35 +08:00
4599d08df9 订单信息 2023-12-08 15:48:54 +08:00
116141d547 礼品卡兑换记录 2023-12-08 15:15:03 +08:00
4c674b0109 Merge remote-tracking branch 'origin/master' 2023-12-08 13:13:31 +08:00
9d1eb21787 礼品卡兑换 2023-12-08 13:13:21 +08:00
6451143ec3 订单信息 2023-12-07 18:28:31 +08:00
68c0ab29e7 Merge remote-tracking branch 'origin/master' 2023-12-07 14:02:10 +08:00
90b80a1290 修改可用优惠券 2023-12-07 14:01:59 +08:00
wangh
b40a9d8efe Merge branch 'master' of https://gitee.com/nny_1/oilSystem
# Conflicts:
#	fuintBackend/fuint-application/src/main/resources/application.properties
2023-12-07 10:24:29 +08:00
wangh
08242aff89 no message 2023-12-07 10:23:33 +08:00
wangh
b93f9559de no message 2023-12-07 10:23:14 +08:00
wangh
f50982f0e6 充值订单 2023-12-07 10:22:52 +08:00
31c8f79bc9 订单信息 2023-12-06 18:36:10 +08:00
19fc2fdb2b Merge remote-tracking branch 'origin/master' 2023-12-06 18:01:06 +08:00
fbbe572286 优化活动 2023-12-06 18:00:48 +08:00
426cd1ca30 订单信息 2023-12-05 17:18:27 +08:00
wangh
6dd43b9d68 积分详情 2023-12-05 15:16:15 +08:00
wangh
abe9969d75 修改 2023-12-05 13:44:15 +08:00
6e8508cd5b 会员信息 2023-12-05 12:04:03 +08:00
@QQNZX
1042b55806 12.05前端 2023-12-05 11:16:58 +08:00
880bb21ae5 Merge remote-tracking branch 'origin/master' 2023-12-05 09:43:47 +08:00
03a83c5702 油站活动 2023-12-05 09:43:37 +08:00
wangh
4eaafc9bf0 Merge branch 'master' of https://gitee.com/nny_1/oilSystem 2023-12-05 09:24:35 +08:00
wangh
869f189c4d no message 2023-12-05 09:24:31 +08:00
0416cb19d0 会员信息 2023-12-04 16:35:09 +08:00
cf5d5684e0 Merge remote-tracking branch 'origin/master' 2023-12-01 16:48:06 +08:00
eca6f8a9a7 小程序储值卡 2023-12-01 16:47:56 +08:00
wangh
a913c83238 no message 2023-12-01 16:40:20 +08:00
ef2ef63234 会员信息 2023-12-01 16:26:25 +08:00
wangh
81749b3388 Merge branch 'master' of https://gitee.com/nny_1/oilSystem 2023-12-01 15:42:28 +08:00
wangh
78c6d5d5d9 no message 2023-12-01 15:42:23 +08:00
c4839870bc 会员信息 2023-12-01 15:40:43 +08:00
d48a4cabe7 会员信息 2023-11-30 18:30:46 +08:00
f3461e779b Merge remote-tracking branch 'origin/master' 2023-11-30 17:29:19 +08:00
cb2543531d 小程序端活动02 2023-11-30 17:29:10 +08:00
wangh
ca0c13a07c Merge branch 'master' of https://gitee.com/nny_1/oilSystem 2023-11-30 14:28:18 +08:00
wangh
eff9fccd2f 封面会员价 2023-11-30 14:28:12 +08:00
41cabe23d1 Merge remote-tracking branch 'origin/master' 2023-11-30 11:57:53 +08:00
e42e7dbbe3 会员信息 2023-11-30 11:48:14 +08:00
wangh
ed40ec677e no message 2023-11-30 11:37:32 +08:00
wangh
d0348342f5 no message 2023-11-30 11:25:19 +08:00