dianliang/oil-station
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
915 Commits 2 Branches 0 Tags 190 MiB
6f6988b8b2
Commit Graph

352 Commits

Author SHA1 Message Date
wangh
3054607717 bug修改 2024-01-09 17:09:45 +08:00
齐天大圣
93336c532f Merge remote-tracking branch 'origin/master' 2024-01-09 16:12:30 +08:00
齐天大圣
afb7203e88 修改bug 2024-01-09 16:12:17 +08:00
wangh
bbded088aa Merge branch 'master' of https://gitee.com/nny_1/oilSystem 
# Conflicts:
#	fuintBackend/fuint-application/src/main/java/com/fuint/business/storeInformation/service/impl/QRCodeServiceImpl.java
 2024-01-09 13:19:59 +08:00
wangh
3f857268a6 bug修改 2024-01-09 12:02:40 +08:00
cun-nan
c3e633ca43 优化项 2024-01-08 18:26:49 +08:00
cun-nan
431947960b 优化项 2024-01-08 14:45:36 +08:00
wangh
a3ed2f8b2d Merge branch 'master' of https://gitee.com/nny_1/oilSystem 2024-01-08 10:07:57 +08:00
wangh
0f37e8db23 bug修改 2024-01-08 10:07:07 +08:00
cun-nan
6813f67d38 优化项 2024-01-06 18:04:36 +08:00
cun-nan
5979294f18 优化项 2024-01-06 15:47:07 +08:00
cun-nan
683b41e456 优化项 2024-01-06 13:37:21 +08:00
@QQNZX
14f1b6fdd4 前端 2024-01-06 10:42:41 +08:00
cun-nan
0596e7f689 优化项 2024-01-06 10:02:09 +08:00
齐天大圣
681381d60b Merge remote-tracking branch 'origin/master' 2024-01-06 09:11:50 +08:00
齐天大圣
92168b1da6 新人有礼活动页 2024-01-06 09:11:41 +08:00
cun-nan
eae119f033 优化项 2024-01-05 18:27:59 +08:00
齐天大圣
8dd3c0150d 修改bug 2024-01-05 18:21:15 +08:00
齐天大圣
13a435eb17 Merge remote-tracking branch 'origin/master' 
# Conflicts:
#	fuintBackend/fuint-application/src/main/java/com/fuint/api/fuyou/service/impl/MerchantConfigServiceImpl.java
 2024-01-05 18:20:49 +08:00
齐天大圣
d92c33373a 修改bug 2024-01-05 18:19:48 +08:00
wangh
ea900039d4 bug处理 2024-01-05 16:53:19 +08:00
齐天大圣
e740b59800 修改bug 2024-01-05 15:12:40 +08:00
齐天大圣
85dbca19b3 Merge remote-tracking branch 'origin/master' 2024-01-05 15:12:01 +08:00
齐天大圣
2b6d0a3a73 修改bug 2024-01-05 15:11:53 +08:00
wangh
0ffa106329 Merge branch 'master' of https://gitee.com/nny_1/oilSystem 
# Conflicts:
#	gasStation-uni/config.js
#	gasStation-uni/pages/index/index.vue
 2024-01-05 14:30:27 +08:00
wangh
fbd4a9b992 no message 2024-01-05 14:28:00 +08:00
wangh
425aace10f 中台bug处理 2024-01-05 14:27:24 +08:00
齐天大圣
c671650574 修改bug 2024-01-05 14:24:09 +08:00
齐天大圣
af1f84f917 Merge remote-tracking branch 'origin/master' 
# Conflicts:
#	gasStation-uni/pagesMy/invite/invite.vue
 2024-01-05 14:06:38 +08:00
齐天大圣
f85e1351ef 修改bug 2024-01-05 14:03:31 +08:00
@QQNZX
9acd5324d5 前端 2024-01-05 14:02:20 +08:00
cun-nan
cff6a8942b 优化项 2024-01-04 18:44:52 +08:00
wangh
dd15966c48 Merge branch 'master' of https://gitee.com/nny_1/oilSystem 2024-01-04 15:56:26 +08:00
wangh
302c39b3dc Merge branch 'master' of https://gitee.com/nny_1/oilSystem 
# Conflicts:
#	gasStation-uni/pages/index/index.vue
 2024-01-04 15:55:48 +08:00
齐天大圣
c67c0333dc 修改bug 2024-01-04 15:52:17 +08:00
wangh
29dbbca735 bug修改 2024-01-04 15:52:02 +08:00
齐天大圣
a7606cdb3a 修改bug 2024-01-04 15:25:45 +08:00
齐天大圣
46f59eb2c0 修改bug 2024-01-04 15:19:02 +08:00
齐天大圣
ff6396b25e 修改bug 2024-01-04 15:12:35 +08:00
齐天大圣
8792a11183 修改bug 2024-01-04 15:01:20 +08:00
齐天大圣
0cda9f462d 修改bug 2024-01-04 13:22:39 +08:00
齐天大圣
0d7caa02e8 修改bug 2024-01-04 12:12:36 +08:00
齐天大圣
981b6d40a3 修改bug 2024-01-04 12:05:43 +08:00
齐天大圣
d6df89b3aa Merge remote-tracking branch 'origin/master' 2024-01-04 12:05:09 +08:00
齐天大圣
5b1c86be9b 修改bug 2024-01-04 12:04:59 +08:00
@QQNZX
d22f21bf03 Merge remote-tracking branch 'origin/master' 
# Conflicts:
#	gasStation-uni/config.js
 2024-01-04 09:11:09 +08:00
@QQNZX
d79fe5d247 前端 模板的更新 2024-01-04 09:10:33 +08:00
wangh
6bf929b433 Merge branch 'master' of https://gitee.com/nny_1/oilSystem 2024-01-04 09:10:15 +08:00
wangh
61d8947fd1 bug修改 2024-01-04 09:09:58 +08:00
@QQNZX
0ecf231fd5 Merge remote-tracking branch 'origin/master' 2024-01-04 09:06:45 +08:00
齐天大圣
876c391ef8 Merge remote-tracking branch 'origin/master' 
# Conflicts:
#	fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardFule/service/impl/CardFuelRecordServiceImpl.java
 2024-01-03 18:46:31 +08:00
齐天大圣
4fa7be30bd 修改bug 2024-01-03 18:45:35 +08:00
cun-nan
12f4741acf 优化项 2024-01-03 18:40:21 +08:00
@QQNZX
5b884e4e92 Merge remote-tracking branch 'origin/master' 2024-01-03 18:27:29 +08:00
齐天大圣
a529c7e67e 修改bug 2024-01-03 15:43:34 +08:00
@QQNZX
03b512ef75 前端 模板的更新 2024-01-03 14:24:24 +08:00
齐天大圣
99767393bc 修改bug 2024-01-03 13:39:21 +08:00
齐天大圣
a897807c16 修改bug 2024-01-03 10:54:36 +08:00
齐天大圣
a9b86ff520 Merge remote-tracking branch 'origin/master' 2024-01-03 09:12:08 +08:00
齐天大圣
5d2b98d6fa 修改bug 2024-01-03 09:11:56 +08:00
cun-nan
b5d55b69f1 优化项 2024-01-02 18:36:47 +08:00
cun-nan
76befae703 优化项 2024-01-02 17:13:25 +08:00
wangh
eac375458b bug修改 2024-01-02 14:24:47 +08:00
齐天大圣
ba0c5935ac 充值记录 2024-01-02 13:07:12 +08:00
齐天大圣
c86397d612 Merge remote-tracking branch 'origin/master' 2024-01-02 12:45:52 +08:00
齐天大圣
3389960aa5 充值记录 2024-01-02 12:45:39 +08:00
wangh
adfb53bac2 Merge branch 'master' of https://gitee.com/nny_1/oilSystem 
# Conflicts:
#	fuintAdmin_zt/.env.development
#	fuintBackend/configure/dev/application.properties
#	fuintBackend/fuint-application/src/main/resources/application.properties
#	gasStation-uni/config.js
#	gasStation-uni/pages/index/index.vue
 2024-01-02 11:29:51 +08:00
wangh
9f3dadf902 no message 2024-01-02 11:22:29 +08:00
wangh
9e403cd413 bug修改+中泰 2024-01-02 11:21:12 +08:00
@QQNZX
9974798e58 前端 2024-01-02 10:04:57 +08:00
齐天大圣
53062019b4 Merge remote-tracking branch 'origin/master' 2024-01-02 09:18:54 +08:00
齐天大圣
7154546662 充值记录 2024-01-02 09:18:45 +08:00
cun-nan
2bc16929cf 优化项 2023-12-29 18:09:33 +08:00
cun-nan
b2bf1bd8ba 首页banner图 2023-12-29 16:52:08 +08:00
cun-nan
b5341ed627 首页banner图 2023-12-29 16:50:44 +08:00
cun-nan
a5d998b02d 满减 2023-12-29 15:27:06 +08:00
cun-nan
c70ce36aa3 登录 2023-12-29 09:15:55 +08:00
cun-nan
830e435b56 子卡信息 2023-12-28 17:31:50 +08:00
cun-nan
cd24222c2a 子卡信息 2023-12-28 13:14:35 +08:00
cun-nan
323add1517 会员信息 2023-12-27 18:44:56 +08:00
cun-nan
53288a6e77 意见反馈 2023-12-26 18:44:50 +08:00
wangh
22d78d8b5f 小票打印--积分支付--中台设置流水 2023-12-26 09:50:37 +08:00
cun-nan
9edf62a5a2 二维码 2023-12-25 18:10:00 +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
cun-nan
dd1a564f60 生成二维码信息 2023-12-23 18:17:19 +08:00
wangh
8148002ce2 no message 2023-12-22 18:18:21 +08:00
cun-nan
b9bac4a4b0 小程序支付 2023-12-22 16:33:34 +08:00
cun-nan
11bcdbd3e8 小程序支付 2023-12-22 14:44:26 +08:00
cun-nan
a96f61ecc8 小程序支付 2023-12-21 18:43:22 +08:00
齐天大圣
90dda4de11 充值记录 2023-12-21 18:11:46 +08:00
齐天大圣
dbf7d7a72a 小程序端推荐有礼 2023-12-21 17:50:14 +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
cun-nan
8a3ee12f1d 小程序支付 2023-12-20 16:04:56 +08:00
cun-nan
52379f54d0 加油信息 2023-12-19 18:03:05 +08:00
@QQNZX
a02adf35a6 油站小程序 两个弹窗 2023-12-19 09:31:53 +08:00
cun-nan
ffeb4a4254 门店信息 2023-12-18 18:44:02 +08:00
齐天大圣
65ba434d19 子卡管理 2023-12-18 17:54:43 +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
@QQNZX
bfd2ed0eeb 油站pc 2023-12-14 15:26:00 +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
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
齐天大圣
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
cun-nan
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
齐天大圣
273f13cae9 礼品卡兑换记录 2023-12-09 13:13:47 +08:00
齐天大圣
230bee5a9c 礼品卡兑换记录 2023-12-09 09:34:35 +08:00
@QQNZX
3e703613b9 前端 2023-12-09 09:28:30 +08:00
@QQNZX
a692fcdeb1 Merge remote-tracking branch 'origin/master' 2023-12-09 09:17:39 +08:00
@QQNZX
742f0f15d9 前端 2023-12-09 09:16:50 +08:00
齐天大圣
e7f8a5bfc9 礼品卡兑换记录 2023-12-08 17:01:33 +08:00
@QQNZX
97b28daba3 Merge remote-tracking branch 'origin/master' 2023-12-08 16:26:57 +08:00
@QQNZX
89c2340190 前端 路由跳转 2023-12-08 16:24:02 +08:00
@QQNZX
50aef3631f 提交 2023-12-08 16:22:35 +08:00
@QQNZX
7d06b718bf 1 2023-12-08 16:16:52 +08:00
cun-nan
4599d08df9 订单信息 2023-12-08 15:48:54 +08:00
@QQNZX
e5535b1968 Merge remote-tracking branch 'origin/master' 2023-12-08 15:40:12 +08:00
齐天大圣
2b1888b719 获取员工列表 2023-12-08 15:34:38 +08:00
@QQNZX
5f62e8d72d 1 2023-12-08 15:24:30 +08:00
齐天大圣
116141d547 礼品卡兑换记录 2023-12-08 15:15:03 +08:00