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

588 Commits

Author SHA1 Message Date
cun-nan
ab81e62477 bug 2024-01-18 15:09:51 +08:00
cun-nan
944b5bbb87 bug 2024-01-18 15:01:26 +08:00
cun-nan
d8023ecfba bug 2024-01-18 10:56:43 +08:00
wangh
46913be03f Merge branch 'master' of https://gitee.com/nny_1/oilSystem 
# Conflicts:
#	fuintCashierWeb/src/views/cashier/orderComponents/order_Unpaid.vue
 2024-01-18 09:03:42 +08:00
wangh
5c65399290 退款以及订单统计 2024-01-18 09:01:26 +08:00
cun-nan
4df95eff14 bug 2024-01-17 18:17:57 +08:00
cun-nan
0111c8055c bug 2024-01-17 17:36:21 +08:00
cun-nan
45677555fc bug 2024-01-17 16:26:08 +08:00
cun-nan
e9dd0600c2 bug 2024-01-17 14:14:19 +08:00
wangh
0cf119bfab Merge branch 'master' of https://gitee.com/nny_1/oilSystem 2024-01-16 16:10:34 +08:00
wangh
82a739ce75 退款处理 2024-01-16 16:10:28 +08:00
齐天大圣
b840bd3e99 过滤商品券 2024-01-16 16:08:41 +08:00
cun-nan
c52b006879 bug 2024-01-16 14:28:20 +08:00
齐天大圣
cac79ebfa9 过滤商品券 2024-01-16 13:30:16 +08:00
齐天大圣
19f9249252 Merge remote-tracking branch 'origin/master' 2024-01-16 13:24:29 +08:00
齐天大圣
4637b6a64c 过滤商品券 2024-01-16 13:24:22 +08:00
cun-nan
2398ead499 bug 2024-01-16 11:30:23 +08:00
wangh
6e16f6ac5d Merge branch 'master' of https://gitee.com/nny_1/oilSystem 2024-01-16 09:38:22 +08:00
wangh
7768b2faf3 退款接口 2024-01-16 09:38:15 +08:00
cun-nan
298977bb25 bug 2024-01-15 18:17:40 +08:00
cun-nan
8ca3554f0c bug 2024-01-15 16:10:11 +08:00
cun-nan
44f040f6ae bug 2024-01-15 14:41:36 +08:00
齐天大圣
c971b639eb Merge remote-tracking branch 'origin/master' 2024-01-15 14:02:56 +08:00
齐天大圣
078a770a83 囤油余额 2024-01-15 14:02:48 +08:00
cun-nan
3f243f5c63 bug 2024-01-15 14:00:24 +08:00
wangh
a3c31a8d59 Merge branch 'master' of https://gitee.com/nny_1/oilSystem 
# Conflicts:
#	gasStation-uni/config.js
 2024-01-15 13:43:41 +08:00
wangh
a92a25fb28 bug 2024-01-15 13:41:32 +08:00
齐天大圣
70e988e9a8 修改bug3 2024-01-15 11:12:07 +08:00
齐天大圣
a639f4c71e 修改bug2 2024-01-15 10:26:12 +08:00
齐天大圣
d3f85f2878 Merge remote-tracking branch 'origin/master' 2024-01-15 10:08:04 +08:00
齐天大圣
13bf3ba524 修改bug1 2024-01-15 10:07:54 +08:00
cun-nan
ea8bab751a bug 2024-01-13 18:01:23 +08:00
齐天大圣
8889a06565 修改bug 2024-01-13 16:34:22 +08:00
齐天大圣
4a5dcf2c61 Merge remote-tracking branch 'origin/master' 2024-01-13 15:46:36 +08:00
齐天大圣
0353336baf 修改bug 2024-01-13 15:46:28 +08:00
wangh
eb6f43a713 no message 2024-01-13 15:11:46 +08:00
wangh
99571f64ad Merge branch 'master' of https://gitee.com/nny_1/oilSystem 2024-01-13 15:04:49 +08:00
wangh
bff603b970 no message 2024-01-13 15:04:45 +08:00
cun-nan
87f9377e74 bug 2024-01-13 14:21:09 +08:00
wangh
be4970aa7a no message 2024-01-13 14:03:54 +08:00
wangh
0ed07ccd49 Merge branch 'master' of https://gitee.com/nny_1/oilSystem 2024-01-13 13:24:02 +08:00
齐天大圣
77df396e46 Merge remote-tracking branch 'origin/master' 2024-01-13 13:22:42 +08:00
齐天大圣
0163084c13 修改bug 2024-01-13 13:22:33 +08:00
wangh
5d9de0a0dc bug修改 2024-01-13 13:22:10 +08:00
cun-nan
94b0dacae7 bug 2024-01-13 11:53:00 +08:00
cun-nan
3892bd0e21 bug 2024-01-13 10:35:03 +08:00
cun-nan
686a0d2e03 bug 2024-01-12 18:03:02 +08:00
cun-nan
db6d7f9c85 bug 2024-01-12 17:03:22 +08:00
cun-nan
288de2b8ba bug 2024-01-12 15:29:24 +08:00
齐天大圣
822965d482 Merge remote-tracking branch 'origin/master' 2024-01-12 14:37:49 +08:00
齐天大圣
95854beff1 修改bug 2024-01-12 14:37:40 +08:00
wangh
250f000040 Merge branch 'master' of https://gitee.com/nny_1/oilSystem 2024-01-12 13:58:57 +08:00
wangh
dde91a7108 中台增加订单 2024-01-12 13:58:51 +08:00
cun-nan
4ed6ba6e8c bug 2024-01-12 13:55:40 +08:00
cun-nan
93ef148515 Merge remote-tracking branch 'origin/master' 2024-01-12 13:26:52 +08:00
cun-nan
654d912ef1 bug 2024-01-12 13:26:22 +08:00
齐天大圣
8537041269 Merge remote-tracking branch 'origin/master' 2024-01-12 12:05:55 +08:00
齐天大圣
b5d5f6b1eb 修改bug 2024-01-12 12:05:42 +08:00
cun-nan
7c512e33aa bug 2024-01-11 18:08:12 +08:00
cun-nan
2a9b7cae2e bug 2024-01-11 13:55:20 +08:00
wangh
a6cc143bed Merge branch 'master' of https://gitee.com/nny_1/oilSystem 2024-01-11 13:34:49 +08:00
wangh
d518ecd277 pc端会员充值修改 2024-01-11 13:34:42 +08:00
cun-nan
2a81b49f14 bug 2024-01-11 09:51:50 +08:00
cun-nan
a61a99cde7 优化项 2024-01-10 18:09:46 +08:00
齐天大圣
087b4ded03 修改bug 2024-01-10 16:17:20 +08:00
齐天大圣
e980d52dee 修改bug 2024-01-10 16:07:07 +08:00
wangh
301be80121 Merge branch 'master' of https://gitee.com/nny_1/oilSystem 2024-01-10 15:44:04 +08:00
wangh
48ce157316 bug 2024-01-10 15:43:57 +08:00
齐天大圣
075427613d 修改bug 2024-01-10 15:30:04 +08:00
齐天大圣
62635c72c2 修改bug 2024-01-10 14:34:55 +08:00
齐天大圣
c54a35084f Merge remote-tracking branch 'origin/master' 2024-01-10 13:54:55 +08:00
齐天大圣
ce2f96006b 修改bug 2024-01-10 13:54:45 +08:00
wangh
8c857bebe3 Merge branch 'master' of https://gitee.com/nny_1/oilSystem 2024-01-10 13:46:35 +08:00
wangh
1a5bb54d36 修改中台用户管理增加和修改的bug 2024-01-10 13:46:27 +08:00
cun-nan
eaa527e109 优化项 2024-01-10 13:45:02 +08:00
cun-nan
8e2fc95aa9 Merge remote-tracking branch 'origin/master' 2024-01-10 11:06:57 +08:00
cun-nan
c076b07a83 优化项 2024-01-10 11:06:41 +08:00
wangh
289b04f406 Merge branch 'master' of https://gitee.com/nny_1/oilSystem 2024-01-09 17:09:51 +08:00
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
6b6ae15cb1 优化项 2024-01-09 11:27:55 +08:00
cun-nan
418ec4a863 优化项 2024-01-09 11:26:55 +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
6ef091cd6c 优化项 2024-01-08 09:18:42 +08:00
cun-nan
6813f67d38 优化项 2024-01-06 18:04:36 +08:00
wangh
ca91fa5b5a Merge branch 'master' of https://gitee.com/nny_1/oilSystem 2024-01-06 15:51:55 +08:00
wangh
a345536e57 no message 2024-01-06 15:51:41 +08:00
cun-nan
5979294f18 优化项 2024-01-06 15:47:07 +08:00
wangh
214ab014ec Merge branch 'master' of https://gitee.com/nny_1/oilSystem 
# Conflicts:
#	fuintAdmin/.env.development
#	fuintBackend/fuint-application/src/main/java/com/fuint/system/dept/controller/SysDeptController.java
 2024-01-06 15:13:27 +08:00
wangh
e267ba63fe bug修改 2024-01-06 15:06:58 +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
cun-nan
eae119f033 优化项 2024-01-05 18:27:59 +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
齐天大圣
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
425aace10f 中台bug处理 2024-01-05 14:27:24 +08:00
齐天大圣
2deb719e4b 修改bug 2024-01-05 14:02:58 +08:00
齐天大圣
18eaab3435 Merge remote-tracking branch 'origin/master' 2024-01-05 09:20:23 +08:00
齐天大圣
bf724adf18 修改bug 2024-01-05 09:20:12 +08:00
cun-nan
cf1c679d19 优化项 2024-01-05 09:17:23 +08:00
cun-nan
cff6a8942b 优化项 2024-01-04 18:44:52 +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
wangh
29dbbca735 bug修改 2024-01-04 15:52:02 +08:00
齐天大圣
8792a11183 修改bug 2024-01-04 15:01:20 +08:00
齐天大圣
2cb89c7776 修改bug 2024-01-04 14:00:45 +08:00
齐天大圣
d1566ef1ce 修改bug 2024-01-04 13:32:09 +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
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
齐天大圣
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
齐天大圣
93e3d51e5b 修改bug 2024-01-03 16:02:45 +08:00
齐天大圣
a529c7e67e 修改bug 2024-01-03 15:43:34 +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
齐天大圣
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
b5341ed627 首页banner图 2023-12-29 16:50:44 +08:00
cun-nan
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
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
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
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
齐天大圣
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
cun-nan
24716f59be 正在使用的商户状态 2023-12-25 11:17:36 +08:00
cun-nan
dd1a564f60 生成二维码信息 2023-12-23 18:17:19 +08:00
cun-nan
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
cun-nan
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
cun-nan
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
cun-nan
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
cun-nan
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
cun-nan
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
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
cun-nan
33cfff8e8b 订单信息 2023-12-14 11:04:16 +08:00
cun-nan
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