From 66085d3172f4af04576574d7e909f874da0c6cae Mon Sep 17 00:00:00 2001 From: wangweijia <495720349@qq.com> Date: Thu, 9 Apr 2020 19:11:06 +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 --- .../ic/customer/bean/OpCustomerDTO.java | 6 +++++- .../controller/CustomerController.java | 15 +++++++++++--- .../ic/region/service/RegionService.java | 3 ++- .../store/mapper/PoiStoreStaffDOMapper.java | 3 ++- .../ic/store/service/PoiStoreService.java | 5 +++-- .../resources/mapper/OpCustomerDOMapper.xml | 20 ++++++++++++++++--- 6 files changed, 41 insertions(+), 11 deletions(-) diff --git a/src/main/java/com/kiisoo/ic/customer/bean/OpCustomerDTO.java b/src/main/java/com/kiisoo/ic/customer/bean/OpCustomerDTO.java index e93d170..2088529 100644 --- a/src/main/java/com/kiisoo/ic/customer/bean/OpCustomerDTO.java +++ b/src/main/java/com/kiisoo/ic/customer/bean/OpCustomerDTO.java @@ -11,8 +11,10 @@ import java.util.Date; public class OpCustomerDTO { /**客户id*/ private Long id; - /**客户名称*/ + /**客户昵称*/ private String name; + /**客户真实姓名*/ + private String vipName; /**客户唯一标示*/ private String idCard; /**客户所属店铺名称 X,XX,XXX*/ @@ -23,4 +25,6 @@ public class OpCustomerDTO { private Date birthday; /**客户手机*/ private String phone; + /**vip手机*/ + private String vipPhone; } 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 43fd30c..6e49812 100644 --- a/src/main/java/com/kiisoo/ic/customer/controller/CustomerController.java +++ b/src/main/java/com/kiisoo/ic/customer/controller/CustomerController.java @@ -4,6 +4,7 @@ import com.kiisoo.ic.common.BaseController; import com.kiisoo.ic.customer.CustomerService; import com.kiisoo.ic.customer.bean.OpCustomerDTO; import lombok.extern.slf4j.Slf4j; +import org.apache.commons.lang3.StringUtils; import org.apache.ibatis.annotations.Param; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.PostMapping; @@ -11,6 +12,8 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.ResponseBody; import org.springframework.web.bind.annotation.RestController; +import java.text.ParseException; +import java.text.SimpleDateFormat; import java.util.Date; import java.util.List; import java.util.Map; @@ -29,9 +32,15 @@ public class CustomerController extends BaseController { @ResponseBody @PostMapping("/info") 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, sellerId, startDate, endDate); + String startDate, String endDate){ + SimpleDateFormat sdf = new SimpleDateFormat(); + List opCustomerDTOS = null; + try { + opCustomerDTOS = customerService.getCustomerByUserAndDate(userId, shopId, regionId, sellerId, + StringUtils.isBlank(startDate) ? null : sdf.parse(startDate), StringUtils.isBlank(endDate) ? null : sdf.parse(endDate)); + } catch (ParseException e) { + log.error("日期转换异常:",e); + } return data(opCustomerDTOS); } } 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 de2639d..2317638 100644 --- a/src/main/java/com/kiisoo/ic/region/service/RegionService.java +++ b/src/main/java/com/kiisoo/ic/region/service/RegionService.java @@ -4,6 +4,7 @@ import com.kiisoo.ic.common.DataConstants; import com.kiisoo.ic.domain.service.PrivilageDomainService; import com.kiisoo.ic.region.entity.RegionDO; import com.kiisoo.ic.region.mapper.RegionDOMapper; +import com.kiisoo.ic.store.bean.PoiStoreStaffDTO; import com.kiisoo.ic.store.entity.PoiStore; import com.kiisoo.ic.store.entity.PoiStoreStaff; import com.kiisoo.ic.store.mapper.PoiStoreDOMapper; @@ -52,7 +53,7 @@ public class RegionService { List shopsIds = privilageDomainService.listUserDatePermission(userId); List shops = poiStoreDOMapper.selectBatchIds(shopsIds); //找到店铺对应的导购 - List sellers = poiStoreStaffDOMapper.selectSellersByShopIds(shopsIds); + List sellers = poiStoreStaffDOMapper.selectSellersByShopIds(shopsIds); Map regionAndShop = new HashMap<>(); regionAndShop.put("region", regionDOS); 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 74da142..1d23509 100644 --- a/src/main/java/com/kiisoo/ic/store/mapper/PoiStoreStaffDOMapper.java +++ b/src/main/java/com/kiisoo/ic/store/mapper/PoiStoreStaffDOMapper.java @@ -1,6 +1,7 @@ package com.kiisoo.ic.store.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.kiisoo.ic.store.bean.PoiStoreStaffDTO; import com.kiisoo.ic.store.entity.PoiStoreStaff; import org.apache.ibatis.annotations.Param; import org.springframework.stereotype.Repository; @@ -28,5 +29,5 @@ public interface PoiStoreStaffDOMapper extends BaseMapper { * @param shopId * @return */ - List selectSellersByShopIds(@Param("shopId") List shopId); + 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 6388468..ae4a5ba 100644 --- a/src/main/java/com/kiisoo/ic/store/service/PoiStoreService.java +++ b/src/main/java/com/kiisoo/ic/store/service/PoiStoreService.java @@ -1,6 +1,7 @@ package com.kiisoo.ic.store.service; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.kiisoo.ic.store.bean.PoiStoreStaffDTO; import com.kiisoo.ic.store.entity.PoiStore; import com.kiisoo.ic.store.entity.PoiStoreStaff; import com.kiisoo.ic.store.mapper.PoiStoreDOMapper; @@ -35,8 +36,8 @@ public class PoiStoreService { * 找到店铺id中所有的导购 * @param shopId 店铺id */ - public List getShopSeller(List shopId){ - List sellers = poiStoreStaffDOMapper.selectSellersByShopIds(shopId); + 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 4b6b39e..9349d7c 100644 --- a/src/main/resources/mapper/OpCustomerDOMapper.xml +++ b/src/main/resources/mapper/OpCustomerDOMapper.xml @@ -4,7 +4,10 @@