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

pc虚拟订单字段修改

master
hp 3 years ago
parent
074baa0a91
commit
7d6553da34
17 changed files with 276 additions and 199 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 3
      anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/AppCurrentCarDetailConfigVo.java
  2. 4
      anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/common/enums/BillTypeEnum.java
  3. 61
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleMapper.xml
  4. 6
      anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdeposit/AppBusDepositBusDetailsVo.java
  5. 6
      anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdeposit/AppBusDepositBuscenterDetailVo.java
  6. 20
      anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdeposit/BusDeposit.java
  7. 9
      anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdepositvehicle/AppBusDepositVehicleDetailVo.java
  8. 11
      anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdepositvehicle/AppBusDepositVehicleDetailsInitVo.java
  9. 2
      anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdepositvehicle/AppBusDepositVehicleDto.java
  10. 6
      anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busmaindeposit/AppBusDepositBuscenterDto.java
  11. 5
      anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeposit/BusDepositService.java
  12. 14
      anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdepositvehicle/BusDepositVehicleService.java
  13. 2
      anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busmaindeposit/BusMainDepositMapper.java
  14. 8
      anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busmaindeposit/BusMainDepositMapper.xml
  15. 309
      anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busmaindeposit/BusMainDepositService.java
  16. 5
      anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/virtualOrders/vehicle/DepositVehicleCarListDto.java
  17. 4
      anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/virtualOrders/vehicle/DepositVehicleCarListVo.java

3
anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/AppCurrentCarDetailConfigVo.java
View File

@ -46,4 +46,7 @@ public class AppCurrentCarDetailConfigVo implements Vo {
@ApiModelProperty(value = "现车和排产车总数") @ApiModelProperty(value = "现车和排产车总数")
private String num; private String num;
@ApiModelProperty(value = "颜色")
private String color;
} }

4
anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/common/enums/BillTypeEnum.java
View File

@ -16,7 +16,9 @@ public enum BillTypeEnum {
CJTKSQ("CJTKSQ", "厂家退库申请"), CJTKSQ("CJTKSQ", "厂家退库申请"),
FYSQ("FYSQ","费用申请"), FYSQ("FYSQ","费用申请"),
FKSQ("FKSQ","付款申请"), FKSQ("FKSQ","付款申请"),
KCDDBGSQ("KCDDBG","库存地点变更申请") KCDDBGSQ("KCDDBG","库存地点变更申请"),
JYDDDJSQ("JYDDDJSQ","简易订单订金收取"),
JYDDCLYD("JYDDCLYD","简易订单车辆预定"),
; ;
private String billType; private String billType;

61
anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleMapper.xml
View File

@ -181,7 +181,7 @@
<select id="namesDown" resultType="java.util.Map"> <select id="namesDown" resultType="java.util.Map">
SELECT bv.vinNo, bv.sid SELECT bv.vinNo, bv.sid
FROM base_vehicle bv FROM base_vehicle bv
${ew.customSqlSegment} ${ew.customSqlSegment}
</select> </select>
<select id="selBySid" resultType="com.yxt.anrui.base.api.basevehicle.BaseVehicle"> <select id="selBySid" resultType="com.yxt.anrui.base.api.basevehicle.BaseVehicle">
select bv.sid, select bv.sid,
@ -278,8 +278,8 @@
bvm.insideCode, bvm.insideCode,
bmc.packingCase bmc.packingCase
FROM base_vehicle bv FROM base_vehicle bv
LEFT JOIN base_vehicle_model bvm ON bv.modelSid = bvm.sid LEFT JOIN base_vehicle_model bvm ON bv.modelSid = bvm.sid
LEFT JOIN base_model_config bmc ON bv.modelConfigSid = bmc.sid LEFT JOIN base_model_config bmc ON bv.modelConfigSid = bmc.sid
WHERE bv.modelSid = #{modelSid} WHERE bv.modelSid = #{modelSid}
GROUP BY bvm.sid GROUP BY bvm.sid
</select> </select>
@ -296,8 +296,8 @@
resultType="com.yxt.anrui.base.api.basevehicle.AppCurrentCarDetailVo"> resultType="com.yxt.anrui.base.api.basevehicle.AppCurrentCarDetailVo">
SELECT bv.guidedPrice AS price SELECT bv.guidedPrice AS price
FROM base_vehicle bv FROM base_vehicle bv
LEFT JOIN base_vehicle_model bvm ON bvm.sid = bv.modelSid LEFT JOIN base_vehicle_model bvm ON bvm.sid = bv.modelSid
LEFT JOIN base_model_config bmc ON bmc.sid = bv.modelConfigSid LEFT JOIN base_model_config bmc ON bmc.sid = bv.modelConfigSid
WHERE bvm.sid = #{modelSid} WHERE bvm.sid = #{modelSid}
ORDER BY bv.guidedPrice ASC ORDER BY bv.guidedPrice ASC
</select> </select>
@ -305,14 +305,14 @@
<select id="getModelNumByModelSid" resultType="java.lang.String"> <select id="getModelNumByModelSid" resultType="java.lang.String">
SELECT count(*) SELECT count(*)
FROM base_vehicle bv FROM base_vehicle bv
LEFT JOIN base_vehicle_model bvm ON bv.modelSid = bvm.sid LEFT JOIN base_vehicle_model bvm ON bv.modelSid = bvm.sid
WHERE bvm.sid = #{modelSid} WHERE bvm.sid = #{modelSid}
</select> </select>
<select id="getConfigNumByModelSid" resultType="java.lang.String"> <select id="getConfigNumByModelSid" resultType="java.lang.String">
SELECT count(*) SELECT count(*)
FROM base_vehmodel_config bvc FROM base_vehmodel_config bvc
LEFT JOIN base_model_config bmc ON bvc.configurationItemsSid = bmc.sid LEFT JOIN base_model_config bmc ON bvc.configurationItemsSid = bmc.sid
WHERE bvc.modelSid = #{modelSid} WHERE bvc.modelSid = #{modelSid}
</select> </select>
@ -335,8 +335,8 @@
bmc.packingCase, bmc.packingCase,
bvm.insideCode bvm.insideCode
FROM base_vehmodel_config bvc FROM base_vehmodel_config bvc
LEFT JOIN base_vehicle_model bvm ON bvc.modelSid = bvm.sid LEFT JOIN base_vehicle_model bvm ON bvc.modelSid = bvm.sid
LEFT JOIN base_model_config bmc ON bvc.configurationItemsSid = bmc.sid LEFT JOIN base_model_config bmc ON bvc.configurationItemsSid = bmc.sid
WHERE bvc.modelSid = #{modelSid} WHERE bvc.modelSid = #{modelSid}
AND bvc.configurationItemsSid = #{configSid} AND bvc.configurationItemsSid = #{configSid}
AND bvc.useOrgSid = #{useOrg} AND bvc.useOrgSid = #{useOrg}
@ -355,7 +355,7 @@
<!--颜色--> <!--颜色-->
bmc.carColor, bmc.carColor,
<!--存放地点--> <!--存放地点-->
bv.location, bv.locationName as location,
<!--销售指导价--> <!--销售指导价-->
<!-- bv.guidedPrice,--> <!-- bv.guidedPrice,-->
<!--车型Sid--> <!--车型Sid-->
@ -415,8 +415,8 @@
bvm.`marketSegmentsValue`, bvm.`engineTypeValue`, bvm.`specifications`, bvm.`marketSegmentsValue`, bvm.`engineTypeValue`, bvm.`specifications`,
bvm.`department`) as vehModelInfor bvm.`department`) as vehModelInfor
FROM base_vehmodel_config bvc FROM base_vehmodel_config bvc
LEFT JOIN base_vehicle_model bvm ON bvc.`modelSid` = bvm.`sid` LEFT JOIN base_vehicle_model bvm ON bvc.`modelSid` = bvm.`sid`
LEFT JOIN base_model_config bmc ON bvc.configurationItemsSid = bmc.`sid` LEFT JOIN base_model_config bmc ON bvc.configurationItemsSid = bmc.`sid`
WHERE bvc.modelSid = #{modelSid} WHERE bvc.modelSid = #{modelSid}
AND bvc.configurationItemsSid = #{configSid} LIMIT 1 AND bvc.configurationItemsSid = #{configSid} LIMIT 1
</select> </select>
@ -469,8 +469,8 @@
bvm.`marketSegmentsValue`, bvm.`engineTypeValue`, bvm.`specifications`, bvm.`marketSegmentsValue`, bvm.`engineTypeValue`, bvm.`specifications`,
bvm.`department`) as vehModelInfor bvm.`department`) as vehModelInfor
FROM base_vehmodel_config bvc FROM base_vehmodel_config bvc
LEFT JOIN base_vehicle_model bvm ON bvc.`modelSid` = bvm.`sid` LEFT JOIN base_vehicle_model bvm ON bvc.`modelSid` = bvm.`sid`
LEFT JOIN base_model_config bmc ON bvc.configurationItemsSid = bmc.`sid` LEFT JOIN base_model_config bmc ON bvc.configurationItemsSid = bmc.`sid`
WHERE bvc.sid = #{vehModelConfigSid} LIMIT 1 WHERE bvc.sid = #{vehModelConfigSid} LIMIT 1
</select> </select>
@ -584,11 +584,11 @@
(select SUM(distinct cast((cast(bo.platformNo as signed) - (select SUM(distinct cast((cast(bo.platformNo as signed) -
IFNULL(cast(bo.lockingNum as signed), '0')) as signed)) as quantity IFNULL(cast(bo.lockingNum as signed), '0')) as signed)) as quantity
from bus_vehicle_order bo from bus_vehicle_order bo
LEFT JOIN bus_vehicle_apply_detail bd on bo.purchaseRequisitionSid = bd.applySid LEFT JOIN bus_vehicle_apply_detail bd on bo.purchaseRequisitionSid = bd.applySid
where bo.useOrgSid = bvc.useOrgSid where bo.useOrgSid = bvc.useOrgSid
AND bd.vehicleSid = bvm.sid) AS produceCarNum AND bd.vehicleSid = bvm.sid) AS produceCarNum
FROM base_vehicle_model bvm FROM base_vehicle_model bvm
LEFT JOIN base_vehmodel_config bvc ON bvm.sid = bvc.modelSid LEFT JOIN base_vehmodel_config bvc ON bvm.sid = bvc.modelSid
WHERE bvc.modelSid = #{modelSid} WHERE bvc.modelSid = #{modelSid}
AND bvc.useOrgSid != #{useOrg} AND bvc.useOrgSid != #{useOrg}
group by bvc.useOrgSid group by bvc.useOrgSid
@ -601,21 +601,22 @@
bvm.vehicleAlias AS model, bvm.vehicleAlias AS model,
bvm.brandName AS brand, bvm.brandName AS brand,
bvm.carBrand AS brandSid, bvm.carBrand AS brandSid,
bmc.carColor AS color,
( (
(SELECT count(*) (SELECT count(*)
FROM base_vehicle bv FROM base_vehicle bv
WHERE bv.modelSid = bvm.sid WHERE bv.modelSid = bvm.sid
AND bv.modelConfigSid = bvc.configurationItemsSid AND bv.modelConfigSid = bvc.configurationItemsSid
AND lockedState = '03') AND lockedState = '03')
+ +
(SELECT count(*) (SELECT count(*)
FROM bus_vehicle_apply_detail bvad FROM bus_vehicle_apply_detail bvad
WHERE bvad.vehicleSid = bvm.sid WHERE bvad.vehicleSid = bvm.sid
AND bvad.configSid = bvc.configurationItemsSid) AND bvad.configSid = bvc.configurationItemsSid)
) AS num ) AS num
FROM base_vehmodel_config bvc FROM base_vehmodel_config bvc
LEFT JOIN base_vehicle_model bvm ON bvc.modelSid = bvm.sid LEFT JOIN base_vehicle_model bvm ON bvc.modelSid = bvm.sid
LEFT JOIN base_model_config bmc ON bvc.configurationItemsSid = bmc.sid LEFT JOIN base_model_config bmc ON bvc.configurationItemsSid = bmc.sid
WHERE bvc.modelSid = #{modelSid} WHERE bvc.modelSid = #{modelSid}
AND bvc.configurationItemsSid = #{configSid} AND bvc.configurationItemsSid = #{configSid}
AND bvc.useOrgSid = #{useOrg} AND bvc.useOrgSid = #{useOrg}
@ -800,14 +801,14 @@
carColor AS color, carColor AS color,
locationName AS address locationName AS address
FROM base_vehicle bv FROM base_vehicle bv
LEFT JOIN base_model_config bmc ON bmc.sid = bv.modelConfigSid LEFT JOIN base_model_config bmc ON bmc.sid = bv.modelConfigSid
${ew.customSqlSegment} ${ew.customSqlSegment}
</select> </select>
<select id="selectVehicleCount" resultType="java.lang.Integer"> <select id="selectVehicleCount" resultType="java.lang.Integer">
select count(*) select count(*)
from base_vehicle bv from base_vehicle bv
${ew.customSqlSegment} ${ew.customSqlSegment}
</select> </select>
<select id="selectByModelSidAndConfigSid" <select id="selectByModelSidAndConfigSid"
@ -816,8 +817,8 @@
convert(bc.guidedPrice / 10000, decimal (10, 2)) AS price, convert(bc.guidedPrice / 10000, decimal (10, 2)) AS price,
bmc.configName AS commonlyConfig bmc.configName AS commonlyConfig
FROM base_vehmodel_config bc FROM base_vehmodel_config bc
LEFT JOIN base_vehicle_model bvm ON bc.`modelSid` = bvm.`sid` LEFT JOIN base_vehicle_model bvm ON bc.`modelSid` = bvm.`sid`
LEFT JOIN base_model_config bmc ON bc.configurationItemsSid = bmc.`sid` LEFT JOIN base_model_config bmc ON bc.configurationItemsSid = bmc.`sid`
where bc.modelSid = #{modelSid} where bc.modelSid = #{modelSid}
AND bc.configurationItemsSid = #{configSid} AND bc.configurationItemsSid = #{configSid}
AND bc.useOrgSid = #{useOrg} AND bc.useOrgSid = #{useOrg}
@ -829,8 +830,8 @@
convert(bvc.guidedPrice / 10000, decimal (10, 2)) AS price, convert(bvc.guidedPrice / 10000, decimal (10, 2)) AS price,
bmc.configName AS commonlyConfig bmc.configName AS commonlyConfig
from base_vehmodel_config bvc from base_vehmodel_config bvc
LEFT JOIN base_vehicle_model bvm ON bvc.`modelSid` = bvm.`sid` LEFT JOIN base_vehicle_model bvm ON bvc.`modelSid` = bvm.`sid`
LEFT JOIN base_model_config bmc ON bvc.configurationItemsSid = bmc.`sid` LEFT JOIN base_model_config bmc ON bvc.configurationItemsSid = bmc.`sid`
where bvc.modelSid = #{modelSid} where bvc.modelSid = #{modelSid}
AND bvc.configurationItemsSid = #{configSid} AND bvc.configurationItemsSid = #{configSid}
AND bvc.useOrgSid = #{useOrg} AND bvc.useOrgSid = #{useOrg}
@ -855,7 +856,7 @@
bv.locationName address, bv.locationName address,
bv.sid carSid, bv.sid carSid,
if(bv.lockedState = 1, 1, 0) if(bv.lockedState = 1, 1, 0)
as isFictitious as isFictitious
from base_vehicle bv from base_vehicle bv
where bv.modelSid = #{modelSid} where bv.modelSid = #{modelSid}
and bv.modelConfigSid = #{configSid} and bv.modelConfigSid = #{configSid}
@ -948,7 +949,7 @@
<update id="updateVehicleOutLibrary"> <update id="updateVehicleOutLibrary">
UPDATE UPDATE
base_vehicle base_vehicle
SET vehicleState = #{vehicleState}, SET vehicleState = #{vehicleState},
vehicleStateValue = #{vehicleStateValue}, vehicleStateValue = #{vehicleStateValue},
salesDate = #{salesDate}, salesDate = #{salesDate},
@ -959,7 +960,7 @@
<update id="updateVehicleBuyBreak"> <update id="updateVehicleBuyBreak">
UPDATE UPDATE
base_vehicle base_vehicle
SET solidDate = #{solidDate}, SET solidDate = #{solidDate},
settlementStatus = #{settlementStatus}, settlementStatus = #{settlementStatus},
settlementStatusValue = #{settlementStatusValue} settlementStatusValue = #{settlementStatusValue}

6
anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdeposit/AppBusDepositBusDetailsVo.java
View File

@ -13,6 +13,12 @@ public class AppBusDepositBusDetailsVo implements Vo {
@ApiModelProperty("单据编号") @ApiModelProperty("单据编号")
private String virtualOrderId; private String virtualOrderId;
@ApiModelProperty("订单类型")
private String depositBillType;
@ApiModelProperty("订单类型")
private String depositBillTypeKey;
@ApiModelProperty("制单日期") @ApiModelProperty("制单日期")
private String virtualOrderDate; private String virtualOrderDate;

6
anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdeposit/AppBusDepositBuscenterDetailVo.java
View File

@ -18,6 +18,12 @@ public class AppBusDepositBuscenterDetailVo implements Vo {
@ApiModelProperty("客户列表") @ApiModelProperty("客户列表")
private List<AppBusDepositCustomerListVo> customerList; private List<AppBusDepositCustomerListVo> customerList;
@ApiModelProperty("订单类型")
private String depositBillType;
@ApiModelProperty("订单类型")
private String depositBillTypeKey;
@ApiModelProperty("制单日期") @ApiModelProperty("制单日期")
private String virtualOrderDate; private String virtualOrderDate;

20
anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdeposit/BusDeposit.java
View File

@ -108,15 +108,15 @@ public class BusDeposit extends BaseEntity {
private String paymentProof; private String paymentProof;
@ApiModelProperty(value = "节点状态") // @ApiModelProperty(value = "节点状态")
private String nodeState; // private String nodeState;
@ApiModelProperty("节点id") // @ApiModelProperty("节点id")
private String nodeId; // private String nodeId;
@ApiModelProperty("流程定义的id") // @ApiModelProperty("流程定义的id")
private String procDefId; // private String procDefId;
@ApiModelProperty("流程实例的id") // @ApiModelProperty("流程实例的id")
private String procInstId; // private String procInstId;
@ApiModelProperty(value = "任务id") // @ApiModelProperty(value = "任务id")
private String taskId; // private String taskId;
} }

9
anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdepositvehicle/AppBusDepositVehicleDetailVo.java
View File

@ -14,8 +14,11 @@ public class AppBusDepositVehicleDetailVo implements Vo {
@ApiModelProperty(value = "虚拟订单编号") @ApiModelProperty(value = "虚拟订单编号")
private String virtualOrderId; private String virtualOrderId;
@ApiModelProperty(value = "制单日期") @ApiModelProperty(value = "制单日期")
private String virtualOrderDate; private String createDate;
@ApiModelProperty("订单类型")
private String depositBillType;
@ApiModelProperty("订单类型")
private String depositBillTypeKey;
@ApiModelProperty(value = "客户sid") @ApiModelProperty(value = "客户sid")
private String customerSid; private String customerSid;
@ApiModelProperty(value = "客户名称") @ApiModelProperty(value = "客户名称")
@ -31,7 +34,7 @@ public class AppBusDepositVehicleDetailVo implements Vo {
@ApiModelProperty(value = "部门名称") @ApiModelProperty(value = "部门名称")
private String departmentName; private String departmentName;
@ApiModelProperty(value = "销售专员") @ApiModelProperty(value = "销售专员")
private String sellerName; private String staffName;
@ApiModelProperty(value = "更新状态地址") @ApiModelProperty(value = "更新状态地址")
private String updateStateUrl; private String updateStateUrl;
@ApiModelProperty(value = "说明") @ApiModelProperty(value = "说明")

11
anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdepositvehicle/AppBusDepositVehicleDetailsInitVo.java
View File

@ -15,18 +15,21 @@ public class AppBusDepositVehicleDetailsInitVo implements Vo {
private String virtualOrderSid; private String virtualOrderSid;
@ApiModelProperty(value = "虚拟订单编号") @ApiModelProperty(value = "虚拟订单编号")
private String virtualOrderId; private String virtualOrderId;
@ApiModelProperty(value = "虚拟订单创建日期")
private String createDate;
@ApiModelProperty("订单类型")
private String depositBillType;
@ApiModelProperty("订单类型")
private String depositBillTypeKey;
@ApiModelProperty(value = "客户sid") @ApiModelProperty(value = "客户sid")
private String customerSid; private String customerSid;
@ApiModelProperty(value = "客户名称") @ApiModelProperty(value = "客户名称")
private String customerName; private String customerName;
@ApiModelProperty(value = "手机号") @ApiModelProperty(value = "手机号")
private String mobile; private String mobile;
@ApiModelProperty("制单日期")
private String createDate;
@ApiModelProperty(value = "销售专员") @ApiModelProperty(value = "销售专员")
private String sellerName; private String staffName;
@ApiModelProperty(value = "部门名称") @ApiModelProperty(value = "部门名称")
private String departmentName; private String departmentName;
@ApiModelProperty(value = "用户sid") @ApiModelProperty(value = "用户sid")

2
anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdepositvehicle/AppBusDepositVehicleDto.java
View File

@ -20,7 +20,7 @@ public class AppBusDepositVehicleDto implements Dto {
@ApiModelProperty("订单编号") @ApiModelProperty("订单编号")
private String virtualOrderId; private String virtualOrderId;
@ApiModelProperty("业务员名称") @ApiModelProperty("业务员名称")
private String sellerName; private String staffName;
@ApiModelProperty("部门名称") @ApiModelProperty("部门名称")
private String departmentName; private String departmentName;
@ApiModelProperty("手机号") @ApiModelProperty("手机号")

6
anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busmaindeposit/AppBusDepositBuscenterDto.java
View File

@ -60,6 +60,12 @@ public class AppBusDepositBuscenterDto implements Dto {
@ApiModelProperty("用户Sid") @ApiModelProperty("用户Sid")
private String userSid; private String userSid;
@ApiModelProperty("申请人")
private String staffName;
@ApiModelProperty("分公司")
private String departmentName;
@ApiModelProperty("客户列表") @ApiModelProperty("客户列表")
private List<AppBusDepositCustomerListDto> customerList; private List<AppBusDepositCustomerListDto> customerList;

5
anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeposit/BusDepositService.java
View File

@ -88,6 +88,9 @@ public class BusDepositService extends MybatisBaseService<BusDepositMapper, BusD
vo.setDepartmentName(busMainDeposit.getOrgName()); vo.setDepartmentName(busMainDeposit.getOrgName());
vo.setStaffName(busMainDeposit.getStaffName()); vo.setStaffName(busMainDeposit.getStaffName());
vo.setCreateDate(busMainDeposit.getCreateDate()); vo.setCreateDate(busMainDeposit.getCreateDate());
vo.setDepositBillType(busMainDeposit.getDepositBillType());
vo.setDepositBillTypeKey(busMainDeposit.getDepositBillTypeKey());
vo.setVirtualOrderSid(busMainDeposit.getSid());
vo.setUserSid(userSid); vo.setUserSid(userSid);
List<String> list = new ArrayList<>(); List<String> list = new ArrayList<>();
if (StringUtils.isNotBlank(vo.getPaymentProof())) { if (StringUtils.isNotBlank(vo.getPaymentProof())) {
@ -118,6 +121,8 @@ public class BusDepositService extends MybatisBaseService<BusDepositMapper, BusD
vo.setDepartmentName(busMainDeposit.getOrgName()); vo.setDepartmentName(busMainDeposit.getOrgName());
vo.setStaffName(busMainDeposit.getStaffName()); vo.setStaffName(busMainDeposit.getStaffName());
vo.setCreateDate(busMainDeposit.getCreateDate()); vo.setCreateDate(busMainDeposit.getCreateDate());
vo.setDepositBillType(busMainDeposit.getDepositBillType());
vo.setDepositBillTypeKey(busMainDeposit.getDepositBillTypeKey());
List<String> list = new ArrayList<>(); List<String> list = new ArrayList<>();
if (StringUtils.isNotBlank(vo.getPaymentProof())) { if (StringUtils.isNotBlank(vo.getPaymentProof())) {
String url = fileUploadComponent.getUrlPrefix() + vo.getPaymentProof(); String url = fileUploadComponent.getUrlPrefix() + vo.getPaymentProof();

14
anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdepositvehicle/BusDepositVehicleService.java
View File

@ -207,8 +207,6 @@ public class BusDepositVehicleService extends MybatisBaseService<BusDepositVehic
public ResultBean<AppBusDepositVehicleDetailsInitVo> reserveCarDetail(AppBusDepositVehicleDetailsInitQuery query) { public ResultBean<AppBusDepositVehicleDetailsInitVo> reserveCarDetail(AppBusDepositVehicleDetailsInitQuery query) {
if (StringUtils.isBlank(query.getVirtualOrderSid())) { if (StringUtils.isBlank(query.getVirtualOrderSid())) {
AppBusDepositVehicleDetailsInitVo vo = selCustomerDetaile(query); AppBusDepositVehicleDetailsInitVo vo = selCustomerDetaile(query);
Map<String, String> map = busMainDepositService.generateBillNo(query.getUserSid());
vo.setVirtualOrderId(map.get("billNo"));
SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd"); SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd");
vo.setCreateDate(simpleDateFormat.format(new Date())); vo.setCreateDate(simpleDateFormat.format(new Date()));
vo.setCarList(new ArrayList<>()); vo.setCarList(new ArrayList<>());
@ -222,10 +220,12 @@ public class BusDepositVehicleService extends MybatisBaseService<BusDepositVehic
vo.setProcInsId(busMainDeposit.getProcInsId()); vo.setProcInsId(busMainDeposit.getProcInsId());
vo.setVirtualOrderId(busMainDeposit.getBillNo()); vo.setVirtualOrderId(busMainDeposit.getBillNo());
vo.setCreateDate(busMainDeposit.getCreateDate()); vo.setCreateDate(busMainDeposit.getCreateDate());
vo.setDepositBillType(busMainDeposit.getDepositBillType());
vo.setDepositBillTypeKey(busMainDeposit.getDepositBillTypeKey());
BusDepositVehicleCustomerVo vehicleCustomerVo = busDepositVehicleCustomerService.selectByBillSid(virtualOrderSid); BusDepositVehicleCustomerVo vehicleCustomerVo = busDepositVehicleCustomerService.selectByBillSid(virtualOrderSid);
vo.setCustomerName(vehicleCustomerVo.getCustomerName()); vo.setCustomerName(vehicleCustomerVo.getCustomerName());
vo.setMobile(vehicleCustomerVo.getCustomerMobile()); vo.setMobile(vehicleCustomerVo.getCustomerMobile());
vo.setSellerName(busMainDeposit.getStaffName()); vo.setStaffName(busMainDeposit.getStaffName());
vo.setDepartmentName(busMainDeposit.getOrgName()); vo.setDepartmentName(busMainDeposit.getOrgName());
vo.setVirtualOrderSid(query.getVirtualOrderSid()); vo.setVirtualOrderSid(query.getVirtualOrderSid());
vo.setUserSid(query.getUserSid()); vo.setUserSid(query.getUserSid());
@ -253,7 +253,7 @@ public class BusDepositVehicleService extends MybatisBaseService<BusDepositVehic
AppCrmCustomerTempInfoVo data = tempDetailsBySid.getData(); AppCrmCustomerTempInfoVo data = tempDetailsBySid.getData();
vo.setCustomerName(data.getName());//客户名称 vo.setCustomerName(data.getName());//客户名称
vo.setMobile(data.getMobile());//手机号 vo.setMobile(data.getMobile());//手机号
vo.setSellerName(sysUserData.getStaffName());//销售专员 vo.setStaffName(sysUserData.getStaffName());//销售专员
vo.setDepartmentName(sysUserData.getOrgName());//部门名称 vo.setDepartmentName(sysUserData.getOrgName());//部门名称
return vo; return vo;
} }
@ -272,7 +272,9 @@ public class BusDepositVehicleService extends MybatisBaseService<BusDepositVehic
vo.setProcInsId(busMainDeposit.getProcInsId()); vo.setProcInsId(busMainDeposit.getProcInsId());
vo.setTaskId(busMainDeposit.getTaskId()); vo.setTaskId(busMainDeposit.getTaskId());
vo.setVirtualOrderId(busMainDeposit.getBillNo()); vo.setVirtualOrderId(busMainDeposit.getBillNo());
vo.setVirtualOrderDate(busMainDeposit.getCreateDate()); vo.setCreateDate(busMainDeposit.getCreateDate());
vo.setDepositBillType(busMainDeposit.getDepositBillType());
vo.setDepositBillTypeKey(busMainDeposit.getDepositBillTypeKey());
//查询客户信息 //查询客户信息
BusDepositVehicleCustomerVo vehicleCustomerVo = busDepositVehicleCustomerService.selectByBillSid(virtualOrderSid); BusDepositVehicleCustomerVo vehicleCustomerVo = busDepositVehicleCustomerService.selectByBillSid(virtualOrderSid);
vo.setCustomerSid(vehicleCustomerVo.getCustomerSid()); vo.setCustomerSid(vehicleCustomerVo.getCustomerSid());
@ -281,7 +283,7 @@ public class BusDepositVehicleService extends MybatisBaseService<BusDepositVehic
vo.setHeadImage(vehicleCustomerVo.getCustomerPhoto()); vo.setHeadImage(vehicleCustomerVo.getCustomerPhoto());
vo.setCustomerClass(vehicleCustomerVo.getCustomerClass()); vo.setCustomerClass(vehicleCustomerVo.getCustomerClass());
vo.setCustomerClassKey(vehicleCustomerVo.getCustomerClassKey()); vo.setCustomerClassKey(vehicleCustomerVo.getCustomerClassKey());
vo.setSellerName(busMainDeposit.getStaffName()); vo.setStaffName(busMainDeposit.getStaffName());
vo.setDepartmentName(busMainDeposit.getOrgName()); vo.setDepartmentName(busMainDeposit.getOrgName());
vo.setUpdateStateUrl("未确定字段"); vo.setUpdateStateUrl("未确定字段");
//查询车辆信息 //查询车辆信息

2
anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busmaindeposit/BusMainDepositMapper.java
View File

@ -134,4 +134,6 @@ public interface BusMainDepositMapper extends BaseMapper<BusMainDeposit> {
int updateByNodeState(@Param("nodeState") String nodeState, @Param("businessSid") String businessSid); int updateByNodeState(@Param("nodeState") String nodeState, @Param("businessSid") String businessSid);
IPage<AppBusMainDepositOrderVo> pageAppList(IPage<BusMainDeposit> page, @Param(Constants.WRAPPER) QueryWrapper<BusMainDeposit> qw, @Param("name") String name); IPage<AppBusMainDepositOrderVo> pageAppList(IPage<BusMainDeposit> page, @Param(Constants.WRAPPER) QueryWrapper<BusMainDeposit> qw, @Param("name") String name);
String selectNum(String bill);
} }

8
anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busmaindeposit/BusMainDepositMapper.xml
View File

@ -325,4 +325,12 @@
where bv.billSid = #{virtualSid} where bv.billSid = #{virtualSid}
group by bv.modelSid, bv.modelConfigSid group by bv.modelSid, bv.modelConfigSid
</select> </select>
<select id="selectNum" resultType="java.lang.String">
select RIGHT (billNo, 4)
from bus_main_deposit
where billNo LIKE concat(#{bill}, '%')
order by id desc
limit 1
</select>
</mapper> </mapper>

309
anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busmaindeposit/BusMainDepositService.java
View File

@ -32,6 +32,9 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
import com.yxt.anrui.base.api.basevehicle.BaseVehicleFeign; import com.yxt.anrui.base.api.basevehicle.BaseVehicleFeign;
import com.yxt.anrui.base.api.basevehmodelconfig.BaseVehmodelConfigFeign; import com.yxt.anrui.base.api.basevehmodelconfig.BaseVehmodelConfigFeign;
import com.yxt.anrui.base.api.basevehmodelconfig.BaseVehmodelVo; import com.yxt.anrui.base.api.basevehmodelconfig.BaseVehmodelVo;
import com.yxt.anrui.base.common.enums.BillTypeEnum;
import com.yxt.anrui.base.common.utils.Rule;
import com.yxt.anrui.base.common.utils.domain.BillNo;
import com.yxt.anrui.buscenter.api.busdeposit.AppBusDepositBusDetailsVo; import com.yxt.anrui.buscenter.api.busdeposit.AppBusDepositBusDetailsVo;
import com.yxt.anrui.buscenter.api.busdeposit.BusDeposit; import com.yxt.anrui.buscenter.api.busdeposit.BusDeposit;
import com.yxt.anrui.buscenter.api.busdepositcustomer.AppBusDepositCustomerListDto; import com.yxt.anrui.buscenter.api.busdepositcustomer.AppBusDepositCustomerListDto;
@ -88,10 +91,12 @@ 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;
import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional; import org.springframework.transaction.annotation.Transactional;
import javax.xml.crypto.Data;
import java.math.BigDecimal; import java.math.BigDecimal;
import java.text.SimpleDateFormat; import java.text.SimpleDateFormat;
import java.util.*; import java.util.*;
@ -184,7 +189,7 @@ public class BusMainDepositService extends MybatisBaseService<BusMainDepositMapp
} }
if (StringUtils.isNotBlank(query.getName())) { if (StringUtils.isNotBlank(query.getName())) {
qw.and(wrapper -> wrapper.like("bd.draweeName", query.getName()).or().like("bdv.customerName", query.getName())); qw.and(wrapper -> wrapper.like("bd.draweeName", query.getName()).or().like("bdvc.customerName", query.getName()));
} }
if (StringUtils.isNotBlank(query.getStartTime())) { if (StringUtils.isNotBlank(query.getStartTime())) {
@ -702,70 +707,94 @@ public class BusMainDepositService extends MybatisBaseService<BusMainDepositMapp
* @return * @return
*/ */
@Transactional(rollbackFor = Exception.class) @Transactional(rollbackFor = Exception.class)
public ResultBean public ResultBean<String> saveDepositInfo(AppBusDepositBuscenterDto dto) {
saveDepositInfo(AppBusDepositBuscenterDto dto) { ResultBean<String> rb = ResultBean.fireFail();
AppUserOrgInfoVo data = sysUserFeign.getUserOrgInfoByUserSid(dto.getUserSid()).getData(); AppUserOrgInfoVo data = sysUserFeign.getUserOrgInfoByUserSid(dto.getUserSid()).getData();
SysOrganizationVo sysOrganizationVo = sysOrganizationFeign.getUseOrgByUserSid(dto.getUserSid()).getData(); String useOrgSid = sysStaffOrgFeign.getPathSidByUserSid(dto.getUserSid()).getData();
Date date = new Date();
SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd"); SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd");
//判断订单sid是否有值(无值 新增 有值 修改) //判断订单sid是否有值(无值 新增 有值 修改)
if (StringUtils.isBlank(dto.getVirtualOrderSid())) { //新增 if (StringUtils.isBlank(dto.getVirtualOrderSid())) { //新增
BusMainDeposit busMainDeposit = new BusMainDeposit(); BusMainDeposit busMainDeposit = new BusMainDeposit();
busMainDeposit.setSid(UUID.randomUUID().toString()); busMainDeposit.setBillNo(getApplyCode1(dto));
Map<String, String> map = generateBillNo(dto.getUserSid());
busMainDeposit.setBillNo(map.get("billNo_Num"));
busMainDeposit.setStaffSid(data.getStaffSid()); busMainDeposit.setStaffSid(data.getStaffSid());
busMainDeposit.setStaffName(data.getStaffName()); busMainDeposit.setStaffName(dto.getStaffName());
busMainDeposit.setOrgSid(data.getOrgSid()); busMainDeposit.setOrgSid(useOrgSid);
busMainDeposit.setOrgName(dto.getDepartmentName());
busMainDeposit.setCreateBySid(dto.getUserSid()); busMainDeposit.setCreateBySid(dto.getUserSid());
busMainDeposit.setOrgName(sysOrganizationVo.getName() + "-" + data.getOrgName());
busMainDeposit.setDepositBillType("订金收取"); busMainDeposit.setDepositBillType("订金收取");
busMainDeposit.setDepositBillTypeKey("01"); busMainDeposit.setDepositBillTypeKey("01");
busMainDeposit.setCreateDate(dateFormat.format(date)); busMainDeposit.setCreateDate(dateFormat.format(new Date()));
baseMapper.insert(busMainDeposit); baseMapper.insert(busMainDeposit);
BusDeposit busDeposit = new BusDeposit(); BusDeposit busDeposit = new BusDeposit();
busDeposit.setBillNo(busMainDeposit.getBillNo()); busDeposit.setBillNo(busMainDeposit.getBillNo());
busDeposit.setBillSid(busMainDeposit.getSid()); busDeposit.setBillSid(busMainDeposit.getSid());
busDeposit.setStaffSid(busMainDeposit.getStaffSid()); busDeposit.setStaffSid(busMainDeposit.getStaffSid());
busDeposit.setStaffName(data.getStaffName()); busDeposit.setStaffName(busMainDeposit.getStaffName());
busDeposit.setOrgSid(data.getOrgSid()); busDeposit.setOrgSid(busMainDeposit.getOrgSid());
busDeposit.setOrgName(sysOrganizationVo.getName() + "-" + data.getOrgName()); busDeposit.setCreateDate(dateFormat.format(new Date()));
busDeposit.setCreateDate(dateFormat.format(date));
setBusDeposit(busDeposit, dto); setBusDeposit(busDeposit, dto);
//付款凭证 //付款凭证
busDeposit.setPaymentProof(parsePaymentProofList(dto.getPayImages())); busDeposit.setPaymentProof(parsePaymentProofList(dto.getPayImages()));
busDepositService.insert(busDeposit); busDepositService.insert(busDeposit);
//添加客户信息 //添加客户信息
appSetBusDepositCustomer(dto, busDeposit.getBillSid()); appSetBusDepositCustomer(dto, busDeposit.getBillSid());
return new ResultBean().success().setData(busMainDeposit.getSid()).setMsg("添加成功"); return rb.success().setData(busMainDeposit.getSid());
} else { //修改 } else { //修改
BusMainDeposit busMainDeposit = baseMapper.selectBySid(dto.getVirtualOrderSid()); BusMainDeposit busMainDeposit = baseMapper.selectBySid(dto.getVirtualOrderSid());
String nodeState = busMainDeposit.getNodeState(); if (busMainDeposit == null) {
if (StringUtils.isBlank(nodeState)) { //判断订单状态是否是未提交和拨回到发起人状态 return rb.setMsg("该订单不存在");
BusDeposit busDeposit = busDepositService.selectByBillSid(dto.getVirtualOrderSid());
//付款凭证
busDeposit.setPaymentProof(parsePaymentProofList(dto.getPayImages()));
busDeposit.setCreateDate(dateFormat.format(date));
busDeposit.setCollectionBankSid(dto.getCollectionBankSid());
setBusDeposit(busDeposit, dto);
busDepositService.updateById(busDeposit);
busDepositCustomerService.delByBillSid(dto.getVirtualOrderSid());
appSetBusDepositCustomer(dto, busDeposit.getBillSid());
return new ResultBean().success().setData(busMainDeposit.getSid()).setMsg("修改成功");
} else if (nodeState.equals("待提交") && nodeState.equals("已驳回")) {
BusDeposit busDeposit = busDepositService.selectByBillSid(dto.getVirtualOrderSid());
//付款凭证
busDeposit.setPaymentProof(parsePaymentProofList(dto.getPayImages()));
busDeposit.setCreateDate(dateFormat.format(date));
busDeposit.setCollectionBankSid(dto.getCollectionBankSid());
setBusDeposit(busDeposit, dto);
busDepositService.updateById(busDeposit);
busDepositCustomerService.delByBillSid(dto.getVirtualOrderSid());
appSetBusDepositCustomer(dto, busDeposit.getBillSid());
return new ResultBean().success().setData(busMainDeposit.getSid()).setMsg("修改成功");
} }
return new ResultBean().fail().setMsg("已提交办理审批中不可修改!"); BusDeposit busDeposit = busDepositService.selectByBillSid(dto.getVirtualOrderSid());
//付款凭证
busDeposit.setPaymentProof(parsePaymentProofList(dto.getPayImages()));
busDeposit.setCreateDate(dateFormat.format(new Date()));
busDeposit.setCollectionBankSid(dto.getCollectionBankSid());
setBusDeposit(busDeposit, dto);
busDepositService.updateById(busDeposit);
busDepositCustomerService.delByBillSid(dto.getVirtualOrderSid());
appSetBusDepositCustomer(dto, busDeposit.getBillSid());
return rb.success().setData(busMainDeposit.getSid());
}
}
public String getApplyCode1(AppBusDepositBuscenterDto dto) {
String userSid = dto.getUserSid();
//获取分公司sid
ResultBean<String> resultBean = sysStaffOrgFeign.getPathSidByUserSid(userSid);
ResultBean<SysOrganizationVo> resultBean1 = sysOrganizationFeign.fetchBySid(resultBean.getData());
String orgCode = resultBean1.getData().getOrgCode();
BillNo b = new BillNo();
b.setOrgCode(orgCode);
b.setBillType(BillTypeEnum.JYDDDJSQ.getBillType());
String bill = Rule.getBill(b);
String i = baseMapper.selectNum(bill);
String billNo = "";
if (StringUtils.isNotBlank(i)) {
billNo = Rule.getBillNo(bill, Integer.valueOf(i).intValue());
} else {
billNo = Rule.getBillNo(bill, 0);
}
return billNo;
}
public String getApplyCode2(AppBusDepositVehicleDto dto) {
String userSid = dto.getUserSid();
//获取分公司sid
ResultBean<String> resultBean = sysStaffOrgFeign.getPathSidByUserSid(userSid);
ResultBean<SysOrganizationVo> resultBean1 = sysOrganizationFeign.fetchBySid(resultBean.getData());
String orgCode = resultBean1.getData().getOrgCode();
BillNo b = new BillNo();
b.setOrgCode(orgCode);
b.setBillType(BillTypeEnum.JYDDCLYD.getBillType());
String bill = Rule.getBill(b);
String i = baseMapper.selectNum(bill);
String billNo = "";
if (StringUtils.isNotBlank(i)) {
billNo = Rule.getBillNo(bill, Integer.valueOf(i).intValue());
} else {
billNo = Rule.getBillNo(bill, 0);
} }
return billNo;
} }
/** /**
@ -776,13 +805,12 @@ public class BusMainDepositService extends MybatisBaseService<BusMainDepositMapp
* @return * @return
*/ */
public BusDeposit setBusDeposit(BusDeposit busDeposit, AppBusDepositBuscenterDto dto) { public BusDeposit setBusDeposit(BusDeposit busDeposit, AppBusDepositBuscenterDto dto) {
BeanUtils.copyProperties(dto, busDeposit, "sid");
busDeposit.setDraweeName(dto.getPayName()); busDeposit.setDraweeName(dto.getPayName());
busDeposit.setProBankAccKey(dto.getCollectionNumberKey()); busDeposit.setProBankAccKey(dto.getCollectionNumberKey());
busDeposit.setProBankAccValue(dto.getCollectionNumber()); busDeposit.setProBankAccValue(dto.getCollectionNumber());
busDeposit.setProBankValue(dto.getCollectionBank()); busDeposit.setProBankValue(dto.getCollectionBank());
busDeposit.setProBankKey(dto.getCollectionBankKey()); busDeposit.setProBankKey(dto.getCollectionBankKey());
busDeposit.setPayTypeKey(dto.getPayTypeKey());
busDeposit.setPayType(dto.getPayType());
if ("03".equals(dto.getPayTypeKey())) { if ("03".equals(dto.getPayTypeKey())) {
busDeposit.setPayBankAcc(dto.getPayNumber()); busDeposit.setPayBankAcc(dto.getPayNumber());
} else { } else {
@ -791,9 +819,6 @@ public class BusMainDepositService extends MybatisBaseService<BusMainDepositMapp
busDeposit.setPaymentDate(dto.getPayDate()); busDeposit.setPaymentDate(dto.getPayDate());
busDeposit.setVehicleNum(dto.getCarNumber()); busDeposit.setVehicleNum(dto.getCarNumber());
busDeposit.setDraweeMobile(dto.getMobile()); busDeposit.setDraweeMobile(dto.getMobile());
busDeposit.setDeposit(dto.getDeposit());
busDeposit.setRemarks(dto.getRemarks());
busDeposit.setCollectionBankSid(dto.getCollectionBankSid());
return busDeposit; return busDeposit;
} }
@ -841,41 +866,41 @@ public class BusMainDepositService extends MybatisBaseService<BusMainDepositMapp
* @return * @return
*/ */
public ResultBean submitMainDespoitApprove(BusDepositDto dto) { public ResultBean submitMainDespoitApprove(BusDepositDto dto) {
String orgSid = checkUserOrg(dto.getUserSid()); // String orgSid = checkUserOrg(dto.getUserSid());
// String businessSid = dto.getSid(); // // String businessSid = dto.getSid();
ResultBean resultBean1 = saveOrUpdateDeposit(dto); // ResultBean resultBean1 = saveOrUpdateDeposit(dto);
String businessSid = resultBean1.getData().toString(); // String businessSid = resultBean1.getData().toString();
Map<String, Object> variables = new HashMap<>(); // Map<String, Object> variables = new HashMap<>();
variables.put("businessSid", businessSid); // variables.put("businessSid", businessSid);
variables.put("isLoan", true); // variables.put("isLoan", true);
variables.put("orgSid", orgSid);//部门sid // variables.put("orgSid", orgSid);//部门sid
ResultBean resultBean = flowableService.businessStart(ProcDefEnum.ORDERDEPOSITAPPROVE.getProDefId(), dto.getUserSid(), variables); // ResultBean resultBean = flowableService.businessStart(ProcDefEnum.ORDERDEPOSITAPPROVE.getProDefId(), dto.getUserSid(), variables);
if (resultBean.getSuccess() && resultBean.getData() != null) { // if (resultBean.getSuccess() && resultBean.getData() != null) {
Map<String, String> map = (Map<String, String>) resultBean.getData(); // Map<String, String> map = (Map<String, String>) resultBean.getData();
/*saveSysFormLink(map);*/ // /*saveSysFormLink(map);*/
//更新虚拟订单审批（订金）业务表中的流程状态 // //更新虚拟订单审批（订金）业务表中的流程状态
modifiBusMainDepositFlowState(businessSid, // modifiBusMainDepositFlowState(businessSid,
ProcDefEnum.ORDERDEPOSITAPPROVE.getProDefId(),//procDefId // ProcDefEnum.ORDERDEPOSITAPPROVE.getProDefId(),//procDefId
map.get("nodeState"),//state // map.get("nodeState"),//state
map.get("procInsId"),//procInstSid // map.get("procInsId"),//procInstSid
map.get("taskDefKey")//nodeSid // map.get("taskDefKey")//nodeSid
); // );
} // }
return resultBean; return new ResultBean();
} }
private void modifiBusMainDepositFlowState(String businessSid, // private void modifiBusMainDepositFlowState(String businessSid,
String proDefId,//procDefId // String proDefId,//procDefId
String nodeState,//state // String nodeState,//state
String procInsId,//procInstSid // String procInsId,//procInstSid
String taskDefKey//nodeSid // String taskDefKey//nodeSid
) { // ) {
baseMapper.modifiBusDepositFlowState(businessSid, // baseMapper.modifiBusDepositFlowState(businessSid,
proDefId,//procDefId // proDefId,//procDefId
nodeState,//state // nodeState,//state
procInsId,//procInstSid // procInsId,//procInstSid
taskDefKey); // taskDefKey);
} // }
/*public ResultBean submitMainDespoitApprove(BusDepositDto dto) { /*public ResultBean submitMainDespoitApprove(BusDepositDto dto) {
String orgSid = checkUserOrg(dto.getUserSid()); String orgSid = checkUserOrg(dto.getUserSid());
String businessSid = ""; String businessSid = "";
@ -962,37 +987,37 @@ public class BusMainDepositService extends MybatisBaseService<BusMainDepositMapp
* @return * @return
*/ */
public ResultBean submitMainDespoitVehicleApprove(BusMainDepositVehicleDto dto) { public ResultBean submitMainDespoitVehicleApprove(BusMainDepositVehicleDto dto) {
String orgSid = checkUserOrg(dto.getUserSid()); // String orgSid = checkUserOrg(dto.getUserSid());
String businessSid = ""; // String businessSid = "";
if (StringUtils.isBlank(orgSid)) { // if (StringUtils.isBlank(orgSid)) {
return new ResultBean().fail().setMsg("用户组织机构不能为空"); // return new ResultBean().fail().setMsg("用户组织机构不能为空");
} // }
// 验证 // // 验证
if (StringUtils.isBlank(dto.getSid())) { // if (StringUtils.isBlank(dto.getSid())) {
// 调用保存接口 // // 调用保存接口
ResultBean resultBean = saveDepositVehicle(dto); // ResultBean resultBean = saveDepositVehicle(dto);
if (!resultBean.getSuccess()) { // if (!resultBean.getSuccess()) {
return resultBean.setMsg("提交失败"); // return resultBean.setMsg("提交失败");
} // }
businessSid = resultBean.getData().toString(); // businessSid = resultBean.getData().toString();
} else { // } else {
// 调用更新接口 // // 调用更新接口
ResultBean resultBean = updateDepositVehicle(dto, dto.getSid()); // ResultBean resultBean = updateDepositVehicle(dto, dto.getSid());
if (!resultBean.getSuccess()) { // if (!resultBean.getSuccess()) {
return resultBean.setMsg("提交失败"); // return resultBean.setMsg("提交失败");
} // }
businessSid = dto.getSid(); // businessSid = dto.getSid();
} // }
Map<String, Object> variables = new HashMap<>(); // Map<String, Object> variables = new HashMap<>();
variables.put("businessSid", businessSid); // variables.put("businessSid", businessSid);
variables.put("isLoan", true); // variables.put("isLoan", true);
variables.put("orgSid", orgSid); // variables.put("orgSid", orgSid);
ResultBean resultBean = flowableService.businessStart(ProcDefEnum.ORDERDEPOSITVEHICLEAPPROVE.getProDefId(), dto.getUserSid(), variables); // ResultBean resultBean = flowableService.businessStart(ProcDefEnum.ORDERDEPOSITVEHICLEAPPROVE.getProDefId(), dto.getUserSid(), variables);
if (resultBean.getSuccess() && resultBean.getData() != null) { // if (resultBean.getSuccess() && resultBean.getData() != null) {
Map<String, String> map = (Map<String, String>) resultBean.getData(); // Map<String, String> map = (Map<String, String>) resultBean.getData();
saveSysFormLink(map); // saveSysFormLink(map);
} // }
return resultBean; return new ResultBean();
} }
/** /**
@ -1128,49 +1153,53 @@ public class BusMainDepositService extends MybatisBaseService<BusMainDepositMapp
* @return * @return
*/ */
@Transactional(rollbackFor = Exception.class) @Transactional(rollbackFor = Exception.class)
public ResultBean reserveCarInfo(AppBusDepositVehicleDto dto) { public ResultBean<String> reserveCarInfo(AppBusDepositVehicleDto dto) {
AppUserOrgInfoVo appUserOrgInfoVo = sysUserFeign.getUserOrgInfoByUserSid(dto.getUserSid()).getData(); ResultBean<String> rb = ResultBean.fireFail();
SysOrganizationVo sysOrganizationVo = sysOrganizationFeign.getUseOrgByUserSid(dto.getUserSid()).getData(); String useOrgSid = sysStaffOrgFeign.getPathSidByUserSid(dto.getUserSid()).getData();
Date date = new Date(); AppUserOrgInfoVo data = sysUserFeign.getUserOrgInfoByUserSid(dto.getUserSid()).getData();
SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd"); SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd");
if (StringUtils.isBlank(dto.getVirtualOrderSid())) {//新增 if (StringUtils.isBlank(dto.getVirtualOrderSid())) {//新增
BusMainDeposit busMainDeposit = new BusMainDeposit(); BusMainDeposit busMainDeposit = new BusMainDeposit();
busMainDeposit.setSid(UUID.randomUUID().toString()); busMainDeposit.setBillNo(getApplyCode2(dto));
Map<String, String> map = generateBillNo(dto.getUserSid());
busMainDeposit.setBillNo(map.get("billNo_Num"));
busMainDeposit.setCreateBySid(dto.getUserSid()); busMainDeposit.setCreateBySid(dto.getUserSid());
busMainDeposit.setStaffSid(appUserOrgInfoVo.getStaffSid()); busMainDeposit.setStaffSid(data.getStaffSid());
busMainDeposit.setStaffName(appUserOrgInfoVo.getStaffName()); busMainDeposit.setStaffName(dto.getStaffName());
busMainDeposit.setOrgSid(appUserOrgInfoVo.getOrgSid()); busMainDeposit.setOrgSid(useOrgSid);
busMainDeposit.setOrgName(sysOrganizationVo.getName() + "-" + appUserOrgInfoVo.getOrgName()); busMainDeposit.setOrgName(dto.getDepartmentName());
busMainDeposit.setDepositBillType("车辆预订"); busMainDeposit.setDepositBillType("车辆预订");
busMainDeposit.setDepositBillTypeKey("02"); busMainDeposit.setDepositBillTypeKey("02");
busMainDeposit.setCreateDate(dateFormat.format(date)); busMainDeposit.setCreateDate(dateFormat.format(new Date()));
baseMapper.insert(busMainDeposit); baseMapper.insert(busMainDeposit);
// 车辆客户信息 // 车辆客户信息
BusDepositVehicleCustomer customer = new BusDepositVehicleCustomer(); BusDepositVehicleCustomer customer = new BusDepositVehicleCustomer();
String customerSid = dto.getCustomerSid(); BeanUtils.copyProperties(dto, customer, "sid");
AppCrmCustomerTempInfoVo appCrmCustomerTempInfoVo = crmCustomerTempFeign.getAppCustomerTempDetailsBySid(customerSid).getData(); AppCrmCustomerTempInfoVo appCrmCustomerTempInfoVo = crmCustomerTempFeign.getAppCustomerTempDetailsBySid(customer.getCustomerSid()).getData();
customer.setCustomerSid(customerSid);
customer.setCustomerName(dto.getCustomerName());
customer.setCustomerMobile(dto.getMobile());
customer.setCustomerClass(appCrmCustomerTempInfoVo.getCustomerType()); customer.setCustomerClass(appCrmCustomerTempInfoVo.getCustomerType());
customer.setCustomerClassKey(appCrmCustomerTempInfoVo.getCustomerTypeKey()); customer.setCustomerClassKey(appCrmCustomerTempInfoVo.getCustomerTypeKey());
customer.setCustomerPhoto(appCrmCustomerTempInfoVo.getCustomerPhoto()); customer.setCustomerMobile(dto.getMobile());
customer.setBillSid(busMainDeposit.getSid()); customer.setBillSid(busMainDeposit.getSid());
busDepositVehicleCustomerService.save(customer); busDepositVehicleCustomerService.save(customer);
//添加车辆信息 //添加车辆信息
appSetBusDepositVehicle(dto, busMainDeposit); appSetBusDepositVehicle(dto, busMainDeposit);
return new ResultBean().success().setData(busMainDeposit.getSid()).setMsg("添加成功"); return rb.success().setData(busMainDeposit.getSid());
} else {//修改 } else {//修改
BusMainDeposit busMainDeposit = fetchBySid(dto.getVirtualOrderSid()); BusMainDeposit busMainDeposit = fetchBySid(dto.getVirtualOrderSid());
BeanUtils.copyProperties(dto, busMainDeposit, "sid");
baseMapper.updateById(busMainDeposit); baseMapper.updateById(busMainDeposit);
busDepositVehicleService.delByBillSid(dto.getVirtualOrderSid()); busDepositVehicleService.delByBillSid(dto.getVirtualOrderSid());
busDepositVehicleCustomerService.delByBillSid(dto.getVirtualOrderSid());
BusDepositVehicleCustomer customer = new BusDepositVehicleCustomer();
BeanUtils.copyProperties(dto, customer, "sid");
AppCrmCustomerTempInfoVo appCrmCustomerTempInfoVo = crmCustomerTempFeign.getAppCustomerTempDetailsBySid(customer.getCustomerSid()).getData();
customer.setCustomerClass(appCrmCustomerTempInfoVo.getCustomerType());
customer.setCustomerClassKey(appCrmCustomerTempInfoVo.getCustomerTypeKey());
customer.setCustomerMobile(dto.getMobile());
customer.setBillSid(busMainDeposit.getSid());
busDepositVehicleCustomerService.save(customer);
appSetBusDepositVehicle(dto, busMainDeposit); appSetBusDepositVehicle(dto, busMainDeposit);
return new ResultBean().success().setData(busMainDeposit.getSid()).setMsg("修改成功"); return rb.success().setData(busMainDeposit.getSid());
} }
} }
/** /**
* 新增/修改虚拟订单订金收取添加车辆信息方法 * 新增/修改虚拟订单订金收取添加车辆信息方法
* *
@ -1905,11 +1934,7 @@ public class BusMainDepositService extends MybatisBaseService<BusMainDepositMapp
ResultBean<List<AppGetNodeVo>> rb = new ResultBean<>(); ResultBean<List<AppGetNodeVo>> rb = new ResultBean<>();
BusinessVariables bv = new BusinessVariables(); BusinessVariables bv = new BusinessVariables();
BeanUtil.copyProperties(query, bv); BeanUtil.copyProperties(query, bv);
// Map<String, Object> formVariables = query.getFormVariables(); bv.setModelId(ProcDefEnum.ORDERDEPOSITAPPROVE.getProDefId());
//判断流程分支
// Map<String, Object> map = IsTrue(formVariables.get("businessSid"));
// bv.setFormVariables(map);
bv.setModelId(ProcDefEnum.SCMCARTRANSFER.getProDefId());
ResultBean<List<Map<String, Object>>> resultBean = flowTaskFeign.getPreviousNodesForReject(bv); ResultBean<List<Map<String, Object>>> resultBean = flowTaskFeign.getPreviousNodesForReject(bv);
//判断数组是否为空，若为空则赋值，若不为空，则遍历循环将map中的数据赋值给getNodeVo //判断数组是否为空，若为空则赋值，若不为空，则遍历循环将map中的数据赋值给getNodeVo
List<AppGetNodeVo> voList = Optional.ofNullable(resultBean.getData()).orElse(new ArrayList<>()).stream().map(m -> JSON.parseObject(JSON.toJSONString(m), AppGetNodeVo.class)).collect(Collectors.toList()); List<AppGetNodeVo> voList = Optional.ofNullable(resultBean.getData()).orElse(new ArrayList<>()).stream().map(m -> JSON.parseObject(JSON.toJSONString(m), AppGetNodeVo.class)).collect(Collectors.toList());
@ -1920,11 +1945,7 @@ public class BusMainDepositService extends MybatisBaseService<BusMainDepositMapp
ResultBean<List<AppGetNodeVo>> rb = ResultBean.fireFail(); ResultBean<List<AppGetNodeVo>> rb = ResultBean.fireFail();
BusinessVariables bv = new BusinessVariables(); BusinessVariables bv = new BusinessVariables();
BeanUtil.copyProperties(query, bv); BeanUtil.copyProperties(query, bv);
// Map<String, Object> formVariables = query.getFormVariables(); bv.setModelId(ProcDefEnum.ORDERDEPOSITAPPROVE.getProDefId());
//判断流程分支
// Map<String, Object> map = IsTrue(formVariables.get("businessSid"));
// bv.setFormVariables(map);
bv.setModelId(ProcDefEnum.SCMCARTRANSFER.getProDefId());
ResultBean<List<Map<String, Object>>> resultBean = flowTaskFeign.getNextNodesForSubmit(bv); ResultBean<List<Map<String, Object>>> resultBean = flowTaskFeign.getNextNodesForSubmit(bv);
//判断数组是否为空，若为空则赋值，若不为空，则遍历循环将map中的数据赋值给getNodeVo //判断数组是否为空，若为空则赋值，若不为空，则遍历循环将map中的数据赋值给getNodeVo
List<AppGetNodeVo> voList = Optional.ofNullable(resultBean.getData()).orElse(new ArrayList<>()).stream().map(m -> JSON.parseObject(JSON.toJSONString(m), AppGetNodeVo.class)).collect(Collectors.toList()); List<AppGetNodeVo> voList = Optional.ofNullable(resultBean.getData()).orElse(new ArrayList<>()).stream().map(m -> JSON.parseObject(JSON.toJSONString(m), AppGetNodeVo.class)).collect(Collectors.toList());
@ -1971,7 +1992,7 @@ public class BusMainDepositService extends MybatisBaseService<BusMainDepositMapp
BeanUtil.copyProperties(query, flowTaskVo); BeanUtil.copyProperties(query, flowTaskVo);
ResultBean<UpdateFlowFieldVo> resultBean = flowableFeign.revokeProcess(flowTaskVo); ResultBean<UpdateFlowFieldVo> resultBean = flowableFeign.revokeProcess(flowTaskVo);
if (!resultBean.getSuccess()) { if (!resultBean.getSuccess()) {
return rb.setMsg("操作失败!"); return rb.setMsg(resultBean.getMsg());
} }
updateFlowFiled(BeanUtil.beanToMap(resultBean.getData())); updateFlowFiled(BeanUtil.beanToMap(resultBean.getData()));
return rb.success().setData(resultBean.getData()); return rb.success().setData(resultBean.getData());

5
anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/virtualOrders/vehicle/DepositVehicleCarListDto.java
View File

@ -1,5 +1,6 @@
package com.yxt.anrui.terminal.api.autoservice.virtualOrders.vehicle; package com.yxt.anrui.terminal.api.autoservice.virtualOrders.vehicle;
import com.fasterxml.jackson.annotation.JsonProperty;
import com.yxt.common.core.dto.Dto; import com.yxt.common.core.dto.Dto;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import lombok.Data; import lombok.Data;
@ -31,4 +32,8 @@ public class DepositVehicleCarListDto implements Dto {
private String modelSid; private String modelSid;
@ApiModelProperty(value = "车辆sid") @ApiModelProperty(value = "车辆sid")
private String carSid; private String carSid;
@ApiModelProperty(value = "颜色")
@JsonProperty("color")
private String colour;
} }

4
anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/virtualOrders/vehicle/DepositVehicleCarListVo.java
View File

@ -1,5 +1,6 @@
package com.yxt.anrui.terminal.api.autoservice.virtualOrders.vehicle; package com.yxt.anrui.terminal.api.autoservice.virtualOrders.vehicle;
import com.fasterxml.jackson.annotation.JsonProperty;
import com.yxt.common.core.vo.Vo; import com.yxt.common.core.vo.Vo;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import lombok.Data; import lombok.Data;
@ -37,6 +38,9 @@ public class DepositVehicleCarListVo implements Vo {
private String carName; private String carName;
@ApiModelProperty(value = "预定日期") @ApiModelProperty(value = "预定日期")
private String reserveDate; private String reserveDate;
@ApiModelProperty(value = "颜色")
@JsonProperty("color")
private String colour;
} }

Write Preview
Loading…
Cancel
Save