|
|
b5341ed627
|
首页banner图
|
2023-12-29 16:50:44 +08:00 |
|
|
|
a5d998b02d
|
满减
|
2023-12-29 15:27:06 +08:00 |
|
|
|
53a7cce4dc
|
Merge remote-tracking branch 'origin/master'
# Conflicts:
# fuintBackend/fuint-application/src/main/resources/application.properties
|
2023-12-29 13:40:44 +08:00 |
|
|
|
78fb118550
|
充值记录
|
2023-12-29 13:38:00 +08:00 |
|
|
|
830e435b56
|
子卡信息
|
2023-12-28 17:31:50 +08:00 |
|
|
|
cd24222c2a
|
子卡信息
|
2023-12-28 13:14:35 +08:00 |
|
|
|
323add1517
|
会员信息
|
2023-12-27 18:44:56 +08:00 |
|
wangh
|
c9dbe51f22
|
Merge branch 'master' of https://gitee.com/nny_1/oilSystem
|
2023-12-27 09:11:48 +08:00 |
|
wangh
|
0f7c14444d
|
完善站长一键登录+修改中台出现的bug
|
2023-12-27 09:11:43 +08:00 |
|
|
|
53288a6e77
|
意见反馈
|
2023-12-26 18:44:50 +08:00 |
|
wangh
|
22d78d8b5f
|
小票打印--积分支付--中台设置流水
|
2023-12-26 09:50:37 +08:00 |
|
|
|
9edf62a5a2
|
二维码
|
2023-12-25 18:10:00 +08:00 |
|
|
|
6faf9677e1
|
充值记录
|
2023-12-25 15:21:10 +08:00 |
|
|
|
dfba5774b0
|
充值记录
|
2023-12-25 14:53:08 +08:00 |
|
|
|
92aac838c5
|
Merge remote-tracking branch 'origin/master'
# Conflicts:
# fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardValue/service/impl/CardValueRecordServiceImpl.java
# fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardValueOrders/mapper/CardValueOrdersMapper.java
# fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardValueOrders/mapper/xml/CardValueOrdersMapper.xml
# fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardValueOrders/service/CardValueOrdersService.java
# fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardValueOrders/service/impl/CardValueOrdersServiceImpl.java
|
2023-12-25 14:44:23 +08:00 |
|
|
|
42869c8cd7
|
充值记录
|
2023-12-25 14:41:17 +08:00 |
|
|
|
24716f59be
|
正在使用的商户状态
|
2023-12-25 11:17:36 +08:00 |
|
|
|
dd1a564f60
|
生成二维码信息
|
2023-12-23 18:17:19 +08:00 |
|
|
|
8ab6707977
|
小程序支付
|
2023-12-23 09:19:34 +08:00 |
|
wangh
|
5cc1c5bb3f
|
Merge branch 'master' of https://gitee.com/nny_1/oilSystem
|
2023-12-22 18:18:25 +08:00 |
|
wangh
|
8148002ce2
|
no message
|
2023-12-22 18:18:21 +08:00 |
|
|
|
c6d27473ae
|
Merge remote-tracking branch 'origin/master'
# Conflicts:
# fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardValue/service/impl/CardValueRecordServiceImpl.java
|
2023-12-22 17:02:09 +08:00 |
|
|
|
b0aa720ccb
|
充值记录
|
2023-12-22 17:01:13 +08:00 |
|
|
|
b9bac4a4b0
|
小程序支付
|
2023-12-22 16:33:34 +08:00 |
|
wangh
|
0c222c88a5
|
Merge branch 'master' of https://gitee.com/nny_1/oilSystem
|
2023-12-22 15:34:06 +08:00 |
|
wangh
|
087ce92cbf
|
中台处理
|
2023-12-22 15:33:38 +08:00 |
|
|
|
a96f61ecc8
|
小程序支付
|
2023-12-21 18:43:22 +08:00 |
|
|
|
536614d596
|
Merge remote-tracking branch 'origin/master'
# Conflicts:
# gasStation-uni/pages/my/my.vue
|
2023-12-21 17:49:34 +08:00 |
|
|
|
cc69c78e3e
|
小程序端推荐有礼
|
2023-12-21 17:48:13 +08:00 |
|
|
|
8a3ee12f1d
|
小程序支付
|
2023-12-20 16:04:56 +08:00 |
|
|
|
b5696f8dec
|
Merge remote-tracking branch 'origin/master'
|
2023-12-20 14:30:54 +08:00 |
|
|
|
89010cb79d
|
小程序端新人有礼活动
|
2023-12-20 14:30:37 +08:00 |
|
wangh
|
4641b04b65
|
Merge branch 'master' of https://gitee.com/nny_1/oilSystem
|
2023-12-19 16:54:53 +08:00 |
|
wangh
|
89bf856d96
|
no message
|
2023-12-19 16:54:46 +08:00 |
|
wangh
|
79a9d8e47e
|
数据统计
|
2023-12-19 16:54:02 +08:00 |
|
|
|
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
|
1956d1a25b
|
自定义充值bug处理+pom引入rocket和rdisson+rocketmq配置+aes加密测试（前后端）
|
2023-12-14 13:36:36 +08:00 |
|
