From 323add15174ba6fb8b3e5e06e8aa7e230de98714 Mon Sep 17 00:00:00 2001 From: cun-nan <19819293608@163.com> Date: Wed, 27 Dec 2023 18:44:56 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=9A=E5=91=98=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../api/fuyou/entity/ReturnParameter.java | 6 +- .../fuyou/service/impl/FyPayServiceImpl.java | 1 + .../controller/LJUserController.java | 20 +- .../userManager/service/LJUserService.java | 13 + .../service/impl/LJUserServiceImpl.java | 11 + .../src/main/resources/application.properties | 4 +- .../views/cashier/NewComponents/homeindex.vue | 6 +- gasStation-uni/pages.json | 7 + gasStation-uni/pages/my/my.vue | 76 +++-- gasStation-uni/pages/refuel/refuel.vue | 4 +- gasStation-uni/pagesMy/editUser/index.vue | 282 ++++++++++++++++++ gasStation-uni/pagesMy/setup/index.vue | 114 +++++-- .../pagesRefuel/orderDetail/index.vue | 200 +++++++++++-- 13 files changed, 656 insertions(+), 88 deletions(-) create mode 100644 gasStation-uni/pagesMy/editUser/index.vue diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/api/fuyou/entity/ReturnParameter.java b/fuintBackend/fuint-application/src/main/java/com/fuint/api/fuyou/entity/ReturnParameter.java index db20baafd..d14ce2bd6 100644 --- a/fuintBackend/fuint-application/src/main/java/com/fuint/api/fuyou/entity/ReturnParameter.java +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/api/fuyou/entity/ReturnParameter.java @@ -14,7 +14,11 @@ public class ReturnParameter { */ private String orderNo; /** - * 响应报文 + * 调起微信支付所需参数（json形式的字符串） */ private String reservedPayInfo; + /** + * 调起支付宝支付所需参数 + */ + private String reservedTransactionId; } diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/api/fuyou/service/impl/FyPayServiceImpl.java b/fuintBackend/fuint-application/src/main/java/com/fuint/api/fuyou/service/impl/FyPayServiceImpl.java index c59cc02fd..6b8c25c9c 100644 --- a/fuintBackend/fuint-application/src/main/java/com/fuint/api/fuyou/service/impl/FyPayServiceImpl.java +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/api/fuyou/service/impl/FyPayServiceImpl.java @@ -384,6 +384,7 @@ public class FyPayServiceImpl implements FyPayService { ReturnParameter returnParameter = new ReturnParameter(); returnParameter.setOrderNo(receiveParameter.getOrderNo()); returnParameter.setReservedPayInfo(resMap.get("reserved_pay_info")); + returnParameter.setReservedTransactionId(resMap.get("reserved_transaction_id")); res.put("data",returnParameter); return res; diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/userManager/controller/LJUserController.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/userManager/controller/LJUserController.java index 0cd096ca0..5af786ad3 100644 --- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/userManager/controller/LJUserController.java +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/userManager/controller/LJUserController.java @@ -46,10 +46,18 @@ public class LJUserController extends BaseController { return getSuccessResult(list); } + /** + * 获取当前登录用户信息 + * @return + */ + @GetMapping("/getUser") + public ResponseObject getUser(){ + return getSuccessResult(userService.selectUserByUserId()); + } + /** * 根据storeId查询会员人数 */ - @GetMapping("/userNum") public ResponseObject userNum(Integer storeId){ return getSuccessResult(userService.userNum(storeId)); @@ -190,4 +198,14 @@ public class LJUserController extends BaseController { public ResponseObject edit(@Validated @RequestBody LJUserVo user){ return getSuccessResult(userService.updateUser(user)); } + + /** + * 修改会员信息 + * @param user + * @return + */ + @PutMapping("/edit") + public ResponseObject editUser(@Validated @RequestBody LJUser user){ + return getSuccessResult(userService.editUser(user)); + } } diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/userManager/service/LJUserService.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/userManager/service/LJUserService.java index 2538ad734..64157e100 100644 --- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/userManager/service/LJUserService.java +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/userManager/service/LJUserService.java @@ -22,6 +22,12 @@ public interface LJUserService extends IService { Integer userNum(Integer storeId); + /** + * 查询当前登录的用户信息 + * @return + */ + LJUser selectUserByUserId(); + /** * 查询所有会员信息 * @return @@ -85,6 +91,13 @@ public interface LJUserService extends IService { */ public int updateUser(LJUserVo user); + /** + * 登录用户修改会员信息（自己修改） + * @param user + * @return + */ + int editUser(LJUser user); + /** * 等级清算规则 */ diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/userManager/service/impl/LJUserServiceImpl.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/userManager/service/impl/LJUserServiceImpl.java index 202a3b618..351531718 100644 --- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/userManager/service/impl/LJUserServiceImpl.java +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/userManager/service/impl/LJUserServiceImpl.java @@ -63,6 +63,12 @@ public class LJUserServiceImpl extends ServiceImpl impleme return baseMapper.selectCount(queryWrapper); } + @Override + public LJUser selectUserByUserId() { + AccountInfo nowAccountInfo = TokenUtil.getNowAccountInfo(); + return baseMapper.selectById(nowAccountInfo.getId()); + } + /** * 查询所有会员信息 * @return @@ -311,6 +317,11 @@ public class LJUserServiceImpl extends ServiceImpl impleme return row; } + @Override + public int editUser(LJUser user) { + return baseMapper.updateById(user); + } + @Override public void clearRule() { List list = this.selectUsersList(); diff --git a/fuintBackend/fuint-application/src/main/resources/application.properties b/fuintBackend/fuint-application/src/main/resources/application.properties index 8879d863b..3ad9552f4 100644 --- a/fuintBackend/fuint-application/src/main/resources/application.properties +++ b/fuintBackend/fuint-application/src/main/resources/application.properties @@ -1,8 +1,8 @@ # \u57FA\u672C\u914D\u7F6E -server.port=8008 +server.port=8080 env.profile=dev #env.properties.path=D:/workspaces/oilSystem/fuintBackend/configure/ -env.properties.path=D:/code/oilSystem/fuintBackend/configure/ +env.properties.path=D:/workspaces/oilSystem/fuintBackend/configure/ # \u6570\u636E\u5E93\u914D\u7F6E diff --git a/fuintCashierWeb/src/views/cashier/NewComponents/homeindex.vue b/fuintCashierWeb/src/views/cashier/NewComponents/homeindex.vue index aec3a3e4c..784b168e7 100644 --- a/fuintCashierWeb/src/views/cashier/NewComponents/homeindex.vue +++ b/fuintCashierWeb/src/views/cashier/NewComponents/homeindex.vue @@ -1463,7 +1463,7 @@ _this.oilOrder.forEach(item => { let discount = {type: "", full: 0, reduce: 0, liters: 0} if (item.type == "汽油") { - let gasolineRule = JSON.parse(response.data.gasolineRule); + let gasolineRule = JSON.parse(response.data.gasolineRule).sort((a,b) => a.gasolineRule1 - b.gasolineRule1); if (response.data.preferential == '自定义优惠' && response.data.status == 'qy') { if (response.data.gasolineDiscount == "满减优惠") { let oilDiscount = 0; @@ -1534,7 +1534,7 @@ } } if (item.type == "柴油") { - let dieselRule = JSON.parse(response.data.dieselRule); + let dieselRule = JSON.parse(response.data.dieselRule).sort((a,b) => a.dieselRule1 - b.dieselRule1); if (response.data.preferential == '自定义优惠' && response.data.status == 'qy') { if (response.data.dieselDiscount == "满减优惠") { let oilDiscount = 0; @@ -1605,7 +1605,7 @@ } } if (item.type == "天然气") { - let naturalGasRule = JSON.parse(response.data.naturalGasRule); + let naturalGasRule = JSON.parse(response.data.naturalGasRule).sort((a,b) => a.naturalGasRule1 - b.naturalGasRule1); if (response.data.preferential == '自定义优惠' && response.data.status == 'qy') { if (response.data.naturalGasDiscount == "满减优惠") { let oilDiscount = 0; diff --git a/gasStation-uni/pages.json b/gasStation-uni/pages.json index dba892e58..51effa40e 100644 --- a/gasStation-uni/pages.json +++ b/gasStation-uni/pages.json @@ -170,6 +170,13 @@ "navigationStyle": "custom" } }, + { + "path": "editUser/index", + "style": { + "navigationBarTitleText": "修改用户信息", + "navigationStyle": "custom" + } + }, { "path": "Coupons/Coupons", "style": { diff --git a/gasStation-uni/pages/my/my.vue b/gasStation-uni/pages/my/my.vue index f7b13d23b..a0fb69c18 100644 --- a/gasStation-uni/pages/my/my.vue +++ b/gasStation-uni/pages/my/my.vue @@ -8,11 +8,12 @@ - - + + + - 135****7106 + {{user.mobile}} 蓝鲸加油站（总站） @@ -21,12 +22,12 @@ size="16"> - + 储值余额 {{cardBalance || 0 }}元 | - + 囤油升数 {{refuelMoney[0].refuelMoney || 0 }}升 @@ -37,14 +38,14 @@ {{cardsList.length || 0 }} | - + 我的积分 {{myPoints || 0 }} - + @@ -54,7 +55,7 @@ - + @@ -63,7 +64,7 @@ - + @@ -71,7 +72,7 @@ 已完成 - + @@ -91,7 +92,7 @@ 礼品卡 - + @@ -101,7 +102,7 @@ - + @@ -110,7 +111,7 @@ - + @@ -118,7 +119,7 @@ 充值记录 - + @@ -134,7 +135,7 @@ 积分商城 - + @@ -142,7 +143,7 @@ 子卡管理 - + @@ -170,7 +171,9 @@ cardBalance: 0.00, title: '', msg: "3", - + // url信息 + baseUrl: this.$baseUrl, + user:{}, } }, @@ -180,10 +183,23 @@ onShow() { this.getUserBalance(); this.getGiftRecords(); - this.getUserInfoList() + this.getUserInfoList(); + this.getUser() }, methods: { - gomyorder(id) { + // 查询当前登录用户信息 + getUser(){ + request({ + url: 'business/userManager/user/getUser', + method: 'get', + }).then(res => { + if (res.data != null && res.data != "" && res.data != undefined) { + this.user = res.data + this.user.mobile = res.data.mobile.slice(0,3) + "****" + res.data.mobile.slice(res.data.mobile.length-5,res.data.mobile.length-1) + } + }) + }, + goMyOrder(id) { uni.navigateTo({ url: '/pagesMy/myorder/myorder?id=' + id }) @@ -193,27 +209,27 @@ url: '/pagesHome/RechargeRecords/RechargeRecords' }) }, - gotodaby() { + goToDaby() { uni.navigateTo({ url: '/pagesMy/today/today' }) }, - gointegral() { + goIntegral() { uni.navigateTo({ url: '/pagesMy/integral/integral' }) }, - gooil() { + goOil() { uni.navigateTo({ url: '/pagesMy/oilBalance/oilBalance' }) }, - gomony() { + goMony() { uni.navigateTo({ url: '/pagesMy/moneyBalance/moneyBalance' }) }, - gosetup() { + goSetup() { uni.navigateTo({ url: '/pagesMy/setup/index' }) @@ -223,12 +239,12 @@ url: '/pagesRefuel/pagesRefuel/index' }) }, - gowriteoff() { + goWriteoff() { uni.navigateTo({ url: '/pagesMy/writeOff/writeOff' }) }, - gorecharge() { + goRecharge() { uni.navigateTo({ url: '/pagesMy/Recharge/Recharge' }) @@ -238,12 +254,12 @@ url: '/pagesHome/PointsMall/PointsMall' }) }, - goinvte() { + goInvte() { uni.navigateTo({ url: '/pagesMy/invite/invite' }) }, - gocard() { + goCard() { uni.navigateTo({ url: '/pagesMy/CardManagement/CardManagement' }) @@ -253,7 +269,7 @@ url: '/pagesMy/VIP/vip' }) }, - gofeedback() { + goFeedback() { uni.navigateTo({ url: '/pagesMy/feedback/feedback' }) @@ -263,7 +279,6 @@ url: '/business/userManager/user/getUserBalance', method: 'get', }).then(res => { - // console.log(res,111222) if (res.code == 200) { this.cardBalance = res.data.cardBalance, /* if (res.data.refuelMoney!=null && res.data.refuelMoney!=""){ @@ -279,7 +294,6 @@ method: 'get', params: this.query }).then(res => { - // console.log(res) if (res.code == 200) { this.cardsList = res.data.records } diff --git a/gasStation-uni/pages/refuel/refuel.vue b/gasStation-uni/pages/refuel/refuel.vue index 5a6aeae19..b9707982e 100644 --- a/gasStation-uni/pages/refuel/refuel.vue +++ b/gasStation-uni/pages/refuel/refuel.vue @@ -92,7 +92,7 @@ - {{item.realName}}员工 + {{item.realName}} @@ -555,6 +555,8 @@ } .box-oil2 { width: 28%; + height: 25px; + line-height: 25px; display: flex; align-items: center; justify-content: center; diff --git a/gasStation-uni/pagesMy/editUser/index.vue b/gasStation-uni/pagesMy/editUser/index.vue new file mode 100644 index 000000000..f57ec868c --- /dev/null +++ b/gasStation-uni/pagesMy/editUser/index.vue @@ -0,0 +1,282 @@ + + + + + \ No newline at end of file diff --git a/gasStation-uni/pagesMy/setup/index.vue b/gasStation-uni/pagesMy/setup/index.vue index a328769c3..272ecacea 100644 --- a/gasStation-uni/pagesMy/setup/index.vue +++ b/gasStation-uni/pagesMy/setup/index.vue @@ -2,35 +2,42 @@ - + 设置 - + + 昵称 - 修改昵称 + + 未填写 + {{user.name}} + + 手机号 - + {{user.mobile}} - 会员卡号 - + 会员号 + {{user.userNo}} - + 车牌号 - + {{user.carNo}} - + @@ -38,20 +45,87 @@