From c7ea9d04f7e7a4f69de38da51893249240860040 Mon Sep 17 00:00:00 2001 From: wangweijia <495720349@qq.com> Date: Thu, 9 Apr 2020 09:42:48 +0800 Subject: [PATCH] =?UTF-8?q?=E5=BA=97=E9=93=BA=E5=AF=B9=E5=BA=94=E7=9A=84?= =?UTF-8?q?=E6=8E=A8=E5=B9=BF=E7=94=A8=E6=88=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../kiisoo/ic/customer/CustomerService.java | 24 +++++++++++++---- .../{entity => bean}/OpCustomerDTO.java | 2 +- .../controller/CustomerController.java | 6 ++--- .../customer/mapper/OpCustomerDOMapper.java | 11 ++++++-- .../ic/region/service/RegionService.java | 4 +++ .../ic/store/bean/PoiStoreStaffDTO.java | 26 +++++++++++++++++++ .../store/mapper/PoiStoreStaffDOMapper.java | 6 +++++ .../ic/store/service/PoiStoreService.java | 16 ++++++++++++ .../resources/mapper/OpCustomerDOMapper.xml | 15 ++++++++++- .../PrivilageUserShopRelationDOMapper.xml | 18 +++++++++++++ 10 files changed, 116 insertions(+), 12 deletions(-) rename src/main/java/com/kiisoo/ic/customer/{entity => bean}/OpCustomerDTO.java (92%) create mode 100644 src/main/java/com/kiisoo/ic/store/bean/PoiStoreStaffDTO.java diff --git a/src/main/java/com/kiisoo/ic/customer/CustomerService.java b/src/main/java/com/kiisoo/ic/customer/CustomerService.java index 34ff354..10c9105 100644 --- a/src/main/java/com/kiisoo/ic/customer/CustomerService.java +++ b/src/main/java/com/kiisoo/ic/customer/CustomerService.java @@ -5,7 +5,7 @@ import com.kiisoo.ic.constants.Constants; import com.kiisoo.ic.customer.bean.CustomerDTO; import com.kiisoo.ic.customer.bean.CustomerModifyDTO; import com.kiisoo.ic.customer.entity.OpCustomer; -import com.kiisoo.ic.customer.entity.OpCustomerDTO; +import com.kiisoo.ic.customer.bean.OpCustomerDTO; import com.kiisoo.ic.customer.entity.OpSellerCustomerRelation; import com.kiisoo.ic.customer.entity.OpVip; import com.kiisoo.ic.customer.mapper.OpCustomerDOMapper; @@ -14,7 +14,6 @@ import com.kiisoo.ic.customer.mapper.OpVipDOMapper; import com.kiisoo.ic.domain.service.PrivilageDomainService; import com.kiisoo.ic.store.entity.PoiStore; import com.kiisoo.ic.store.service.PoiStoreService; -import com.kiisoo.ic.store.entity.PoiStore; import com.kiisoo.ic.store.entity.PoiStoreStaff; import com.kiisoo.ic.store.mapper.PoiStoreDOMapper; import com.kiisoo.ic.store.mapper.PoiStoreStaffDOMapper; @@ -150,6 +149,15 @@ public class CustomerService { return customers; } + /** + * 根据导购id找到顾客信息 + * @param sellerId + */ + public List getCustomerInfoByShopIds(long sellerId, Date startDate, Date endDate){ + List customers = opCustomerDOMapper.selectCustomerInfoBySellerId(sellerId, startDate, endDate); + return customers; + } + /** * 根据条件查询扫码推广的客户信息 * @param userId 用户id @@ -158,10 +166,16 @@ public class CustomerService { * @param startDate 开始时间 * @param endDate 结束时间 */ - public List getCustomerByUserAndDate(long userId,Long shopId, Long regionId , Date startDate, Date endDate){ + public List getCustomerByUserAndDate(long userId,Long shopId, Long regionId , Long sellerId, Date startDate, Date endDate){ Set shopIds = new HashSet<>(); + + //根据店铺查询所有扫码客户信息 + List opCustomerDTOS; //如果有店铺则查店铺 - if(shopId != null){ + if(sellerId != null){ + opCustomerDTOS = getCustomerInfoByShopIds(sellerId, startDate, endDate); + return opCustomerDTOS; + }else if(shopId != null){ shopIds.add(shopId); }else if(regionId != null){ //如果有区域则查区域店铺 @@ -173,7 +187,7 @@ public class CustomerService { } //根据店铺查询所有扫码客户信息 - List opCustomerDTOS = getCustomerInfoByShopIds(shopIds, startDate, endDate); + opCustomerDTOS = getCustomerInfoByShopIds(shopIds, startDate, endDate); return opCustomerDTOS; } diff --git a/src/main/java/com/kiisoo/ic/customer/entity/OpCustomerDTO.java b/src/main/java/com/kiisoo/ic/customer/bean/OpCustomerDTO.java similarity index 92% rename from src/main/java/com/kiisoo/ic/customer/entity/OpCustomerDTO.java rename to src/main/java/com/kiisoo/ic/customer/bean/OpCustomerDTO.java index 08d3613..e93d170 100644 --- a/src/main/java/com/kiisoo/ic/customer/entity/OpCustomerDTO.java +++ b/src/main/java/com/kiisoo/ic/customer/bean/OpCustomerDTO.java @@ -1,4 +1,4 @@ -package com.kiisoo.ic.customer.entity; +package com.kiisoo.ic.customer.bean; import lombok.Data; diff --git a/src/main/java/com/kiisoo/ic/customer/controller/CustomerController.java b/src/main/java/com/kiisoo/ic/customer/controller/CustomerController.java index e68ad15..43fd30c 100644 --- a/src/main/java/com/kiisoo/ic/customer/controller/CustomerController.java +++ b/src/main/java/com/kiisoo/ic/customer/controller/CustomerController.java @@ -2,7 +2,7 @@ package com.kiisoo.ic.customer.controller; import com.kiisoo.ic.common.BaseController; import com.kiisoo.ic.customer.CustomerService; -import com.kiisoo.ic.customer.entity.OpCustomerDTO; +import com.kiisoo.ic.customer.bean.OpCustomerDTO; import lombok.extern.slf4j.Slf4j; import org.apache.ibatis.annotations.Param; import org.springframework.beans.factory.annotation.Autowired; @@ -28,10 +28,10 @@ public class CustomerController extends BaseController { @ResponseBody @PostMapping("/info") - public Map getCustomerInfo(@Param("userId") long userId, Long shopId, Long regionId , + public Map getCustomerInfo(@Param("userId") long userId, Long shopId, Long regionId , Long sellerId, @Param("startDate") Date startDate, @Param("endDate") Date endDate){ - List opCustomerDTOS = customerService.getCustomerByUserAndDate(userId, shopId, regionId, startDate, endDate); + List opCustomerDTOS = customerService.getCustomerByUserAndDate(userId, shopId, regionId, sellerId, startDate, endDate); return data(opCustomerDTOS); } } diff --git a/src/main/java/com/kiisoo/ic/customer/mapper/OpCustomerDOMapper.java b/src/main/java/com/kiisoo/ic/customer/mapper/OpCustomerDOMapper.java index 0c16443..3b03535 100644 --- a/src/main/java/com/kiisoo/ic/customer/mapper/OpCustomerDOMapper.java +++ b/src/main/java/com/kiisoo/ic/customer/mapper/OpCustomerDOMapper.java @@ -2,11 +2,10 @@ package com.kiisoo.ic.customer.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.kiisoo.ic.customer.entity.OpCustomer; -import com.kiisoo.ic.customer.entity.OpCustomerDTO; +import com.kiisoo.ic.customer.bean.OpCustomerDTO; import org.apache.ibatis.annotations.Param; import org.springframework.stereotype.Repository; -import javax.xml.crypto.Data; import java.util.Date; import java.util.List; import java.util.Set; @@ -27,4 +26,12 @@ public interface OpCustomerDOMapper extends BaseMapper { List selectCustomerInfoByShopIds(@Param("shopId") Set shopIds, @Param("startDate")Date startDate, @Param("endDate") Date endDate); + /** + * 根据导购id找到所有推广顾客信息 + * @param sellerId 店铺id + * @param startDate 推广开始时间 + * @param endDate 推广结束时间 + * @return + */ + List selectCustomerInfoBySellerId(@Param("sellerId") long sellerId, @Param("startDate") Date startDate,@Param("endDate") Date endDate); } diff --git a/src/main/java/com/kiisoo/ic/region/service/RegionService.java b/src/main/java/com/kiisoo/ic/region/service/RegionService.java index dd89bc4..de2639d 100644 --- a/src/main/java/com/kiisoo/ic/region/service/RegionService.java +++ b/src/main/java/com/kiisoo/ic/region/service/RegionService.java @@ -45,15 +45,19 @@ public class RegionService { * @return map key：shop,region value: regiondos, shopIds */ public Map getRegionAndShop(long userId){ + //找到区域集合 List regionDOS = getUserRegion(userId); //找到店铺集合 List shopsIds = privilageDomainService.listUserDatePermission(userId); List shops = poiStoreDOMapper.selectBatchIds(shopsIds); + //找到店铺对应的导购 + List sellers = poiStoreStaffDOMapper.selectSellersByShopIds(shopsIds); Map regionAndShop = new HashMap<>(); regionAndShop.put("region", regionDOS); regionAndShop.put("shop", shops); + regionAndShop.put("seller", sellers); return regionAndShop; } diff --git a/src/main/java/com/kiisoo/ic/store/bean/PoiStoreStaffDTO.java b/src/main/java/com/kiisoo/ic/store/bean/PoiStoreStaffDTO.java new file mode 100644 index 0000000..4ace227 --- /dev/null +++ b/src/main/java/com/kiisoo/ic/store/bean/PoiStoreStaffDTO.java @@ -0,0 +1,26 @@ +package com.kiisoo.ic.store.bean; + +import com.kiisoo.ic.store.entity.PoiStoreStaff; +import lombok.Data; + +/** + * 店铺人员具体信息 + */ +@Data +public class PoiStoreStaffDTO extends PoiStoreStaff { + /**名称*/ + private String name; + + /**电话*/ + private String mobil; + + /**邮箱*/ + private String email; + + /**地址*/ + private String address; + + /**备注*/ + private String remark; + +} 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 d4dfe98..74da142 100644 --- a/src/main/java/com/kiisoo/ic/store/mapper/PoiStoreStaffDOMapper.java +++ b/src/main/java/com/kiisoo/ic/store/mapper/PoiStoreStaffDOMapper.java @@ -23,4 +23,10 @@ public interface PoiStoreStaffDOMapper extends BaseMapper { List selectByUserId(@Param("userId") Long userId); + /** + * 根据店铺集合查询导购 + * @param shopId + * @return + */ + List selectSellersByShopIds(@Param("shopId") List shopId); } diff --git a/src/main/java/com/kiisoo/ic/store/service/PoiStoreService.java b/src/main/java/com/kiisoo/ic/store/service/PoiStoreService.java index d847098..6388468 100644 --- a/src/main/java/com/kiisoo/ic/store/service/PoiStoreService.java +++ b/src/main/java/com/kiisoo/ic/store/service/PoiStoreService.java @@ -1,7 +1,10 @@ package com.kiisoo.ic.store.service; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.kiisoo.ic.store.entity.PoiStore; +import com.kiisoo.ic.store.entity.PoiStoreStaff; import com.kiisoo.ic.store.mapper.PoiStoreDOMapper; +import com.kiisoo.ic.store.mapper.PoiStoreStaffDOMapper; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -16,6 +19,9 @@ public class PoiStoreService { @Autowired private PoiStoreDOMapper poiStoreDOMapper; + @Autowired + private PoiStoreStaffDOMapper poiStoreStaffDOMapper; + /** * 根据区域id找到店铺集合 * @param regionId @@ -24,4 +30,14 @@ public class PoiStoreService { List poiStores = poiStoreDOMapper.selectRegionShop(regionId); return poiStores; } + + /** + * 找到店铺id中所有的导购 + * @param shopId 店铺id + */ + public List getShopSeller(List shopId){ + List sellers = poiStoreStaffDOMapper.selectSellersByShopIds(shopId); + return sellers; + } + } diff --git a/src/main/resources/mapper/OpCustomerDOMapper.xml b/src/main/resources/mapper/OpCustomerDOMapper.xml index 6615e78..4b6b39e 100644 --- a/src/main/resources/mapper/OpCustomerDOMapper.xml +++ b/src/main/resources/mapper/OpCustomerDOMapper.xml @@ -2,7 +2,7 @@ - select t2.id,t2.`name`,t2.member_id as idCard,GROUP_CONCAT(DISTINCT t0.`name`) as shopName, GROUP_CONCAT(DISTINCT t4.`name`) as sellerName, t3.birthday, t2.phone from @@ -25,4 +25,17 @@ GROUP BY t2.id order by t2.id asc + diff --git a/src/main/resources/mapper/PrivilageUserShopRelationDOMapper.xml b/src/main/resources/mapper/PrivilageUserShopRelationDOMapper.xml index 2af947b..0810767 100644 --- a/src/main/resources/mapper/PrivilageUserShopRelationDOMapper.xml +++ b/src/main/resources/mapper/PrivilageUserShopRelationDOMapper.xml @@ -9,5 +9,23 @@ +