Browse Source

注释旧的销售订单的接口

master
dimengzhe 3 years ago
parent
commit
13d3b9d38e
  1. 13
      anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/commoncontract/CommonContractFeign.java
  2. 13
      anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/commoncontract/CommonContractFeignFallback.java
  3. 27
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commoncontract/CommonContractRest.java
  4. 43
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commoncontract/CommonContractService.java

13
anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/commoncontract/CommonContractFeign.java

@ -12,7 +12,6 @@ import org.springframework.web.multipart.MultipartFile;
import javax.validation.Valid; import javax.validation.Valid;
import java.io.IOException; import java.io.IOException;
import java.text.ParseException; import java.text.ParseException;
import java.util.List;
import java.util.Map; import java.util.Map;
/** /**
@ -44,9 +43,9 @@ public interface CommonContractFeign {
@PostMapping("/generateContractNo") @PostMapping("/generateContractNo")
public Map<String, String> generateContractNo(@RequestParam("userSid") String userSid); public Map<String, String> generateContractNo(@RequestParam("userSid") String userSid);
@ApiOperation("新增保存") /* @ApiOperation("新增保存")
@PostMapping("/save") @PostMapping("/save")
public ResultBean save(@RequestBody CommonContractDto dto); public ResultBean save(@RequestBody CommonContractDto dto);*/
@ApiOperation("修改保存") @ApiOperation("修改保存")
@PostMapping("/update/{sid}") @PostMapping("/update/{sid}")
@ -92,10 +91,10 @@ public interface CommonContractFeign {
public ResultBean delAppCommonContractByBusSid(@RequestParam("busSid") String busSid); public ResultBean delAppCommonContractByBusSid(@RequestParam("busSid") String busSid);
/*销售订单*/ /*销售订单*/
@ApiOperation("手机端根据销售订单sid查询合同信息") /* @ApiOperation("手机端根据销售订单sid查询合同信息")
@GetMapping("/getAppBusOrderContractByOrderSid") @GetMapping("/getAppBusOrderContractByOrderSid")
public ResultBean<AppBusOrderContractVo> getAppBusOrderContractByOrderSid(@RequestParam("userSid") String userSid, @RequestParam("orderSid") String orderSid); public ResultBean<AppBusOrderContractVo> getAppBusOrderContractByOrderSid(@RequestParam("userSid") String userSid, @RequestParam("orderSid") String orderSid);
*/
@ApiOperation("手机端保存、修改销售订单合同信息") @ApiOperation("手机端保存、修改销售订单合同信息")
@PostMapping("/saveOrUpdateAppBusOrderContract") @PostMapping("/saveOrUpdateAppBusOrderContract")
public ResultBean<AppBusOrderContractVo> saveOrUpdateAppBusOrderContract(@RequestBody AppBusOrderContractDto dto); public ResultBean<AppBusOrderContractVo> saveOrUpdateAppBusOrderContract(@RequestBody AppBusOrderContractDto dto);
@ -133,9 +132,9 @@ public interface CommonContractFeign {
@GetMapping("/printItemSet") @GetMapping("/printItemSet")
public ResultBean<PrintItemVo> printItemSet(@RequestParam("busSid") String busSid, @RequestParam("customerName") String customerName); public ResultBean<PrintItemVo> printItemSet(@RequestParam("busSid") String busSid, @RequestParam("customerName") String customerName);
@ApiOperation(value = "打印项确认(生成word后转为pdf)") /* @ApiOperation(value = "打印项确认(生成word后转为pdf)")
@PostMapping("/printConfirm") @PostMapping("/printConfirm")
public ResultBean<List<PrintConfirmVo>> printConfirm(@RequestBody PrintConfirmDto dto); public ResultBean<List<PrintConfirmVo>> printConfirm(@RequestBody PrintConfirmDto dto);*/
/******************************************************新车买卖合同审核(流程)******************************************************/ /******************************************************新车买卖合同审核(流程)******************************************************/

13
anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/commoncontract/CommonContractFeignFallback.java

@ -8,7 +8,6 @@ import org.springframework.web.multipart.MultipartFile;
import java.io.IOException; import java.io.IOException;
import java.text.ParseException; import java.text.ParseException;
import java.util.List;
import java.util.Map; import java.util.Map;
/** /**
@ -38,11 +37,11 @@ public class CommonContractFeignFallback implements CommonContractFeign {
return null; return null;
} }
@Override /* @Override
public ResultBean save(CommonContractDto dto) { public ResultBean save(CommonContractDto dto) {
return ResultBean.fireFail().setMsg("接口anrui-base/commoncontract/save无法访问"); return ResultBean.fireFail().setMsg("接口anrui-base/commoncontract/save无法访问");
} }
*/
@Override @Override
public ResultBean update(CommonContractDto dto, String sid) { public ResultBean update(CommonContractDto dto, String sid) {
return ResultBean.fireFail().setMsg("接口anrui-base/commoncontract/update无法访问"); return ResultBean.fireFail().setMsg("接口anrui-base/commoncontract/update无法访问");
@ -100,11 +99,11 @@ public class CommonContractFeignFallback implements CommonContractFeign {
return rb.setMsg("接口anrui-base/commoncontract/delAppCommonContractByBusSid无法访问"); return rb.setMsg("接口anrui-base/commoncontract/delAppCommonContractByBusSid无法访问");
} }
@Override /* @Override
public ResultBean<AppBusOrderContractVo> getAppBusOrderContractByOrderSid(String userSid, String orderSid) { public ResultBean<AppBusOrderContractVo> getAppBusOrderContractByOrderSid(String userSid, String orderSid) {
ResultBean rb = ResultBean.fireFail(); ResultBean rb = ResultBean.fireFail();
return rb.setMsg("接口anrui-base/commoncontract/getAppBusOrderContractByOrderSid无法访问"); return rb.setMsg("接口anrui-base/commoncontract/getAppBusOrderContractByOrderSid无法访问");
} }*/
@Override @Override
public ResultBean<AppBusOrderContractVo> saveOrUpdateAppBusOrderContract(AppBusOrderContractDto dto) { public ResultBean<AppBusOrderContractVo> saveOrUpdateAppBusOrderContract(AppBusOrderContractDto dto) {
@ -140,11 +139,11 @@ public class CommonContractFeignFallback implements CommonContractFeign {
return rb.setMsg("接口anrui-base/commoncontract/printItemSet无法访问"); return rb.setMsg("接口anrui-base/commoncontract/printItemSet无法访问");
} }
@Override /* @Override
public ResultBean printConfirm(PrintConfirmDto dto) { public ResultBean printConfirm(PrintConfirmDto dto) {
ResultBean rb = ResultBean.fireFail(); ResultBean rb = ResultBean.fireFail();
return rb.setMsg("接口anrui-base/commoncontract/printConfirm无法访问"); return rb.setMsg("接口anrui-base/commoncontract/printConfirm无法访问");
} }*/
@Override @Override
public ResultBean submitCarSaleContractApprove(CarSaleContractApproveDto dto) { public ResultBean submitCarSaleContractApprove(CarSaleContractApproveDto dto) {

27
anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commoncontract/CommonContractRest.java

@ -1,21 +1,10 @@
package com.yxt.anrui.base.biz.commoncontract; package com.yxt.anrui.base.biz.commoncontract;
import cn.hutool.core.bean.BeanUtil;
import com.yxt.anrui.base.api.commonappendix.CommonAppendixVo; import com.yxt.anrui.base.api.commonappendix.CommonAppendixVo;
import com.yxt.anrui.base.api.commonappendix.CommonAttachTypeEnum; import com.yxt.anrui.base.api.commonappendix.CommonAttachTypeEnum;
import com.yxt.anrui.base.api.commonappendix.PcCommonAppendixDto; import com.yxt.anrui.base.api.commonappendix.PcCommonAppendixDto;
import com.yxt.anrui.base.api.commoncontract.*; import com.yxt.anrui.base.api.commoncontract.*;
import com.yxt.anrui.base.biz.commonappendix.CommonAppendixService; import com.yxt.anrui.base.biz.commonappendix.CommonAppendixService;
import com.yxt.anrui.buscenter.api.busorder.BusOrder;
import com.yxt.anrui.buscenter.api.busorder.BusOrderAllVo;
import com.yxt.anrui.buscenter.api.busorder.BusOrderFeign;
import com.yxt.anrui.buscenter.api.busorder.BusOrderVo;
import com.yxt.anrui.buscenter.api.busorderdeposit.BusOrderDepositVo;
import com.yxt.anrui.buscenter.api.busorderdiscount.BusOrderDiscountVo;
import com.yxt.anrui.buscenter.api.busordermodel.BusOrderModel;
import com.yxt.anrui.buscenter.api.busordermodel.BusOrderModelVo;
import com.yxt.anrui.buscenter.api.busordervehicle.BusOrderVehicleVo;
import com.yxt.anrui.fin.api.finuncollectedreceivablesdetailed.FinUncollectedReceivablesDetailedDto;
import com.yxt.anrui.fin.api.finuncollectedreceivablesdetailed.FinUncollectedReceivablesDetailedFeign; import com.yxt.anrui.fin.api.finuncollectedreceivablesdetailed.FinUncollectedReceivablesDetailedFeign;
import com.yxt.common.base.config.component.FileUploadComponent; import com.yxt.common.base.config.component.FileUploadComponent;
import com.yxt.common.base.utils.ExportExcelUtils; import com.yxt.common.base.utils.ExportExcelUtils;
@ -74,8 +63,8 @@ public class CommonContractRest implements CommonContractFeign {
private FileUploadComponent fileUploadComponent; private FileUploadComponent fileUploadComponent;
@Autowired @Autowired
private FinUncollectedReceivablesDetailedFeign finUncollectedReceivablesDetailedFeign; private FinUncollectedReceivablesDetailedFeign finUncollectedReceivablesDetailedFeign;
@Autowired /* @Autowired
private BusOrderFeign busOrderFeign; private BusOrderFeign busOrderFeign;*/
@Override @Override
public ResultBean<PagerVo<CommonContractVo>> listPage(@RequestBody PagerQuery<CommonContractQuery> pq) { public ResultBean<PagerVo<CommonContractVo>> listPage(@RequestBody PagerQuery<CommonContractQuery> pq) {
@ -90,7 +79,7 @@ public class CommonContractRest implements CommonContractFeign {
return map; return map;
} }
@Override /* @Override
public ResultBean save(CommonContractDto dto) { public ResultBean save(CommonContractDto dto) {
ResultBean rb = ResultBean.fireFail(); ResultBean rb = ResultBean.fireFail();
dto.setSid(UUID.randomUUID().toString()); dto.setSid(UUID.randomUUID().toString());
@ -169,7 +158,7 @@ public class CommonContractRest implements CommonContractFeign {
finUncollectedReceivablesDetailedFeign.saveOrUpdate(finUncollectedReceivablesDetailedSingleDto); finUncollectedReceivablesDetailedFeign.saveOrUpdate(finUncollectedReceivablesDetailedSingleDto);
} }
return rb.success().setData(commonContract.getSid()); return rb.success().setData(commonContract.getSid());
} }*/
@Override @Override
public ResultBean update(CommonContractDto dto, String sid) { public ResultBean update(CommonContractDto dto, String sid) {
@ -298,7 +287,7 @@ public class CommonContractRest implements CommonContractFeign {
* @param orderSid * @param orderSid
* @return * @return
*/ */
@Override /* @Override
public ResultBean<AppBusOrderContractVo> getAppBusOrderContractByOrderSid(String userSid, String orderSid) { public ResultBean<AppBusOrderContractVo> getAppBusOrderContractByOrderSid(String userSid, String orderSid) {
if (StringUtils.isBlank(userSid)) { if (StringUtils.isBlank(userSid)) {
return new ResultBean().fail().setMsg("用户sid不能为空"); return new ResultBean().fail().setMsg("用户sid不能为空");
@ -307,7 +296,7 @@ public class CommonContractRest implements CommonContractFeign {
return new ResultBean().fail().setMsg("销售sid不能为空"); return new ResultBean().fail().setMsg("销售sid不能为空");
} }
return commonContractService.getAppBusOrderContractByOrderSid(userSid, orderSid); return commonContractService.getAppBusOrderContractByOrderSid(userSid, orderSid);
} }*/
/** /**
* 手机端保存修改销售订单合同信息 * 手机端保存修改销售订单合同信息
@ -411,10 +400,10 @@ public class CommonContractRest implements CommonContractFeign {
return commonContractService.printItemSet(busSid, customerName); return commonContractService.printItemSet(busSid, customerName);
} }
@Override /* @Override
public ResultBean<List<PrintConfirmVo>> printConfirm(PrintConfirmDto dto) { public ResultBean<List<PrintConfirmVo>> printConfirm(PrintConfirmDto dto) {
return commonContractService.printConfirm(dto); return commonContractService.printConfirm(dto);
} }*/
public List getSheetVal(Sheet sheet, int[] resultCell) throws ParseException { public List getSheetVal(Sheet sheet, int[] resultCell) throws ParseException {
SimpleDateFormat ft = new SimpleDateFormat("yyyy-MM-dd"); SimpleDateFormat ft = new SimpleDateFormat("yyyy-MM-dd");

43
anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commoncontract/CommonContractService.java

@ -3,8 +3,6 @@ package com.yxt.anrui.base.biz.commoncontract;
import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.bean.BeanUtil;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.metadata.IPage;
import com.yxt.anrui.base.api.basemodelszconfig.AppBaseModelSzconfigDetailsVo;
import com.yxt.anrui.base.api.basetrailer.AppBaseTrailerDetailsVo;
import com.yxt.anrui.base.api.commonappendix.CommonAppendix; import com.yxt.anrui.base.api.commonappendix.CommonAppendix;
import com.yxt.anrui.base.api.commoncontract.*; import com.yxt.anrui.base.api.commoncontract.*;
import com.yxt.anrui.base.biz.basemodelszconfig.BaseModelSzconfigService; import com.yxt.anrui.base.biz.basemodelszconfig.BaseModelSzconfigService;
@ -15,20 +13,13 @@ import com.yxt.anrui.base.biz.commonappendix.CommonAppendixService;
import com.yxt.anrui.base.biz.flow.FlowableService; import com.yxt.anrui.base.biz.flow.FlowableService;
import com.yxt.anrui.buscenter.api.busdeposit.BusDepositFeign; import com.yxt.anrui.buscenter.api.busdeposit.BusDepositFeign;
import com.yxt.anrui.buscenter.api.busdepositvehicle.BusDepositVehicleFeign; import com.yxt.anrui.buscenter.api.busdepositvehicle.BusDepositVehicleFeign;
import com.yxt.anrui.buscenter.api.busorder.BusOrderFeign;
import com.yxt.anrui.buscenter.api.busorder.BusOrderVo; import com.yxt.anrui.buscenter.api.busorder.BusOrderVo;
import com.yxt.anrui.buscenter.api.busorderdiscount.AppBusOrderDiscountListVo;
import com.yxt.anrui.buscenter.api.busorderdiscount.BusOrderDiscountFeign;
import com.yxt.anrui.buscenter.api.busordermodel.AppBusOrderModelVo;
import com.yxt.anrui.buscenter.api.busordermodel.BusOrderModelFeign;
import com.yxt.anrui.buscenter.api.busordervehicle.BusOrderVehicleFeign;
import com.yxt.anrui.crm.api.crmcustomer.CrmCustomerFeign; import com.yxt.anrui.crm.api.crmcustomer.CrmCustomerFeign;
import com.yxt.anrui.flowable.api.sysformlink.SysFormLinkFeign; import com.yxt.anrui.flowable.api.sysformlink.SysFormLinkFeign;
import com.yxt.anrui.flowable.api.sysformlink.SysFormStateVo; import com.yxt.anrui.flowable.api.sysformlink.SysFormStateVo;
import com.yxt.anrui.flowable.api.utils.ProcDefEnum; import com.yxt.anrui.flowable.api.utils.ProcDefEnum;
import com.yxt.anrui.portal.api.dictcommon.DictCommonFeign; import com.yxt.anrui.portal.api.dictcommon.DictCommonFeign;
import com.yxt.anrui.portal.api.dictcommon.DictCommonVo; import com.yxt.anrui.portal.api.dictcommon.DictCommonVo;
import com.yxt.anrui.portal.api.sysorganization.SysOrganization;
import com.yxt.anrui.portal.api.sysorganization.SysOrganizationFeign; import com.yxt.anrui.portal.api.sysorganization.SysOrganizationFeign;
import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgFeign; import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgFeign;
import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgVo; import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgVo;
@ -51,12 +42,8 @@ import org.springframework.transaction.annotation.Transactional;
import java.io.File; import java.io.File;
import java.math.BigDecimal; import java.math.BigDecimal;
import java.text.MessageFormat;
import java.text.SimpleDateFormat; import java.text.SimpleDateFormat;
import java.util.*; import java.util.*;
import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors;
import java.util.concurrent.Future;
import java.util.stream.Collectors; import java.util.stream.Collectors;
/** /**
@ -94,14 +81,14 @@ public class CommonContractService extends MybatisBaseService<CommonContractMapp
private DictCommonFeign dictCommonFeign; private DictCommonFeign dictCommonFeign;
@Autowired @Autowired
private BusDepositFeign busDepositFeign; private BusDepositFeign busDepositFeign;
@Autowired /* @Autowired
private BusOrderFeign busOrderFeign; private BusOrderFeign busOrderFeign;
@Autowired @Autowired
private BusOrderDiscountFeign busOrderDiscountFeign; private BusOrderDiscountFeign busOrderDiscountFeign;*/
@Autowired /* @Autowired
private BusOrderModelFeign busOrderModelFeign; private BusOrderModelFeign busOrderModelFeign;
@Autowired @Autowired
private BusOrderVehicleFeign busOrderVehicleFeign; private BusOrderVehicleFeign busOrderVehicleFeign;*/
@Autowired @Autowired
private BusDepositVehicleFeign busDepositVehicleFeign; private BusDepositVehicleFeign busDepositVehicleFeign;
@Autowired @Autowired
@ -410,7 +397,7 @@ public class CommonContractService extends MybatisBaseService<CommonContractMapp
* @param orderSid 销售订单sid * @param orderSid 销售订单sid
* @return * @return
*/ */
public ResultBean<AppBusOrderContractVo> getAppBusOrderContractByOrderSid(String userSid, String orderSid) { /* public ResultBean<AppBusOrderContractVo> getAppBusOrderContractByOrderSid(String userSid, String orderSid) {
Map<String, String> map = generateContractNo(userSid); Map<String, String> map = generateContractNo(userSid);
String staffSid = map.get("staffSid"); String staffSid = map.get("staffSid");
CommonContractVo commonContractVo = baseMapper.selectCountByCusAndStaAndBusSid(staffSid, orderSid); CommonContractVo commonContractVo = baseMapper.selectCountByCusAndStaAndBusSid(staffSid, orderSid);
@ -439,7 +426,7 @@ public class CommonContractService extends MybatisBaseService<CommonContractMapp
} }
} }
return new ResultBean<AppBusOrderContractVo>().success().setData(contractVo); return new ResultBean<AppBusOrderContractVo>().success().setData(contractVo);
} }*/
/** /**
* 手机端保存/修改销售订单 * 手机端保存/修改销售订单
@ -580,7 +567,7 @@ public class CommonContractService extends MybatisBaseService<CommonContractMapp
* @param dto * @param dto
* @return * @return
*/ */
public ResultBean<List<PrintConfirmVo>> printConfirm(PrintConfirmDto dto) { /* public ResultBean<List<PrintConfirmVo>> printConfirm(PrintConfirmDto dto) {
Map<String, Object> map = new HashMap<String, Object>(); Map<String, Object> map = new HashMap<String, Object>();
// 合同信息 // 合同信息
CommonContract contract = fetchBySid(dto.getSid()); CommonContract contract = fetchBySid(dto.getSid());
@ -699,7 +686,7 @@ public class CommonContractService extends MybatisBaseService<CommonContractMapp
return new ResultBean().fail().setMsg("生成文件失败"); return new ResultBean().fail().setMsg("生成文件失败");
} }
return new ResultBean().success().setData(list); return new ResultBean().success().setData(list);
} }*/
/** /**
* 生成 新车买卖合同(现车或订车) pdf * 生成 新车买卖合同(现车或订车) pdf
@ -865,7 +852,7 @@ public class CommonContractService extends MybatisBaseService<CommonContractMapp
* @param createDate 交订金时间(未确定暂时取制单日期) * @param createDate 交订金时间(未确定暂时取制单日期)
* @return * @return
*/ */
public String genContractNo(String brandSid, String modelSid, String orgSid, String createDate) { /* public String genContractNo(String brandSid, String modelSid, String orgSid, String createDate) {
// 品牌简称 // 品牌简称
String brandShortName = baseVehicleBrandService.getBrandShortName(brandSid); String brandShortName = baseVehicleBrandService.getBrandShortName(brandSid);
// 车型代号 // 车型代号
@ -888,7 +875,7 @@ public class CommonContractService extends MybatisBaseService<CommonContractMapp
String loanType = ""; String loanType = "";
return brandShortName + vehicleTypeCodeNum + orgShortName + regionDivision + yearAndMonth + num + loanType; return brandShortName + vehicleTypeCodeNum + orgShortName + regionDivision + yearAndMonth + num + loanType;
} }*/
/** /**
* 根据传入的交订金时间获取所属年份和月份 * 根据传入的交订金时间获取所属年份和月份
@ -953,8 +940,8 @@ public class CommonContractService extends MybatisBaseService<CommonContractMapp
* @param map 封装数据 * @param map 封装数据
* @return * @return
*/ */
public Map<String, Object> getMap(Map<String, Object> map, PrintConfirmDto dto) { /* public Map<String, Object> getMap(Map<String, Object> map, PrintConfirmDto dto) {
Map<String, Object> commonContractMap = map; Map<String, Object> commonContractMap = map;*/
/** /**
* 车辆登记合同参数 * 车辆登记合同参数
* 甲方${partyA} * 甲方${partyA}
@ -971,7 +958,7 @@ public class CommonContractService extends MybatisBaseService<CommonContractMapp
*/ */
//甲方为卖方,即xxx公司,即根据销售订单的单位sid查询单位的名称 //甲方为卖方,即xxx公司,即根据销售订单的单位sid查询单位的名称
//乙方为受卖方,即销售订单的客户名称 //乙方为受卖方,即销售订单的客户名称
ResultBean<BusOrderVo> busOrderVoResultBean = busOrderFeign.fetchSid(dto.getBusSid()); /* ResultBean<BusOrderVo> busOrderVoResultBean = busOrderFeign.fetchSid(dto.getBusSid());
if (busOrderVoResultBean.getSuccess() && busOrderVoResultBean.getData() != null) { if (busOrderVoResultBean.getSuccess() && busOrderVoResultBean.getData() != null) {
BusOrderVo orderVo = busOrderVoResultBean.getData(); BusOrderVo orderVo = busOrderVoResultBean.getData();
//乙方 //乙方
@ -979,9 +966,9 @@ public class CommonContractService extends MybatisBaseService<CommonContractMapp
//客户名称 //客户名称
commonContractMap.put("customerName", orderVo.getCustomerName()); commonContractMap.put("customerName", orderVo.getCustomerName());
} }
return commonContractMap; return commonContractMap;*/
} /* }*/
/** /**
* 涉及高低开票的需要打印两套合同 * 涉及高低开票的需要打印两套合同

Loading…
Cancel
Save