From a09d3208af41b2d5e776be21eab4e58ab3779504 Mon Sep 17 00:00:00 2001 From: wangh <9483> Date: Thu, 25 Jan 2024 10:24:55 +0800 Subject: [PATCH] no message --- fuintAdmin/src/views/member/userInfo.vue | 18 ++- fuintAdmin/src/views/order/order_Cashier.vue | 9 +- fuintAdmin/src/views/order/order_Goods.vue | 6 +- fuintAdmin/src/views/order/order_Oil.vue | 5 +- fuintAdmin_zt/src/api/system/Site/site.js | 7 +- .../service/impl/MemberServiceImpl.java | 115 +++++++++--------- .../views/cashier/NewComponents/Integral.vue | 14 +++ .../cashier/orderComponents/order_Cashier.vue | 5 +- .../cashier/orderComponents/order_Goods.vue | 6 +- .../cashier/orderComponents/order_Oil.vue | 6 +- fuintCashierWeb/src/views/details/index.vue | 19 ++- 11 files changed, 135 insertions(+), 75 deletions(-) diff --git a/fuintAdmin/src/views/member/userInfo.vue b/fuintAdmin/src/views/member/userInfo.vue index 88856531e..0929ccef9 100644 --- a/fuintAdmin/src/views/member/userInfo.vue +++ b/fuintAdmin/src/views/member/userInfo.vue @@ -384,7 +384,10 @@
- @@ -978,6 +981,19 @@ export default { this.selectOilType(this.oilTypeList[0].oilType); } }, + directives: { + // 注册一个局部的自定义指令 v-focus + focus: { + // 指令的定义 + inserted: function (el) { + // 聚焦元素 + el.querySelector('input').focus() + // this.$nextTick( () =>{ + // this.$refs.getFocus.focus() + // }) + }, + }, + }, created() { this.id = this.$route.query.id; this.getUserInfo(); diff --git a/fuintAdmin/src/views/order/order_Cashier.vue b/fuintAdmin/src/views/order/order_Cashier.vue index c4270e11e..aa3b848f0 100644 --- a/fuintAdmin/src/views/order/order_Cashier.vue +++ b/fuintAdmin/src/views/order/order_Cashier.vue @@ -130,7 +130,7 @@ @click="patchwork(scope.row)" type="primary" plain round>补打 退款 @@ -230,6 +230,8 @@ @@ -247,7 +249,7 @@
- +
退款仅支持全额退款,退款金额将按照支付信息原路退回、优惠券、储值卡等原路退回处理
@@ -394,6 +396,9 @@ import {refundApi} from "@/api/order/refund"; type: "canRefund" } refundApi(map).then(res=>{ + // if() { + // + // } this.$message({ type: 'info', message: '退款成功' diff --git a/fuintAdmin/src/views/order/order_Goods.vue b/fuintAdmin/src/views/order/order_Goods.vue index ea719e44e..889dd5454 100644 --- a/fuintAdmin/src/views/order/order_Goods.vue +++ b/fuintAdmin/src/views/order/order_Goods.vue @@ -158,7 +158,7 @@ @@ -180,6 +180,8 @@ @@ -197,7 +199,7 @@
- +
退款仅支持全额退款,退款金额将按照支付信息原路退回、优惠券、储值卡等原路退回处理
diff --git a/fuintAdmin/src/views/order/order_Oil.vue b/fuintAdmin/src/views/order/order_Oil.vue index 3704aa434..fc2239aa8 100644 --- a/fuintAdmin/src/views/order/order_Oil.vue +++ b/fuintAdmin/src/views/order/order_Oil.vue @@ -208,7 +208,7 @@ type="primary" plain round>补打 退款 @@ -229,6 +229,7 @@ @@ -246,7 +247,7 @@
- +
退款仅支持全额退款,退款金额将按照支付信息原路退回、优惠券、储值卡等原路退回处理
diff --git a/fuintAdmin_zt/src/api/system/Site/site.js b/fuintAdmin_zt/src/api/system/Site/site.js index 72ea31e3e..9c846b911 100644 --- a/fuintAdmin_zt/src/api/system/Site/site.js +++ b/fuintAdmin_zt/src/api/system/Site/site.js @@ -74,12 +74,13 @@ export function resetUserPwd(userId, password) { password } return request({ - url: '/system/user/resetPwd', - method: 'put', + url: '/backendApi/account/resetPwd', + method: 'post', data: data }) } - +// url: '/system/user/resetPwd', +// // 用户状态修改 export function changeUserStatus(userId, status) { const data = { diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/common/service/impl/MemberServiceImpl.java b/fuintBackend/fuint-application/src/main/java/com/fuint/common/service/impl/MemberServiceImpl.java index 9519f3c99..c9ab82f5f 100644 --- a/fuintBackend/fuint-application/src/main/java/com/fuint/common/service/impl/MemberServiceImpl.java +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/common/service/impl/MemberServiceImpl.java @@ -782,53 +782,12 @@ public class MemberServiceImpl extends ServiceImpl impleme save(mtUser); - - // 新增余额信息 if (ObjectUtil.isNotEmpty(storeId) && storeId !="") { - - LJStore store = iljStoreService.selectStoreByStoreId(Integer.parseInt(storeId)); - - // 根据userid和连锁店id查询是否存在对应的余额信息 - UserBalance userBalance = userBalanceService.selectUserBalance(mtUser.getId(), store.getChainStoreId()); - if (ObjectUtil.isEmpty(userBalance)) { - // 新增余额信息 - UserBalance userBalanceAdd = new UserBalance(); - userBalanceAdd.setMtUserId(mtUser.getId()); - userBalanceAdd.setStoreId(Integer.parseInt(storeId)); - userBalanceAdd.setChainStoreId(store.getChainStoreId()); - userBalanceAdd.setCardBalance(0.0); - userBalanceAdd.setPoints(0); - userBalanceAdd.setGrowthValue(0); - userBalanceAdd.setConsumeNum(0); - LJUserGrade ljUserGrade = ljUserGradeService.selectUserGradeByStoreId(Integer.parseInt(storeId)); - if (ObjectUtil.isNotEmpty(ljUserGrade) && ObjectUtil.isNotEmpty(ljUserGrade.getId())) { - userBalanceAdd.setGradeId(ljUserGrade.getId()); - } - // 新增会员余额信息 - userBalanceService.insertUserBalance(userBalanceAdd); - } - // 查询关联表里面是否有信息 （注册邀请） - MtInvitation mtInvitation1 = mtInvitationMapper.queryByStoreId(Integer.parseInt(storeId), mtUser.getId()); - if (ObjectUtil.isEmpty(mtInvitation1)) { - MtInvitation mtInvitation = new MtInvitation(); - mtInvitation.setUserId(mtUser.getId()); - mtInvitation.setStoreId(Integer.parseInt(storeId)); - if (ObjectUtil.isNotEmpty(staffId) && staffId !="") { - mtInvitation.setStaffId(Integer.parseInt(staffId)); - } - if (ObjectUtil.isNotEmpty(inviterId) && inviterId !="") { - mtInvitation.setInviterId(Integer.parseInt(inviterId)); - - } - - - if (!ObjectUtil.isEmpty(store)){ - mtInvitation.setChainStoreId(store.getChainStoreId()); - } - mtInvitationMapper.insert(mtInvitation); - } + createVaseInfo(mtUser, storeId, staffId, inviterId); } + + return mtUser; }else { @@ -840,23 +799,16 @@ public class MemberServiceImpl extends ServiceImpl impleme mtUserMobile.setOpenId(openId); updateById(mtUserMobile); - + // 新增余额信息 if (ObjectUtil.isNotEmpty(storeId) && storeId !="") { - MtInvitation mtInvitation1 = mtInvitationMapper.queryByStoreId(Integer.parseInt(storeId), mtUserMobile.getId()); - if (ObjectUtil.isEmpty(mtInvitation1)) { - MtInvitation mtInvitation = new MtInvitation(); - mtInvitation.setUserId(mtUserMobile.getId()); - mtInvitation.setStoreId(Integer.parseInt(storeId)); - if (ObjectUtil.isNotEmpty(staffId) && staffId !="") { - mtInvitation.setStaffId(Integer.parseInt(staffId)); - } - if (ObjectUtil.isNotEmpty(inviterId) && inviterId !="") { - mtInvitation.setInviterId(Integer.parseInt(inviterId)); - } - mtInvitationMapper.insert(mtInvitation); - } + createVaseInfo(mtUserMobile,storeId,staffId,inviterId); } + } + + + + return mtUserMobile; } else { @@ -977,6 +929,53 @@ public class MemberServiceImpl extends ServiceImpl impleme } + /** + * 创建用户的基础信息 + */ + private void createVaseInfo (MtUser mtUser, String storeId,String staffId, String inviterId) { + LJStore store = iljStoreService.selectStoreByStoreId(Integer.parseInt(storeId)); + + // 根据userid和连锁店id查询是否存在对应的余额信息 + UserBalance userBalance = userBalanceService.selectUserBalance(mtUser.getId(), store.getChainStoreId()); + if (ObjectUtil.isEmpty(userBalance)) { + // 新增余额信息 + UserBalance userBalanceAdd = new UserBalance(); + userBalanceAdd.setMtUserId(mtUser.getId()); + userBalanceAdd.setStoreId(Integer.parseInt(storeId)); + userBalanceAdd.setChainStoreId(store.getChainStoreId()); + userBalanceAdd.setCardBalance(0.0); + userBalanceAdd.setPoints(0); + userBalanceAdd.setGrowthValue(0); + userBalanceAdd.setConsumeNum(0); + LJUserGrade ljUserGrade = ljUserGradeService.selectUserGradeByStoreId(Integer.parseInt(storeId)); + if (ObjectUtil.isNotEmpty(ljUserGrade) && ObjectUtil.isNotEmpty(ljUserGrade.getId())) { + userBalanceAdd.setGradeId(ljUserGrade.getId()); + } + // 新增会员余额信息 + userBalanceService.insertUserBalance(userBalanceAdd); + } + // 查询关联表里面是否有信息 （注册邀请） + MtInvitation mtInvitation1 = mtInvitationMapper.queryByStoreId(Integer.parseInt(storeId), mtUser.getId()); + if (ObjectUtil.isEmpty(mtInvitation1)) { + MtInvitation mtInvitation = new MtInvitation(); + mtInvitation.setUserId(mtUser.getId()); + mtInvitation.setStoreId(Integer.parseInt(storeId)); + if (ObjectUtil.isNotEmpty(staffId) && staffId !="") { + mtInvitation.setStaffId(Integer.parseInt(staffId)); + } + if (ObjectUtil.isNotEmpty(inviterId) && inviterId !="") { + mtInvitation.setInviterId(Integer.parseInt(inviterId)); + + } + + + if (!ObjectUtil.isEmpty(store)){ + mtInvitation.setChainStoreId(store.getChainStoreId()); + } + mtInvitationMapper.insert(mtInvitation); + } + } + //生成用户编号 private String editUserNo() { diff --git a/fuintCashierWeb/src/views/cashier/NewComponents/Integral.vue b/fuintCashierWeb/src/views/cashier/NewComponents/Integral.vue index 23dbcb327..1ee2988bf 100644 --- a/fuintCashierWeb/src/views/cashier/NewComponents/Integral.vue +++ b/fuintCashierWeb/src/views/cashier/NewComponents/Integral.vue @@ -339,6 +339,7 @@
@@ -475,6 +476,19 @@ import {getUserInfoMobile, getUserVoMobile, getUserVoName} from "@/api/cashier/u this.getStaffList(); this.getStaff(); }, + directives: { + // 注册一个局部的自定义指令 v-focus + focus: { + // 指令的定义 + inserted: function (el) { + // 聚焦元素 + el.querySelector('input').focus() + // this.$nextTick( () =>{ + // this.$refs.getFocus.focus() + // }) + }, + }, + }, methods:{ // 获取所有积分商品 async getGift() { diff --git a/fuintCashierWeb/src/views/cashier/orderComponents/order_Cashier.vue b/fuintCashierWeb/src/views/cashier/orderComponents/order_Cashier.vue index 5a4dbc67b..ef2f9192a 100644 --- a/fuintCashierWeb/src/views/cashier/orderComponents/order_Cashier.vue +++ b/fuintCashierWeb/src/views/cashier/orderComponents/order_Cashier.vue @@ -130,7 +130,7 @@ @click="patchwork(scope.row)" type="primary" plain round>补打 退款 @@ -230,6 +230,7 @@ @@ -247,7 +248,7 @@
- +
退款仅支持全额退款,退款金额将按照支付信息原路退回、优惠券、储值卡等原路退回处理
diff --git a/fuintCashierWeb/src/views/cashier/orderComponents/order_Goods.vue b/fuintCashierWeb/src/views/cashier/orderComponents/order_Goods.vue index 2502839f6..987355a15 100644 --- a/fuintCashierWeb/src/views/cashier/orderComponents/order_Goods.vue +++ b/fuintCashierWeb/src/views/cashier/orderComponents/order_Goods.vue @@ -158,7 +158,7 @@ @@ -180,6 +180,8 @@ @@ -197,7 +199,7 @@
- +
退款仅支持全额退款,退款金额将按照支付信息原路退回、优惠券、储值卡等原路退回处理
diff --git a/fuintCashierWeb/src/views/cashier/orderComponents/order_Oil.vue b/fuintCashierWeb/src/views/cashier/orderComponents/order_Oil.vue index 4b0104175..24e9cdc27 100644 --- a/fuintCashierWeb/src/views/cashier/orderComponents/order_Oil.vue +++ b/fuintCashierWeb/src/views/cashier/orderComponents/order_Oil.vue @@ -208,7 +208,7 @@ type="primary" plain round>补打 退款 @@ -229,6 +229,8 @@ @@ -246,7 +248,7 @@
- +
退款仅支持全额退款,退款金额将按照支付信息原路退回、优惠券、储值卡等原路退回处理
diff --git a/fuintCashierWeb/src/views/details/index.vue b/fuintCashierWeb/src/views/details/index.vue index bb23663cb..79cdf8256 100644 --- a/fuintCashierWeb/src/views/details/index.vue +++ b/fuintCashierWeb/src/views/details/index.vue @@ -386,7 +386,11 @@
- @@ -970,6 +974,19 @@ export default { } } }, + directives: { + // 注册一个局部的自定义指令 v-focus + focus: { + // 指令的定义 + inserted: function (el) { + // 聚焦元素 + el.querySelector('input').focus() + // this.$nextTick( () =>{ + // this.$refs.getFocus.focus() + // }) + }, + }, + }, mounted() { if (this.oilTypeList.length > 0) { this.selectOilType(this.oilTypeList[0].oilType);