编写虚拟订单使用记录接口，修改提交虚拟订单接口

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdepositfictitious/BusDepositFictitiousFeign.java

@@ -25,6 +25,8 @@
  *********************************************************/
 package com.yxt.anrui.buscenter.api.busdepositfictitious;
 
+import com.yxt.anrui.buscenter.api.busdepositcustomer.BusDepositCustomerQuery;
+import com.yxt.anrui.buscenter.api.busdepositcustomer.BusDepositCustomerVo;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import com.yxt.common.core.query.PagerQuery;
@@ -55,5 +57,9 @@ import java.util.List;
         path = "v1/busdepositfictitious",
         fallback = BusDepositFictitiousFeignFallback.class)
 public interface BusDepositFictitiousFeign {
-    
+
+    @ApiOperation("订金使用记录接口")
+    @GetMapping("/getDepositRecords/{depositBillNo}")
+    public ResultBean<List<BusDepositRecordsVo>> getDepositRecords(@PathVariable("depositBillNo") String depositBillNo);
+
 }

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdepositfictitious/BusDepositFictitiousFeignFallback.java

@@ -25,8 +25,13 @@
  *********************************************************/
 package com.yxt.anrui.buscenter.api.busdepositfictitious;
 
+import com.yxt.common.core.query.PagerQuery;
+import com.yxt.common.core.result.ResultBean;
+import com.yxt.common.core.vo.PagerVo;
 import org.springframework.stereotype.Component;
 
+import java.util.List;
+
 /**
  * Project: anrui-buscenter(业务管理) <br/>
  * File: BusDepositFictitiousFeignFallback.java <br/>
@@ -43,4 +48,8 @@ import org.springframework.stereotype.Component;
 @Component
 public class BusDepositFictitiousFeignFallback implements BusDepositFictitiousFeign {
 
+    @Override
+    public ResultBean<List<BusDepositRecordsVo>> getDepositRecords(String depositBillNo) {
+        return null;
+    }
 }

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdepositfictitious/BusDepositRecordsVo.java

@@ -0,0 +1,24 @@
+package com.yxt.anrui.buscenter.api.busdepositfictitious;
+
+import com.yxt.common.core.vo.Vo;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+public class BusDepositRecordsVo implements Vo {
+
+    @ApiModelProperty("合同编号")
+    private String contractId;
+    @ApiModelProperty("使用金额")
+    private String usePrice;
+    @ApiModelProperty("使用时间")
+    private String useDate;
+    @ApiModelProperty("销售订单编号")
+    private String salesOrderSid;
+    @ApiModelProperty("用途")
+    private String purpose;
+    @ApiModelProperty("客户名称")
+    private String customer;
+
+
+}

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdepositfictitious/BusDepositFictitiousMapper.java

@@ -30,6 +30,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.toolkit.Constants;
 import com.yxt.anrui.buscenter.api.busdepositfictitious.BusDepositFictitiousDetailsVo;
+import com.yxt.anrui.buscenter.api.busdepositfictitious.BusDepositRecordsVo;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
@@ -53,7 +54,7 @@ import java.util.List;
  */
 @Mapper
 public interface BusDepositFictitiousMapper extends BaseMapper<BusDepositFictitious> {
-    
+
 
     /**
      * 根据订金sid删除虚拟订单和订金关联的信息
@@ -71,5 +72,11 @@ public interface BusDepositFictitiousMapper extends BaseMapper<BusDepositFictiti
      */
     List<BusDepositFictitiousDetailsVo> detailsList(String sid);
 
-
+    /**
+     * 根据虚拟订单sid查询订金使用记录
+     *
+     * @param virtualOrderSid 拟订单sid
+     * @return
+     */
+    List<BusDepositRecordsVo> getDepositRecords(@Param("depositBillNo") String depositBillNo);
 }

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdepositfictitious/BusDepositFictitiousMapper.xml

@@ -19,4 +19,16 @@
         from bus_deposit_fictitious
         where depositSid = #{sid}
     </select>
+    <select id="getDepositRecords"
+            resultType="com.yxt.anrui.buscenter.api.busdepositfictitious.BusDepositRecordsVo">
+        SELECT bso.billNo       as contractId,
+               bdf.price        as usePrice,
+               bdf.createTime   as useDate,
+               bso.sid          as salesOrderSid,
+               bso.customerName as customer
+        FROM bus_deposit_fictitious bdf
+                 LEFT JOIN bus_sales_order_deposit bsod ON bdf.depositSid = bsod.sid
+                 LEFT JOIN bus_sales_order bso ON bso.sid = bsod.salesOrderSid
+        WHERE bdf.depositBillNo = #{depositBillNo}
+    </select>
 </mapper>

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdepositfictitious/BusDepositFictitiousRest.java

@@ -34,6 +34,8 @@ import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import java.util.List;
+
 /**
  * Project: anrui-buscenter(业务管理) <br/>
  * File: BusDepositFictitiousFeignFallback.java <br/>
@@ -51,6 +53,16 @@ import org.springframework.web.bind.annotation.*;
 @RestController("com.yxt.anrui.buscenter.biz.busdepositfictitious.BusDepositFictitiousRest")
 @RequestMapping("v1/busdepositfictitious")
 public class BusDepositFictitiousRest implements BusDepositFictitiousFeign {
+    @Autowired
+    BusDepositFictitiousService busDepositFictitiousService;
 
-	
+    @Override
+    public ResultBean<List<BusDepositRecordsVo>> getDepositRecords(String depositBillNo) {
+        ResultBean rb = ResultBean.fireFail();
+        List<BusDepositRecordsVo> list = busDepositFictitiousService.getDepositRecords(depositBillNo);
+        for (BusDepositRecordsVo busDepositRecordsVo : list) {
+            busDepositRecordsVo.setPurpose("虚拟订单转订金");
+        }
+        return rb.success().setData(list);
+    }
 }

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdepositfictitious/BusDepositFictitiousService.java

@@ -37,6 +37,7 @@ import com.yxt.common.core.vo.PagerVo;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.ArrayList;
 import java.util.List;
 
 /**
@@ -87,4 +88,15 @@ public class BusDepositFictitiousService extends MybatisBaseService<BusDepositFi
     public int deleteByDepositSid(String sid) {
         return baseMapper.deleteByDepositSid(sid);
     }
+
+    /**
+     * 根据虚拟订单编号查询订金使用记录
+     *
+     * @param depositBillNo 虚拟订单编号
+     * @return
+     */
+    public List<BusDepositRecordsVo> getDepositRecords(String depositBillNo) {
+        List<BusDepositRecordsVo> list = baseMapper.getDepositRecords(depositBillNo);
+        return list;
+    }
 }

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

@@ -129,4 +129,6 @@ public interface BusMainDepositMapper extends BaseMapper<BusMainDeposit> {
     int selByBillSidCount(@Param("virtualOrderSid") String virtualOrderSid);
 
     AppBusDepositBusDetailsVo selDepositByBillsid(@Param("virtualOrderSid") String virtualOrderSid);
+
+    int updateByNodeState(@Param("nodeState") String nodeState, @Param("businessSid") String businessSid);
 }

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

@@ -187,6 +187,12 @@
         WHERE sid = #{sid}
     </update>
 
+    <update id="updateByNodeState">
+        UPDATE bus_main_deposit
+        SET nodeState=#{nodeState}
+        WHERE sid = #{businessSid}
+    </update>
+
     <select id="orderPageList" resultType="com.yxt.anrui.buscenter.api.busmaindeposit.pc.PcBusMainDepositVo">
         select bv.brandName,
                bv.modelName        as modelAlias,

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

@@ -36,6 +36,7 @@ import com.yxt.anrui.buscenter.api.busdeposit.BusDeposit;
 import com.yxt.anrui.buscenter.api.busdepositcustomer.AppBusDepositCustomerListDto;
 import com.yxt.anrui.buscenter.api.busdepositcustomer.BusDepositCustomer;
 import com.yxt.anrui.buscenter.api.busdepositcustomer.BusDepositCustomerVo;
+import com.yxt.anrui.buscenter.api.busdepositfictitious.BusDepositRecordsVo;
 import com.yxt.anrui.buscenter.api.busdepositvehicle.AppBusDepositVehicleCarListDto;
 import com.yxt.anrui.buscenter.api.busdepositvehicle.AppBusDepositVehicleDto;
 import com.yxt.anrui.buscenter.api.busdepositvehicle.BusDepositVehListVo;
@@ -46,6 +47,7 @@ import com.yxt.anrui.buscenter.api.busmaindeposit.*;
 import com.yxt.anrui.buscenter.api.busmaindeposit.pc.*;
 import com.yxt.anrui.buscenter.biz.busdeposit.BusDepositService;
 import com.yxt.anrui.buscenter.biz.busdepositcustomer.BusDepositCustomerService;
+import com.yxt.anrui.buscenter.biz.busdepositfictitious.BusDepositFictitiousService;
 import com.yxt.anrui.buscenter.biz.busdepositvehicle.BusDepositVehicleService;
 import com.yxt.anrui.buscenter.biz.busdepositvehiclecustomer.BusDepositVehicleCustomerService;
 import com.yxt.anrui.buscenter.biz.flow.FlowableService;
@@ -78,6 +80,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
+import java.math.BigDecimal;
 import java.text.SimpleDateFormat;
 import java.util.*;
 
@@ -139,6 +142,9 @@ public class BusMainDepositService extends MybatisBaseService<BusMainDepositMapp
     @Autowired
     private BaseVehmodelConfigFeign baseVehmodelConfigFeign;
 
+    @Autowired
+    BusDepositFictitiousService busDepositFictitiousService;
+
 
     public PagerVo<BusMainDeposit> listPage(PagerQuery<BusMainDepositQuery> pq) {
         BusMainDepositQuery query = pq.getParams();
@@ -593,13 +599,26 @@ public class BusMainDepositService extends MybatisBaseService<BusMainDepositMapp
         QueryWrapper<AppBusMainDepositVo> qw = aaQueryWrapper(pagerQuery.getParams());
         AppBusMainDepositQuery params = pagerQuery.getParams();
         IPage<AppBusMainDepositVo> iPage = baseMapper.getVirtualOrders(page, qw, params.getName());
+        BigDecimal bigDecimalAll = new BigDecimal("0");
         for (AppBusMainDepositVo record : iPage.getRecords()) {
             String virtualOrderSid = record.getVirtualOrderSid();
             if (record.getVirtualOrderType().equals("01")) {
                 AppBusDepositBusDetailsVo vo = baseMapper.selDepositByBillsid(virtualOrderSid);
                 record.setPayName(vo.getPayName());
                 record.setMobile(vo.getMobile());
-                record.setDescribe("订金: " + vo.getDeposit() + "元 已用: 0元");
+                List<BusDepositRecordsVo> depositRecords = busDepositFictitiousService.getDepositRecords(record.getVirtualOrderId());
+                if (depositRecords.size() > 0) {
+                    for (BusDepositRecordsVo depositRecord : depositRecords) {
+                        String usePrice = depositRecord.getUsePrice();
+                        if (StringUtils.isNotBlank(usePrice)) {
+                            BigDecimal priceBig = new BigDecimal(usePrice);
+                            bigDecimalAll = bigDecimalAll.add(priceBig);
+                        }
+                    }
+                    record.setDescribe("订金: " + vo.getDeposit() + "元 已用:" + bigDecimalAll.toString() + "元");
+                } else {
+                    record.setDescribe("订金: " + vo.getDeposit() + "元 已用:" + "0" + "元");
+                }
                 record.setCarNumber(vo.getCarNumber());
             } else if (record.getVirtualOrderType().equals("02")) {
                 BusDepositVehicleCustomer busDepositVehicleCustomer = baseMapper.selectVehicleCustomerByBillSid(virtualOrderSid);
@@ -610,19 +629,27 @@ public class BusMainDepositService extends MybatisBaseService<BusMainDepositMapp
                 record.setMobile(busDepositVehicleCustomer.getCustomerMobile());
             }
 //            ResultBean<SysFormStateVo> resultBean = sysFormLinkFeign.selectStateByBusinessSid(record.getVirtualOrderSid());
-            record.setShowUpdateBtn(false);
-            record.setShowDeleteBtn(false);
+
             // 状态判断:0未提交,1办理中, 2已办结, -1退回到发起人,-2终止
-            if ("未提交".equals(record.getVirtualOrderState()) || "退回到发起人".equals(record.getVirtualOrderState())) {
-                record.setShowUpdateBtn(true);
+            if ("待提交".equals(record.getVirtualOrderState())) {
                 record.setShowDeleteBtn(true);
-                record.setShowDonwnLoadBtn(true);
-            } else {
                 record.setShowUpdateBtn(true);
-                record.setShowDeleteBtn(true);
+            } else {
+                record.setShowDeleteBtn(false);
+                record.setShowUpdateBtn(false);
+            }
+            List<BusDepositRecordsVo> depositRecords = busDepositFictitiousService.getDepositRecords(record.getVirtualOrderId());
+            if (depositRecords.size() > 0) {
+                record.setShowDepositBtn(true);
+            } else {
+                record.setShowDepositBtn(false);
             }
-            record.setShowDepositBtn(false);
-            record.setShowApplyBtn(true);
+            if ("收款确认".equals(record.getVirtualOrderState())) {
+                record.setShowApplyBtn(true);
+            } else {
+                record.setShowApplyBtn(false);
+            }
+
         }
         return iPage;
     }
@@ -974,6 +1001,7 @@ public class BusMainDepositService extends MybatisBaseService<BusMainDepositMapp
         ResultBean resultBean = flowableService.businessStart(ProcDefEnum.ORDERDEPOSITAPPROVE.getProDefId(), dto.getUserSid(), variables);
         if (resultBean.getSuccess() && resultBean.getData() != null) {
             Map<String, String> map = (Map<String, String>) resultBean.getData();
+            baseMapper.updateByNodeState(map.get("nodeState"), businessSid);
             saveSysFormLink(map);
         }
         return new ResultBean().success();