diff --git a/src/main/java/com/kiisoo/ic/customer/CustomerService.java b/src/main/java/com/kiisoo/ic/customer/CustomerService.java index 64f4723..4670bdd 100644 --- a/src/main/java/com/kiisoo/ic/customer/CustomerService.java +++ b/src/main/java/com/kiisoo/ic/customer/CustomerService.java @@ -31,7 +31,9 @@ import com.kiisoo.ic.store.mapper.PoiStoreStaffDOMapper; import com.kiisoo.ic.store.mapper.PrivilageCpUserStoreDOMapper; import com.kiisoo.ic.store.service.PoiStoreService; import com.kiisoo.ic.synchronous.entity.TurnBackDTO; +import com.kiisoo.ic.system.entity.PrivilageUserDO; import com.kiisoo.ic.system.enums.RoleEnum; +import com.kiisoo.ic.system.mapper.PrivilageUserDOMapper; import com.kiisoo.ic.webappmy.vo.StafferInfoVO; import lombok.extern.slf4j.Slf4j; import org.apache.commons.collections.CollectionUtils; @@ -90,6 +92,10 @@ public class CustomerService { @Autowired private CustomerViewService customerViewService; + + @Autowired + public PrivilageUserDOMapper privilageUserDOMapper; + /** * token */ @@ -326,9 +332,10 @@ public class CustomerService { /** * 处理客户和导购的关系 - * - * @param opCustomer 客户的数据信息 - * @param staffCode 导购Code + * @param opCustomer + * @param joinTime + * @param shopId + * @param sellerId */ @Transactional(rollbackFor = Exception.class) public void sellerCustomerRelation(OpCustomer opCustomer, Date joinTime, long shopId, long sellerId) { @@ -543,6 +550,22 @@ public class CustomerService { }else{ thisList = opSellerCustomerRelationDOMapper.selectFriendListByShopIdAndDate(shopId, sellerId, search, startDate, endDate, type); } + + if(CollectionUtils.isNotEmpty(thisList)){ + for (int i = 0; i < thisList.size(); i++) { + // 设置导购名称 + if(!thisList.get(i).getInviteSellerId().equals(0L)){ + Map map = new HashMap<>(); + map.put("id", thisList.get(i).getInviteSellerId()); + String userName = poiStoreStaffDOMapper.selectUserNameById(thisList.get(i).getInviteSellerId()); + if(StringUtils.isNotEmpty(userName)){ + thisList.get(i).setInviteSellerName(userName); + } + }else{ + thisList.get(i).setInviteSellerName(""); + } + } + } } else { // 0、新增好友 1、累计好友 if(flag == 0){ @@ -551,8 +574,8 @@ public class CustomerService { thisList = opSellerCustomerRelationDOMapper.selectFriendListBySellerAndDate(userId, search, startDate, endDate, type); } } - results.put("this", new PageInfo<>(thisList)); + results.put("this", new PageInfo<>(thisList)); return results; } 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 7dc327e..100573e 100644 --- a/src/main/java/com/kiisoo/ic/store/mapper/PoiStoreStaffDOMapper.java +++ b/src/main/java/com/kiisoo/ic/store/mapper/PoiStoreStaffDOMapper.java @@ -57,4 +57,7 @@ public interface PoiStoreStaffDOMapper extends BaseMapper { Long selectStaffIdByUserId(@Param("userId") Long userId); Long selectStaffIdByTag(@Param("storeId") Long store,@Param("tag") String tag); + + String selectUserNameById(@Param("id") Long id); + } 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 7faac13..a12f79f 100644 --- a/src/main/java/com/kiisoo/ic/store/service/StoreEmployeeService.java +++ b/src/main/java/com/kiisoo/ic/store/service/StoreEmployeeService.java @@ -115,10 +115,16 @@ public class StoreEmployeeService { private String cancelQrCode; /** - * 查询门店号 - * - * @param storeId 门店id - * @param regionId 区域id + * 推广管理-列表,查询门店号 + * @param userId 用户ID + * @param storeId 店铺ID + * @param bigRegionId 大区ID + * @param companyId 公司ID + * @param pageNum 页码 + * @param pageSize + * @param code + * @return + * @throws Exception */ public PageInfo listStoreUser(Long userId, Long storeId, Long bigRegionId, Long companyId, Integer pageNum, Integer pageSize, String code) throws Exception { Map result = new HashMap<>(); diff --git a/src/main/resources/mapper/OpSellerCustomerRelationDOMapper.xml b/src/main/resources/mapper/OpSellerCustomerRelationDOMapper.xml index 833b8e7..32fd4f4 100644 --- a/src/main/resources/mapper/OpSellerCustomerRelationDOMapper.xml +++ b/src/main/resources/mapper/OpSellerCustomerRelationDOMapper.xml @@ -46,22 +46,19 @@ @@ -134,22 +130,19 @@ diff --git a/src/main/resources/mapper/PrivilageUserShopRelationDOMapper.xml b/src/main/resources/mapper/PrivilageUserShopRelationDOMapper.xml index 0035e94..7d4f812 100644 --- a/src/main/resources/mapper/PrivilageUserShopRelationDOMapper.xml +++ b/src/main/resources/mapper/PrivilageUserShopRelationDOMapper.xml @@ -65,4 +65,10 @@ select staff_id from poi_store_staff_tag where store_id = #{storeId} and tag = #{tag} limit 1 + +