|
|
ffeb4a4254
|
门店信息
|
2023-12-18 18:44:02 +08:00 |
|
|
|
f76021b177
|
Merge remote-tracking branch 'origin/master'
|
2023-12-18 17:55:09 +08:00 |
|
|
|
65ba434d19
|
子卡管理
|
2023-12-18 17:54:43 +08:00 |
|
wangh
|
96f978ae11
|
Merge branch 'master' of https://gitee.com/nny_1/oilSystem
# Conflicts:
# fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardFule/mapper/CardFuelRecordMapper.java
|
2023-12-18 17:43:57 +08:00 |
|
wangh
|
026b7e6d0b
|
主页的数据统计
|
2023-12-18 17:42:52 +08:00 |
|
|
|
0a4cde035f
|
子卡管理
|
2023-12-18 17:32:37 +08:00 |
|
|
|
f8a1fdea61
|
修改小程序端的活动展示方式
|
2023-12-18 15:10:29 +08:00 |
|
|
|
711d4a4e90
|
核销记录
|
2023-12-18 11:14:51 +08:00 |
|
|
|
79e2d77212
|
核销记录
|
2023-12-15 17:41:25 +08:00 |
|
|
|
407af8365e
|
用户余额查询
|
2023-12-15 13:48:17 +08:00 |
|
|
|
69eb9cccb5
|
Merge remote-tracking branch 'origin/master'
|
2023-12-14 15:56:43 +08:00 |
|
|
|
e0be7fbed7
|
小程序囤油卡
|
2023-12-14 15:54:53 +08:00 |
|
|
|
2c4febc2b7
|
订单信息
|
2023-12-14 15:06:24 +08:00 |
|
wangh
|
29b2f0f586
|
Merge branch 'master' of https://gitee.com/nny_1/oilSystem
# Conflicts:
# gasStation-uni/config.js
# gasStation-uni/pages/index/index.vue
|
2023-12-14 13:40:31 +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 |
|
|
|
33cfff8e8b
|
订单信息
|
2023-12-14 11:04:16 +08:00 |
|
|
|
217c669407
|
订单信息
|
2023-12-13 18:43:50 +08:00 |
|
|
|
b429636651
|
Merge remote-tracking branch 'origin/master'
# Conflicts:
# fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardFavorable/mapper/CardFavorableRecordMapper.java
# fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardFavorable/mapper/xml/CardFavorableRecordMapper.xml
|
2023-12-13 17:11:02 +08:00 |
|
|
|
e00b708435
|
小程序我的券
|
2023-12-13 17:09:31 +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
|
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 |
|
|
|
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 |
|
|
|
ef2ef63234
|
会员信息
|
2023-12-01 16:26:25 +08:00 |
|
