zhenghuang
/
bsdgy-server
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

下载二维码，添加客户表情bug

Browse Source
master
LegnaYet 6 years ago
parent 77d3d92fb0
commit 5a2b013757
4 changed files with 17 additions and 25 deletions
Show Stats Download Patch File Download Diff File

1
pom.xml
Unescape Escape View File

@ -265,6 +265,7 @@
</plugins>
<finalName>kiisoo-ic</finalName>
<resources>
<resource>
<directory>src/main/java</directory>

4
src/main/java/com/kiisoo/ic/customer/CustomerService.java
Unescape Escape View File

@ -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());

35
src/main/java/com/kiisoo/ic/store/service/StoreEmployeeService.java
Unescape Escape View File

@ -277,7 +277,7 @@ public class StoreEmployeeService {
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
//查询所有公司
QueryWrapper<PrivilageOrganizational> queryWrapper = new QueryWrapper<>();
queryWrapper.eq("status", 1).eq("type", 1).eq("level", 2);
queryWrapper.eq("status", 1).eq("type", 2).eq("level", 2);
List<PrivilageOrganizational> privilageOrganizationals = retailCompanyMapper.selectList(queryWrapper);
if (CollectionUtils.isNotEmpty(privilageOrganizationals)) {
//根文件夹用于存放公司
@ -299,7 +299,7 @@ public class StoreEmployeeService {
complayFile.mkdir();
//查询客户
QueryWrapper<PrivilageOrganizational> 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<PrivilageOrganizational> customerList = retailCompanyMapper.selectList(customerWrap);
if (CollectionUtils.isNotEmpty(customerList)) {
List<Long> customerIds = customerList.stream().map(i -> i.getId()).collect(Collectors.toList());
@ -312,15 +312,9 @@ public class StoreEmployeeService {
if (StringUtils.isBlank(cpUserId)) {
continue;
}
Map<String, Object> 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<PrivilageOrganizational> privilageOrganizationals = retailCompanyMapper.selectList(null);
//查询所有公司
QueryWrapper<PrivilageOrganizational> queryWrapper = new QueryWrapper<>();
queryWrapper.eq("status", 1).eq("type", 2).eq("level", 2);
List<PrivilageOrganizational> 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<PrivilageOrganizational> 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<PrivilageOrganizational> customerList = retailCompanyMapper.selectList(customerWrap);
if (CollectionUtils.isNotEmpty(customerList)) {
List<Long> customerIds = customerList.stream().map(i -> i.getId()).collect(Collectors.toList());
@ -497,16 +494,8 @@ public class StoreEmployeeService {
if (StringUtils.isBlank(cpUserId)) {
continue;
}
Map<String, Object> 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;
}

2
src/main/resources/mapper/PoiStoreDOMapper.xml
Unescape Escape View File

@ -66,7 +66,7 @@
<select id="selectShopByCustomerIds" resultType="com.kiisoo.ic.store.entity.PoiStore">
select t3.id,t3.name
select t3.id,t3.name,t3.code
from privilage_organizational_domain t1,
privilage_domain_entity t2,
poi_store t3

Write Preview
Loading…
Cancel
Save