wangh
|
b4cdb77bdf
|
no message
|
2023-12-18 17:44:23 +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 |
|
|
|
18551be789
|
Merge remote-tracking branch 'origin/master'
|
2023-12-18 17:32:45 +08:00 |
|
|
|
0a4cde035f
|
子卡管理
|
2023-12-18 17:32:37 +08:00 |
|
@QQNZX
|
42dd71dcc4
|
油站小程序
|
2023-12-18 16:32:08 +08:00 |
|
@QQNZX
|
447bf6c744
|
油站小程序
|
2023-12-18 16:31:53 +08:00 |
|
@QQNZX
|
5891934b1b
|
油站小程序
|
2023-12-18 15:43:32 +08:00 |
|
@QQNZX
|
4d5b7529e4
|
油站小程序
|
2023-12-18 15:19:34 +08:00 |
|
|
|
f8a1fdea61
|
修改小程序端的活动展示方式
|
2023-12-18 15:10:29 +08:00 |
|
@QQNZX
|
1b9036ffb0
|
Merge remote-tracking branch 'origin/master'
|
2023-12-18 11:32:54 +08:00 |
|
@QQNZX
|
936812a15e
|
油站小程序
|
2023-12-18 11:32:45 +08:00 |
|
|
|
aed22bb5a0
|
核销记录
|
2023-12-18 11:15:19 +08:00 |
|
|
|
134ce14aa3
|
Merge remote-tracking branch 'origin/master'
|
2023-12-18 11:15:03 +08:00 |
|
|
|
711d4a4e90
|
核销记录
|
2023-12-18 11:14:51 +08:00 |
|
@QQNZX
|
f4e97540f3
|
油站小程序
|
2023-12-18 11:10:15 +08:00 |
|
@QQNZX
|
63339f8016
|
油站小程序
|
2023-12-18 09:22:30 +08:00 |
|
|
|
ad65f4e8df
|
Merge remote-tracking branch 'origin/master'
|
2023-12-15 17:41:34 +08:00 |
|
|
|
79e2d77212
|
核销记录
|
2023-12-15 17:41:25 +08:00 |
|
@QQNZX
|
c30f6ff2cd
|
油站小程序
|
2023-12-15 15:11:42 +08:00 |
|
@QQNZX
|
8022856572
|
油站小程序
|
2023-12-15 14:34:59 +08:00 |
|
@QQNZX
|
c90136e79b
|
油站小程序
|
2023-12-15 14:00:09 +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 |
|
wangh
|
6e233b3f6a
|
Merge branch 'master' of https://gitee.com/nny_1/oilSystem
|
2023-12-14 15:53:11 +08:00 |
|
wangh
|
959f950df0
|
no message
|
2023-12-14 15:53:06 +08:00 |
|
@QQNZX
|
48633780cd
|
Merge remote-tracking branch 'origin/master'
|
2023-12-14 15:26:09 +08:00 |
|
@QQNZX
|
bfd2ed0eeb
|
油站pc
|
2023-12-14 15:26:00 +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
|
f0f50652e3
|
pc端 增加个人统计 和数据统计
|
2023-12-14 13:39:27 +08:00 |
|
wangh
|
0b4359a2e5
|
小程序签到处理
|
2023-12-14 13:38:01 +08:00 |
|
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 |
|
|
|
33cfff8e8b
|
订单信息
|
2023-12-14 11:04:16 +08:00 |
|
|
|
217c669407
|
订单信息
|
2023-12-13 18:43:50 +08:00 |
|
|
|
f6c574e4aa
|
小程序活动加载页
|
2023-12-13 18:19:52 +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 |
|
@QQNZX
|
96c2c9d7b9
|
油站小程序
|
2023-12-11 09:43:13 +08:00 |
|
wangh
|
1cf76004b4
|
Merge branch 'master' of https://gitee.com/nny_1/oilSystem
|
2023-12-11 09:21:36 +08:00 |
|
wangh
|
0fab8cd1d4
|
订单详情页
|
2023-12-11 09:21:21 +08:00 |
|
|
|
5e2969c04f
|
订单信息
|
2023-12-09 15:31:46 +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 |
|
@QQNZX
|
78c5c4c595
|
前端
|
2023-12-09 15:10:30 +08:00 |
|
@QQNZX
|
a3e8c82806
|
前端
|
2023-12-09 15:10:18 +08:00 |
|
@QQNZX
|
9397009e36
|
前端
|
2023-12-09 13:21:01 +08:00 |
|
