|
|
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 |
|
|
|
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
|
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 |
|
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
|
9ff4038838
|
登录接口
|
2023-11-30 11:07:26 +08:00 |
|
wangh
|
cb14e279c2
|
Merge branch 'master' of https://gitee.com/nny_1/oilSystem
|
2023-11-30 09:06:13 +08:00 |
|
wangh
|
2fbeeabba2
|
no message
|
2023-11-30 09:06:08 +08:00 |
|
|
|
f920b643aa
|
会员信息
|
2023-11-29 18:33:09 +08:00 |
|
|
|
a77183d47b
|
Merge remote-tracking branch 'origin/master'
# Conflicts:
# fuintBackend/fuint-application/src/main/resources/application.properties
|
2023-11-29 18:23:52 +08:00 |
|
|
|
eff58c7a3a
|
小程序端活动
|
2023-11-29 18:21:11 +08:00 |
|
wangh
|
c5d44f4d22
|
no message
|
2023-11-29 17:41:11 +08:00 |
|
wangh
|
01641bbae2
|
no message
|
2023-11-29 17:37:42 +08:00 |
|
wangh
|
dd5df3bc78
|
Merge branch 'master' of https://gitee.com/nny_1/oilSystem
|
2023-11-29 17:19:38 +08:00 |
|
wangh
|
f6413514f6
|
1
|
2023-11-29 17:19:32 +08:00 |
|
|
|
71b21efc27
|
会员信息
|
2023-11-29 17:18:28 +08:00 |
|
|
|
d4b1d72608
|
会员信息
|
2023-11-29 16:56:28 +08:00 |
|
wangh
|
f45dfbd0de
|
Merge branch 'master' of https://gitee.com/nny_1/oilSystem
# Conflicts:
# gasStation-uni/unpackage/dist/dev/.sourcemap/mp-weixin/pagesMy/CardManagement/CardManagement.js.map
# gasStation-uni/unpackage/dist/dev/.sourcemap/mp-weixin/pagesMy/Recharge/Recharge.js.map
# gasStation-uni/unpackage/dist/dev/.sourcemap/mp-weixin/pagesMy/feedback/feedback.js.map
# gasStation-uni/unpackage/dist/dev/.sourcemap/mp-weixin/pagesMy/invite/invite.js.map
# gasStation-uni/unpackage/dist/dev/.sourcemap/mp-weixin/pagesMy/writeOff/writeOff.js.map
|
2023-11-29 16:50:42 +08:00 |
|
wangh
|
28a26db27c
|
1
|
2023-11-29 16:48:44 +08:00 |
|
|
|
491c8bf426
|
会员信息
|
2023-11-29 16:26:19 +08:00 |
|
wangh
|
7073e91a34
|
1
|
2023-11-29 14:03:47 +08:00 |
|
wangh
|
b25c52f6de
|
登录修改
|
2023-11-29 11:50:58 +08:00 |
|
|
|
cec9d85b3a
|
收银台
|
2023-11-28 18:33:35 +08:00 |
|
wangh
|
195a7298e0
|
1
|
2023-11-28 18:10:16 +08:00 |
|
|
|
37fa476a0f
|
收银台
|
2023-11-28 16:40:05 +08:00 |
|
|
|
996d2ea94c
|
收银台
|
2023-11-28 15:42:35 +08:00 |
|
|
|
f30a3556e3
|
收银台
|
2023-11-27 18:28:41 +08:00 |
|
wangh
|
b00edb2f12
|
Merge branch 'master' of https://gitee.com/nny_1/oilSystem
|
2023-11-25 18:08:58 +08:00 |
|
|
|
3f76359c59
|
收银台
|
2023-11-25 18:08:20 +08:00 |
|
wangh
|
90a3adc44f
|
bug
修改
|
2023-11-25 18:08:15 +08:00 |
|
|
|
ad81a123c6
|
Merge remote-tracking branch 'origin/master'
|
2023-11-25 14:42:05 +08:00 |
|
|
|
492179cb24
|
修改Bug
|
2023-11-25 14:41:54 +08:00 |
|
|
|
71e423f5a5
|
收银台
|
2023-11-25 10:27:36 +08:00 |
|
|
|
ec27a74ce8
|
收银台
|
2023-11-24 18:13:11 +08:00 |
|
wangh
|
f706797001
|
bug修改
|
2023-11-24 17:59:53 +08:00 |
|
|
|
87147fbcf3
|
Merge remote-tracking branch 'origin/master'
|
2023-11-24 17:24:20 +08:00 |
|
|
|
92d425f57c
|
手机验证码登录
|
2023-11-24 17:24:10 +08:00 |
|
wangh
|
7e8e0fac03
|
修改
|
2023-11-24 10:23:59 +08:00 |
|
|
|
302a7850fe
|
收银台
|
2023-11-23 18:37:40 +08:00 |
|
wangh
|
d68f87b29b
|
bug修改
|
2023-11-23 18:33:25 +08:00 |
|
|
|
58db28edfb
|
收银台
|
2023-11-22 18:10:36 +08:00 |
|
wangh
|
b2574cc2cb
|
会员等级和进油修改
|
2023-11-22 18:05:02 +08:00 |
|
|
|
f6a9d94364
|
Merge remote-tracking branch 'origin/master'
|
2023-11-22 13:40:06 +08:00 |
|
|
|
9da6684bf0
|
修改Bug
|
2023-11-22 13:39:57 +08:00 |
|
wangh
|
19f521c406
|
修改bug
|
2023-11-22 10:53:41 +08:00 |
|
|
|
efaf87cb3e
|
Merge remote-tracking branch 'origin/master'
|
2023-11-22 10:47:32 +08:00 |
|
|
|
916383fe82
|
修改Bug
|
2023-11-22 10:47:20 +08:00 |
|
wangh
|
b51938071a
|
Merge branch 'master' of https://gitee.com/nny_1/oilSystem
|
2023-11-21 18:12:04 +08:00 |
|
wangh
|
174bfee9d5
|
bug修改
|
2023-11-21 18:11:49 +08:00 |
|
|
|
92251e2556
|
Merge remote-tracking branch 'origin/master'
|
2023-11-21 14:30:06 +08:00 |
|
|
|
3eec70da9b
|
修改Bug
|
2023-11-21 14:29:55 +08:00 |
|
|
|
92f6691025
|
收银台
|
2023-11-21 11:00:14 +08:00 |
|
|
|
3c916cb22b
|
Merge remote-tracking branch 'origin/master'
|
2023-11-21 09:45:37 +08:00 |
|
|
|
4293d06417
|
兑换优惠券
|
2023-11-21 09:45:28 +08:00 |
|
|
|
7ec55c0386
|
收银台
|
2023-11-20 19:53:05 +08:00 |
|
|
|
5568c13c04
|
收银台
|
2023-11-20 14:27:22 +08:00 |
|
|
|
40afd862da
|
Merge remote-tracking branch 'origin/master'
|
2023-11-20 09:22:30 +08:00 |
|
|
|
61fd49e3c4
|
满减优惠券
|
2023-11-20 09:22:14 +08:00 |
|
wangh
|
516f80e57b
|
收银台
|
2023-11-17 16:38:17 +08:00 |
|
|
|
b9b49fcb62
|
收银台
|
2023-11-17 16:33:36 +08:00 |
|
|
|
435e6feb10
|
会员等级
|
2023-11-17 15:39:55 +08:00 |
|
|
|
88053d1a20
|
修改会员等级
|
2023-11-17 15:21:40 +08:00 |
|
|
|
40c0b630e2
|
Merge remote-tracking branch 'origin/master'
|
2023-11-17 13:09:40 +08:00 |
|
|
|
9fee58ebd7
|
修改卡券Bug
|
2023-11-17 13:09:28 +08:00 |
|
wangh
|
478e6fc8f8
|
Merge branch 'master' of https://gitee.com/nny_1/oilSystem
|
2023-11-17 11:14:45 +08:00 |
|
wangh
|
de70f12c56
|
油枪
|
2023-11-17 11:14:36 +08:00 |
|
|
|
6f1406f8c6
|
收银台
|
2023-11-16 19:00:57 +08:00 |
|
wangh
|
4ef7e1cdca
|
Merge branch 'master' of https://gitee.com/nny_1/oilSystem
# Conflicts:
# fuintCashierWeb/.env.development
|
2023-11-16 18:42:37 +08:00 |
|
wangh
|
b1329a0dcc
|
积分兑换
|
2023-11-16 18:40:50 +08:00 |
|
|
|
b9f4fad30f
|
卡券核销
|
2023-11-16 18:31:29 +08:00 |
|
|
|
758442ff37
|
Merge remote-tracking branch 'origin/master'
|
2023-11-15 19:36:20 +08:00 |
|
|
|
8581ade77e
|
新人有礼
|
2023-11-15 19:36:12 +08:00 |
|
|
|
5bafce40c5
|
收银台
|
2023-11-15 18:48:07 +08:00 |
|
|
|
1c320b17c1
|
折扣营销
|
2023-11-15 18:26:05 +08:00 |
|
|
|
88e9ba8bc9
|
Merge remote-tracking branch 'origin/master'
|
2023-11-15 14:34:45 +08:00 |
|
|
|
925c8cc402
|
修改消费有礼bug
|
2023-11-15 14:34:34 +08:00 |
|
|
|
757d9c5adb
|
收银台
|
2023-11-14 19:00:25 +08:00 |
|
wangh
|
9fb78cf532
|
积分
|
2023-11-14 18:53:58 +08:00 |
|
|
|
684598000e
|
Merge remote-tracking branch 'origin/master'
|
2023-11-14 11:20:29 +08:00 |
|
|
|
9d79c997a6
|
营销活动
|
2023-11-14 11:20:08 +08:00 |
|
|
|
4f69e72145
|
Merge remote-tracking branch 'origin/master'
|
2023-11-13 19:01:25 +08:00 |
|
|
|
f72db0c784
|
收银台
|
2023-11-13 18:59:13 +08:00 |
|
