From aca1959c0faafd7b45cefe53c839602e278df0b6 Mon Sep 17 00:00:00 2001 From: Yen Date: Sun, 23 Apr 2023 08:56:07 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../BmsSupplierVisitAddressController.java | 47 +++++++++- .../controller/my/BmsChannelMyController.java | 77 ++++++++++++++++ .../my/BmsChannelPointMyController.java | 90 +++++++++++++++++++ .../my/BmsSupplierMyController.java | 53 +++++++++++ .../modules/bms/entity/BmsChannelPoint.java | 5 ++ .../bms/entity/BmsSupplierVisitAddress.java | 2 + .../bo/BmsSupplierVisitDefaultAddressBo.java | 14 +++ .../bms/mapper/BmsChannelPointMapper.java | 7 ++ .../bms/service/BmsChannelPointService.java | 2 + .../impl/BmsChannelPointServiceImpl.java | 5 ++ .../his/controller/HistTestController.java | 4 +- .../mapper/bms/BmsChannelPointMapper.xml | 35 ++++++++ 12 files changed, 338 insertions(+), 3 deletions(-) create mode 100644 src/main/java/com/qs/serve/modules/bms/controller/my/BmsChannelMyController.java create mode 100644 src/main/java/com/qs/serve/modules/bms/controller/my/BmsChannelPointMyController.java create mode 100644 src/main/java/com/qs/serve/modules/bms/controller/my/BmsSupplierMyController.java create mode 100644 src/main/java/com/qs/serve/modules/bms/entity/bo/BmsSupplierVisitDefaultAddressBo.java diff --git a/src/main/java/com/qs/serve/modules/bms/controller/BmsSupplierVisitAddressController.java b/src/main/java/com/qs/serve/modules/bms/controller/BmsSupplierVisitAddressController.java index c7b001c6..2703365f 100644 --- a/src/main/java/com/qs/serve/modules/bms/controller/BmsSupplierVisitAddressController.java +++ b/src/main/java/com/qs/serve/modules/bms/controller/BmsSupplierVisitAddressController.java @@ -15,6 +15,7 @@ import com.qs.serve.modules.baz.service.BazVisitFlowService; import com.qs.serve.modules.baz.service.BazVisitInfoService; import com.qs.serve.modules.bms.entity.BmsSupplier; import com.qs.serve.modules.bms.entity.BmsSupplierVisit; +import com.qs.serve.modules.bms.entity.bo.BmsSupplierVisitDefaultAddressBo; import com.qs.serve.modules.bms.entity.so.BmsSupplierVisitSo; import com.qs.serve.modules.bms.mapper.BmsSupplierMapper; import com.qs.serve.modules.bms.service.*; @@ -140,7 +141,6 @@ public class BmsSupplierVisitAddressController { */ @GetMapping("/getById/{id}") @SysLog(module = SystemModule.BASE, title = "供应商拜访地址", biz = BizType.QUERY) - @PreAuthorize("hasRole('bms:supplierVisitAddress:query')") public R getById(@PathVariable("id") String id){ BmsSupplierVisitAddress bmsSupplierVisitAddress = bmsSupplierVisitAddressService.getById(id); BmsSupplier supplier = bmsSupplierService.getById(bmsSupplierVisitAddress.getSupplierId()); @@ -149,7 +149,52 @@ public class BmsSupplierVisitAddressController { return R.ok(bmsSupplierVisitAddress); } + /** + * 获取默认地址 + * @param supplierId + * @return + */ + @GetMapping("/getByDefaultAddress/{supplierId}") + @SysLog(module = SystemModule.BASE, title = "供应商拜访地址", biz = BizType.QUERY) + public R getByDefaultAddress(@PathVariable("supplierId") String supplierId){ + LambdaQueryWrapper lqw = new LambdaQueryWrapper<>(); + lqw.eq(BmsSupplierVisitAddress::getSupplierId,supplierId); + lqw.eq(BmsSupplierVisitAddress::getDefaultFlag,1); + return R.ok(bmsSupplierVisitAddressService.list(lqw)); + } + /** + * 设置默认 + * @param defaultAddressBo + * @return + */ + @PostMapping("/setDefault") + public R setDefault(@RequestBody BmsSupplierVisitDefaultAddressBo defaultAddressBo){ + BmsSupplierVisitAddress bmsSupplierVisitAddress = bmsSupplierVisitAddressService.getById(defaultAddressBo.getAddressId()); + LambdaQueryWrapper lqw = new LambdaQueryWrapper<>(); + lqw.eq(BmsSupplierVisitAddress::getAddressType,bmsSupplierVisitAddress.getAddressType()); + lqw.eq(BmsSupplierVisitAddress::getSupplierId,bmsSupplierVisitAddress.getSupplierId()); + BmsSupplierVisitAddress address = new BmsSupplierVisitAddress(); + address.setDefaultFlag(0); + bmsSupplierVisitAddressService.update(address,lqw); + bmsSupplierVisitAddress.setDefaultFlag(1); + bmsSupplierVisitAddressService.updateById(bmsSupplierVisitAddress); + return R.ok(); + } + + /** + * 取消默认 + * @param defaultAddressBo + * @return + */ + @PostMapping("/cancelDefault") + public R cancelDefault(@RequestBody BmsSupplierVisitDefaultAddressBo defaultAddressBo){ + BmsSupplierVisitAddress bmsSupplierVisitAddress = new BmsSupplierVisitAddress(); + bmsSupplierVisitAddress.setId(defaultAddressBo.getAddressId()); + bmsSupplierVisitAddress.setDefaultFlag(1); + bmsSupplierVisitAddressService.updateById(bmsSupplierVisitAddress); + return R.ok(); + } /** * 更新 diff --git a/src/main/java/com/qs/serve/modules/bms/controller/my/BmsChannelMyController.java b/src/main/java/com/qs/serve/modules/bms/controller/my/BmsChannelMyController.java new file mode 100644 index 00000000..5a614922 --- /dev/null +++ b/src/main/java/com/qs/serve/modules/bms/controller/my/BmsChannelMyController.java @@ -0,0 +1,77 @@ +package com.qs.serve.modules.bms.controller.my; + +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.qs.serve.common.model.annotation.SysLog; +import com.qs.serve.common.model.dto.PageVo; +import com.qs.serve.common.model.dto.R; +import com.qs.serve.common.model.enums.BizType; +import com.qs.serve.common.model.enums.SystemModule; +import com.qs.serve.common.util.AuthContextUtils; +import com.qs.serve.common.util.CollectionUtil; +import com.qs.serve.common.util.PageUtil; +import com.qs.serve.modules.bms.common.MasterUserType; +import com.qs.serve.modules.bms.entity.BmsChannel; +import com.qs.serve.modules.bms.entity.BmsChannelPoint; +import com.qs.serve.modules.bms.entity.BmsMasterUser; +import com.qs.serve.modules.bms.mapper.BmsMasterUserMapper; +import com.qs.serve.modules.bms.service.BmsChannelPointService; +import com.qs.serve.modules.bms.service.BmsChannelService; +import com.qs.serve.modules.bms.service.BmsMasterUserService; +import com.qs.serve.modules.his.entity.HisUserChannelPoint; +import com.qs.serve.modules.his.service.HisUserChannelPointService; +import com.qs.serve.modules.tbs.entity.TbsActivityChannel; +import com.qs.serve.modules.tbs.service.TbsActivityChannelService; +import lombok.AllArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.springframework.security.access.prepost.PreAuthorize; +import org.springframework.web.bind.annotation.*; + +import javax.validation.Valid; +import java.util.List; +import java.util.stream.Collectors; + +/** + * 基础档案 渠道（我的） + * @author YenHex + * @since 2022-11-03 + */ +@Slf4j +@AllArgsConstructor +@RestController +@RequestMapping("my/channel") +public class BmsChannelMyController { + + private BmsChannelService bmsChannelService; + private BmsChannelPointService bmsChannelPointService; + private TbsActivityChannelService activityChannelService; + private HisUserChannelPointService hisUserChannelPointService; + private BmsMasterUserMapper bmsMasterUserMapper; + private BmsMasterUserService bmsMasterUserService; + + /** + * 翻页 + * @param param + * @return + */ + @GetMapping("/page") + public R> getPage(BmsChannel param){ + LambdaQueryWrapper lqw = new LambdaQueryWrapper<>(); + lqw.eq(BmsMasterUser::getUserId, AuthContextUtils.getSysUserId()); + lqw.eq(BmsMasterUser::getType,MasterUserType.Channel); + lqw.select(BmsMasterUser::getTargetId); + List masterUsers = bmsMasterUserService.list(lqw); + List targetIds = masterUsers.stream().map(BmsMasterUser::getTargetId).distinct().collect(Collectors.toList()); + if(CollectionUtil.isEmpty(targetIds)){ + return R.byEmptyList(); + } + PageUtil.startPage(); + LambdaQueryWrapper channelWrapper = new LambdaQueryWrapper<>(param); + channelWrapper.orderByDesc(BmsChannel::getCreateTime); + channelWrapper.in(BmsChannel::getId,targetIds); + List list = bmsChannelService.list(channelWrapper); + return R.byPageHelperList(list); + } + + +} + diff --git a/src/main/java/com/qs/serve/modules/bms/controller/my/BmsChannelPointMyController.java b/src/main/java/com/qs/serve/modules/bms/controller/my/BmsChannelPointMyController.java new file mode 100644 index 00000000..9daf72e7 --- /dev/null +++ b/src/main/java/com/qs/serve/modules/bms/controller/my/BmsChannelPointMyController.java @@ -0,0 +1,90 @@ +package com.qs.serve.modules.bms.controller.my; + +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.qs.serve.common.model.annotation.SysLog; +import com.qs.serve.common.model.dto.PageVo; +import com.qs.serve.common.model.dto.R; +import com.qs.serve.common.model.enums.BizType; +import com.qs.serve.common.model.enums.SystemModule; +import com.qs.serve.common.util.AuthContextUtils; +import com.qs.serve.common.util.CopierUtil; +import com.qs.serve.common.util.PageUtil; +import com.qs.serve.common.util.StringUtils; +import com.qs.serve.modules.baz.common.BazTargetTypeConsts; +import com.qs.serve.modules.baz.entity.BazVisitInfo; +import com.qs.serve.modules.baz.service.BazVisitInfoService; +import com.qs.serve.modules.bms.entity.BmsChannelPoint; +import com.qs.serve.modules.bms.entity.BmsRegion; +import com.qs.serve.modules.bms.entity.BmsRegion2; +import com.qs.serve.modules.bms.entity.bo.BmsChannelPointBo; +import com.qs.serve.modules.bms.entity.bo.BmsChannelPointMapInfoBo; +import com.qs.serve.modules.bms.entity.so.BmsPointVisitSo; +import com.qs.serve.modules.bms.entity.vo.BmsUserPoint4VisitVo; +import com.qs.serve.modules.bms.mapper.BmsChannelPointMapper; +import com.qs.serve.modules.bms.service.BmsChannelPointService; +import com.qs.serve.modules.bms.service.BmsRegion2Service; +import com.qs.serve.modules.bms.service.BmsRegionService; +import com.qs.serve.modules.his.service.HisUserChannelPointService; +import com.qs.serve.modules.tbs.entity.TbsActivityChannelPoint; +import com.qs.serve.modules.tbs.service.TbsActivityChannelPointService; +import lombok.AllArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.springframework.security.access.prepost.PreAuthorize; +import org.springframework.web.bind.annotation.*; + +import javax.validation.Valid; +import java.util.List; + +/** + * 基础档案 渠道站点(我的) + * @author YenHex + * @since 2022-11-03 + */ +@Slf4j +@AllArgsConstructor +@RestController +@RequestMapping("my/channelPoint") +public class BmsChannelPointMyController { + + private BazVisitInfoService bazVisitInfoService; + private BmsChannelPointService bmsChannelPointService; + private BmsRegionService bmsRegionService; + private BmsRegion2Service bmsRegion2Service; + private TbsActivityChannelPointService activityChannelPointService; + private BmsChannelPointMapper channelPointMapper; + private HisUserChannelPointService hisUserChannelPointService; + + + /** + * 翻页 + * @param param + * @return + */ + @GetMapping("/page") + @PreAuthorize("hasRole('bms:channelPoint:query')") + public R> getPage(BmsChannelPoint param){ + PageUtil.startPage(); + param.setUserId(AuthContextUtils.getSysUserId()); + param.setTenantId(AuthContextUtils.getTenant()); + List list = bmsChannelPointService.selectChannelPointMyList(param); + for (BmsChannelPoint channelPoint : list) { + if(StringUtils.hasText(channelPoint.getBizRegionPath())){ + String[] bizRegions = channelPoint.getBizRegionPath().split("_"); + if(bizRegions.length>0){ + channelPoint.setBizRegionName(bizRegions[bizRegions.length-1]); + } + } + if(StringUtils.hasText(channelPoint.getSaleRegionPath())){ + String[] regions = channelPoint.getSaleRegionPath().split("_"); + if(regions.length>0){ + channelPoint.setSaleRegionName(regions[regions.length-1]); + } + } + } + return R.byPageHelperList(list); + } + + + +} + diff --git a/src/main/java/com/qs/serve/modules/bms/controller/my/BmsSupplierMyController.java b/src/main/java/com/qs/serve/modules/bms/controller/my/BmsSupplierMyController.java new file mode 100644 index 00000000..656a6cf5 --- /dev/null +++ b/src/main/java/com/qs/serve/modules/bms/controller/my/BmsSupplierMyController.java @@ -0,0 +1,53 @@ +package com.qs.serve.modules.bms.controller.my; + +import com.qs.serve.common.model.dto.PageVo; +import com.qs.serve.common.model.dto.R; +import com.qs.serve.common.util.AuthContextUtils; +import com.qs.serve.common.util.CopierUtil; +import com.qs.serve.common.util.PageUtil; +import com.qs.serve.common.util.TreeUtil; +import com.qs.serve.modules.bms.entity.BmsSupplier; +import com.qs.serve.modules.bms.entity.vo.BmsSupplierTreeVo; +import com.qs.serve.modules.bms.service.BmsSupplierService; +import com.qs.serve.modules.wx.entity.WxUser; +import com.qs.serve.modules.wx.service.WxUserService; +import lombok.AllArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import java.util.ArrayList; +import java.util.List; +import java.util.stream.Collectors; + +/** + * 基础档案 客户(我的) + * @author YenHex + * @since 2022-10-10 + */ +@Slf4j +@AllArgsConstructor +@RestController +@RequestMapping("/my/supplier") +public class BmsSupplierMyController { + + private final BmsSupplierService bmsSupplierService; + + /** + * 翻页查询 + * @param param + * @return + */ + @GetMapping("/page") + public R> getPage(BmsSupplier param){ + param.setCurrUserId(AuthContextUtils.getSysUserId()); + param.setStopFlag(0); + PageUtil.startPage(); + List list = bmsSupplierService.selectSupplierList(param); + return R.byPageHelperList(list); + } + +} + diff --git a/src/main/java/com/qs/serve/modules/bms/entity/BmsChannelPoint.java b/src/main/java/com/qs/serve/modules/bms/entity/BmsChannelPoint.java index aae2f907..40d996f2 100644 --- a/src/main/java/com/qs/serve/modules/bms/entity/BmsChannelPoint.java +++ b/src/main/java/com/qs/serve/modules/bms/entity/BmsChannelPoint.java @@ -153,5 +153,10 @@ public class BmsChannelPoint implements Serializable { @TableField(exist = false) private String supplierId; + + /** 后端参数 */ + @TableField(exist = false) + private String userId; + } diff --git a/src/main/java/com/qs/serve/modules/bms/entity/BmsSupplierVisitAddress.java b/src/main/java/com/qs/serve/modules/bms/entity/BmsSupplierVisitAddress.java index 1eb562ca..567f15da 100644 --- a/src/main/java/com/qs/serve/modules/bms/entity/BmsSupplierVisitAddress.java +++ b/src/main/java/com/qs/serve/modules/bms/entity/BmsSupplierVisitAddress.java @@ -51,6 +51,8 @@ public class BmsSupplierVisitAddress implements Serializable { private String localAddress; + private Integer defaultFlag; + /** 纬度 */ @Length(max = 255,message = "纬度长度不能超过255字") private String localX; diff --git a/src/main/java/com/qs/serve/modules/bms/entity/bo/BmsSupplierVisitDefaultAddressBo.java b/src/main/java/com/qs/serve/modules/bms/entity/bo/BmsSupplierVisitDefaultAddressBo.java new file mode 100644 index 00000000..12b69e7c --- /dev/null +++ b/src/main/java/com/qs/serve/modules/bms/entity/bo/BmsSupplierVisitDefaultAddressBo.java @@ -0,0 +1,14 @@ +package com.qs.serve.modules.bms.entity.bo; + +import lombok.Data; + +/** + * @author YenHex + * @since 2023/4/21 + */ +@Data +public class BmsSupplierVisitDefaultAddressBo { + + private String addressId; + +} diff --git a/src/main/java/com/qs/serve/modules/bms/mapper/BmsChannelPointMapper.java b/src/main/java/com/qs/serve/modules/bms/mapper/BmsChannelPointMapper.java index 7c54dea2..1ecbe44f 100644 --- a/src/main/java/com/qs/serve/modules/bms/mapper/BmsChannelPointMapper.java +++ b/src/main/java/com/qs/serve/modules/bms/mapper/BmsChannelPointMapper.java @@ -39,6 +39,13 @@ public interface BmsChannelPointMapper extends BaseMapper { @InterceptorIgnore(tenantLine = "1") List selectUserPointList4Visit(@Param("query") BmsPointVisitSo param); + /** + * 直属管理人 + * @param param + * @return + */ + @InterceptorIgnore(tenantLine = "1") + List selectUserPointList4My(@Param("query") BmsChannelPoint param); } diff --git a/src/main/java/com/qs/serve/modules/bms/service/BmsChannelPointService.java b/src/main/java/com/qs/serve/modules/bms/service/BmsChannelPointService.java index 53973bdc..5c23c8ca 100644 --- a/src/main/java/com/qs/serve/modules/bms/service/BmsChannelPointService.java +++ b/src/main/java/com/qs/serve/modules/bms/service/BmsChannelPointService.java @@ -19,6 +19,8 @@ public interface BmsChannelPointService extends IService { List selectChannelPointList(BmsChannelPoint channelPoint); + List selectChannelPointMyList(BmsChannelPoint channelPoint); + List listByBizRegionId(String id); List listBySaleRegionId(String id); diff --git a/src/main/java/com/qs/serve/modules/bms/service/impl/BmsChannelPointServiceImpl.java b/src/main/java/com/qs/serve/modules/bms/service/impl/BmsChannelPointServiceImpl.java index 5d24443e..1a897eb0 100644 --- a/src/main/java/com/qs/serve/modules/bms/service/impl/BmsChannelPointServiceImpl.java +++ b/src/main/java/com/qs/serve/modules/bms/service/impl/BmsChannelPointServiceImpl.java @@ -79,6 +79,11 @@ public class BmsChannelPointServiceImpl extends ServiceImpl selectChannelPointMyList(BmsChannelPoint channelPoint) { + return baseMapper.selectUserPointList4My(channelPoint); + } + @Override public List listByBizRegionId(String id) { LambdaQueryWrapper channelPointWrapper = new LambdaQueryWrapper<>(); diff --git a/src/main/java/com/qs/serve/modules/his/controller/HistTestController.java b/src/main/java/com/qs/serve/modules/his/controller/HistTestController.java index 37122188..9aed512d 100644 --- a/src/main/java/com/qs/serve/modules/his/controller/HistTestController.java +++ b/src/main/java/com/qs/serve/modules/his/controller/HistTestController.java @@ -22,8 +22,8 @@ import java.util.List; */ @Slf4j @AllArgsConstructor -@RestController -@RequestMapping("his/dev") +//@RestController +//@RequestMapping("his/dev") public class HistTestController { HisUserChannelPointService hisUserChannelPointService; diff --git a/src/main/resources/mapper/bms/BmsChannelPointMapper.xml b/src/main/resources/mapper/bms/BmsChannelPointMapper.xml index c2e9edd9..a8951b02 100644 --- a/src/main/resources/mapper/bms/BmsChannelPointMapper.xml +++ b/src/main/resources/mapper/bms/BmsChannelPointMapper.xml @@ -143,5 +143,40 @@ bms_channel_point.id + +