From f56a2d8fb20ef2032dc4e832f1c5808a7c2d51b7 Mon Sep 17 00:00:00 2001 From: yechenhao Date: Sun, 24 May 2020 01:21:44 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A4=A7=E5=B1=8F=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../store/service/PoiStoreStaffService.java | 49 ++++++++++++++----- .../store/service/StoreEmployeeService.java | 6 ++- .../controller/WebAppMyController.java | 6 ++- 3 files changed, 46 insertions(+), 15 deletions(-) diff --git a/src/main/java/com/kiisoo/ic/store/service/PoiStoreStaffService.java b/src/main/java/com/kiisoo/ic/store/service/PoiStoreStaffService.java index 89e5757..34117b7 100644 --- a/src/main/java/com/kiisoo/ic/store/service/PoiStoreStaffService.java +++ b/src/main/java/com/kiisoo/ic/store/service/PoiStoreStaffService.java @@ -123,12 +123,21 @@ public class PoiStoreStaffService { String epWechatQrCode = poiStoreStaffVO.getEpWechatQrCode(); if (StringUtils.isBlank(epWechatQrCode)){ try { - epWechatQrCode = storeEmployeeService.getQrCodeFromBSD(cpUserId,BSD_REQ_QRCODE_TYPE_SELLER,poiStoreStaffVO.getStaffCode(),storeInfo.getCode()); - poiStoreStaffVO.setEpWechatQrCode(epWechatQrCode); - PoiStoreStaff update = new PoiStoreStaff(); - update.setId(poiStoreStaffVO.getId()); - update.setEpWechatQrCode(epWechatQrCode); - poiStoreStaffDOMapper.updateById(update); + if (poiStoreStaffVO.getType() == 1L){ + epWechatQrCode = storeEmployeeService.getQrCodeFromBSD(poiStoreStaffVO.getStaffCode(),BSD_REQ_QRCODE_TYPE_SELLER,poiStoreStaffVO.getStaffCode(),storeInfo.getCode()); + poiStoreStaffVO.setEpWechatQrCode(epWechatQrCode); + PoiStoreStaff update = new PoiStoreStaff(); + update.setId(poiStoreStaffVO.getId()); + update.setEpWechatQrCode(epWechatQrCode); + poiStoreStaffDOMapper.updateById(update); + }else{ + epWechatQrCode = storeEmployeeService.getQrCodeFromBSD(cpUserId,BSD_REQ_QRCODE_TYPE_SELLER,poiStoreStaffVO.getStaffCode(),storeInfo.getCode()); + poiStoreStaffVO.setEpWechatQrCode(epWechatQrCode); + PoiStoreStaff update = new PoiStoreStaff(); + update.setId(poiStoreStaffVO.getId()); + update.setEpWechatQrCode(epWechatQrCode); + poiStoreStaffDOMapper.updateById(update); + } } catch (Exception e) { log.error("生成二维码失败:cpuserid-"+cpUserId+"--staffCode-"+poiStoreStaffVO.getStaffCode(),e); } @@ -195,12 +204,22 @@ public class PoiStoreStaffService { String epWechatQrCode = poiStoreStaffVO.getEpWechatQrCode(); if (StringUtils.isBlank(epWechatQrCode)){ try { - epWechatQrCode = storeEmployeeService.getQrCodeFromBSD(cpUserId,BSD_REQ_QRCODE_TYPE_SELLER,poiStoreStaffVO.getStaffCode(),storeInfo.getCode()); - poiStoreStaffVO.setEpWechatQrCode(epWechatQrCode); - PoiStoreStaff update = new PoiStoreStaff(); - update.setId(poiStoreStaffVO.getId()); - update.setEpWechatQrCode(epWechatQrCode); - poiStoreStaffDOMapper.updateById(update); + if (poiStoreStaffVO.getType() == 1L){ + epWechatQrCode = storeEmployeeService.getQrCodeFromBSD(poiStoreStaffVO.getStaffCode(),BSD_REQ_QRCODE_TYPE_SELLER,poiStoreStaffVO.getStaffCode(),storeInfo.getCode()); + poiStoreStaffVO.setEpWechatQrCode(epWechatQrCode); + PoiStoreStaff update = new PoiStoreStaff(); + update.setId(poiStoreStaffVO.getId()); + update.setEpWechatQrCode(epWechatQrCode); + poiStoreStaffDOMapper.updateById(update); + }else{ + epWechatQrCode = storeEmployeeService.getQrCodeFromBSD(cpUserId,BSD_REQ_QRCODE_TYPE_SELLER,poiStoreStaffVO.getStaffCode(),storeInfo.getCode()); + poiStoreStaffVO.setEpWechatQrCode(epWechatQrCode); + PoiStoreStaff update = new PoiStoreStaff(); + update.setId(poiStoreStaffVO.getId()); + update.setEpWechatQrCode(epWechatQrCode); + poiStoreStaffDOMapper.updateById(update); + } + } catch (Exception e) { log.error("生成二维码失败:cpuserid-"+cpUserId+"--staffCode-"+poiStoreStaffVO.getStaffCode(),e); } @@ -370,7 +389,11 @@ public class PoiStoreStaffService { qrCodeDO.setState(poiStore.getCode() + "-" + poiStoreStaffVO.getStaffCode()); String qrCode = ""; try { - qrCode = storeEmployeeService.getQrCodeFromBSD(cpUserId, BSD_REQ_QRCODE_TYPE_SELLER, poiStoreStaffVO.getStaffCode(), poiStore.getCode()); + if (poiStoreStaffVO.getType() == 1L){ + qrCode = storeEmployeeService.getQrCodeFromBSD(poiStoreStaffVO.getStaffCode(), BSD_REQ_QRCODE_TYPE_SELLER, poiStoreStaffVO.getStaffCode(), poiStore.getCode()); + }else{ + qrCode = storeEmployeeService.getQrCodeFromBSD(cpUserId, BSD_REQ_QRCODE_TYPE_SELLER, poiStoreStaffVO.getStaffCode(), poiStore.getCode()); + } }catch (Exception e) { log.error("生成二维码失败:cpuserid-"+cpUserId+"--staffCode-"+poiStoreStaffVO.getStaffCode(),e); } diff --git a/src/main/java/com/kiisoo/ic/store/service/StoreEmployeeService.java b/src/main/java/com/kiisoo/ic/store/service/StoreEmployeeService.java index eb3f526..fc3f574 100644 --- a/src/main/java/com/kiisoo/ic/store/service/StoreEmployeeService.java +++ b/src/main/java/com/kiisoo/ic/store/service/StoreEmployeeService.java @@ -731,7 +731,11 @@ public class StoreEmployeeService { String url = poiStoreStaff.getEpWechatQrCode(); if (StringUtils.isBlank(url)) { try { - url = getQrCodeFromBSD(cpUserId, BSD_REQ_QRCODE_TYPE_SELLER, poiStoreStaff.getStaffCode(), poiStore.getCode()); + if (poiStoreStaff.getType() == 1L){ + url = getQrCodeFromBSD(poiStoreStaff.getStaffCode(), BSD_REQ_QRCODE_TYPE_SELLER, poiStoreStaff.getStaffCode(), poiStore.getCode()); + }else{ + url = getQrCodeFromBSD(cpUserId, BSD_REQ_QRCODE_TYPE_SELLER, poiStoreStaff.getStaffCode(), poiStore.getCode()); + } poiStoreStaff.setEpWechatQrCode(url); poiStoreStaffDOMapper.updateById(poiStoreStaff); } catch (Exception e) { diff --git a/src/main/java/com/kiisoo/ic/webappmy/controller/WebAppMyController.java b/src/main/java/com/kiisoo/ic/webappmy/controller/WebAppMyController.java index d5a3bbd..762b0b6 100644 --- a/src/main/java/com/kiisoo/ic/webappmy/controller/WebAppMyController.java +++ b/src/main/java/com/kiisoo/ic/webappmy/controller/WebAppMyController.java @@ -167,7 +167,11 @@ public class WebAppMyController extends BaseController { Long storeId = poiStoreStaffs.get(0).getStoreId(); String cpUserId = privilageCpUserStoreDOMapper.selectCpUserIdByStoreId(storeId); try { - img = storeEmployeeService.getQrCodeFromBSD(cpUserId,BSD_REQ_QRCODE_TYPE_SELLER,poiStoreStaffs.get(0).getStaffCode(),poiStoreStaffs.get(0).getStoreCode()); + if (poiStoreStaffs.get(0).getType() == 1L){ + img = storeEmployeeService.getQrCodeFromBSD(poiStoreStaffs.get(0).getStaffCode(),BSD_REQ_QRCODE_TYPE_SELLER,poiStoreStaffs.get(0).getStaffCode(),poiStoreStaffs.get(0).getStoreCode()); + }else{ + img = storeEmployeeService.getQrCodeFromBSD(cpUserId,BSD_REQ_QRCODE_TYPE_SELLER,poiStoreStaffs.get(0).getStaffCode(),poiStoreStaffs.get(0).getStoreCode()); + } PoiStoreStaff update = new PoiStoreStaff(); update.setId(poiStoreStaffs.get(0).getId()); update.setEpWechatQrCode(img);