diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseoutsourcingapplication/BaseOutsourcingApplicationService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseoutsourcingapplication/BaseOutsourcingApplicationService.java index 3b9741abf0..6b5e7e19fa 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseoutsourcingapplication/BaseOutsourcingApplicationService.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseoutsourcingapplication/BaseOutsourcingApplicationService.java @@ -68,6 +68,7 @@ import com.yxt.anrui.scm.api.scmvehicleexamine.ScmEntryVehicleExamineDto; import com.yxt.anrui.scm.api.scmvehicleexamine.ScmVehicleExamineFeign; import com.yxt.anrui.scm.api.scmvehinspectitem.ScmVehinspectItemDto; import com.yxt.anrui.scm.api.scmvehinspectitem.ScmVehinspectItemFeign; +import com.yxt.common.base.config.component.FileUploadComponent; import com.yxt.common.base.service.MybatisBaseService; import com.yxt.common.base.utils.DateUtils; import com.yxt.common.base.utils.PagerUtil; @@ -128,6 +129,8 @@ public class BaseOutsourcingApplicationService extends MybatisBaseService createQueryWrapper(BaseOutsourcingApplicationQuery query) { // todo: 这里根据具体业务调整查询条件 @@ -746,7 +749,7 @@ public class BaseOutsourcingApplicationService extends MybatisBaseService commonAppendixVos = commonAppendixService.selByLinkSid(sid); List stringList = new ArrayList<>(); if (commonAppendixVos != null && commonAppendixVos.size() > 0) { - stringList.add(commonAppendixVos.get(0).getFilePath()); + stringList.add(fileUploadComponent.getUrlPrefix()+commonAppendixVos.get(0).getFilePath()); } vo.setImages(stringList); return rb.success().setData(vo); diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commoncontract/CommonContractService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commoncontract/CommonContractService.java index fcaede70b5..d5c83c63e7 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commoncontract/CommonContractService.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commoncontract/CommonContractService.java @@ -1149,7 +1149,7 @@ public class CommonContractService extends MybatisBaseService images; } diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/app/order/AppOrderDetailsVo.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/app/order/AppOrderDetailsVo.java index fe0cb274d8..c314599f76 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/app/order/AppOrderDetailsVo.java +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/app/order/AppOrderDetailsVo.java @@ -79,4 +79,11 @@ public class AppOrderDetailsVo implements Vo { @ApiModelProperty("任务id") private String taskId; + + @ApiModelProperty("订单编号") + private String billNo; + @ApiModelProperty("资金类型") + private String financePlanValue; + @ApiModelProperty("付款类型") + private String payTypeKey; } diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/app/order/AppOrderPriceInfoVo.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/app/order/AppOrderPriceInfoVo.java index 96354831af..e447f40c0f 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/app/order/AppOrderPriceInfoVo.java +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/app/order/AppOrderPriceInfoVo.java @@ -24,4 +24,10 @@ public class AppOrderPriceInfoVo implements Vo { private String date; @ApiModelProperty(value = "预计提车地点") private String address; + + @ApiModelProperty("单台整体指导价") + private String singleGuildPrice; + @ApiModelProperty("单台整体成交价") + private String singleFinalPrice; + } diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busmaindeposit/BusMainDepositService.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busmaindeposit/BusMainDepositService.java index 072711c716..303edfb6e4 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busmaindeposit/BusMainDepositService.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busmaindeposit/BusMainDepositService.java @@ -1211,6 +1211,7 @@ public class BusMainDepositService extends MybatisBaseService variables = new HashMap<>(); - Map appMap = new HashMap<>(); - appMap.put("sid",bv.getBusinessSid()); - variables.put("app",appMap); + Map variables = new HashMap<>(); + Map appMap = new HashMap<>(); + appMap.put("sid", bv.getBusinessSid()); + variables.put("app", appMap); bv.setFormVariables(variables); if (bv.getTaskId().equals(busMainDeposit.getTaskId())) { ResultBean resultBean = flowableFeign.handleProsess(bv); @@ -1992,10 +1993,10 @@ public class BusMainDepositService extends MybatisBaseService variables = new HashMap<>(); - Map appMap = new HashMap<>(); - appMap.put("sid",appMap); - variables.put("app",appMap); + Map variables = new HashMap<>(); + Map appMap = new HashMap<>(); + appMap.put("sid", appMap); + variables.put("app", appMap); flowTaskVo.setValues(variables); ResultBean resultBean = flowableFeign.taskReject(flowTaskVo); if (!resultBean.getSuccess()) { @@ -2066,6 +2067,7 @@ public class BusMainDepositService extends MybatisBaseService appMap, BusMainDeposit busMainDeposit) { //=====极光推送信息========================================参数组装 String procId = busMainDeposit.getProcInsId(); - ResultBean> resultBean = flowTaskFeign.getLatestTasks(procId); + ResultBean> resultBean = flowTaskFeign.getLatestTasks(procId); String nextNodeUserSids = resultBean.getData().get(0).getASSIGNEE_(); List receiveSidList = Arrays.asList(nextNodeUserSids.split(",")); //根据用户的sid查询用户的id @@ -2085,7 +2087,18 @@ public class BusMainDepositService extends MybatisBaseService selectUrlByKey = sysProUrlFeign.selectUrlByKey(ProcDefEnum.VEHICLEAPPLY.getProDefId(), ufVo.getTaskDefKey(), "1", "2"); + String proDefId = ""; + String name = ""; + if ("01".equals(busMainDeposit.getDepositBillTypeKey())) {//订金收取 + proDefId = ProcDefEnum.ORDERDEPOSITAPPROVE.getProDefId(); + name = "简易订单申请-订金收取"; + } else { + if ("02".equals(busMainDeposit.getDepositBillTypeKey())) {//车辆预定 + proDefId = ProcDefEnum.ORDERDEPOSITVEHICLEAPPROVE.getProDefId(); + name = "简易订单申请-车辆预定"; + } + } + ResultBean selectUrlByKey = sysProUrlFeign.selectUrlByKey(proDefId, ufVo.getTaskDefKey(), "1", "2"); SysProUrlVo sysProUrlVo = selectUrlByKey.getData(); messageFlowableDto.setBusinessSid(busMainDeposit.getSid()); messageFlowableDto.setApp_type("2"); @@ -2105,9 +2118,9 @@ public class BusMainDepositService extends MybatisBaseService stringResultBean = messageFeign.getMessage(messageFlowableDto); diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderMapper.xml b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderMapper.xml index 05a760e6cd..b7afe2a08f 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderMapper.xml +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderMapper.xml @@ -54,7 +54,7 @@ case bo.isInsurance when 0 then '否' when 1 then '是' end as insuranceInfo, - if(bo.nodeState = '已办结', true, false) as showContractBtn, + if(bo.nodeState = '已办结', true, false) as showContractBtn, bo.nodeState is null as showUpdateBtn, bo.nodeState is null as showDeleteBtn, 0 as showFinancialBtn @@ -67,11 +67,11 @@ ${ew.sqlSegment} and concat(IFNULL(bo.customerName - , '') - , ifnull(bo.billNo - , '')) LIKE concat('%' - , #{name} - , '%') + , '') + , ifnull(bo.billNo + , '')) LIKE concat('%' + , #{name} + , '%') order by bo.id @@ -184,7 +184,10 @@ when 1 then '现车' when 2 then '采购订单' when 3 then '排产' end as orderType, - bo.orgSid + bo.orgSid, + bo.billNo, + bo.financePlanValue, + bo.payTypeKey from bus_sales_order bo where sid = #{sid} diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java index 028a48e572..391f9e1905 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java @@ -1163,7 +1163,7 @@ public class BusSalesOrderService extends MybatisBaseService qw = appCreateQueryWrapper(pq.getParams()); IPage page = PagerUtil.queryToPage(pq); - IPage pagging = baseMapper.getSaleOrders(page, qw,pq.getParams().getName()); + IPage pagging = baseMapper.getSaleOrders(page, qw, pq.getParams().getName()); for (AppBusSalesOrderVo record : pagging.getRecords()) { if (StringUtils.isNotBlank(record.getCustomerImage())) { record.setCustomerImage(fileUploadComponent.getUrlPrefix() + record.getCustomerImage()); @@ -1974,7 +1974,7 @@ public class BusSalesOrderService extends MybatisBaseService voList = orderVoResultBean.getData(); voList.removeAll(Collections.singleton(null)); - if(!voList.isEmpty()){ + if (!voList.isEmpty()) { for (AppBaseVehicleOrderVo vehicleOrderVo : voList) { vinNoList.add(vehicleOrderVo.getVin()); } @@ -2020,7 +2020,7 @@ public class BusSalesOrderService extends MybatisBaseService applyListVos = applyListResultBean.getData(); applyListVos.removeAll(Collections.singleton(null)); - if(!applyListVos.isEmpty()){ + if (!applyListVos.isEmpty()) { for (AppBusVehicleApplyListVo applyListVo : applyListVos) { AppReadyCarVo appReadyCarVo = new AppReadyCarVo(); BeanUtil.copyProperties(applyListVo, appReadyCarVo); @@ -2143,6 +2143,9 @@ public class BusSalesOrderService extends MybatisBaseService list = busDepositFictitiousService.detailsList(depositInfo.getSid()); list.removeAll(Collections.singleton(null)); + List stringList = new ArrayList<>(); if (!list.isEmpty()) { for (BusDepositFictitiousDetailsVo v : list) { String b = "编号为" + v.getDepositBillNo() + "虚拟订单订金转入" + v.getPrice() + "元，"; a = a + b; + if (StringUtils.isNotBlank(v.getPayPath())) { + List payPathList = Arrays.asList(v.getPayPath().split(",")); + for (int i = 0; i < payPathList.size(); i++) { + stringList.add(fileUploadComponent.getUrlPrefix() + payPathList.get(i)); + } + } } a = a + "原订金额度使用完后，其收据自动作废。"; depositInfo.setDepositRemarks(a); + depositInfo.setImages(stringList); } } vo.setDepositInfo(depositInfo); @@ -2408,7 +2419,7 @@ public class BusSalesOrderService extends MybatisBaseService appMap, BusSalesOrder busSalesOrder) { //=====极光推送信息========================================参数组装 String procId = busSalesOrder.getProcInstId(); - ResultBean> resultBean = flowTaskFeign.getLatestTasks(procId); + ResultBean> resultBean = flowTaskFeign.getLatestTasks(procId); String nextNodeUserSids = resultBean.getData().get(0).getASSIGNEE_(); List receiveSidList = Arrays.asList(nextNodeUserSids.split(",")); //根据用户的sid查询用户的id diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderdeposit/BusSalesOrderDepositMapper.xml b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderdeposit/BusSalesOrderDepositMapper.xml index 6c8e4bbf81..b3689ffe79 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderdeposit/BusSalesOrderDepositMapper.xml +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderdeposit/BusSalesOrderDepositMapper.xml @@ -71,7 +71,7 @@ diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderdeposit/BusSalesOrderDepositService.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderdeposit/BusSalesOrderDepositService.java index 5eae998c6f..24074d244f 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderdeposit/BusSalesOrderDepositService.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderdeposit/BusSalesOrderDepositService.java @@ -45,6 +45,7 @@ import com.yxt.anrui.buscenter.biz.bussalesorderprice.BusSalesOrderPriceService; import com.yxt.anrui.flowable.api.flowcomment.FlowComment; import com.yxt.anrui.portal.api.sysuser.SysUserFeign; import com.yxt.anrui.portal.api.sysuser.SysUserInfoVo; +import com.yxt.common.base.config.component.FileUploadComponent; import com.yxt.common.base.service.MybatisBaseService; import com.yxt.common.base.utils.PagerUtil; import com.yxt.common.core.query.PagerQuery; @@ -87,6 +88,8 @@ public class BusSalesOrderDepositService extends MybatisBaseService0){ + String payPath = StringUtils.join(listDto.getEntrustImage(), ","); + if(payPath.contains(fileUploadComponent.getUrlPrefix())){ + payPath = payPath.replaceAll(fileUploadComponent.getUrlPrefix(),""); + } + busDepositFictitious.setPayPath(payPath); + } busDepositFictitiousService.save(busDepositFictitious); } } diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderprice/BusSalesOrderPriceMapper.xml b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderprice/BusSalesOrderPriceMapper.xml index f1f9e75a46..479324f0c5 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderprice/BusSalesOrderPriceMapper.xml +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderprice/BusSalesOrderPriceMapper.xml @@ -49,11 +49,12 @@ diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/order/OrderDepositInfoVo.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/order/OrderDepositInfoVo.java index 9186ed698b..5c8f6d2ae2 100644 --- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/order/OrderDepositInfoVo.java +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/order/OrderDepositInfoVo.java @@ -1,9 +1,12 @@ package com.yxt.anrui.terminal.api.autoservice.saleOrders.order; +import com.fasterxml.jackson.annotation.JsonProperty; import com.yxt.common.core.vo.Vo; import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import java.util.List; + /** * @Author dimengzhe * @Date 2022/6/9 16:05 @@ -21,4 +24,10 @@ public class OrderDepositInfoVo implements Vo { @ApiModelProperty(value = "订金结转方式") private String type; + + @ApiModelProperty("需补交订金") + @JsonProperty("compensatePay") + private String makeUpDeposit; + @ApiModelProperty("所有订金结转上传的委托书") + private List images; } diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/order/OrderDetailsVo.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/order/OrderDetailsVo.java index dfc68822f6..434c6b42cb 100644 --- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/order/OrderDetailsVo.java +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/order/OrderDetailsVo.java @@ -1,5 +1,6 @@ package com.yxt.anrui.terminal.api.autoservice.saleOrders.order; +import com.fasterxml.jackson.annotation.JsonProperty; import com.yxt.common.core.vo.Vo; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -14,8 +15,8 @@ import java.util.List; @Data public class OrderDetailsVo implements Vo { private static final long serialVersionUID = 3824138856793171263L; - @ApiModelProperty(value = "合同编号") - private String contractId; + // @ApiModelProperty(value = "合同编号") +// private String contractId; @ApiModelProperty(value = "制单日期") private String orderDate; @ApiModelProperty(value = "客户sid") @@ -28,8 +29,8 @@ public class OrderDetailsVo implements Vo { private String phone; @ApiModelProperty(value = "客户类型") private String customerKey; - @ApiModelProperty(value = "订单类型") - private String orderType; + // @ApiModelProperty(value = "订单类型") +// private String orderType; @ApiModelProperty(value = "挂靠公司") private String affiliated; @ApiModelProperty(value = "开票类型") @@ -70,4 +71,14 @@ public class OrderDetailsVo implements Vo { @ApiModelProperty("任务id") private String taskId; + @ApiModelProperty("订单编号") + @JsonProperty("orderId") + private String billNo; + @ApiModelProperty("资金类型") + @JsonProperty("fundsSource") + private String financePlanValue; + @ApiModelProperty("付款类型") + @JsonProperty("payType") + private String payTypeKey; + } diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/order/OrderPriceInfoVo.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/order/OrderPriceInfoVo.java index 9da4f9f9a0..3428f50ec0 100644 --- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/order/OrderPriceInfoVo.java +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/order/OrderPriceInfoVo.java @@ -1,5 +1,6 @@ package com.yxt.anrui.terminal.api.autoservice.saleOrders.order; +import com.fasterxml.jackson.annotation.JsonProperty; import com.yxt.common.core.vo.Vo; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -23,4 +24,11 @@ public class OrderPriceInfoVo implements Vo { private String date; @ApiModelProperty(value = "预计提车地点") private String address; + + @ApiModelProperty("单台整体指导价") + @JsonProperty("guidancePrice") + private String singleGuildPrice; + @ApiModelProperty("单台整体成交价") + @JsonProperty("overallPrice") + private String singleFinalPrice; }