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

Merge remote-tracking branch 'origin/master'

master
yunuo970428 2 years ago
parent
e8e023b07f 06f5bc67b2
commit
ecf1e0acd8
7 changed files with 179 additions and 57 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. 4
      anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorderreturnvehapply/BusSalesOrderReturnVehApplyDetailsVo.java
  2. 11
      anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java
  3. 5
      anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderreturnvehapply/BusSalesOrderReturnVehApplyService.java
  4. 17
      anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationService.java
  5. 80
      anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrderRetVeh/flowable/AppBusSalesOrderReturnVehDto.java
  6. 112
      anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrderRetVeh/flowable/OrderRetVehSubmitDto.java
  7. 7
      anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrderRetVeh/flowable/SubmitOrderRetVehDto.java

4
anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorderreturnvehapply/BusSalesOrderReturnVehApplyDetailsVo.java
View File

@ -30,6 +30,8 @@ import com.yxt.anrui.buscenter.api.bussalesorderreturnveh.BusSalesOrderReturnVeh
import com.yxt.common.core.vo.Vo;
import com.fasterxml.jackson.annotation.JsonFormat;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
@ -113,5 +115,5 @@ public class BusSalesOrderReturnVehApplyDetailsVo implements Vo {
@ApiModelProperty("制单日期")
private String creatTime; //制单日期
@ApiModelProperty("退库车辆列表")
private List<BusSalesOrderReturnVehDetailsVo> busSalesOrderReturnVehs;
private List<BusSalesOrderReturnVehDetailsVo> busSalesOrderReturnVehs = new ArrayList<>();
}

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

@ -1479,11 +1479,14 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
record.setContractId(commonContractVoResultBean.getData().getContractNo());
}
AppOrderDetailsVo appOrderDetailsVo = getSaleOrderDetails(record.getSaleOrderSid()).getData();
List<VinListsVo> vinListsVos = appOrderDetailsVo.getModelInfo().getVinListsVos();
AppOrderModelInfoVo modelInfo = appOrderDetailsVo.getModelInfo();
List<String> vinSids = new ArrayList<>();
for (VinListsVo vinListsVo : vinListsVos) {
if (StringUtils.isNotBlank(vinListsVo.getVinSid())){
vinSids.add(vinListsVo.getVinSid());
if (modelInfo != null){
List<VinListsVo> vinListsVos = modelInfo.getVinListsVos();
for (VinListsVo vinListsVo : vinListsVos) {
if (StringUtils.isNotBlank(vinListsVo.getVinSid())){
vinSids.add(vinListsVo.getVinSid());
}
}
}
if (vinSids.size() > 0){

5
anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderreturnvehapply/BusSalesOrderReturnVehApplyService.java
View File

@ -289,6 +289,9 @@ public class BusSalesOrderReturnVehApplyService extends MybatisBaseService<BusSa
if (baseVehicleCertificateVo != null){
busSalesOrderReturnVehDetailsVo.setCertificateStateKey(baseVehicleCertificateVo.getCertificateState());
busSalesOrderReturnVehDetailsVo.setCertificateStateValue(baseVehicleCertificateVo.getCertificateStateValue());
}else {
busSalesOrderReturnVehDetailsVo.setCertificateStateKey("-");
busSalesOrderReturnVehDetailsVo.setCertificateStateValue("-");
}
busSalesOrderReturnVehDetailsVo.setInvoicingStateKey("");
busSalesOrderReturnVehDetailsVo.setInvoicingStateValue("");
@ -361,7 +364,7 @@ public class BusSalesOrderReturnVehApplyService extends MybatisBaseService<BusSa
//流程中的参数赋值、若有网关，则赋值网关中判断的字段。
Map<String, Object> variables = new HashMap<>();
Map<String, Object> appMap = new HashMap<>();
appMap.put("sid", businessSid);
appMap.put("orderSid", businessSid);
variables.put("app", appMap);
//用户的部门全路径sid
bv.setOrgSidPath(orgSidPath);

17
anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationService.java
View File

@ -878,6 +878,23 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
finCollectionConfirmation.setStaffUserSid(dto.getUserSid());
finCollectionConfirmation.setStaffDeptSid(createDeptSid);
finCollectionConfirmation.setStaffDeptName(deptName);
if ("03".equals(dto.getCollectionTypeKey()) || "05".equals(dto.getCollectionTypeKey())) {
if (StringUtils.isNotBlank(dto.getCollectionBankNum())) {
return rb.setMsg("收款银行账号不能为空");
}
if (StringUtils.isNotBlank(dto.getReceivingName())) {
return rb.setMsg("收款银行名称不能为空");
}
if (StringUtils.isNotBlank(dto.getCollectionBank())) {
return rb.setMsg("收款银行不能为空");
}
if (StringUtils.isNotBlank(dto.getPayAccount())) {
return rb.setMsg("付款账号后4位不能为空");
}
if (StringUtils.isNotBlank(dto.getPayBank())) {
return rb.setMsg("付款银行不能为空");
}
}
if ("03".equals(dto.getCollectionTypeKey()) || "05".equals(dto.getCollectionTypeKey())) {
//收款银行账号
finCollectionConfirmation.setCollectionBankNum(dto.getCollectionBankNum());

80
anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrderRetVeh/flowable/AppBusSalesOrderReturnVehDto.java
View File

@ -0,0 +1,80 @@
/*********************************************************
*********************************************************
******************** *******************
************* ************
******* _oo0oo_ *******
*** o8888888o ***
* 88" . "88 *
* (| -_- |) *
* 0\ = /0 *
* ___/`---'\___ *
* .' \\| |// '. *
* / \\||| : |||// \ *
* / _||||| -:- |||||- \ *
* | | \\\ - /// | | *
* | \_| ''\---/'' |_/ | *
* \ .-\__ '-' ___/-. / *
* ___'. .' /--.--\ `. .'___ *
* ."" '< `.___\_<|>_/___.' >' "". *
* | | : `- \`.;`\ _ /`;.`/ - ` : | | *
* \ \ `_. \_ __\ /__ _/ .-` / / *
* =====`-.____`.___ \_____/___.-`___.-'===== *
* `=---=' *
* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
*********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
*********************************************************/
package com.yxt.anrui.terminal.api.autoservice.saleOrderRetVeh.flowable;
import com.yxt.common.core.dto.Dto;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
/**
* Project: anrui_buscenter(销售订单退车) <br/>
* File: BusSalesOrderReturnVehDto.java <br/>
* Class: com.yxt.anrui.buscenter.api.bussalesorderreturnveh.BusSalesOrderReturnVehDto <br/>
* Description: 销售订单退库车辆表 数据传输对象. <br/>
* Copyright: Copyright (c) 2011 <br/>
* Company: https://gitee.com/liuzp315 <br/>
* Makedate: 2023-03-09 14:26:23 <br/>
*
* @author liupopo
* @version 1.0
* @since 1.0
*/
@Data
@ApiModel(value = "销售订单退库车辆表 数据传输对象", description = "销售订单退库车辆表 数据传输对象")
public class AppBusSalesOrderReturnVehDto implements Dto {
private String sid; // sid
@ApiModelProperty("主表sid")
private String mainSid; // 主表sid
@ApiModelProperty("车架号")
private String vinNo; // 车架号
@ApiModelProperty("车辆sid")
private String vehSid; // 车辆sid
@ApiModelProperty("车身颜色key")
private String carColorKey; // 车身颜色key
@ApiModelProperty("车身颜色value")
private String carColorValue; // 车身颜色value
@ApiModelProperty("合格证状态key")
private String certificateStateKey; // 合格证状态key
@ApiModelProperty("合格证状态value")
private String certificateStateValue; // 合格证状态value
@ApiModelProperty("开票状态key")
private String invoicingStateKey; // 开票状态key
@ApiModelProperty("开票状态value")
private String invoicingStateValue; // 开票状态value
@ApiModelProperty("投保状态key")
private String insureStateKey; // 投保状态key
@ApiModelProperty("投保状态value")
private String insureStateValue; // 投保状态value
@ApiModelProperty("库存状态key")
private String stockStateKey; // 库存状态key
@ApiModelProperty("库存状态value")
private String stockStateValue; // 库存状态value
}

112
anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrderRetVeh/flowable/OrderRetVehSubmitDto.java
View File

@ -5,6 +5,9 @@ import com.yxt.common.core.dto.Dto;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.util.ArrayList;
import java.util.List;
/**
* @Author dimengzhe
* @Date 2022/8/9 8:58
@ -14,57 +17,64 @@ import lombok.Data;
public class OrderRetVehSubmitDto implements Dto {
private static final long serialVersionUID = 6988372341832062114L;
@ApiModelProperty(value = "价格说明")
private String priceRemarks;
@ApiModelProperty(value = "优惠说明")
private String discountRemarks;
@ApiModelProperty(value = "中介名称")
@JsonProperty("intermediaryName")
private String distributorName;
@JsonProperty("intermediaryMobile")
@ApiModelProperty(value = "联系电话")
private String distributorMobile;
@ApiModelProperty(value = "中介单位sid")
@JsonProperty("intermediarySid")
private String distributorSid;
@ApiModelProperty(value = "单车中介服务费")
@JsonProperty("agencyFee")
private String distributorPrice;
@ApiModelProperty(value = "内部引荐人")
@JsonProperty("recommender")
private String name;
@ApiModelProperty(value = "内部引荐人sid")
@JsonProperty("recommenderSid")
private String userSid;
@ApiModelProperty(value = "数量")
@JsonProperty("number")
private Integer num;
private String sid; // sid
@ApiModelProperty("中介返利备注")
@ApiModelProperty(value = "备注")
private String remarks;
@ApiModelProperty(value = "中介名称")
@JsonProperty("intermediaryName2")
private String distributorNameTwo;
@JsonProperty("intermediaryMobile2")
@ApiModelProperty(value = "联系电话")
private String distributorMobileTwo;
@ApiModelProperty(value = "中介单位sid")
@JsonProperty("intermediarySid2")
private String distributorSidTwo;
@ApiModelProperty(value = "单车中介服务费")
@JsonProperty("agencyFee2")
private String distributorPriceTwo;
@ApiModelProperty("所在单位1")
@JsonProperty("intermediaryUnit")
private String distributorUnit;
@ApiModelProperty("所在单位2")
@JsonProperty("intermediaryUnit2")
private String distributorUnitTwo;
@ApiModelProperty("当前组织机构全路径sid")
private String orgPath;
@ApiModelProperty("申请人sid")
private String createBySid; // 申请人sid
@ApiModelProperty("申请人姓名")
private String createByName; // 申请人姓名
@ApiModelProperty("销售类型key")
private String saleTypeKey; // 销售类型key
@ApiModelProperty("销售类型value")
private String saleTypeValue; // 销售类型value
@ApiModelProperty("成交价")
private String salePrice; // 成交价
@ApiModelProperty("收款情况")
private String collection; // 收款情况
@ApiModelProperty("合同编号")
private String contractNo; // 合同编号
@ApiModelProperty("客户sid")
private String customerSid; // 客户sid
@ApiModelProperty("客户编码")
private String customerNo; // 客户编码
@ApiModelProperty("客户名称")
private String customerName; // 客户名称
@ApiModelProperty(value = "客户头像")
private String customerPhoto;
@ApiModelProperty(value = "客户电话")
private String customerPhone;
@ApiModelProperty("车型品牌名称")
private String brandName; // 车型品牌名称
@ApiModelProperty("车型图片")
private String modelImage; // 车型图片
@ApiModelProperty("配置sid")
private String configSid; // 配置sid
@ApiModelProperty("车型sid")
private String modelSid; // 车型sid
@ApiModelProperty("车型小名")
private String modelName; // 车型小名
@ApiModelProperty("订单台数")
private String orderNum; // 订单台数
@ApiModelProperty("终止原因")
private String stopRemarks; // 终止原因
@ApiModelProperty("分公司sid")
private String useOrgSid; // 分公司sid
@ApiModelProperty("分公司名称")
private String useOrgName; // 分公司名称
@ApiModelProperty("流程实例id")
private String procInstId; // 流程实例id
@ApiModelProperty("任务编号id")
private String taskId; // 任务编号id
@ApiModelProperty("组织机构全路径sid")
private String orgSidPath; // 组织机构全路径sid
@ApiModelProperty("申请编号")
private String applyNo; // 申请编号
@ApiModelProperty("资金来源")
private String fundsSource; //资金来源
@ApiModelProperty("制单日期")
private String creatTime; //制单日期
@ApiModelProperty("退库车辆列表")
private List<AppBusSalesOrderReturnVehDto> busSalesOrderReturnVehs = new ArrayList<>();
}

7
anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrderRetVeh/flowable/SubmitOrderRetVehDto.java
View File

@ -12,10 +12,17 @@ import lombok.Data;
@Data
public class SubmitOrderRetVehDto implements Dto {
private static final long serialVersionUID = -3341005368687646398L;
@ApiModelProperty("销售订单退车申请sid")
private String businessSid;
@ApiModelProperty("任务id")
private String taskId;
@ApiModelProperty("流程实例id")
private String procInsId;
@ApiModelProperty("组织全路径")
private String orgPath;
private OrderRetVehSubmitDto info;
}

Write Preview
Loading…
Cancel
Save