导购接口

src/main/java/com/kiisoo/ic/store/service/PoiStoreStaffService.java

@@ -62,8 +62,6 @@ public class PoiStoreStaffService {
     @Autowired
     private PrivilageDomainService privilageDomainService;
     @Autowired
-    private PoiStoreService poiStoreService;
-    @Autowired
     private PrivilageUserDOMapper privilageUserDOMapper;
     @Autowired
     private StoreEmployeeService storeEmployeeService;
@@ -71,8 +69,8 @@ public class PoiStoreStaffService {
     private PoiStoreDOMapper poiStoreDOMapper;
     @Autowired
     private PrivilageCpUserStoreDOMapper privilageCpUserStoreDOMapper;
-    @Autowired
-    private PrivilageAccountService privilageAccountService;
+//    @Autowired
+//    private PrivilageAccountService privilageAccountService;
     @Autowired
     private  PrivilageUserService privilageUserService;
     @Autowired
@@ -279,7 +277,7 @@ public class PoiStoreStaffService {
         privilageUserRoleService.insertUserRoleRelation(userId,privilageRoleDO.getId());
         if (StringUtils.isNotBlank(poiStoreStaffVO.getIsOpen())){
             //添加一个账号
-            privilageAccountService.insertAccount(poiStoreStaffVO.getStaffCode(), AccountEnum.ACCOUNT_FIRST_PWD.getDescribe(), userId);
+//            privilageAccountService.insertAccount(poiStoreStaffVO.getStaffCode(), AccountEnum.ACCOUNT_FIRST_PWD.getDescribe(), userId);
         }
         //去生成一个推广人员二维码
         QrCodeDO qrCodeDO = parseQrCodeBSD(poiStoreStaffVO);

src/main/java/com/kiisoo/ic/store/service/StoreEmployeeService.java

@@ -1298,7 +1298,7 @@ public class StoreEmployeeService {
 
         PrivilageUserDO us = new PrivilageUserDO();
         us.setName(shop.getName());
-        us.setMobil(poiStoreStaffVO.getMobil());
+        us.setMobile(poiStoreStaffVO.getMobil());
         us.setEmail("");
         us.setAddress("");
         us.setStatus(1);

src/main/java/com/kiisoo/ic/system/entity/PrivilageUserDO.java

@@ -41,7 +41,7 @@ public class PrivilageUserDO implements Serializable {
     /**
      * 电话
      */
-    private String mobil;
+    private String mobile;
 
     /**
      * 邮箱

src/main/java/com/kiisoo/ic/system/service/impl/PrivilageAccountServiceImpl.java

@@ -127,21 +127,24 @@ public class PrivilageAccountServiceImpl extends ServiceImpl<PrivilageAccountDOM
 
     @Override
     public PageInfo<AccountBean> listAccountInfo(int pageNum, int pageSize, String searchContent,
-                                              Long roleId, Long companyId, Long shopId) {
+                                                 Long roleId, Long companyId, Long shopId) {
         PageHelper.startPage(pageNum, pageSize);
         //根据搜索内容和角色筛选查询
         List<AccountBean> accountIds = new ArrayList<>();
         // 运营人员角色
-        if(roleId.equals(3L)){
-            accountIds = privilageAccountDOMapper.selectAccountIdByRoleAndSearchContentAndYY(searchContent, roleId, companyId);
+        if (null != roleId) {
+
+            if (roleId.equals(3L)) {
+                accountIds = privilageAccountDOMapper.selectAccountIdByRoleAndSearchContentAndYY(searchContent, roleId, companyId);
+            }
         } else {
             accountIds = privilageAccountDOMapper.selectAccountIdByRoleAndSearchContent(searchContent, roleId, companyId, shopId);
-            if(CollectionUtils.isNotEmpty(accountIds)){
+            if (CollectionUtils.isNotEmpty(accountIds)) {
                 for (int i = 0; i < accountIds.size(); i++) {
                     AccountBean item = accountIds.get(i);
-                    if(item.getRoleId().equals(3L)){
+                    if (item.getRoleId().equals(3L)) {
                         List<AccountBean> itemList = privilageAccountDOMapper.selectCompanyNameAndCodeByRoleId(item.getUserId());
-                        if(CollectionUtils.isNotEmpty(itemList)){
+                        if (CollectionUtils.isNotEmpty(itemList)) {
                             accountIds.get(i).setCompanyName(itemList.get(0).getCompanyName());
                             accountIds.get(i).setCompanyCode(itemList.get(0).getCompanyCode());
                         }
@@ -263,7 +266,7 @@ public class PrivilageAccountServiceImpl extends ServiceImpl<PrivilageAccountDOM
         QueryWrapper<PrivilageUserDO> mobileUserQw = new QueryWrapper<>();
         mobileUserQw.eq("mobil", mobil).eq("status", "1");
         List<PrivilageUserDO> mobileUsers = privilageUserDOMapper.selectList(mobileUserQw);
-        if (CollectionUtils.isNotEmpty(mobileUsers) && !oldUser.getMobil().equals(mobil)) {
+        if (CollectionUtils.isNotEmpty(mobileUsers) && !oldUser.getMobile().equals(mobil)) {
             return AccountEnum.ACCOUNT_MODIFY_STATUS_MOBILE_EXISTS.getType();
         }
 
@@ -282,7 +285,7 @@ public class PrivilageAccountServiceImpl extends ServiceImpl<PrivilageAccountDOM
         privilageUserDO.setId(modifyAccountInput.getUserId());
         privilageUserDO.setName(modifyAccountInput.getUserName());
         privilageUserDO.setUpdateTime(new Date());
-        privilageUserDO.setMobil(modifyAccountInput.getMobil());
+        privilageUserDO.setMobile(modifyAccountInput.getMobil());
         privilageUserDOMapper.updateById(privilageUserDO);
 
         //保存用户角色
@@ -365,7 +368,7 @@ public class PrivilageAccountServiceImpl extends ServiceImpl<PrivilageAccountDOM
                     //客户orgId
                     Long customerId = privilageDomainEntityDOMapper.selectDomainIdByShopEntity(shopNameByUserId.getStoreId());
 
-                    if (customerId != null){
+                    if (customerId != null) {
                         PrivilageOrganizational customer = retailCompanyMapper.selectById(customerId);
                         PrivilageOrganizational company = retailCompanyMapper.selectById(customer.getParentId());
 

src/main/java/com/kiisoo/ic/system/service/impl/PrivilageUserServiceImpl.java

@@ -53,7 +53,7 @@ public class PrivilageUserServiceImpl extends ServiceImpl<PrivilageUserDOMapper,
         privilageUserDO.setName(userName);
         privilageUserDO.setStatus(UserEnum.USER_STATUS_NORMAL.getType());
         privilageUserDO.setCreateTime(new Date());
-        privilageUserDO.setMobil(mobil);
+        privilageUserDO.setMobile(mobil);
         privilageUserDOMapper.insert(privilageUserDO);
         return privilageUserDO.getId();
     }