修复问题

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<BaseOu
     private SysProUrlFeign sysProUrlFeign;
     @Autowired
     private MessageFeign messageFeign;
+    @Autowired
+    private FileUploadComponent fileUploadComponent;
 
     private QueryWrapper<BaseOutsourcingApplication> createQueryWrapper(BaseOutsourcingApplicationQuery query) {
         // todo: 这里根据具体业务调整查询条件
@@ -746,7 +749,7 @@ public class BaseOutsourcingApplicationService extends MybatisBaseService<BaseOu
         List<CommonAppendixVo> commonAppendixVos = commonAppendixService.selByLinkSid(sid);
         List<String> 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);

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<CommonContractMapp
         //查询台数
         String num = priceInfo.getNumber();
         //单台成交价
-        String transactionPrice = priceInfo.getTransactionPrice();
+        String transactionPrice = priceInfo.getSingleFinalPrice();
         String remarks = "主车" + num + "台，单台成交价：" + transactionPrice + "元。";
         //优惠说明
         //ToDo:

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/app/order/AppOrderDepositInfoVo.java

@@ -4,6 +4,8 @@ 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:27
@@ -27,4 +29,9 @@ public class AppOrderDepositInfoVo implements Vo {
     private String sid;
     @ApiModelProperty(value = "订金交纳方式")
     private String type;
+
+    @ApiModelProperty("需补交订金")
+    private String makeUpDeposit;
+    @ApiModelProperty("所有订金结转上传的委托书")
+    private List<String> images;
 }

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;
 }

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;
+
 }

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<BusMainDepositMapp
             return rb.success().setData(busMainDeposit.getSid());
         }
     }
+
     /**
      * 新增/修改虚拟订单订金收取添加车辆信息方法
      *
@@ -1906,10 +1907,10 @@ public class BusMainDepositService extends MybatisBaseService<BusMainDepositMapp
         String userSid = bv.getUserSid();
         SysOrganizationVo data = sysOrganizationFeign.getUseOrgByUserSid(userSid).getData();
         bv.setOrgSidPath(data.getOrgSidPath());
-        Map<String,Object> variables = new HashMap<>();
-        Map<String,Object> appMap = new HashMap<>();
-        appMap.put("sid",bv.getBusinessSid());
-        variables.put("app",appMap);
+        Map<String, Object> variables = new HashMap<>();
+        Map<String, Object> appMap = new HashMap<>();
+        appMap.put("sid", bv.getBusinessSid());
+        variables.put("app", appMap);
         bv.setFormVariables(variables);
         if (bv.getTaskId().equals(busMainDeposit.getTaskId())) {
             ResultBean<UpdateFlowFieldVo> resultBean = flowableFeign.handleProsess(bv);
@@ -1992,10 +1993,10 @@ public class BusMainDepositService extends MybatisBaseService<BusMainDepositMapp
             if (businessTaskId.equals(query.getTaskId())) {
                 FlowTaskVo flowTaskVo = new FlowTaskVo();
                 BeanUtil.copyProperties(query, flowTaskVo);
-                Map<String,Object> variables = new HashMap<>();
-                Map<String,Object> appMap = new HashMap<>();
-                appMap.put("sid",appMap);
-                variables.put("app",appMap);
+                Map<String, Object> variables = new HashMap<>();
+                Map<String, Object> appMap = new HashMap<>();
+                appMap.put("sid", appMap);
+                variables.put("app", appMap);
                 flowTaskVo.setValues(variables);
                 ResultBean<UpdateFlowFieldVo> resultBean = flowableFeign.taskReject(flowTaskVo);
                 if (!resultBean.getSuccess()) {
@@ -2066,6 +2067,7 @@ public class BusMainDepositService extends MybatisBaseService<BusMainDepositMapp
 
     /**
      * 消息推送
+     *
      * @param ufVo
      * @param appMap
      * @param busMainDeposit
@@ -2074,7 +2076,7 @@ public class BusMainDepositService extends MybatisBaseService<BusMainDepositMapp
     public String getMessage(UpdateFlowFieldVo ufVo, Map<String, Object> appMap, BusMainDeposit busMainDeposit) {
         //=====极光推送信息========================================参数组装
         String procId = busMainDeposit.getProcInsId();
-        ResultBean<List<LatestTaskVo>>  resultBean = flowTaskFeign.getLatestTasks(procId);
+        ResultBean<List<LatestTaskVo>> resultBean = flowTaskFeign.getLatestTasks(procId);
         String nextNodeUserSids = resultBean.getData().get(0).getASSIGNEE_();
         List<String> receiveSidList = Arrays.asList(nextNodeUserSids.split(","));
         //根据用户的sid查询用户的id
@@ -2085,7 +2087,18 @@ public class BusMainDepositService extends MybatisBaseService<BusMainDepositMapp
         BeanUtil.copyProperties(ufVo, messageJsonDto);
         //查询流程审批的页面操作地址组装json的参数
         //根据taskDef和移动端标识
-        ResultBean<SysProUrlVo> 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<SysProUrlVo> 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<BusMainDepositMapp
         messageFlowableDto.setJson(messageJsonDto);
         messageFlowableDto.setList(receiveSidList);
         messageFlowableDto.setReceiveIdList(reveiveIdList);
-        messageFlowableDto.setModuleName("简易订单申请");
-        messageFlowableDto.setMsgContent("简易订单申请");
-        messageFlowableDto.setMsgTitle("简易订单申请");
+        messageFlowableDto.setModuleName(name);
+        messageFlowableDto.setMsgContent(name);
+        messageFlowableDto.setMsgTitle(name);
         messageFlowableDto.setCreateName(busMainDeposit.getStaffName());
         messageFlowableDto.setTaskId(ufVo.getTaskId());
         ResultBean<String> stringResultBean = messageFeign.getMessage(messageFlowableDto);

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}
             <if test="name != null and name != ''">
                 and concat(IFNULL(bo.customerName
-                , '')
-                , ifnull(bo.billNo
-                , '')) LIKE concat('%'
-                , #{name}
-                , '%')
+                  , '')
+                  , ifnull(bo.billNo
+                  , '')) LIKE concat('%'
+                  , #{name}
+                  , '%')
             </if>
         </where>
         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}
     </select>

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<BusSalesOrderMapper
         pq.getParams().setStaffSid(data.getStaffSid());
         QueryWrapper<BusSalesOrder> qw = appCreateQueryWrapper(pq.getParams());
         IPage<BusSalesOrder> page = PagerUtil.queryToPage(pq);
-        IPage<AppBusSalesOrderVo> pagging = baseMapper.getSaleOrders(page, qw,pq.getParams().getName());
+        IPage<AppBusSalesOrderVo> 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<BusSalesOrderMapper
             if (orderVoResultBean.getSuccess()) {
                 List<AppBaseVehicleOrderVo> 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<BusSalesOrderMapper
             if (applyListResultBean.getSuccess()) {
                 List<AppBusVehicleApplyListVo> 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<BusSalesOrderMapper
         /***************************价格信息***************************************/
         AppOrderPriceInfoVo priceInfo = busSalesOrderPriceService.selectPrice(sid);
         if (priceInfo != null) {
+            if (vo.getModelInfo() != null) {
+                priceInfo.setTransactionPrice(vo.getModelInfo().getPrice());
+            }
             vo.setPriceInfo(priceInfo);
         }
         /***************************上装信息***************************************/
@@ -2177,13 +2180,21 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
             if ("02".equals(depositInfo.getDepositTypeKey())) {
                 List<BusDepositFictitiousDetailsVo> list = busDepositFictitiousService.detailsList(depositInfo.getSid());
                 list.removeAll(Collections.singleton(null));
+                List<String> 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<String> 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<BusSalesOrderMapper
     public String getMessage(UpdateFlowFieldVo ufVo, Map<String, Object> appMap, BusSalesOrder busSalesOrder) {
         //=====极光推送信息========================================参数组装
         String procId = busSalesOrder.getProcInstId();
-        ResultBean<List<LatestTaskVo>>  resultBean = flowTaskFeign.getLatestTasks(procId);
+        ResultBean<List<LatestTaskVo>> resultBean = flowTaskFeign.getLatestTasks(procId);
         String nextNodeUserSids = resultBean.getData().get(0).getASSIGNEE_();
         List<String> receiveSidList = Arrays.asList(nextNodeUserSids.split(","));
         //根据用户的sid查询用户的id

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderdeposit/BusSalesOrderDepositMapper.xml

@@ -71,7 +71,7 @@
     </update>
 
     <select id="selectDeposit" resultType="com.yxt.anrui.buscenter.api.bussalesorder.app.order.AppOrderDepositInfoVo">
-        select deposit, depositAll as depositTotal, sid, depositTypeKey,depositType as type
+        select deposit, depositAll as depositTotal, sid, depositTypeKey,depositType as type,makeUpDeposit
         from bus_sales_order_deposit
         where salesOrderSid = #{sid}
     </select>

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 MybatisBaseService<BusSalesOrde
     private SysUserFeign sysUserFeign;
     @Autowired
     private BusDepositService busDepositService;
+    @Autowired
+    private FileUploadComponent fileUploadComponent;
 
     public String saveOrderDepo(BusSalesOrderDepositDto busSalesOrderDepositDto, String sid) {
         BusSalesOrderDeposit busSalesOrderDeposit = new BusSalesOrderDeposit();
@@ -216,7 +219,13 @@ public class BusSalesOrderDepositService extends MybatisBaseService<BusSalesOrde
                 BusDepositFictitious busDepositFictitious = new BusDepositFictitious();
                 BeanUtil.copyProperties(listDto, busDepositFictitious, "sid");
                 busDepositFictitious.setDepositSid(depositSid);
-                busDepositFictitious.setPayPath(StringUtils.join(listDto.getEntrustImage(), ","));
+                if(listDto.getEntrustImage().size()>0){
+                    String payPath = StringUtils.join(listDto.getEntrustImage(), ",");
+                    if(payPath.contains(fileUploadComponent.getUrlPrefix())){
+                        payPath = payPath.replaceAll(fileUploadComponent.getUrlPrefix(),"");
+                    }
+                    busDepositFictitious.setPayPath(payPath);
+                }
                 busDepositFictitiousService.save(busDepositFictitious);
             }
         }

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderprice/BusSalesOrderPriceMapper.xml

@@ -49,11 +49,12 @@
     </select>
 
     <select id="selectPrice" resultType="com.yxt.anrui.buscenter.api.bussalesorder.app.order.AppOrderPriceInfoVo">
-        select bp.singleFinalPrice                           as transactionPrice,
-               bp.quantity                                   as number,
+        select bp.quantity                                   as number,
                bp.priceSum                                   as totalPrice,
                DATE_FORMAT(bp.plannedPickUpDate, '%Y-%m-%d') as date,
-               bp.plannedPickUpLocation                      as address
+               bp.plannedPickUpLocation                      as address,
+               bp.singleGuildPrice,
+               bp.singleFinalPrice
         from bus_sales_order_price bp
         where bp.salesOrderSid = #{sid}
     </select>

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<String> images;
 }

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;
+
 }

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;
 }