From 6abc572ac0981009fb2635113a63ab216328fa32 Mon Sep 17 00:00:00 2001 From: LegnaYet <1023868505@qq.com> Date: Tue, 19 May 2020 16:31:25 +0800 Subject: [PATCH] =?UTF-8?q?=E9=97=A8=E5=BA=97=E5=8F=B7=E7=AE=A1=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../store/service/PoiStoreStaffService.java | 12 +++++--- .../store/service/StoreEmployeeService.java | 28 +++++++++++------- .../controller/WebAppMyController.java | 29 ++++++++++++------- 3 files changed, 45 insertions(+), 24 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 bf896f1..2da3a6a 100644 --- a/src/main/java/com/kiisoo/ic/store/service/PoiStoreStaffService.java +++ b/src/main/java/com/kiisoo/ic/store/service/PoiStoreStaffService.java @@ -129,7 +129,7 @@ public class PoiStoreStaffService { update.setEpWechatQrCode(epWechatQrCode); poiStoreStaffDOMapper.updateById(update); } catch (Exception e) { - + log.error("生成二维码失败:cpuserid-"+cpUserId+"--staffCode-"+poiStoreStaffVO.getStaffCode(),e); } } @@ -201,7 +201,7 @@ public class PoiStoreStaffService { update.setEpWechatQrCode(epWechatQrCode); poiStoreStaffDOMapper.updateById(update); } catch (Exception e) { - + log.error("生成二维码失败:cpuserid-"+cpUserId+"--staffCode-"+poiStoreStaffVO.getStaffCode(),e); } } //账号信息 @@ -366,8 +366,12 @@ public class PoiStoreStaffService { qrCodeDO.setUser(data); //店铺编码-导购编码 qrCodeDO.setState(poiStore.getCode() + "-" + poiStoreStaffVO.getStaffCode()); - - String qrCode = storeEmployeeService.getQrCodeFromBSD(cpUserId, BSD_REQ_QRCODE_TYPE_SELLER, poiStoreStaffVO.getStaffCode(), poiStore.getCode()); + String qrCode = ""; + try { + qrCode = storeEmployeeService.getQrCodeFromBSD(cpUserId, BSD_REQ_QRCODE_TYPE_SELLER, poiStoreStaffVO.getStaffCode(), poiStore.getCode()); + }catch (Exception e) { + log.error("生成二维码失败:cpuserid-"+cpUserId+"--staffCode-"+poiStoreStaffVO.getStaffCode(),e); + } qrCodeDO.setQrCode(qrCode); return qrCodeDO; 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 a12f79f..5ff2b5c 100644 --- a/src/main/java/com/kiisoo/ic/store/service/StoreEmployeeService.java +++ b/src/main/java/com/kiisoo/ic/store/service/StoreEmployeeService.java @@ -33,6 +33,7 @@ import com.kiisoo.ic.store.mapper.PoiStoreDOMapper; import com.kiisoo.ic.store.mapper.PoiStoreStaffDOMapper; import com.kiisoo.ic.store.mapper.PrivilageCpUserStoreDOMapper; import com.kiisoo.ic.utils.ZipUtils; +import lombok.extern.slf4j.Slf4j; import org.apache.commons.collections.CollectionUtils; import org.apache.commons.lang3.StringUtils; import org.apache.poi.hssf.usermodel.HSSFCellStyle; @@ -70,6 +71,7 @@ import static com.kiisoo.ic.store.constant.Constants.*; * @Version: v1 */ @Service +@Slf4j public class StoreEmployeeService { @Autowired @@ -180,12 +182,16 @@ public class StoreEmployeeService { String qrCodeAction = cpUserStore.getQrCodeAction(); if (StringUtils.isBlank(qrCodeAction)){ - qrCodeAction = getQrCodeFromBSD(cpUserStore.getCpUserId(),BSD_REQ_QRCODE_TYPE_STORE,"0",cpUserStore.getCode()); - cpUserStore.setQrCodeAction(qrCodeAction); - PrivilageCpUserDO update = new PrivilageCpUserDO(); - update.setId(cpUserStore.getUserId()); - update.setQrCode(qrCodeAction); - privilageCpUserDOMapper.updateById(update); + try { + qrCodeAction = getQrCodeFromBSD(cpUserStore.getCpUserId(),BSD_REQ_QRCODE_TYPE_STORE,"0",cpUserStore.getCode()); + cpUserStore.setQrCodeAction(qrCodeAction); + PrivilageCpUserDO update = new PrivilageCpUserDO(); + update.setId(cpUserStore.getUserId()); + update.setQrCode(qrCodeAction); + privilageCpUserDOMapper.updateById(update); + }catch (Exception e){ + log.error("生成二维码失败:cpuserid-"+cpUserStore.getCpUserId(),e); + } } //查询导购数目 @@ -368,11 +374,12 @@ public class StoreEmployeeService { if (StringUtils.isBlank(url)){ try { url = getQrCodeFromBSD(cpUserId, BSD_REQ_QRCODE_TYPE_STORE, "0", poiStore.getCode()); + privilageCpUserDO.setQrCode(url); + int update = privilageCpUserDOMapper.updateById(privilageCpUserDO); }catch (Exception e) { + log.error("生成二维码失败:cpuserid-"+cpUserId,e); continue; } - privilageCpUserDO.setQrCode(url); - int update = privilageCpUserDOMapper.updateById(privilageCpUserDO); } if (StringUtils.isBlank(url)) { continue; @@ -695,11 +702,12 @@ public class StoreEmployeeService { if (StringUtils.isBlank(url)){ try { url = getQrCodeFromBSD(cpUserId, BSD_REQ_QRCODE_TYPE_STORE, poiStoreStaff.getStaffCode(), poiStore.getCode()); + poiStoreStaff.setEpWechatQrCode(url); + poiStoreStaffDOMapper.updateById(poiStoreStaff); }catch (Exception e) { + log.error("生成二维码失败:cpuserid-"+cpUserId+"--staffCode-"+poiStoreStaff.getStaffCode(),e); continue; } - poiStoreStaff.setEpWechatQrCode(url); - poiStoreStaffDOMapper.updateById(poiStoreStaff); } if (StringUtils.isBlank(url)) { continue; 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 b7ab5d6..d5a3bbd 100644 --- a/src/main/java/com/kiisoo/ic/webappmy/controller/WebAppMyController.java +++ b/src/main/java/com/kiisoo/ic/webappmy/controller/WebAppMyController.java @@ -129,11 +129,15 @@ public class WebAppMyController extends BaseController { if(cpUserStoreDO!=null && cpUserStoreDO.size() > 0){ img = cpUserStoreDO.get(0).getQrCodeAction(); if (StringUtils.isBlank(img)){ - img = storeEmployeeService.getQrCodeFromBSD(cpUserStoreDO.get(0).getCpUserId(),BSD_REQ_QRCODE_TYPE_STORE,"0",cpUserStoreDO.get(0).getCode()); - PrivilageCpUserDO update = new PrivilageCpUserDO(); - update.setId(cpUserStoreDO.get(0).getUserId()); - update.setQrCode(img); - privilageCpUserDOMapper.updateById(update); + try { + img = storeEmployeeService.getQrCodeFromBSD(cpUserStoreDO.get(0).getCpUserId(),BSD_REQ_QRCODE_TYPE_STORE,"0",cpUserStoreDO.get(0).getCode()); + PrivilageCpUserDO update = new PrivilageCpUserDO(); + update.setId(cpUserStoreDO.get(0).getUserId()); + update.setQrCode(img); + privilageCpUserDOMapper.updateById(update); + } catch (Exception e) { + log.error("生成二维码失败:cpuserid-"+cpUserStoreDO.get(0).getCpUserId(),e); + } } return data(img); }else{ @@ -162,11 +166,16 @@ public class WebAppMyController extends BaseController { if (StringUtils.isBlank(img)){ Long storeId = poiStoreStaffs.get(0).getStoreId(); String cpUserId = privilageCpUserStoreDOMapper.selectCpUserIdByStoreId(storeId); - 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); - poiStoreStaffDOMapper.updateById(update); + try { + 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); + poiStoreStaffDOMapper.updateById(update); + }catch (Exception e){ + log.error("生成二维码失败:cpuserid-"+cpUserId+"--staffCode-"+poiStoreStaffs.get(0).getStaffCode(),e); + } + } return data(img); }else{