diff --git a/src/main/java/com/kiisoo/ic/config/ShiroConfig.java b/src/main/java/com/kiisoo/ic/config/ShiroConfig.java index 75d114d..e09ca55 100644 --- a/src/main/java/com/kiisoo/ic/config/ShiroConfig.java +++ b/src/main/java/com/kiisoo/ic/config/ShiroConfig.java @@ -59,6 +59,7 @@ public class ShiroConfig { filterChainDefinitionMap.put("/store/emp/download/store/code", "anon"); filterChainDefinitionMap.put("/qy/customer/handle", "anon"); filterChainDefinitionMap.put("/store/emp/download/store/seller/code", "anon"); + filterChainDefinitionMap.put("/user/img/download", "anon"); filterChainDefinitionMap.put("/department/sync", "anon"); filterChainDefinitionMap.put("/store/promotion/data/**", "anon"); // 配置退出 过滤器,其中的具体的退出代码Shiro已经替我们实现了 diff --git a/src/main/java/com/kiisoo/ic/employee/controller/EmployeeController.java b/src/main/java/com/kiisoo/ic/employee/controller/EmployeeController.java index 68154d0..28e6580 100644 --- a/src/main/java/com/kiisoo/ic/employee/controller/EmployeeController.java +++ b/src/main/java/com/kiisoo/ic/employee/controller/EmployeeController.java @@ -9,7 +9,12 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.*; +import javax.servlet.ServletOutputStream; import javax.servlet.http.HttpServletResponse; +import java.io.BufferedInputStream; +import java.io.File; +import java.io.FileInputStream; +import java.io.IOException; import java.util.List; import java.util.Map; @@ -44,6 +49,35 @@ public class EmployeeController extends BaseController { return fail(); } } + /** + * 新增成员 + * @return + * @throws Exception + */ + @RequestMapping(value = "img/download",method = RequestMethod.POST) + public void listUser(@RequestParam("url")String url,HttpServletResponse response){ + BufferedInputStream in = null; + try { + + in = new BufferedInputStream(employeeService.getInputStream(url)); + //输入到response + ServletOutputStream outputStream = response.getOutputStream(); + byte[] bufferNew = new byte[1024]; + int lenNew; + while ((lenNew = in.read(bufferNew)) > 0) { + outputStream.write(bufferNew, 0, lenNew); + } + outputStream.flush(); + }catch (Exception e){ + log.error("添加用户失败",e); + }finally { + try { + in.close(); + } catch (IOException e) { + e.printStackTrace(); + } + } + } /** * 新增成员 * @param response 请求响应 diff --git a/src/main/java/com/kiisoo/ic/employee/service/QrCodeService.java b/src/main/java/com/kiisoo/ic/employee/service/QrCodeService.java index 8eb25d1..7efe97e 100644 --- a/src/main/java/com/kiisoo/ic/employee/service/QrCodeService.java +++ b/src/main/java/com/kiisoo/ic/employee/service/QrCodeService.java @@ -18,6 +18,8 @@ import org.springframework.transaction.annotation.Transactional; import java.util.HashMap; import java.util.Map; +import static com.kiisoo.ic.config.WxCpConfiguration.APPLICATIONID; + /** * @Description: 推广码业务 * @Auther: yinliujing @@ -26,7 +28,7 @@ import java.util.Map; */ @Service public class QrCodeService { - WxCpService mainService = WxCpConfiguration.getCpService(1000037); + WxCpService mainService = WxCpConfiguration.getCpService(APPLICATIONID); @Autowired private PoiStoreStaffDOMapper poiStoreStaffDOMapper; diff --git a/src/main/java/com/kiisoo/ic/store/entity/PoiStore.java b/src/main/java/com/kiisoo/ic/store/entity/PoiStore.java index 11615e6..7223634 100644 --- a/src/main/java/com/kiisoo/ic/store/entity/PoiStore.java +++ b/src/main/java/com/kiisoo/ic/store/entity/PoiStore.java @@ -1,9 +1,11 @@ package com.kiisoo.ic.store.entity; import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; + import java.util.Date; /** @@ -94,5 +96,6 @@ public class PoiStore { /** * 店铺简称 */ + @TableField(exist = false) private String abbreviation; } diff --git a/src/main/java/com/kiisoo/ic/store/mapper/PoiStoreStaffDOMapper.java b/src/main/java/com/kiisoo/ic/store/mapper/PoiStoreStaffDOMapper.java index e75636a..f3ac537 100644 --- a/src/main/java/com/kiisoo/ic/store/mapper/PoiStoreStaffDOMapper.java +++ b/src/main/java/com/kiisoo/ic/store/mapper/PoiStoreStaffDOMapper.java @@ -41,4 +41,6 @@ public interface PoiStoreStaffDOMapper extends BaseMapper { * 根据用户id找到导购信息 */ List selectInfoById(@Param("userId") Long userId); + + Long selectStaffIdByUserId(@Param("userId") Long userId); } diff --git a/src/main/java/com/kiisoo/ic/store/mapper/PrivilageCpUserStoreDOMapper.java b/src/main/java/com/kiisoo/ic/store/mapper/PrivilageCpUserStoreDOMapper.java index fc985b2..5b4989b 100644 --- a/src/main/java/com/kiisoo/ic/store/mapper/PrivilageCpUserStoreDOMapper.java +++ b/src/main/java/com/kiisoo/ic/store/mapper/PrivilageCpUserStoreDOMapper.java @@ -19,4 +19,6 @@ public interface PrivilageCpUserStoreDOMapper extends BaseMapper selectCpUserByShops (@Param("shopIds") List shops); Long selectOneByCpUserId(String cpuserId); + + String selectCpUserIdByStoreId(Long storeId); } 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 17317b1..7eda472 100644 --- a/src/main/java/com/kiisoo/ic/store/service/PoiStoreStaffService.java +++ b/src/main/java/com/kiisoo/ic/store/service/PoiStoreStaffService.java @@ -15,7 +15,7 @@ import com.kiisoo.ic.store.entity.PoiStoreStaff; import com.kiisoo.ic.store.entity.PoiStoreStaffVO; import com.kiisoo.ic.store.mapper.PoiStoreDOMapper; import com.kiisoo.ic.store.mapper.PoiStoreStaffDOMapper; -import com.kiisoo.ic.system.bean.AccountBean; +import com.kiisoo.ic.store.mapper.PrivilageCpUserStoreDOMapper; import com.kiisoo.ic.system.bean.ImportAccountErrorBean; import com.kiisoo.ic.system.bean.PrivilageUserBean; import com.kiisoo.ic.system.entity.PrivilageAccountDO; @@ -37,15 +37,12 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.web.multipart.MultipartFile; -import javax.management.relation.Role; import java.io.IOException; import java.io.InputStream; import java.lang.reflect.InvocationTargetException; -import java.math.BigDecimal; import java.text.SimpleDateFormat; import java.util.*; import java.util.concurrent.atomic.AtomicInteger; -import java.util.regex.Pattern; import java.util.stream.Collectors; import static com.kiisoo.ic.store.constant.Constants.TYPE_MANAGER; @@ -68,6 +65,8 @@ public class PoiStoreStaffService { @Autowired private PoiStoreDOMapper poiStoreDOMapper; @Autowired + private PrivilageCpUserStoreDOMapper privilageCpUserStoreDOMapper; + @Autowired private PrivilageAccountService privilageAccountService; @Autowired private PrivilageUserService privilageUserService; @@ -258,14 +257,18 @@ public class PoiStoreStaffService { qrCodeDO.setType(1); qrCodeDO.setScene(2); //查询店铺店长编码 - String staffCode = poiStoreStaffDOMapper.selectShopManagerByShop(poiStoreStaffVO.getStoreId()); + String cpUserId = privilageCpUserStoreDOMapper.selectCpUserIdByStoreId(poiStoreStaffVO.getStoreId()); + + PoiStore poiStore = poiStoreDOMapper.selectById(poiStoreStaffVO.getStoreId()); + + String[] data = new String[1]; //选择店铺对应店长的编码 - //data[0] = (staffCode); - data[0] = ("JiangDeXiang"); + data[0] = (cpUserId); +// data[0] = ("JiangDeXiang"); qrCodeDO.setUser(data); //店铺编码-导购编码 - qrCodeDO.setState(poiStoreStaffVO.getStoreCode() + "-" + poiStoreStaffVO.getStaffCode()); + qrCodeDO.setState(poiStore.getCode() + "-" + poiStoreStaffVO.getStaffCode()); return qrCodeService.getQrCode(qrCodeDO); } diff --git a/src/main/java/com/kiisoo/ic/system/entity/PrivilageUserDO.java b/src/main/java/com/kiisoo/ic/system/entity/PrivilageUserDO.java index 4441414..5c5a8a2 100644 --- a/src/main/java/com/kiisoo/ic/system/entity/PrivilageUserDO.java +++ b/src/main/java/com/kiisoo/ic/system/entity/PrivilageUserDO.java @@ -1,6 +1,7 @@ package com.kiisoo.ic.system.entity; import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; @@ -35,6 +36,7 @@ public class PrivilageUserDO implements Serializable { private String name; /**别名*/ + @TableField(exist = false) private String abbreviation; /** diff --git a/src/main/java/com/kiisoo/ic/system/service/impl/PrivilageAccountServiceImpl.java b/src/main/java/com/kiisoo/ic/system/service/impl/PrivilageAccountServiceImpl.java index 6eef60f..e6a10e6 100644 --- a/src/main/java/com/kiisoo/ic/system/service/impl/PrivilageAccountServiceImpl.java +++ b/src/main/java/com/kiisoo/ic/system/service/impl/PrivilageAccountServiceImpl.java @@ -26,6 +26,7 @@ import com.kiisoo.ic.system.mapper.PrivilageUserDOMapper; import com.kiisoo.ic.system.service.PrivilageAccountService; import com.kiisoo.ic.system.service.PrivilageUserRoleService; import com.kiisoo.ic.system.service.PrivilageUserService; +import com.kiisoo.ic.webappmy.vo.StafferInfoVO; import org.apache.commons.lang3.StringUtils; import org.apache.poi.hssf.usermodel.HSSFWorkbook; import org.apache.poi.ss.usermodel.*; @@ -177,14 +178,21 @@ public class PrivilageAccountServiceImpl extends ServiceImpl + + diff --git a/src/main/resources/mapper/PrivilageUserShopRelationDOMapper.xml b/src/main/resources/mapper/PrivilageUserShopRelationDOMapper.xml index 79b32da..3dba8c2 100644 --- a/src/main/resources/mapper/PrivilageUserShopRelationDOMapper.xml +++ b/src/main/resources/mapper/PrivilageUserShopRelationDOMapper.xml @@ -32,8 +32,13 @@ + +