调整

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<BmsSupplierVisitAddress> 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<BmsSupplierVisitAddress> 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<BmsSupplierVisitAddress> 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();
+    }
 
     /**
      * 更新

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<PageVo<BmsChannel>> getPage(BmsChannel param){
+        LambdaQueryWrapper<BmsMasterUser> lqw = new LambdaQueryWrapper<>();
+        lqw.eq(BmsMasterUser::getUserId, AuthContextUtils.getSysUserId());
+        lqw.eq(BmsMasterUser::getType,MasterUserType.Channel);
+        lqw.select(BmsMasterUser::getTargetId);
+        List<BmsMasterUser> masterUsers = bmsMasterUserService.list(lqw);
+        List<String> targetIds = masterUsers.stream().map(BmsMasterUser::getTargetId).distinct().collect(Collectors.toList());
+        if(CollectionUtil.isEmpty(targetIds)){
+            return R.byEmptyList();
+        }
+        PageUtil.startPage();
+        LambdaQueryWrapper<BmsChannel> channelWrapper = new LambdaQueryWrapper<>(param);
+        channelWrapper.orderByDesc(BmsChannel::getCreateTime);
+        channelWrapper.in(BmsChannel::getId,targetIds);
+        List<BmsChannel> list = bmsChannelService.list(channelWrapper);
+        return R.byPageHelperList(list);
+    }
+
+
+}
+

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<PageVo<BmsChannelPoint>> getPage(BmsChannelPoint param){
+        PageUtil.startPage();
+        param.setUserId(AuthContextUtils.getSysUserId());
+        param.setTenantId(AuthContextUtils.getTenant());
+        List<BmsChannelPoint> 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);
+    }
+
+
+
+}
+

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<PageVo<BmsSupplier>> getPage(BmsSupplier param){
+        param.setCurrUserId(AuthContextUtils.getSysUserId());
+        param.setStopFlag(0);
+        PageUtil.startPage();
+        List<BmsSupplier> list = bmsSupplierService.selectSupplierList(param);
+        return R.byPageHelperList(list);
+    }
+
+}
+

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;
+
 }
 

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;

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;
+
+}

src/main/java/com/qs/serve/modules/bms/mapper/BmsChannelPointMapper.java

@@ -39,6 +39,13 @@ public interface BmsChannelPointMapper extends BaseMapper<BmsChannelPoint> {
     @InterceptorIgnore(tenantLine = "1")
     List<BmsUserPoint4VisitVo> selectUserPointList4Visit(@Param("query") BmsPointVisitSo param);
 
+    /**
+     * 直属管理人
+     * @param param
+     * @return
+     */
+    @InterceptorIgnore(tenantLine = "1")
+    List<BmsChannelPoint> selectUserPointList4My(@Param("query") BmsChannelPoint param);
 
 }
 

src/main/java/com/qs/serve/modules/bms/service/BmsChannelPointService.java

@@ -19,6 +19,8 @@ public interface BmsChannelPointService extends IService<BmsChannelPoint> {
 
     List<BmsChannelPoint> selectChannelPointList(BmsChannelPoint channelPoint);
 
+    List<BmsChannelPoint> selectChannelPointMyList(BmsChannelPoint channelPoint);
+
     List<BmsChannelPoint> listByBizRegionId(String id);
 
     List<BmsChannelPoint> listBySaleRegionId(String id);

src/main/java/com/qs/serve/modules/bms/service/impl/BmsChannelPointServiceImpl.java

@@ -79,6 +79,11 @@ public class BmsChannelPointServiceImpl extends ServiceImpl<BmsChannelPointMappe
         return baseMapper.selectChannelPointList(channelPoint);
     }
 
+    @Override
+    public List<BmsChannelPoint> selectChannelPointMyList(BmsChannelPoint channelPoint) {
+        return baseMapper.selectUserPointList4My(channelPoint);
+    }
+
     @Override
     public List<BmsChannelPoint> listByBizRegionId(String id) {
         LambdaQueryWrapper<BmsChannelPoint> channelPointWrapper = new LambdaQueryWrapper<>();

src/main/java/com/qs/serve/modules/his/controller/HistTestController.java

@@ -22,8 +22,8 @@ import java.util.List;
  */
 @Slf4j
 @AllArgsConstructor
-@RestController
+//@RestController
-@RequestMapping("his/dev")
+//@RequestMapping("his/dev")
 public class HistTestController {
 
     HisUserChannelPointService hisUserChannelPointService;

src/main/resources/mapper/bms/BmsChannelPointMapper.xml

@@ -143,5 +143,40 @@
         bms_channel_point.id
     </select>
 
+    <select id="selectUserPointList4My" resultType="com.qs.serve.modules.bms.entity.BmsChannelPoint">
+        SELECT
+        <include refid="bmsChannelPointSql"/>
+        FROM ( SELECT DISTINCT mu.point_id target_id FROM `his_user_channel_point` mu WHERE del_flag = 0 AND user_id = #{query.userId} AND tenant_id = #{query.tenantId} ) pmu
+        LEFT JOIN `bms_channel_point` `bms_channel_point` ON `bms_channel_point`.id = pmu.target_id
+        <if test="query.supplierId!=null and query.supplierId!=''">
+            LEFT JOIN bms_supplier_channel ON bms_supplier_channel.`channel_id` = `bms_channel_point`.`channel_id`
+        </if>
+        <where>
+            and `bms_channel_point`.`del_flag` = 0
+            <if test="query.supplierId!=null and query.supplierId!=''">
+                and bms_supplier_channel.`supplier_id` = #{query.supplierId} and bms_supplier_channel.`del_flag` = 0
+            </if>
+            <if test="query.id != null"> and `bms_channel_point`.`id` = #{query.id}</if>
+            <if test="query.channelId != null"> and `bms_channel_point`.`channel_id` = #{query.channelId}</if>
+            <if test="query.channelName != null and query.channelName != ''"> and `bms_channel_point`.`channel_name` like concat('%',#{query.channelName},'%') </if>
+            <if test="query.pointCode != null and query.pointCode != ''"> and `bms_channel_point`.`point_code` like concat('%',#{query.pointCode},'%') </if>
+            <if test="query.pointName != null and query.pointName != ''"> and `bms_channel_point`.`point_name` like concat('%',#{query.pointName},'%') </if>
+            <if test="query.shopArea != null and query.shopArea != ''"> and `bms_channel_point`.`shop_area` = #{query.shopArea}</if>
+            <if test="query.countCheckstand != null"> and `bms_channel_point`.`count_checkstand` = #{query.countCheckstand}</if>
+            <if test="query.pointLevel != null and query.pointLevel != ''"> and `bms_channel_point`.`point_level` = #{query.pointLevel}</if>
+            <if test="query.pointType != null and query.pointType != ''"> and `bms_channel_point`.`point_type` like concat('%',#{query.pointType},'%') </if>
+            <if test="query.address != null and query.address != ''"> and `bms_channel_point`.`address` = #{query.address}</if>
+            <if test="query.saleRegionId != null and query.saleRegionId != ''"> and `bms_channel_point`.`sale_region_id` = #{query.saleRegionId}</if>
+            <if test="query.saleRegionPath != null and query.saleRegionPath != ''"> and `bms_channel_point`.`sale_region_path` like concat('%',#{query.saleRegionPath},'%') </if>
+            <if test="query.saleRegionPathIds != null and query.saleRegionPathIds != ''"> and `bms_channel_point`.`sale_region_path_ids` = #{query.saleRegionPathIds}</if>
+            <if test="query.bizRegionId != null and query.bizRegionId != ''"> and `bms_channel_point`.`biz_region_id` = #{query.bizRegionId}</if>
+            <if test="query.bizRegionPath != null and query.bizRegionPath != ''"> and `bms_channel_point`.`biz_region_path`  like concat('%',#{query.bizRegionPath},'%') </if>
+            <if test="query.bizRegionPathIds != null and query.bizRegionPathIds != ''"> and `bms_channel_point`.`biz_region_path_ids` = #{query.bizRegionPathIds}</if>
+            <if test="query.remark != null and query.remark != ''"> and `bms_channel_point`.`remark` = #{query.remark}</if>
+        </where>
+        ORDER BY
+        bms_channel_point.id
+    </select>
+
 
 </mapper>