Browse Source

移动端-经销商初始化可编辑、删除经销商、删除经销商人员、经销商人员初始化

master
dimengzhe 3 years ago
parent
commit
c37b48411c
  1. 16
      anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basedistributor/BaseDistributorFeign.java
  2. 20
      anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basedistributor/BaseDistributorFeignFallback.java
  3. 26
      anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basedistributor/app/BaseDistribuDeailVo.java
  4. 33
      anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basedistributor/app/BaseInfoListVo.java
  5. 30
      anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basedistributor/app/BasePersonalVo.java
  6. 4
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basedistributor/BaseDistributorMapper.java
  7. 14
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basedistributor/BaseDistributorMapper.xml
  8. 20
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basedistributor/BaseDistributorRest.java
  9. 65
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basedistributor/BaseDistributorService.java
  10. 2
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basedistributorappendix/BaseDistributorAppendixMapper.java
  11. 6
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basedistributorappendix/BaseDistributorAppendixMapper.xml
  12. 13
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basedistributorappendix/BaseDistributorAppendixService.java
  13. 3
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basedistributorstaff/BaseDistributorStaffMapper.java
  14. 8
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basedistributorstaff/BaseDistributorStaffMapper.xml
  15. 21
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basedistributorstaff/BaseDistributorStaffService.java
  16. 26
      anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/distributor/DisInitDetailsVo.java
  17. 34
      anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/distributor/DisInitRecordVo.java
  18. 31
      anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/distributor/DisPersonVo.java
  19. 21
      anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/distributor/DistributorFeign.java
  20. 25
      anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/distributor/DistributorRest.java
  21. 48
      anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/distributor/DistributorService.java

16
anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basedistributor/BaseDistributorFeign.java

@ -92,4 +92,20 @@ public interface BaseDistributorFeign {
@ApiOperation("移动-经销商详情") @ApiOperation("移动-经销商详情")
@GetMapping("/getDistributorDetail/{sid}") @GetMapping("/getDistributorDetail/{sid}")
ResultBean<BaseDisDetailsVo> getDistributorDetail(@PathVariable("sid") String sid); ResultBean<BaseDisDetailsVo> getDistributorDetail(@PathVariable("sid") String sid);
@ApiOperation("移动-经销商初始化详情")
@GetMapping("/getDistributorInfo/{sid}")
ResultBean<BaseDistribuDeailVo> getDistributorInfo(@PathVariable("sid") String sid);
@ApiOperation("移动-经销商删除")
@DeleteMapping("/deleteInfo/{sid}")
ResultBean deleteInfo(@PathVariable("sid") String sid);
@ApiOperation("移动-经销商删除人员")
@DeleteMapping("/deleteDistributorPersonnel/{sid}")
ResultBean deleteDistributorPersonnel(@PathVariable(value = "sid") String sid);
@ApiOperation("移动-经销商人员初始化")
@GetMapping("/getDistributorPersonnel/{sid}")
ResultBean<BasePersonalVo> getDistributorPersonnel(@PathVariable("sid") String sid);
} }

20
anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basedistributor/BaseDistributorFeignFallback.java

@ -92,5 +92,25 @@ public class BaseDistributorFeignFallback implements BaseDistributorFeign {
return null; return null;
} }
@Override
public ResultBean<BaseDistribuDeailVo> getDistributorInfo(String sid) {
return null;
}
@Override
public ResultBean deleteInfo(String sid) {
return null;
}
@Override
public ResultBean deleteDistributorPersonnel(String sid) {
return null;
}
@Override
public ResultBean<BasePersonalVo> getDistributorPersonnel(String sid) {
return null;
}
} }

26
anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basedistributor/app/BaseDistribuDeailVo.java

@ -0,0 +1,26 @@
package com.yxt.anrui.base.api.basedistributor.app;
import com.yxt.common.core.vo.Vo;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.util.List;
/**
* @Author dimengzhe
* @Date 2022/7/14 18:04
* @Description
*/
@Data
public class BaseDistribuDeailVo implements Vo {
private static final long serialVersionUID = -1854151022333182857L;
@ApiModelProperty(value = "基础信息状态是否完善:0<值<1")
private Integer baseInfoState;
@ApiModelProperty(value = "开票信息状态")
private Integer invoiceInfoState;
@ApiModelProperty(value = "文件信息状态")
private Integer fileInfoState;
private List<BaseInfoListVo> records;
}

33
anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basedistributor/app/BaseInfoListVo.java

@ -0,0 +1,33 @@
package com.yxt.anrui.base.api.basedistributor.app;
import com.yxt.common.core.vo.Vo;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
/**
* @Author dimengzhe
* @Date 2022/7/14 18:08
* @Description
*/
@Data
public class BaseInfoListVo implements Vo {
private static final long serialVersionUID = -7627404232931673522L;
@ApiModelProperty(value = "姓名")
private String name;
@ApiModelProperty(value = "身份类型key")
private String identityKey;
@ApiModelProperty(value = "身份类型value")
private String identityValue;
@ApiModelProperty(value = "联系电话")
private String mobile;
@ApiModelProperty(value = "备注")
private String remarks;
@ApiModelProperty(value = "人员sid")
private String sid;
@ApiModelProperty(value = "经销商sid")
private String distributorSid;
}

30
anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basedistributor/app/BasePersonalVo.java

@ -0,0 +1,30 @@
package com.yxt.anrui.base.api.basedistributor.app;
import com.yxt.common.core.vo.Vo;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
/**
* @Author dimengzhe
* @Date 2022/7/14 23:15
* @Description
*/
@Data
public class BasePersonalVo implements Vo {
private static final long serialVersionUID = -8637873294371165497L;
@ApiModelProperty(value = "姓名")
private String name;
@ApiModelProperty(value = "身份类型key")
private String identityKey;
@ApiModelProperty(value = "身份类型value")
private String identityValue;
@ApiModelProperty(value = "联系电话")
private String mobile;
@ApiModelProperty(value = "备注")
private String remarks;
@ApiModelProperty(value = "人员记录sid")
private String sid;
@ApiModelProperty(value = "经销商sid")
private String distributorSid;
}

4
anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basedistributor/BaseDistributorMapper.java

@ -112,4 +112,8 @@ public interface BaseDistributorMapper extends BaseMapper<BaseDistributor> {
BaseInfoVo getDistributorDetail(String sid); BaseInfoVo getDistributorDetail(String sid);
BaseInvoiceInfoVo getInfo(String sid); BaseInvoiceInfoVo getInfo(String sid);
BaseDistributor selectBySid(String sid);
BaseDistributor selectBySidOne(String sid);
} }

14
anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basedistributor/BaseDistributorMapper.xml

@ -165,4 +165,18 @@
from base_distributor bd from base_distributor bd
where bd.sid = #{sid} where bd.sid = #{sid}
</select> </select>
<select id="selectBySid" resultType="com.yxt.anrui.base.api.basedistributor.BaseDistributor">
select *
from base_distributor
where sid = #{sid}
and length(disName) = 0
</select>
<select id="selectBySidOne" resultType="com.yxt.anrui.base.api.basedistributor.BaseDistributor">
select *
from base_distributor
where sid = #{sid}
and length(invoPhone) = 0
</select>
</mapper> </mapper>

20
anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basedistributor/BaseDistributorRest.java

@ -199,4 +199,24 @@ public class BaseDistributorRest implements BaseDistributorFeign {
public ResultBean<BaseDisDetailsVo> getDistributorDetail(String distributorSid) { public ResultBean<BaseDisDetailsVo> getDistributorDetail(String distributorSid) {
return baseDistributorService.getDistributorDetail(distributorSid); return baseDistributorService.getDistributorDetail(distributorSid);
} }
@Override
public ResultBean<BaseDistribuDeailVo> getDistributorInfo(String sid) {
return baseDistributorService.getDistributorInfo(sid);
}
@Override
public ResultBean deleteInfo(String sid) {
return baseDistributorService.deleteInfo(sid);
}
@Override
public ResultBean deleteDistributorPersonnel(String sid) {
return baseDistributorService.deleteDistributorPersonnel(sid);
}
@Override
public ResultBean<BasePersonalVo> getDistributorPersonnel(String sid) {
return baseDistributorService.getDistributorPersonnel(sid);
}
} }

65
anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basedistributor/BaseDistributorService.java

@ -569,4 +569,69 @@ public class BaseDistributorService extends MybatisBaseService<BaseDistributorMa
vo.setRecords(records); vo.setRecords(records);
return rb.success().setData(vo); return rb.success().setData(vo);
} }
public ResultBean<BaseDistribuDeailVo> getDistributorInfo(String sid) {
ResultBean<BaseDistribuDeailVo> rb = ResultBean.fireFail();
BaseDistributor baseDistributor = fetchBySid(sid);
if (baseDistributor == null) {
return rb.setMsg("该经销商不存在");
}
BaseDistribuDeailVo vo = new BaseDistribuDeailVo();
//查询基础信息是否已完善
BaseDistributor distributor = baseMapper.selectBySid(sid);
if (distributor != null) {
vo.setBaseInfoState(0);
} else {
vo.setBaseInfoState(1);
}
BaseDistributor distributor1 = baseMapper.selectBySidOne(sid);
if (distributor1 != null) {
vo.setInvoiceInfoState(0);
} else {
vo.setInvoiceInfoState(1);
}
int count = baseDistributorAppendixService.selectByLinkSid(sid);
if (count > 0) {
vo.setFileInfoState(1);
} else {
vo.setFileInfoState(0);
}
List<BaseInfoListVo> records = baseDistributorStaffService.selectByListVo(sid);
records.removeAll(Collections.singleton(null));
vo.setRecords(records);
return rb.success().setData(vo);
}
public ResultBean deleteInfo(String sid) {
ResultBean rb = ResultBean.fireFail();
BaseDistributor baseDistributor = fetchBySid(sid);
if (baseDistributor == null) {
return rb.setMsg("该数据不存在");
}
baseDistributorAppendixService.delByLinkSid(sid);
baseDistributorStaffService.deleteStaff(sid);
deleteBySid(sid);
return rb.success().setMsg("删除成功");
}
public ResultBean deleteDistributorPersonnel(String sid) {
ResultBean rb = ResultBean.fireFail();
BaseDistributorStaff baseDistributorStaff = baseDistributorStaffService.fetchBySid(sid);
if (baseDistributorStaff == null) {
return rb.setMsg("该数据不存在");
}
baseDistributorStaffService.delBySid(sid);
return rb.success().setMsg("删除成功");
}
public ResultBean<BasePersonalVo> getDistributorPersonnel(String sid) {
ResultBean<BasePersonalVo> rb = ResultBean.fireFail();
BaseDistributorStaff baseDistributorStaff = baseDistributorStaffService.fetchBySid(sid);
if (baseDistributorStaff == null) {
return rb.setMsg("该数据不存在");
}
BasePersonalVo vo = new BasePersonalVo();
BeanUtil.copyProperties(baseDistributorStaff, vo);
return rb.success().setData(vo);
}
} }

2
anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basedistributorappendix/BaseDistributorAppendixMapper.java

@ -44,4 +44,6 @@ public interface BaseDistributorAppendixMapper extends BaseMapper<BaseDistributo
List<BaseDistributorAppendixVo> selByLinkSidAndAttachType(@Param("sid") String sid, @Param("attachType") String attachType); List<BaseDistributorAppendixVo> selByLinkSidAndAttachType(@Param("sid") String sid, @Param("attachType") String attachType);
List<String> selByLinkSidAndAttachTypeOne(@Param("sid") String sid, @Param("s") String s, @Param("path") String path); List<String> selByLinkSidAndAttachTypeOne(@Param("sid") String sid, @Param("s") String s, @Param("path") String path);
int selectByLinkSid(String sid);
} }

6
anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basedistributorappendix/BaseDistributorAppendixMapper.xml

@ -43,4 +43,10 @@
where linkSid = #{sid} where linkSid = #{sid}
and attachType = #{s} and attachType = #{s}
</select> </select>
<select id="selectByLinkSid" resultType="int">
select count(*)
from base_distributor_appendix
where linkSid = #{sid}
</select>
</mapper> </mapper>

13
anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basedistributorappendix/BaseDistributorAppendixService.java

@ -37,7 +37,7 @@ public class BaseDistributorAppendixService extends MybatisBaseService<BaseDistr
*/ */
public List<BaseDistributorAppendixVo> selectListVo(BaseDistributorAppendixOneQuery query) { public List<BaseDistributorAppendixVo> selectListVo(BaseDistributorAppendixOneQuery query) {
QueryWrapper<BaseDistributorAppendixVo> qw = buildQueryWrapper(query); QueryWrapper<BaseDistributorAppendixVo> qw = buildQueryWrapper(query);
return baseMapper.selectListVo(qw,fileUploadComponent.getUrlPrefix()); return baseMapper.selectListVo(qw, fileUploadComponent.getUrlPrefix());
} }
@ -60,6 +60,7 @@ public class BaseDistributorAppendixService extends MybatisBaseService<BaseDistr
} }
return qw; return qw;
} }
/** /**
* 根据备案资料sid查询是否存在 * 根据备案资料sid查询是否存在
* *
@ -216,12 +217,16 @@ public class BaseDistributorAppendixService extends MybatisBaseService<BaseDistr
return baseMapper.selByLinkSid(sid); return baseMapper.selByLinkSid(sid);
} }
public List<BaseDistributorAppendixVo> selByLinkSidAndAttachType(String sid,String attachType) { public List<BaseDistributorAppendixVo> selByLinkSidAndAttachType(String sid, String attachType) {
return baseMapper.selByLinkSidAndAttachType(sid,attachType); return baseMapper.selByLinkSidAndAttachType(sid, attachType);
} }
public List<String> selByLinkSidAndAttachTypeOne(String sid, String s) { public List<String> selByLinkSidAndAttachTypeOne(String sid, String s) {
String path = fileUploadComponent.getUrlPrefix(); String path = fileUploadComponent.getUrlPrefix();
return baseMapper.selByLinkSidAndAttachTypeOne(sid,s,path); return baseMapper.selByLinkSidAndAttachTypeOne(sid, s, path);
}
public int selectByLinkSid(String sid) {
return baseMapper.selectByLinkSid(sid);
} }
} }

3
anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basedistributorstaff/BaseDistributorStaffMapper.java

@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.conditions.Wrapper;
import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.toolkit.Constants; import com.baomidou.mybatisplus.core.toolkit.Constants;
import com.yxt.anrui.base.api.basedistributor.app.BaseInfoListVo;
import com.yxt.anrui.base.api.basedistributor.app.BaseRecordsVo; import com.yxt.anrui.base.api.basedistributor.app.BaseRecordsVo;
import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Param;
@ -64,4 +65,6 @@ public interface BaseDistributorStaffMapper extends BaseMapper<BaseDistributorSt
List<BaseDistributorStaffVo> selbyDistributorSid(String sid); List<BaseDistributorStaffVo> selbyDistributorSid(String sid);
List<BaseRecordsVo> selectByVo(String sid); List<BaseRecordsVo> selectByVo(String sid);
List<BaseInfoListVo> selectByListVo(String sid);
} }

8
anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basedistributorstaff/BaseDistributorStaffMapper.xml

@ -44,6 +44,12 @@
bs.remarks, bs.remarks,
bs.identityValue bs.identityValue
from base_distributor_staff bs from base_distributor_staff bs
where distributorSid = #{sid} where bs.distributorSid = #{sid}
</select>
<select id="selectByListVo" resultType="com.yxt.anrui.base.api.basedistributor.app.BaseInfoListVo">
select bs.name, bs.mobile, bs.remarks, bs.identityKey, bs.identityValue, bs.sid, bs.distributorSid
from base_distributor_staff bs
where bs.distributorSid = #{sid}
</select> </select>
</mapper> </mapper>

21
anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basedistributorstaff/BaseDistributorStaffService.java

@ -1,22 +1,10 @@
package com.yxt.anrui.base.biz.basedistributorstaff; package com.yxt.anrui.base.biz.basedistributorstaff;
import cn.hutool.core.bean.BeanUtil; import com.yxt.anrui.base.api.basedistributor.app.BaseInfoListVo;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.yxt.anrui.base.api.basedistributor.app.BaseRecordsVo; import com.yxt.anrui.base.api.basedistributor.app.BaseRecordsVo;
import org.apache.commons.lang3.StringUtils;
import com.yxt.common.base.service.MybatisBaseService;
import com.yxt.common.base.utils.PagerUtil;
import com.yxt.common.core.query.PagerQuery;
import com.yxt.common.core.result.ResultBean;
import com.yxt.common.core.vo.PagerVo;
import com.yxt.anrui.base.api.basedistributorstaff.BaseDistributorStaff; import com.yxt.anrui.base.api.basedistributorstaff.BaseDistributorStaff;
import com.yxt.anrui.base.api.basedistributorstaff.BaseDistributorStaffQuery;
import com.yxt.anrui.base.api.basedistributorstaff.BaseDistributorStaffVo; import com.yxt.anrui.base.api.basedistributorstaff.BaseDistributorStaffVo;
import com.yxt.anrui.base.api.basedistributorstaff.BaseDistributorStaffDto; import com.yxt.common.base.service.MybatisBaseService;
import com.yxt.anrui.base.api.basedistributorstaff.BaseDistributorStaffFeign;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import java.util.List; import java.util.List;
@ -69,6 +57,7 @@ public class BaseDistributorStaffService extends MybatisBaseService<BaseDistribu
/** /**
* 根据经销商sid查询人员信息 * 根据经销商sid查询人员信息
*
* @param sid 经销商sid * @param sid 经销商sid
* @return * @return
*/ */
@ -83,4 +72,8 @@ public class BaseDistributorStaffService extends MybatisBaseService<BaseDistribu
public List<BaseRecordsVo> selectByVo(String sid) { public List<BaseRecordsVo> selectByVo(String sid) {
return baseMapper.selectByVo(sid); return baseMapper.selectByVo(sid);
} }
public List<BaseInfoListVo> selectByListVo(String sid) {
return baseMapper.selectByListVo(sid);
}
} }

26
anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/distributor/DisInitDetailsVo.java

@ -0,0 +1,26 @@
package com.yxt.anrui.terminal.api.autoservice.distributor;
import com.yxt.common.core.vo.Vo;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.util.List;
/**
* @Author dimengzhe
* @Date 2022/7/14 21:43
* @Description
*/
@Data
public class DisInitDetailsVo implements Vo {
private static final long serialVersionUID = -8457454906785752187L;
@ApiModelProperty(value = "基础信息状态是否完善:0<值<1")
private Integer baseInfoState;
@ApiModelProperty(value = "开票信息状态")
private Integer invoiceInfoState;
@ApiModelProperty(value = "文件信息状态")
private Integer fileInfoState;
private List<DisInitRecordVo> records;
}

34
anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/distributor/DisInitRecordVo.java

@ -0,0 +1,34 @@
package com.yxt.anrui.terminal.api.autoservice.distributor;
import com.yxt.common.core.vo.Vo;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
/**
* @Author dimengzhe
* @Date 2022/7/14 21:44
* @Description
*/
@Data
public class DisInitRecordVo implements Vo {
private static final long serialVersionUID = 6206055217585777689L;
@ApiModelProperty(value = "姓名")
private String name;
@ApiModelProperty(value = "身份类型key")
private String identityKey;
@ApiModelProperty(value = "身份类型value")
private String identityValue;
@ApiModelProperty(value = "联系电话")
private String mobile;
@ApiModelProperty(value = "备注")
private String remarks;
@ApiModelProperty(value = "人员sid")
private String sid;
@ApiModelProperty(value = "经销商sid")
private String distributorSid;
}

31
anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/distributor/DisPersonVo.java

@ -0,0 +1,31 @@
package com.yxt.anrui.terminal.api.autoservice.distributor;
import com.yxt.common.core.vo.Vo;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
/**
* @Author dimengzhe
* @Date 2022/7/14 23:29
* @Description
*/
@Data
public class DisPersonVo implements Vo {
private static final long serialVersionUID = -7887942354086920464L;
@ApiModelProperty(value = "姓名")
private String name;
@ApiModelProperty(value = "身份类型key")
private String identityKey;
@ApiModelProperty(value = "身份类型value")
private String identityValue;
@ApiModelProperty(value = "联系电话")
private String mobile;
@ApiModelProperty(value = "备注")
private String remarks;
@ApiModelProperty(value = "人员记录sid")
private String sid;
@ApiModelProperty(value = "经销商sid")
private String distributorSid;
}

21
anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/distributor/DistributorFeign.java

@ -26,9 +26,28 @@ public interface DistributorFeign {
@ResponseBody @ResponseBody
ResultBean<PagerVo<DistributorVo>> getDistributorList(@RequestBody PagerQuery<DistributorQuery> pagerQuery); ResultBean<PagerVo<DistributorVo>> getDistributorList(@RequestBody PagerQuery<DistributorQuery> pagerQuery);
@ApiOperation("移动端-经销商分页列表") @ApiOperation("移动端-经销商详情")
@GetMapping("/getDistributorDetail/{distributorSid}") @GetMapping("/getDistributorDetail/{distributorSid}")
@ResponseBody @ResponseBody
ResultBean<DisDetailsVo> getDistributorDetail(@PathVariable(value = "distributorSid") String distributorSid); ResultBean<DisDetailsVo> getDistributorDetail(@PathVariable(value = "distributorSid") String distributorSid);
@ApiOperation("移动端-经销商初始化详情")
@GetMapping("/getDistributorInfo/{distributorSid}")
@ResponseBody
ResultBean<DisInitDetailsVo> getDistributorInfo(@PathVariable(value = "distributorSid") String sid);
@ApiOperation("移动端-经销商删除")
@DeleteMapping("/deleteDistributor/{distributorSid}")
@ResponseBody
ResultBean deleteDistributor(@PathVariable("distributorSid") String sid);
@ApiOperation("移动端-经销商删除人员")
@DeleteMapping("/deleteDistributorPersonnel/{sid}")
@ResponseBody
ResultBean deleteDistributorPersonnel(@PathVariable(value = "sid") String sid);
@ApiOperation("移动端-经销商人员初始化")
@GetMapping("/getDistributorPersonnel/{sid}")
@ResponseBody
ResultBean<DisPersonVo> getDistributorPersonnel(@PathVariable("sid")String sid);
} }

25
anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/distributor/DistributorRest.java

@ -1,9 +1,6 @@
package com.yxt.anrui.terminal.biz.autoservice.distributor; package com.yxt.anrui.terminal.biz.autoservice.distributor;
import com.yxt.anrui.terminal.api.autoservice.distributor.DisDetailsVo; import com.yxt.anrui.terminal.api.autoservice.distributor.*;
import com.yxt.anrui.terminal.api.autoservice.distributor.DistributorFeign;
import com.yxt.anrui.terminal.api.autoservice.distributor.DistributorQuery;
import com.yxt.anrui.terminal.api.autoservice.distributor.DistributorVo;
import com.yxt.common.core.query.PagerQuery; import com.yxt.common.core.query.PagerQuery;
import com.yxt.common.core.result.ResultBean; import com.yxt.common.core.result.ResultBean;
import com.yxt.common.core.vo.PagerVo; import com.yxt.common.core.vo.PagerVo;
@ -34,4 +31,24 @@ public class DistributorRest implements DistributorFeign {
public ResultBean<DisDetailsVo> getDistributorDetail(String sid) { public ResultBean<DisDetailsVo> getDistributorDetail(String sid) {
return distributorService.getDistributorDetail(sid); return distributorService.getDistributorDetail(sid);
} }
@Override
public ResultBean<DisInitDetailsVo> getDistributorInfo(String sid) {
return distributorService.getDistributorInfo(sid);
}
@Override
public ResultBean deleteDistributor(String sid) {
return distributorService.deleteDistributor(sid);
}
@Override
public ResultBean deleteDistributorPersonnel(String sid) {
return distributorService.deleteDistributorPersonnel(sid);
}
@Override
public ResultBean<DisPersonVo> getDistributorPersonnel(String sid) {
return distributorService.getDistributorPersonnel(sid);
}
} }

48
anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/distributor/DistributorService.java

@ -3,12 +3,8 @@ package com.yxt.anrui.terminal.biz.autoservice.distributor;
import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.bean.BeanUtil;
import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSON;
import com.yxt.anrui.base.api.basedistributor.BaseDistributorFeign; import com.yxt.anrui.base.api.basedistributor.BaseDistributorFeign;
import com.yxt.anrui.base.api.basedistributor.app.BaseDisDetailsVo; import com.yxt.anrui.base.api.basedistributor.app.*;
import com.yxt.anrui.base.api.basedistributor.app.BaseDistributorsQuery; import com.yxt.anrui.terminal.api.autoservice.distributor.*;
import com.yxt.anrui.base.api.basedistributor.app.BaseDistributorsVo;
import com.yxt.anrui.terminal.api.autoservice.distributor.DisDetailsVo;
import com.yxt.anrui.terminal.api.autoservice.distributor.DistributorQuery;
import com.yxt.anrui.terminal.api.autoservice.distributor.DistributorVo;
import com.yxt.anrui.terminal.config.CoverUtils; import com.yxt.anrui.terminal.config.CoverUtils;
import com.yxt.common.core.query.PagerQuery; import com.yxt.common.core.query.PagerQuery;
import com.yxt.common.core.result.ResultBean; import com.yxt.common.core.result.ResultBean;
@ -53,4 +49,44 @@ public class DistributorService {
BeanUtil.copyProperties(getDistributorDetail.getData(), vo); BeanUtil.copyProperties(getDistributorDetail.getData(), vo);
return rb.success().setData(vo); return rb.success().setData(vo);
} }
public ResultBean<DisInitDetailsVo> getDistributorInfo(String sid) {
ResultBean<DisInitDetailsVo> rb = ResultBean.fireFail();
ResultBean<BaseDistribuDeailVo> getDistributorInfo = baseDistributorFeign.getDistributorInfo(sid);
if (!getDistributorInfo.getSuccess()) {
return rb.setMsg(getDistributorInfo.getMsg());
}
DisInitDetailsVo vo = new DisInitDetailsVo();
BeanUtil.copyProperties(getDistributorInfo.getData(), vo);
return rb.success().setData(vo);
}
public ResultBean deleteDistributor(String sid) {
ResultBean rb = ResultBean.fireFail();
ResultBean resultBean = baseDistributorFeign.deleteInfo(sid);
if (!resultBean.getSuccess()) {
return rb.setMsg(resultBean.getMsg());
}
return rb.success().setMsg("删除成功");
}
public ResultBean deleteDistributorPersonnel(String sid) {
ResultBean rb = ResultBean.fireFail();
ResultBean resultBean = baseDistributorFeign.deleteDistributorPersonnel(sid);
if (!resultBean.getSuccess()) {
return rb.setMsg(resultBean.getMsg());
}
return rb.success().setMsg("删除成功");
}
public ResultBean<DisPersonVo> getDistributorPersonnel(String sid) {
ResultBean<DisPersonVo> rb = ResultBean.fireFail();
ResultBean<BasePersonalVo> resultBean = baseDistributorFeign.getDistributorPersonnel(sid);
if (!resultBean.getSuccess()) {
return rb.setMsg(resultBean.getMsg());
}
DisPersonVo disPersonVo = new DisPersonVo();
BeanUtil.copyProperties(resultBean.getData(), disPersonVo);
return rb.success().setData(disPersonVo);
}
} }

Loading…
Cancel
Save