diff --git a/src/main/java/com/kiisoo/ic/customer/CustomerService.java b/src/main/java/com/kiisoo/ic/customer/CustomerService.java index 1e8d892..ec85930 100644 --- a/src/main/java/com/kiisoo/ic/customer/CustomerService.java +++ b/src/main/java/com/kiisoo/ic/customer/CustomerService.java @@ -6,6 +6,7 @@ import com.github.pagehelper.PageHelper; 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.bean.FriendDTO; import com.kiisoo.ic.customer.entity.OpCustomer; import com.kiisoo.ic.customer.bean.OpCustomerDTO; import com.kiisoo.ic.customer.entity.OpSellerCustomerRelation; @@ -20,6 +21,8 @@ import com.kiisoo.ic.store.service.PoiStoreService; import com.kiisoo.ic.store.entity.PoiStoreStaff; import com.kiisoo.ic.store.mapper.PoiStoreDOMapper; import com.kiisoo.ic.store.mapper.PoiStoreStaffDOMapper; +import com.kiisoo.ic.system.enums.RoleEnum; +import com.kiisoo.ic.webappmy.vo.StafferInfoVO; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -241,4 +244,34 @@ public class CustomerService { opCustomerDOMapper.updateById(opCustomer); } + /** + * + * @param userId + * @param startDate + * @param endDate + * @param lastStartDate + * @param lastEndDate + */ + public Map listCustomer(Long userId,Long sellerId,String search,String roleCode,Date startDate,Date endDate,Date lastStartDate,Date lastEndDate){ + Map results = new HashMap<>(); + if (roleCode.equals(RoleEnum.ROLE_CODE_DZ.getRoleCode())){ + List stafferInfoVOS = poiStoreStaffDOMapper.selectInfoById(userId); + Long shopId = stafferInfoVOS.get(0).getStoreId(); + List thisList = opSellerCustomerRelationDOMapper.selectShopListByDate(shopId,null,sellerId,search,startDate,endDate); + results.put("this",thisList); + List lastList = opSellerCustomerRelationDOMapper.selectShopListByDate(shopId,null,sellerId,search,lastStartDate,lastEndDate); + results.put("last",lastList); + List earlyList = opSellerCustomerRelationDOMapper.selectShopListByDate(shopId,null,sellerId,search,null,lastStartDate); + results.put("early",earlyList); + }else{ + List thisList = opSellerCustomerRelationDOMapper.selectShopListByDate(null,userId,null,search,startDate,endDate); + results.put("this",thisList); + List lastList = opSellerCustomerRelationDOMapper.selectShopListByDate(null,userId,null,search,lastStartDate,lastEndDate); + results.put("last",lastList); + List earlyList = opSellerCustomerRelationDOMapper.selectShopListByDate(null,userId,null,search,null,lastStartDate); + results.put("early",earlyList); + } + return results; + } + } diff --git a/src/main/java/com/kiisoo/ic/customer/bean/FriendDTO.java b/src/main/java/com/kiisoo/ic/customer/bean/FriendDTO.java new file mode 100644 index 0000000..4ddf280 --- /dev/null +++ b/src/main/java/com/kiisoo/ic/customer/bean/FriendDTO.java @@ -0,0 +1,51 @@ +package com.kiisoo.ic.customer.bean; + +import lombok.Data; + +import java.sql.Date; + +/** + * @ClassName: FriendDTO + * @Description: + * @Auther: yechenhao + * @Date: 2020/4/20 0008 16:46 + * @Version: + */ +@Data +public class FriendDTO { + + /** + * 客户id + */ + private Long customerId; + + /** + * 客户名 + */ + private String customerName; + + /** + * 客户电话 + */ + private String mobile; + + /** + * 邀请的导购名 + */ + private String inviteSellerName; + + /** + * 邀请的导购id + */ + private String inviteSellerId; + + /** + * 添加时间 + */ + private Date addTime; + + /** + * 会员类型 + */ + private String vipType; +} 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 b410a4b..7b28d87 100644 --- a/src/main/java/com/kiisoo/ic/customer/controller/CustomerController.java +++ b/src/main/java/com/kiisoo/ic/customer/controller/CustomerController.java @@ -67,4 +67,25 @@ public class CustomerController extends BaseController { return fail(); } } + + /** + * 修改客户信息 + * @param customerId 客户id + * @param name 客户名称 + * @return + */ + @ResponseBody + @PostMapping("/list/friends") + public Map listCustomer(@RequestParam("userId") Long userId,@RequestParam(value = "sellerId",required = false)Long sellerId, + @RequestParam(value = "search",required = false)String search,@RequestParam("roleCode")String roleCode, + @RequestParam("startDate")Date startDate,@RequestParam("endDate")Date endDate, + @RequestParam("lastStartDate")Date lastStartDate,@RequestParam("lastEndDate")Date lastEndDate){ + try { + Map stringObjectMap = customerService.listCustomer(userId, sellerId, search, roleCode, startDate, endDate, lastStartDate, lastEndDate); + return success(); + } catch (Exception e) { + log.error("修改客户信息异常:",e); + return fail(); + } + } } diff --git a/src/main/java/com/kiisoo/ic/customer/mapper/OpSellerCustomerRelationDOMapper.java b/src/main/java/com/kiisoo/ic/customer/mapper/OpSellerCustomerRelationDOMapper.java index 4cf2376..5ba8264 100644 --- a/src/main/java/com/kiisoo/ic/customer/mapper/OpSellerCustomerRelationDOMapper.java +++ b/src/main/java/com/kiisoo/ic/customer/mapper/OpSellerCustomerRelationDOMapper.java @@ -1,13 +1,29 @@ package com.kiisoo.ic.customer.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.kiisoo.ic.customer.bean.FriendDTO; import com.kiisoo.ic.customer.entity.OpSellerCustomerRelation; +import org.apache.ibatis.annotations.Param; import org.springframework.stereotype.Repository; +import java.util.Date; +import java.util.List; + /** * 导购客户 */ @Repository public interface OpSellerCustomerRelationDOMapper extends BaseMapper { + /** + * 查询用户 + * @param shopId + * @param sellerId + * @param search + * @param startDate + * @param endDate + * @return + */ + List selectShopListByDate(@Param("shopId") Long shopId, @Param("userId")Long userId, @Param("sellerId")Long sellerId, + @Param("search")String search, @Param("startDate")Date startDate, @Param("endDate")Date endDate); } diff --git a/src/main/java/com/kiisoo/ic/store/controller/StoreEmployeeController.java b/src/main/java/com/kiisoo/ic/store/controller/StoreEmployeeController.java index c898c53..e0df956 100644 --- a/src/main/java/com/kiisoo/ic/store/controller/StoreEmployeeController.java +++ b/src/main/java/com/kiisoo/ic/store/controller/StoreEmployeeController.java @@ -69,7 +69,7 @@ public class StoreEmployeeController extends BaseController { * 批量下载店铺二维码 * @param response */ - @RequestMapping(value = "download/store/code",method = RequestMethod.GET) + @RequestMapping(value = "download/store/code",method = RequestMethod.POST) @ResponseBody public void downloadCode(HttpServletResponse response) { try { @@ -83,7 +83,7 @@ public class StoreEmployeeController extends BaseController { * 批量下载导购二维码 * @param response */ - @RequestMapping(value = "download/store/seller/code",method = RequestMethod.GET) + @RequestMapping(value = "download/store/seller/code",method = RequestMethod.POST) @ResponseBody public void downloadSellerCode(HttpServletResponse response) { try { diff --git a/src/main/java/com/kiisoo/ic/webappmy/vo/StafferInfoVO.java b/src/main/java/com/kiisoo/ic/webappmy/vo/StafferInfoVO.java index f99c2cc..fd29246 100644 --- a/src/main/java/com/kiisoo/ic/webappmy/vo/StafferInfoVO.java +++ b/src/main/java/com/kiisoo/ic/webappmy/vo/StafferInfoVO.java @@ -23,4 +23,9 @@ public class StafferInfoVO { * 店铺名称 */ private String shopName; + + /** + * 店铺id + */ + private Long storeId; } diff --git a/src/main/resources/mapper/OpSellerCustomerRelationDOMapper.xml b/src/main/resources/mapper/OpSellerCustomerRelationDOMapper.xml new file mode 100644 index 0000000..29c58c0 --- /dev/null +++ b/src/main/resources/mapper/OpSellerCustomerRelationDOMapper.xml @@ -0,0 +1,32 @@ + + + + + diff --git a/src/main/resources/mapper/PrivilageUserShopRelationDOMapper.xml b/src/main/resources/mapper/PrivilageUserShopRelationDOMapper.xml index 802eae6..79b32da 100644 --- a/src/main/resources/mapper/PrivilageUserShopRelationDOMapper.xml +++ b/src/main/resources/mapper/PrivilageUserShopRelationDOMapper.xml @@ -32,7 +32,7 @@