yxt_develop
/
anrui
9
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

优化销售订单单据信息

master
dimengzhe 1 year ago
parent
18e8c8f443
commit
037b8cbf3e
9 changed files with 113 additions and 5 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 8
      anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basedistributor/BaseDistributorFeign.java
  2. 5
      anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basedistributor/BaseDistributorFeignFallback.java
  3. 2
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basedistributor/BaseDistributorMapper.java
  4. 8
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basedistributor/BaseDistributorMapper.xml
  5. 5
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basedistributor/BaseDistributorRest.java
  6. 42
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basedistributor/BaseDistributorService.java
  7. 6
      anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderMapper.java
  8. 8
      anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderMapper.xml
  9. 34
      anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java

8
anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basedistributor/BaseDistributorFeign.java
View File

@ -138,7 +138,6 @@ public interface BaseDistributorFeign {
@ApiOperation("移动端-销售订单-经销商分页列 表")
@PostMapping("/getDistributorList")
ResultBean<PagerVo<BaseDistributorsListVo>> getDistributorList(@RequestBody PagerQuery<BaseDistributorsListQuery> pagerQuery);
@ApiOperation("移动端-经销商分页列表")
@PostMapping("/getDistributorListOne")
ResultBean<PagerVo<BaseDistributorsVo>> getDistributorListOne(@RequestBody PagerQuery<BaseDistributorsQuery> pagerQuery);
@ -211,8 +210,13 @@ public interface BaseDistributorFeign {
@GetMapping("/selectDisListBySid/{sid}")
ResultBean<BaseDistributorListVo> selectDisListBySid(@PathVariable("sid") String sid);
// //---------------------------------------移动端流程---------------------------------------------//
// @ApiOperation("经销商备案提交")
// @PostMapping("/submitDistributor")
// public ResultBean submitDistributor(@RequestBody @Valid AppSubmitDistributorApplyDto dto);
@ApiOperation("移动销售订单查询开票名称")
@GetMapping("/getInvoiceName")
ResultBean<List<AppDisAndCustm>> getInvoiceName(@RequestParam("userSid") String userSid, @RequestParam("orgPath") String orgPath, @RequestParam(value = "search", required = false) String search,@RequestParam("invoiceKey") String invoiceKey);
}

5
anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basedistributor/BaseDistributorFeignFallback.java
View File

@ -234,6 +234,11 @@ public class BaseDistributorFeignFallback implements BaseDistributorFeign {
return null;
}
@Override
public ResultBean<List<AppDisAndCustm>> getInvoiceName(String userSid, String orgPath, String search, String invoiceKey) {
return null;
}
// @Override
// public ResultBean submitDistributor(AppSubmitDistributorApplyDto dto) {
// return null;

2
anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basedistributor/BaseDistributorMapper.java
View File

@ -141,4 +141,6 @@ public interface BaseDistributorMapper extends BaseMapper<BaseDistributor> {
int updateFlowFiled(Map<String, Object> map);
LoanCustomerRecord selectByRecord(String sid);
List<AppDisAndCustm> getInvoiceName(@Param("useOrgSid") String useOrgSid, @Param("s") String s);
}

8
anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basedistributor/BaseDistributorMapper.xml
View File

@ -306,4 +306,12 @@
and effectiveDate > NOW()
order by id desc limit 1
</select>
<select id="getInvoiceName" resultType="com.yxt.anrui.base.api.basedistributor.AppDisAndCustm">
select sid id,disName dictValue from base_distributor
where useOrg = #{useOrgSid}
<if test="s != null and s != ''">
and disName like concat('%',#{s},'%')
</if>
</select>
</mapper>

5
anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basedistributor/BaseDistributorRest.java
View File

@ -368,6 +368,11 @@ public class BaseDistributorRest implements BaseDistributorFeign {
return baseDistributorService.selectDisListBySid(sid);
}
@Override
public ResultBean<List<AppDisAndCustm>> getInvoiceName(String userSid, String orgPath, String search, String invoiceKey) {
return baseDistributorService.getInvoiceName(userSid,orgPath,search,invoiceKey);
}
// /*-----------------------------------移动端流程------------------------------------------------*/
// @Override
// public ResultBean submitDistributor(AppSubmitDistributorApplyDto dto) {

42
anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basedistributor/BaseDistributorService.java
View File

@ -1529,6 +1529,48 @@ public class BaseDistributorService extends MybatisBaseService<BaseDistributorMa
return rb.success();
}
public ResultBean<List<AppDisAndCustm>> getInvoiceName(String userSid, String orgPath, String search, String invoiceKey) {
ResultBean<List<AppDisAndCustm>> rb = ResultBean.fireFail();
List<AppDisAndCustm> list = new ArrayList<>();
if(StringUtils.isBlank(invoiceKey)){
return rb.setMsg("请先选择开票类型");
}else{
String useOrgSid = sysStaffOrgFeign.getOrgSidByPath(orgPath).getData();
list = baseMapper.getInvoiceName(useOrgSid,search);
list.removeAll(Collections.singleton(null));
if(!list.isEmpty()){
for (int i = 0; i < list.size(); i++) {
AppDisAndCustm appDisAndCustm = list.get(i);
Extra extra = new Extra();
extra.setSid(appDisAndCustm.getId());
extra.setName(appDisAndCustm.getDictValue());
appDisAndCustm.setExtra(extra);
}
}
if("01".equals(invoiceKey)){
CrmCustomerTempListQuery crmCustomerTempListQuery = new CrmCustomerTempListQuery();
SysUserVo sysUserVo = sysUserFeign.fetchBySid(userSid).getData();
crmCustomerTempListQuery.setStaffSid(sysUserVo.getStaffSid());
crmCustomerTempListQuery.setOrgPath(orgPath);
crmCustomerTempListQuery.setCertificateTypeKey("01");
crmCustomerTempListQuery.setSearch(search);
List<CrmCustomerTempListVo> crmCustomerTempListVos = crmCustomerTempFeign.selectCustomerList(crmCustomerTempListQuery).getData();
for (CrmCustomerTempListVo crmCustomerTempListVo : crmCustomerTempListVos) {
AppDisAndCustm appDisAndCustm = new AppDisAndCustm();
Extra extra = new Extra();
appDisAndCustm.setDictValue(crmCustomerTempListVo.getName());
appDisAndCustm.setId(crmCustomerTempListVo.getSid());
extra.setSid(appDisAndCustm.getId());
extra.setName(appDisAndCustm.getDictValue());
extra.setInfo(crmCustomerTempListVo.getIdCard());
appDisAndCustm.setExtra(extra);
list.add(appDisAndCustm);
}
}
}
return rb.success().setData(list);
}
////-------------------------------------流程------------------------------------------------/
//

6
anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderMapper.java
View File

@ -30,11 +30,13 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.Constants;
import com.yxt.anrui.base.api.basedistributor.BaseDistributor;
import com.yxt.anrui.base.api.basevehicle.BaseVehicle;
import com.yxt.anrui.buscenter.api.bussalesorder.*;
import com.yxt.anrui.buscenter.api.bussalesorder.app.model.AppModelInfoVo;
import com.yxt.anrui.buscenter.api.bussalesorder.app.order.*;
import com.yxt.anrui.buscenter.api.bussalesorder.contract.AppRovalContractPageVo;
import com.yxt.anrui.crm.api.crmcustomertemp.CrmCustomerTemp;
import com.yxt.anrui.riskcenter.api.loanpreloancreditapply.LoanPreloanCreditApply;
import com.yxt.anrui.riskcenter.api.loansolutions.LoanSolutions;
import org.apache.ibatis.annotations.Mapper;
@ -230,4 +232,8 @@ public interface BusSalesOrderMapper extends BaseMapper<BusSalesOrder> {
String selectByBusVinSid(String sid);
LoanSolutions seletByOrderSid(String sid);
BaseDistributor selectDis(String affiliatedOrgSid);
CrmCustomerTemp selectCrm(String affiliatedOrgSid);
}

8
anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderMapper.xml
View File

@ -619,4 +619,12 @@
<select id="seletByOrderSid" resultType="com.yxt.anrui.riskcenter.api.loansolutions.LoanSolutions">
select * from anrui_riskcenter.loan_solutions where salesOrderSid = #{sid}
</select>
<select id="selectDis" resultType="com.yxt.anrui.base.api.basedistributor.BaseDistributor">
select * from anrui_base.base_distributor where sid = #{affiliatedOrgSid}
</select>
<select id="selectCrm" resultType="com.yxt.anrui.crm.api.crmcustomertemp.CrmCustomerTemp">
select * from anrui_crm.crm_customer_temp where sid = #{affiliatedOrgSid}
</select>
</mapper>

34
anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java
View File

@ -36,6 +36,7 @@ import com.google.common.util.concurrent.ThreadFactoryBuilder;
import com.yxt.anrui.base.api.basebrandletpricepowimit.BaseBrandMitQuery;
import com.yxt.anrui.base.api.basebrandletpricepowimit.BaseBrandletpricepowimitFeign;
import com.yxt.anrui.base.api.basediscountpackage.BaseDiscountpackageFeign;
import com.yxt.anrui.base.api.basedistributor.BaseDistributor;
import com.yxt.anrui.base.api.basemiddleman.BaseMiddlemanDetailsVo;
import com.yxt.anrui.base.api.basemiddleman.BaseMiddlemanFeign;
import com.yxt.anrui.base.api.basemodelconfig.AppCarConfigSummaryVo;
@ -129,6 +130,7 @@ import com.yxt.anrui.buscenter.biz.bussalesordervehicle.BusSalesOrderVehicleServ
import com.yxt.anrui.buscenter.biz.bussalesvehicleorder.BusSalesVehicleOrderService;
import com.yxt.anrui.buscenter.biz.bussolutionschange.BusSolutionsChangeService;
import com.yxt.anrui.crm.api.crmcustomertemp.AppCrmCustomerTempInfoVo;
import com.yxt.anrui.crm.api.crmcustomertemp.CrmCustomerTemp;
import com.yxt.anrui.crm.api.crmcustomertemp.CrmCustomerTempFeign;
import com.yxt.anrui.crm.api.crmcustomertemp.CrmCustomerTempVo;
import com.yxt.anrui.crm.api.crmvehicledemand.CrmOrderVo;
@ -2206,8 +2208,10 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
vo.setAffiliatedType("1");
vo.setAffiliatedOrgNameChoose(vo.getAffiliatedCompany());
} else {
vo.setAffiliatedType("0");
vo.setAffiliatedOrgNameWrite(vo.getAffiliatedCompany());
// vo.setAffiliatedType("0");
vo.setAffiliatedType("1");
// vo.setAffiliatedOrgNameWrite(vo.getAffiliatedCompany());
vo.setAffiliatedOrgNameChoose(vo.getAffiliatedCompany());
}
vo.setSaleOrderSid(saleOrderSid);
}
@ -2239,6 +2243,11 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
if (StringUtils.isBlank(dto.getUserSid())) {
return rb.setMsg("用户sid不能为空");
}
if("1".equals(dto.getPayTypeKey())){
if(StringUtils.isBlank(dto.getAffiliatedOrgSid())){
return rb.setMsg("开票信息为必选项");
}
}
SysUserVo sysUserInfoVo = sysUserFeign.fetchBySid(dto.getUserSid()).getData();
//根据客户sid查询客户信息
ResultBean<AppCrmCustomerTempInfoVo> crmCustomerTempInfoVoResultBean = crmCustomerTempFeign.getAppCustomerTempDetailsBySid(dto.getCustomerSid());
@ -2246,7 +2255,8 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
if (crmCustomerTempInfoVoResultBean.getSuccess()) {
AppCrmCustomerTempInfoVo customerTempInfoVo = crmCustomerTempInfoVoResultBean.getData();
//挂靠公司填写类型：1选择，0手写
String affiliatedType = dto.getAffiliatedType();
// String affiliatedType = dto.getAffiliatedType();
String affiliatedType = "1";
//新增销售订单
if (StringUtils.isBlank(dto.getSid())) {
BusSalesOrder busSalesOrder = new BusSalesOrder();
@ -2265,6 +2275,15 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
if ("1".equals(affiliatedType)) {
busSalesOrder.setAffiliatedCompany(dto.getAffiliatedOrgNameChoose());
busSalesOrder.setAffiliatedCompanySid(dto.getAffiliatedOrgSid());
BaseDistributor baseDistributor = baseMapper.selectDis(dto.getAffiliatedOrgSid());
if(baseDistributor == null){
CrmCustomerTemp crmCustomerTemp = baseMapper.selectCrm(dto.getAffiliatedOrgSid());
if(crmCustomerTemp != null){
busSalesOrder.setAffiliatedCompanyType(1);
}
}else{
busSalesOrder.setAffiliatedCompanyType(0);
}
}
//根据用户sid查询分公司sid
String useOrgSid = "";
@ -2342,6 +2361,15 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
if ("1".equals(affiliatedType)) {
busSalesOrder.setAffiliatedCompany(dto.getAffiliatedOrgNameChoose());
busSalesOrder.setAffiliatedCompanySid(dto.getAffiliatedOrgSid());
BaseDistributor baseDistributor = baseMapper.selectDis(dto.getAffiliatedOrgSid());
if(baseDistributor == null){
CrmCustomerTemp crmCustomerTemp = baseMapper.selectCrm(dto.getAffiliatedOrgSid());
if(crmCustomerTemp != null){
busSalesOrder.setAffiliatedCompanyType(1);
}
}else{
busSalesOrder.setAffiliatedCompanyType(0);
}
}
busSalesOrder.setCustomerPhoto(customerTempInfoVo.getCustomerPhoto());
busSalesOrder.setCustomerClass(customerTempInfoVo.getCustomerType());

Write Preview
Loading…
Cancel
Save