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 680045f..798c3cb 100644 --- a/src/main/java/com/kiisoo/ic/store/service/PoiStoreStaffService.java +++ b/src/main/java/com/kiisoo/ic/store/service/PoiStoreStaffService.java @@ -161,6 +161,8 @@ public class PoiStoreStaffService { PoiStoreStaff shopNameByUserId = poiStoreStaffDOMapper.selectOne(wrapperUser); if(shopNameByUserId!=null){ + String cpUserId = privilageCpUserStoreDOMapper.selectCpUserIdByStoreId(shopNameByUserId.getStoreId()); + PoiStore storeInfo = poiStoreDOMapper.selectById(shopNameByUserId.getStoreId()); //根据店铺查询所有扫码客户信息 QueryWrapper wrapper = new QueryWrapper<>(); //如果有店铺则查店铺 @@ -182,6 +184,19 @@ public class PoiStoreStaffService { poiStoreStaffVO.setName(privilageUserBean.getName()); poiStoreStaffVO.setMobil(privilageUserBean.getMobil()); } + 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); + } catch (Exception e) { + + } + } //账号信息 QueryWrapper wrapperAccount = new QueryWrapper<>(); wrapperAccount.eq("user_id",poiStoreStaff.getUserId()).eq("type",Constants.ACCOUNT_STATUS_UNABLE); 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 f002c2b..9be388b 100644 --- a/src/main/java/com/kiisoo/ic/store/service/StoreEmployeeService.java +++ b/src/main/java/com/kiisoo/ic/store/service/StoreEmployeeService.java @@ -7,6 +7,7 @@ import com.github.pagehelper.PageInfo; import com.kiisoo.aegis.common.faces.util.HttpUtil; import com.kiisoo.ic.common.utils.ExcelUtils; import com.kiisoo.ic.common.utils.MD5FileUtil; +import com.kiisoo.ic.common.utils.httpClientUtil.HttpClientUtil; import com.kiisoo.ic.customer.entity.OpSellerCustomerRelation; import com.kiisoo.ic.customer.mapper.OpSellerCustomerRelationDOMapper; import com.kiisoo.ic.customer.service.CustomerViewService; @@ -185,8 +186,8 @@ public class StoreEmployeeService { params.put("type", type); params.put("state", state); params.put("storeNo", storeNo); - String get = HttpUtil.post("http://vtest.bsd.cn/BSD_WXAPP/qyWechat/getShareQRcode?token=" + MD5FileUtil.getMD5String("BOSIDENG"+sdf.format(new Date())), params); - JSONObject qrCodeJson = JSONObject.parseObject(get); + String message = HttpClientUtil.httpPost("http://vtest.bsd.cn/BSD_WXAPP/qyWechat/getShareQRcode?token=" + MD5FileUtil.getMD5String("BOSIDENG" + sdf.format(new Date())), JSONObject.toJSONString(params)).getMessage(); + JSONObject qrCodeJson = JSONObject.parseObject(message); BsdShareCodeResponse bsdResponse = qrCodeJson.toJavaObject(BsdShareCodeResponse.class); if (bsdResponse.getSuccess()){ return bsdResponse.getResultCode(); 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 c845dc0..b5b58d3 100644 --- a/src/main/java/com/kiisoo/ic/webappmy/controller/WebAppMyController.java +++ b/src/main/java/com/kiisoo/ic/webappmy/controller/WebAppMyController.java @@ -2,15 +2,19 @@ package com.kiisoo.ic.webappmy.controller; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.kiisoo.ic.common.BaseController; +import com.kiisoo.ic.employee.entity.PrivilageCpUserDO; +import com.kiisoo.ic.employee.mapper.PrivilageCpUserDOMapper; import com.kiisoo.ic.store.constant.Constants; import com.kiisoo.ic.store.entity.PoiStoreStaff; import com.kiisoo.ic.store.entity.StoreUserDTO; import com.kiisoo.ic.store.mapper.PoiStoreStaffDOMapper; import com.kiisoo.ic.store.mapper.PrivilageCpUserStoreDOMapper; +import com.kiisoo.ic.store.service.StoreEmployeeService; import com.kiisoo.ic.webappmy.service.WebAppService; import com.kiisoo.ic.webappmy.vo.StafferInfoVO; import com.kiisoo.ic.webappmy.vo.UserParam; import lombok.extern.slf4j.Slf4j; +import org.apache.commons.lang3.StringUtils; import org.apache.shiro.SecurityUtils; import org.apache.shiro.subject.Subject; import org.springframework.beans.factory.annotation.Autowired; @@ -21,6 +25,8 @@ import java.util.ArrayList; import java.util.List; import java.util.Map; +import static com.kiisoo.ic.store.constant.Constants.BSD_REQ_QRCODE_TYPE_STORE; + /** * 小程序-我的功能请求控制器 * Created by hc on 2020/4/16 @@ -36,6 +42,12 @@ public class WebAppMyController extends BaseController { @Autowired private PrivilageCpUserStoreDOMapper privilageCpUserStoreDOMapper; + @Autowired + private PrivilageCpUserDOMapper privilageCpUserDOMapper; + + @Autowired + private StoreEmployeeService storeEmployeeService; + @Autowired private WebAppService webAppService; /** @@ -66,11 +78,18 @@ public class WebAppMyController extends BaseController { List shopIds = new ArrayList<>(); shopIds.add(shopId); List cpUserStoreDO = privilageCpUserStoreDOMapper.selectCpUserByShops(shopIds); - if(cpUserStoreDO.size() > 0){ + 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); + } return data(img); }else{ - throw new Exception(); + return fail(); } }catch (Exception e){ log.error("获取门店推广码异常",e); @@ -92,9 +111,18 @@ public class WebAppMyController extends BaseController { List poiStoreStaffs = poiStoreStaffDOMapper.selectList(new QueryWrapper<>(poiStoreStaff)); if(poiStoreStaffs.size() > 0){ img = poiStoreStaffs.get(0).getEpWechatQrCode(); + if (StringUtils.isBlank(img)){ + Long storeId = poiStoreStaffs.get(0).getStoreId(); + String cpUserId = privilageCpUserStoreDOMapper.selectCpUserIdByStoreId(storeId); + img = storeEmployeeService.getQrCodeFromBSD(cpUserId,BSD_REQ_QRCODE_TYPE_STORE,"0",poiStoreStaffs.get(0).getStoreCode()); + PoiStoreStaff update = new PoiStoreStaff(); + update.setId(poiStoreStaffs.get(0).getId()); + update.setEpWechatQrCode(img); + poiStoreStaffDOMapper.updateById(update); + } return data(img); }else{ - throw new Exception(); + return fail(); } }catch (Exception e){ log.error("获取用户推广码异常",e); diff --git a/src/main/resources/mapper/PrivilageCpUserStoreDOMapper.xml b/src/main/resources/mapper/PrivilageCpUserStoreDOMapper.xml index 1214aca..1d05b1d 100644 --- a/src/main/resources/mapper/PrivilageCpUserStoreDOMapper.xml +++ b/src/main/resources/mapper/PrivilageCpUserStoreDOMapper.xml @@ -4,7 +4,8 @@