From 5a2b0137574cf32a3af3e2169b42903da16636b3 Mon Sep 17 00:00:00 2001 From: LegnaYet <1023868505@qq.com> Date: Sun, 26 Apr 2020 19:48:38 +0800 Subject: [PATCH] =?UTF-8?q?=E4=B8=8B=E8=BD=BD=E4=BA=8C=E7=BB=B4=E7=A0=81?= =?UTF-8?q?=EF=BC=8C=E6=B7=BB=E5=8A=A0=E5=AE=A2=E6=88=B7=E8=A1=A8=E6=83=85?= =?UTF-8?q?bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pom.xml | 1 + .../kiisoo/ic/customer/CustomerService.java | 4 ++- .../store/service/StoreEmployeeService.java | 35 +++++++------------ .../resources/mapper/PoiStoreDOMapper.xml | 2 +- 4 files changed, 17 insertions(+), 25 deletions(-) diff --git a/pom.xml b/pom.xml index f3051d3..17305eb 100644 --- a/pom.xml +++ b/pom.xml @@ -265,6 +265,7 @@ kiisoo-ic + src/main/java diff --git a/src/main/java/com/kiisoo/ic/customer/CustomerService.java b/src/main/java/com/kiisoo/ic/customer/CustomerService.java index b2c65db..7581d91 100644 --- a/src/main/java/com/kiisoo/ic/customer/CustomerService.java +++ b/src/main/java/com/kiisoo/ic/customer/CustomerService.java @@ -19,6 +19,7 @@ import com.kiisoo.ic.customer.mapper.OpSellerCustomerRelationDOMapper; import com.kiisoo.ic.customer.mapper.OpVipDOMapper; import com.kiisoo.ic.customer.service.CustomerViewService; import com.kiisoo.ic.domain.service.PrivilageDomainService; +import com.kiisoo.ic.employee.service.EmployeeService; import com.kiisoo.ic.generalize.service.RetailCompanyService; import com.kiisoo.ic.store.entity.PoiStore; import com.kiisoo.ic.store.entity.PoiStoreStaff; @@ -114,7 +115,8 @@ public class CustomerService { //做插入使用 OpCustomer insertCustomer = new OpCustomer(); insertCustomer.setExternalUserid(customerDTO.getExternalUserid()); - insertCustomer.setName(customerDTO.getName()); + String customerName = EmployeeService.filterEmoji(customerDTO.getName()); + insertCustomer.setName(customerName); if(null != opCustomer){ //存在--1.处理客户导购关系。 sellerCustomerRelation(opCustomer,customerDTO.getStaffCode(),poiStore.getId(),poiStoreStaff.getUserId()); 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 b370353..dfff570 100644 --- a/src/main/java/com/kiisoo/ic/store/service/StoreEmployeeService.java +++ b/src/main/java/com/kiisoo/ic/store/service/StoreEmployeeService.java @@ -277,7 +277,7 @@ public class StoreEmployeeService { SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd"); //查询所有公司 QueryWrapper queryWrapper = new QueryWrapper<>(); - queryWrapper.eq("status", 1).eq("type", 1).eq("level", 2); + queryWrapper.eq("status", 1).eq("type", 2).eq("level", 2); List privilageOrganizationals = retailCompanyMapper.selectList(queryWrapper); if (CollectionUtils.isNotEmpty(privilageOrganizationals)) { //根文件夹用于存放公司 @@ -299,7 +299,7 @@ public class StoreEmployeeService { complayFile.mkdir(); //查询客户 QueryWrapper customerWrap = new QueryWrapper<>(); - customerWrap.eq("status", 1).eq("type", 1).eq("level", 3).eq("parent_id", privilageOrganizational.getId()); + customerWrap.eq("status", 1).eq("type", 2).eq("level", 3).eq("parent_id", privilageOrganizational.getId()); List customerList = retailCompanyMapper.selectList(customerWrap); if (CollectionUtils.isNotEmpty(customerList)) { List customerIds = customerList.stream().map(i -> i.getId()).collect(Collectors.toList()); @@ -312,15 +312,9 @@ public class StoreEmployeeService { if (StringUtils.isBlank(cpUserId)) { continue; } - Map params = new HashMap<>(); - params.put("userId", cpUserId); - params.put("type", 0); - params.put("storeNo", poiStore.getCode()); - String get = HttpUtil.get("http://vtest.bsd.cn/BSD_WXAPP/qyWechat/getShareQRcode?token=BOSIDENG" + MD5FileUtil.getMD5String(sdf.format(new Date())), params); - JSONObject saveAccountInputJSON = JSONObject.parseObject(get); - BsdShareCodeResponse bsdResponse = saveAccountInputJSON.toJavaObject(BsdShareCodeResponse.class); - - String url = bsdResponse.getData(); + + String url = getQrCodeFromBSD(cpUserId, BSD_REQ_QRCODE_TYPE_STORE, "0", poiStore.getCode()); + if (StringUtils.isBlank(url)) { continue; } @@ -454,7 +448,10 @@ public class StoreEmployeeService { public void downloadStoreStaffCodeFromBSD(HttpServletResponse response) throws Exception { SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd"); //查询所有公司 - List privilageOrganizationals = retailCompanyMapper.selectList(null); + //查询所有公司 + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.eq("status", 1).eq("type", 2).eq("level", 2); + List privilageOrganizationals = retailCompanyMapper.selectList(queryWrapper); if (CollectionUtils.isNotEmpty(privilageOrganizationals)) { //根文件夹用于存放公司 String fileUrl = "导购码-" + UUID.randomUUID().toString().replace("-", ""); @@ -474,7 +471,7 @@ public class StoreEmployeeService { File complayFile = new File(file.getPath() + "/" + privilageOrganizational.getName()); complayFile.mkdir(); QueryWrapper customerWrap = new QueryWrapper<>(); - customerWrap.eq("status", 1).eq("type", 1).eq("level", 3).eq("parent_id", privilageOrganizational.getId()); + customerWrap.eq("status", 1).eq("type", 2).eq("level", 3).eq("parent_id", privilageOrganizational.getId()); List customerList = retailCompanyMapper.selectList(customerWrap); if (CollectionUtils.isNotEmpty(customerList)) { List customerIds = customerList.stream().map(i -> i.getId()).collect(Collectors.toList()); @@ -497,16 +494,8 @@ public class StoreEmployeeService { if (StringUtils.isBlank(cpUserId)) { continue; } - Map params = new HashMap<>(); - params.put("userId", cpUserId); - params.put("type", 1); - params.put("state", poiStoreStaff.getStaffCode()); - params.put("storeNo", poiStore.getCode()); - String get = HttpUtil.get("http://vtest.bsd.cn/BSD_WXAPP/qyWechat/getShareQRcode?token=BOSIDENG" + MD5FileUtil.getMD5String(sdf.format(new Date())), params); - JSONObject saveAccountInputJSON = JSONObject.parseObject(get); - BsdShareCodeResponse bsdResponse = saveAccountInputJSON.toJavaObject(BsdShareCodeResponse.class); - - String url = bsdResponse.getData(); + + String url = getQrCodeFromBSD(cpUserId, BSD_REQ_QRCODE_TYPE_STORE, poiStoreStaff.getStaffCode(), poiStore.getCode()); if (StringUtils.isBlank(url)) { continue; } diff --git a/src/main/resources/mapper/PoiStoreDOMapper.xml b/src/main/resources/mapper/PoiStoreDOMapper.xml index 31f99c2..b468613 100644 --- a/src/main/resources/mapper/PoiStoreDOMapper.xml +++ b/src/main/resources/mapper/PoiStoreDOMapper.xml @@ -66,7 +66,7 @@