diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/member/controller/LJStaffController.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/member/controller/LJStaffController.java index 399473645..63ac5552e 100644 --- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/member/controller/LJStaffController.java +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/member/controller/LJStaffController.java @@ -65,6 +65,16 @@ public class LJStaffController extends BaseController { return getSuccessResult(list); } + /** + * 查询当前店铺所有加油员信息 + * @return + */ + @GetMapping("/queryList1/{storeId}") + public ResponseObject queryStaffs1(@PathVariable Integer storeId){ + List list = mtStaffService.queryStaffLists1(storeId); + return getSuccessResult(list); + } + /** * 根据id查询员工信息 * @param id diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/member/service/ILJStaffService.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/member/service/ILJStaffService.java index 2a14d5f61..493a8d575 100644 --- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/member/service/ILJStaffService.java +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/member/service/ILJStaffService.java @@ -36,6 +36,12 @@ public interface ILJStaffService extends IService { */ public List queryStaffLists(Integer storeId); + /** + * 查询当前店铺所有加油员信息 + * @return + */ + public List queryStaffLists1(Integer storeId); + /** * 根据id查询员工信息 * @param id diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/member/service/impl/LJStaffServiceImpl.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/member/service/impl/LJStaffServiceImpl.java index 3189afa00..7841df9f8 100644 --- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/member/service/impl/LJStaffServiceImpl.java +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/member/service/impl/LJStaffServiceImpl.java @@ -93,6 +93,17 @@ public class LJStaffServiceImpl extends ServiceImpl impl return list; } + @Override + public List queryStaffLists1(Integer storeId) { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.eq("store_id",storeId); + queryWrapper.eq("status","qy"); + queryWrapper.eq("role_id","15"); + queryWrapper.eq("if_delete","0"); + List list = baseMapper.selectList(queryWrapper); + return list; + } + /** * 根据id查询员工信息 * @param id diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/common/shiroConfig/ShiroConfig.java b/fuintBackend/fuint-application/src/main/java/com/fuint/common/shiroConfig/ShiroConfig.java index 1a4255842..2fd36f921 100644 --- a/fuintBackend/fuint-application/src/main/java/com/fuint/common/shiroConfig/ShiroConfig.java +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/common/shiroConfig/ShiroConfig.java @@ -67,6 +67,16 @@ public class ShiroConfig { filterMap.put("/business/petrolStationManagement/oilGun/queryGunList/**","anon"); // 获取油枪列表信息 filterMap.put("/business/petrolStationManagement/oilTank/**","anon"); // 获取油罐信息 filterMap.put("/business/oilOrder/addOilOrder","anon"); // 添加油品订单信息 + filterMap.put("/business/member/staff/queryList1/**","anon"); // 获取店铺员工信息列表 + filterMap.put("/clientApi/sign/mpWxLogin2","anon"); // 获取微信openid + //加油页面免登录配置 + filterMap.put("/business/oilOrder/appletPay","anon"); // 调起支付接口 + filterMap.put("/business/allOrderInfo/orderStatus","anon"); // 修改订单状态信息 + filterMap.put("/business/userManager/userGrade/isUse","anon"); // 查看是否有可使用的会员等级优惠 + filterMap.put("/business/userManager/user/storeUser","anon"); // 根据店铺id查询用户信息 + filterMap.put("/business/marketingActivity/activeExchange/getPaymentActive","anon"); // 查询用户油品订单的优惠信息 + filterMap.put("/business/oilOrder/oilOrderNo","anon"); // 获取油品订单 + filterMap.put("/business/petrolStationManagement/oilNumber/getOilNumberName/**","anon"); // 获取店铺油号信息 diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/module/clientApi/controller/ClientSignController.java b/fuintBackend/fuint-application/src/main/java/com/fuint/module/clientApi/controller/ClientSignController.java index b1e1105d7..249216c52 100644 --- a/fuintBackend/fuint-application/src/main/java/com/fuint/module/clientApi/controller/ClientSignController.java +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/module/clientApi/controller/ClientSignController.java @@ -192,9 +192,9 @@ public class ClientSignController extends BaseController { return getSuccessResult(true); } -// if ((Boolean) param.get("isRefuel") == true){ -// return getSuccessResult(true); -// } + if ((Boolean) param.get("isRefuel") == true){ + return getSuccessResult(true); + } AccountInfo nowAccountInfo = TokenUtil.getNowAccountInfo(); if (ObjectUtil.isEmpty(nowAccountInfo)) return getSuccessResult(true); diff --git a/gasStation-uni/pages/refuel/refuel.vue b/gasStation-uni/pages/refuel/refuel.vue index bea97765f..41af744e6 100644 --- a/gasStation-uni/pages/refuel/refuel.vue +++ b/gasStation-uni/pages/refuel/refuel.vue @@ -248,10 +248,12 @@ this.storeId = uni.getStorageSync("storeId") this.staffId = uni.getStorageSync("inviteStaffId") this.getStore(uni.getStorageSync("storeId")); + this.getStaffList(uni.getStorageSync("storeId")); } } else { if (uni.getStorageSync("storeId")) { this.getStore(uni.getStorageSync("storeId")); + this.getStaffList(uni.getStorageSync("storeId")); } } @@ -261,6 +263,7 @@ onShow() { // this.isExistStoreId(); this.getStore(uni.getStorageSync("storeId")); + this.getStaffList(uni.getStorageSync("storeId")); // this.getStore(0); this.getTheJudgmentIsTheSame() @@ -274,6 +277,7 @@ isExistStoreId() { if (uni.getStorageSync("storeId") != "") { this.getStore(uni.getStorageSync("storeId")); + this.getStaffList(uni.getStorageSync("storeId")); } else { this.getAddress(); } @@ -292,7 +296,7 @@ }, }).then((res) => { _this.getOilNumber(id); - _this.getStaffList(id) + // _this.getStaffList(id) _this.store = res.data _this.storeId = res.data.id; uni.setStorageSync("storeId", _this.store.id) @@ -332,7 +336,7 @@ _this.store = response.data.store; _this.storeId = response.data.store.id; _this.getOilNumber(_this.storeId); - _this.getStaffList(_this.storeId) + // _this.getStaffList(_this.storeId) let welfare = response.data.store.welfare; if (welfare != undefined && welfare != null && welfare != "") { if (welfare.includes(",")) { @@ -385,9 +389,8 @@ getStaffList(storeId) { let _this = this; request({ - url: "business/member/staff/queryList", - method: 'post', - data:{storeId:storeId} + url: "business/member/staff/queryList1/"+storeId, + method: 'get', }).then((res) => { _this.staffList = res.data }) @@ -545,22 +548,23 @@ // if (!this.AppToken) { // return; // } - await request({ - url: 'chainStoreInfo/theJudgmentIsTheSame', - method: 'get', - data: { - "chainStoreId": uni.getStorageSync("chainStoreId") - } - }).then(res => { - if (!res.data) { - uni.removeStorageSync("App-Token"); - } - }) + // await request({ + // url: 'chainStoreInfo/theJudgmentIsTheSame', + // method: 'get', + // data: { + // "chainStoreId": uni.getStorageSync("chainStoreId") + // } + // }).then(res => { + // if (!res.data) { + // uni.removeStorageSync("App-Token"); + // } + // }) if (uni.getStorageSync("appltType")== "WECHAT") { // 判断当前登录的code是否相同 wx.login({ success(res) { + console.log(res); if (res.code) { //发起网络请求 request({