销售订单-移动端初始化订金信息

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorderdeposit/BusSalesOrderDepositFeign.java

@@ -25,8 +25,13 @@
  *********************************************************/
 package com.yxt.anrui.buscenter.api.bussalesorderdeposit;
 
+import com.yxt.anrui.buscenter.api.bussalesorderdeposit.app.AppBusSalesOrderDepositVo;
+import com.yxt.common.core.result.ResultBean;
 import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
 import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
 
 /**
  * Project: anrui-buscenter(业务管理) <br/>
@@ -49,5 +54,9 @@ import org.springframework.cloud.openfeign.FeignClient;
         fallback = BusSalesOrderDepositFeignFallback.class)
 public interface BusSalesOrderDepositFeign {
 
-   
+    @ApiOperation("初始化订金信息")
+    @GetMapping(value = "/getDepositInfo/{sid}")
+    ResultBean<AppBusSalesOrderDepositVo> getDepositInfo(@PathVariable(value = "sid") String sid);
+
+
 }

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorderdeposit/BusSalesOrderDepositFeignFallback.java

@@ -25,6 +25,7 @@
  *********************************************************/
 package com.yxt.anrui.buscenter.api.bussalesorderdeposit;
 
+import com.yxt.anrui.buscenter.api.bussalesorderdeposit.app.AppBusSalesOrderDepositVo;
 import com.yxt.common.core.query.PagerQuery;
 import com.yxt.common.core.result.ResultBean;
 import com.yxt.common.core.vo.PagerVo;
@@ -48,4 +49,8 @@ import java.util.List;
 @Component
 public class BusSalesOrderDepositFeignFallback implements BusSalesOrderDepositFeign {
 
+    @Override
+    public ResultBean<AppBusSalesOrderDepositVo> getDepositInfo(String sid) {
+        return null;
+    }
 }

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorderdeposit/app/AppBusSalesOrderDepositListVo.java

@@ -0,0 +1,33 @@
+package com.yxt.anrui.buscenter.api.bussalesorderdeposit.app;
+
+import com.yxt.common.core.vo.Vo;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * @Author dimengzhe
+ * @Date 2022/6/7 13:38
+ * @Description
+ */
+@Data
+public class AppBusSalesOrderDepositListVo implements Vo {
+    private static final long serialVersionUID = -9212964561264321091L;
+
+    @ApiModelProperty(value = "虚拟订单sid")
+    private String virtualOrderSid;
+    @ApiModelProperty(value = "虚拟订单编号")
+    private String virtualOrderId;
+    @ApiModelProperty(value = "剩余金额")
+    private String remainderMoney;
+    @ApiModelProperty(value = "结转金额")
+    private String payMoney;
+    @ApiModelProperty(value = "款项支付委托书:销售订单与客户为同一人时，list为空")
+    private List<String> entrustImage = new ArrayList<>();
+    @ApiModelProperty(value = "款项支付委托书")
+    private String payPath;
+
+    private Boolean showImage;
+}

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorderdeposit/app/AppBusSalesOrderDepositVo.java

@@ -0,0 +1,33 @@
+package com.yxt.anrui.buscenter.api.bussalesorderdeposit.app;
+
+import com.yxt.common.core.vo.Vo;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * @Author dimengzhe
+ * @Date 2022/6/7 13:37
+ * @Description
+ */
+@Data
+public class AppBusSalesOrderDepositVo implements Vo {
+    private static final long serialVersionUID = 1890442022147551234L;
+
+    @ApiModelProperty(value = "销售订单sid")
+    private String saleOrderSid;
+    @ApiModelProperty(value = "车辆数量")
+    private String carNumber;
+    @ApiModelProperty(value = "订金合计")
+    private String depositTotal;
+    @ApiModelProperty(value = "订金缴纳方式")
+    private String payType;
+    @ApiModelProperty(value = "订金缴纳方式key")
+    private String payTypeKey;
+    @ApiModelProperty(value = "订金信息sid")
+    private String sid;
+
+    private List<AppBusSalesOrderDepositListVo> virtualOrderList = new ArrayList<>();
+}

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

@@ -25,17 +25,13 @@
  *********************************************************/
 package com.yxt.anrui.buscenter.biz.busdepositfictitious;
 
-import com.baomidou.mybatisplus.core.conditions.Wrapper;
-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.BusDepositFictitious;
 import com.yxt.anrui.buscenter.api.busdepositfictitious.BusDepositFictitiousDetailsVo;
 import com.yxt.anrui.buscenter.api.busdepositfictitious.BusDepositRecordsVo;
+import com.yxt.anrui.buscenter.api.bussalesorderdeposit.app.AppBusSalesOrderDepositListVo;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
-import org.apache.ibatis.annotations.Select;
-import com.yxt.anrui.buscenter.api.busdepositfictitious.BusDepositFictitious;
-import com.yxt.anrui.buscenter.api.busdepositfictitious.BusDepositFictitiousVo;
 
 import java.util.List;
 
@@ -79,4 +75,12 @@ public interface BusDepositFictitiousMapper extends BaseMapper<BusDepositFictiti
      * @return
      */
     List<BusDepositRecordsVo> getDepositRecords(@Param("depositBillNo") String depositBillNo);
+
+    /**
+     * 根据订金信息sid查询虚拟订单和订金信息的关联
+     *
+     * @param sid 订金信息sid
+     * @return
+     */
+    List<AppBusSalesOrderDepositListVo> getList(String sid);
 }

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

@@ -31,4 +31,16 @@
                  LEFT JOIN bus_sales_order bso ON bso.sid = bsod.salesOrderSid
         WHERE bdf.depositBillNo = #{depositBillNo}
     </select>
+
+    <select id="getList"
+            resultType="com.yxt.anrui.buscenter.api.bussalesorderdeposit.app.AppBusSalesOrderDepositListVo">
+        select bf.depositBillNo as virtualOrderId,
+               bd.sid           as virtualOrderSid,
+               bf.depositPrice  as remainderMoney,
+               bf.price         as payMoney,
+               bf.payPath
+        from bus_deposit_fictitious bf
+                 left join bus_main_deposit bd on bd.billNo = bf.depositBillNo
+        where bf.depositSid = #{sid}
+    </select>
 </mapper>

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

@@ -26,18 +26,14 @@
 package com.yxt.anrui.buscenter.biz.busdepositfictitious;
 
 import cn.hutool.core.bean.BeanUtil;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.yxt.anrui.buscenter.api.busdepositfictitious.BusDepositFictitious;
-import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.yxt.anrui.buscenter.api.busdepositfictitious.BusDepositFictitiousDetailsVo;
-import com.yxt.anrui.buscenter.api.busdepositfictitious.*;
+import com.yxt.anrui.buscenter.api.busdepositfictitious.BusDepositFictitiousDto;
-import com.yxt.anrui.buscenter.biz.bussalesorderdeposit.BusSalesOrderDepositService;
+import com.yxt.anrui.buscenter.api.busdepositfictitious.BusDepositRecordsVo;
+import com.yxt.anrui.buscenter.api.bussalesorderdeposit.app.AppBusSalesOrderDepositListVo;
 import com.yxt.common.base.service.MybatisBaseService;
-import com.yxt.common.base.utils.PagerUtil;
-import com.yxt.common.core.query.PagerQuery;
-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;
 
 /**
@@ -99,4 +95,8 @@ public class BusDepositFictitiousService extends MybatisBaseService<BusDepositFi
         List<BusDepositRecordsVo> list = baseMapper.getDepositRecords(depositBillNo);
         return list;
     }
+
+    public List<AppBusSalesOrderDepositListVo> getList(String sid) {
+        return baseMapper.getList(sid);
+    }
 }

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

@@ -25,18 +25,11 @@
  *********************************************************/
 package com.yxt.anrui.buscenter.biz.bussalesorderdeposit;
 
-import com.baomidou.mybatisplus.core.conditions.Wrapper;
-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.bussalesorderdeposit.BusSalesOrderDeposit;
 import com.yxt.anrui.buscenter.api.bussalesorderdeposit.BusSalesOrderDepositDetailsVo;
+import com.yxt.anrui.buscenter.api.bussalesorderdeposit.app.AppBusSalesOrderDepositVo;
 import org.apache.ibatis.annotations.Mapper;
-import org.apache.ibatis.annotations.Param;
-import org.apache.ibatis.annotations.Select;
-import com.yxt.anrui.buscenter.api.bussalesorderdeposit.BusSalesOrderDeposit;
-import com.yxt.anrui.buscenter.api.bussalesorderdeposit.BusSalesOrderDepositVo;
-
-import java.util.List;
 
 /**
  * Project: anrui-buscenter(业务管理) <br/>
@@ -72,4 +65,12 @@ public interface BusSalesOrderDepositMapper extends BaseMapper<BusSalesOrderDepo
      * @return
      */
     int deleteByOrderSid(String sid);
+
+    /**
+     * 根据销售订单sid查询订金信息
+     *
+     * @param sid 销售订单sid
+     * @return
+     */
+    AppBusSalesOrderDepositVo getDepositInfo(String sid);
 }

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

@@ -9,7 +9,7 @@
         from bus_sales_order_deposit
         where salesOrderSid = #{sid}
     </select>
-    
+
     <!--根据销售订单sid查询订金信息-->
     <select id="details" resultType="com.yxt.anrui.buscenter.api.bussalesorderdeposit.BusSalesOrderDepositDetailsVo">
         select sid,
@@ -27,4 +27,15 @@
         from bus_sales_order_deposit
         where salesOrderSid = #{sid}
     </delete>
+
+    <select id="getDepositInfo"
+            resultType="com.yxt.anrui.buscenter.api.bussalesorderdeposit.app.AppBusSalesOrderDepositVo">
+        select bd.salesOrderSid  as saleOrderSid,
+               bd.depositAll     as depositTotal,
+               bd.depositType    as payType,
+               bd.depositTypeKey as payTypeKey,
+               bd.sid
+        from bus_sales_order_deposit bd
+        where bd.salesOrderSid = #{sid}
+    </select>
 </mapper>

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

@@ -25,14 +25,13 @@
  *********************************************************/
 package com.yxt.anrui.buscenter.biz.bussalesorderdeposit;
 
-import com.yxt.anrui.buscenter.api.bussalesorderdeposit.*;
+import com.yxt.anrui.buscenter.api.bussalesorderdeposit.BusSalesOrderDepositFeign;
-import com.yxt.common.core.query.PagerQuery;
+import com.yxt.anrui.buscenter.api.bussalesorderdeposit.app.AppBusSalesOrderDepositVo;
 import com.yxt.common.core.result.ResultBean;
-import com.yxt.common.core.vo.PagerVo;
 import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
 /**
  * Project: anrui-buscenter(业务管理) <br/>
@@ -51,5 +50,12 @@ import org.springframework.web.bind.annotation.*;
 @RestController("com.yxt.anrui.buscenter.biz.bussalesorderdeposit.BusSalesOrderDepositRest")
 @RequestMapping("v1/bussalesorderdeposit")
 public class BusSalesOrderDepositRest implements BusSalesOrderDepositFeign {
-	
+
+    @Autowired
+    private BusSalesOrderDepositService busSalesOrderDepositService;
+
+    @Override
+    public ResultBean<AppBusSalesOrderDepositVo> getDepositInfo(String sid) {
+        return busSalesOrderDepositService.getDepositInfo(sid);
+    }
 }

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

@@ -26,15 +26,26 @@
 package com.yxt.anrui.buscenter.biz.bussalesorderdeposit;
 
 import cn.hutool.core.bean.BeanUtil;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.yxt.anrui.buscenter.api.bussalesorder.BusSalesOrder;
-import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.yxt.anrui.buscenter.api.bussalesorderdeposit.BusSalesOrderDeposit;
-import com.yxt.anrui.buscenter.api.bussalesorderdeposit.*;
+import com.yxt.anrui.buscenter.api.bussalesorderdeposit.BusSalesOrderDepositDetailsVo;
+import com.yxt.anrui.buscenter.api.bussalesorderdeposit.BusSalesOrderDepositDto;
+import com.yxt.anrui.buscenter.api.bussalesorderdeposit.app.AppBusSalesOrderDepositListVo;
+import com.yxt.anrui.buscenter.api.bussalesorderdeposit.app.AppBusSalesOrderDepositVo;
+import com.yxt.anrui.buscenter.api.bussalesorderprice.BusSalesOrderPrice;
+import com.yxt.anrui.buscenter.biz.busdepositfictitious.BusDepositFictitiousService;
+import com.yxt.anrui.buscenter.biz.bussalesorder.BusSalesOrderService;
+import com.yxt.anrui.buscenter.biz.bussalesorderprice.BusSalesOrderPriceService;
 import com.yxt.common.base.service.MybatisBaseService;
-import com.yxt.common.base.utils.PagerUtil;
+import com.yxt.common.core.result.ResultBean;
-import com.yxt.common.core.query.PagerQuery;
+import org.springframework.beans.factory.annotation.Autowired;
-import com.yxt.common.core.vo.PagerVo;
 import org.springframework.stereotype.Service;
 
+import java.util.Arrays;
+import java.util.List;
+import java.util.Objects;
+import java.util.stream.Collectors;
+
 /**
  * Project: anrui-buscenter(业务管理) <br/>
  * File: BusSalesOrderDepositService.java <br/>
@@ -51,6 +62,14 @@ import org.springframework.stereotype.Service;
 @Service
 public class BusSalesOrderDepositService extends MybatisBaseService<BusSalesOrderDepositMapper, BusSalesOrderDeposit> {
 
+
+    @Autowired
+    private BusSalesOrderService busSalesOrderService;
+    @Autowired
+    private BusDepositFictitiousService busDepositFictitiousService;
+    @Autowired
+    private BusSalesOrderPriceService busSalesOrderPriceService;
+
     public String saveOrderDepo(BusSalesOrderDepositDto busSalesOrderDepositDto, String sid) {
         BusSalesOrderDeposit busSalesOrderDeposit = new BusSalesOrderDeposit();
         BeanUtil.copyProperties(busSalesOrderDepositDto, busSalesOrderDeposit, "sid");
@@ -88,5 +107,37 @@ public class BusSalesOrderDepositService extends MybatisBaseService<BusSalesOrde
     public int deleteByOrderSid(String sid) {
         return baseMapper.deleteByOrderSid(sid);
     }
-    
+
+    public ResultBean<AppBusSalesOrderDepositVo> getDepositInfo(String sid) {
+        ResultBean<AppBusSalesOrderDepositVo> rb = ResultBean.fireFail();
+        //查询销售订单是否存在
+        BusSalesOrder busSalesOrder = busSalesOrderService.fetchBySid(sid);
+        if (busSalesOrder == null) {
+            return rb.setMsg("该销售订单单据不存在");
+        }
+        //查询该订金信息是否存在
+        AppBusSalesOrderDepositVo vo = baseMapper.getDepositInfo(sid);
+        //根据销售订单sid查询价格信息
+        BusSalesOrderPrice busSalesOrderPrice = busSalesOrderPriceService.selectBySalesOrderSid(sid);
+        if (vo == null) {
+            vo = new AppBusSalesOrderDepositVo();
+            vo.setSaleOrderSid(sid);
+        } else {
+            //根据订金sid查询虚拟订单和订金的关联
+            List<AppBusSalesOrderDepositListVo> listVos = busDepositFictitiousService.getList(vo.getSid());
+            listVos.parallelStream().filter(Objects::nonNull).collect(Collectors.toList());
+            if (!listVos.isEmpty()) {
+                for (AppBusSalesOrderDepositListVo listVo : listVos) {
+                    String payPath = listVo.getPayPath();
+                    List<String> stringList = Arrays.asList(payPath.split(","));
+                    listVo.setEntrustImage(stringList);
+                }
+            }
+            vo.setVirtualOrderList(listVos);
+        }
+        if (busSalesOrderPrice != null) {
+            vo.setCarNumber(busSalesOrderPrice.getQuantity().toString());
+        }
+        return rb.success().setData(vo);
+    }
 }

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/AppBusSalesOrderFeign.java

@@ -29,6 +29,7 @@ import com.yxt.anrui.buscenter.api.bussalesorder.BusSalesOrderFeignFallback;
 import com.yxt.anrui.buscenter.api.bussalesorder.app.*;
 import com.yxt.anrui.crm.api.crmvehicledemand.AppCrmOrderVehicleDemandQuery;
 import com.yxt.anrui.crm.api.crmvehicledemand.AppOrderCrmVehicleDemandVo;
+import com.yxt.anrui.terminal.api.autoservice.saleOrders.depositinfo.DepositInfoVo;
 import com.yxt.anrui.terminal.api.autoservice.saleOrders.discount.DiscountDto;
 import com.yxt.anrui.terminal.api.autoservice.saleOrders.discount.DiscountVo;
 import com.yxt.anrui.terminal.api.autoservice.saleOrders.insurance.InsuranceInfoDto;
@@ -172,4 +173,12 @@ public interface AppBusSalesOrderFeign {
     @ResponseBody
     ResultBean<InsuranceInfoVo> getInsurance(@PathVariable(value = "saleOrderSid") String sid);
 
+    /*-----------------------------------------订金信息------------------------------------------*/
+
+    @ApiOperation("初始化订金信息")
+    @GetMapping("/init/depositInfo/{saleOrderSid}")
+    @ResponseBody
+    ResultBean<DepositInfoVo> getDeposit(@PathVariable(value = "saleOrderSid") String sid);
+
+
 }

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/AppBusSalesOrderFeignFallback.java

@@ -28,6 +28,7 @@ package com.yxt.anrui.terminal.api.autoservice.saleOrders;
 import com.yxt.anrui.buscenter.api.bussalesorder.app.*;
 import com.yxt.anrui.crm.api.crmvehicledemand.AppCrmOrderVehicleDemandQuery;
 import com.yxt.anrui.crm.api.crmvehicledemand.AppOrderCrmVehicleDemandVo;
+import com.yxt.anrui.terminal.api.autoservice.saleOrders.depositinfo.DepositInfoVo;
 import com.yxt.anrui.terminal.api.autoservice.saleOrders.discount.DiscountDto;
 import com.yxt.anrui.terminal.api.autoservice.saleOrders.discount.DiscountVo;
 import com.yxt.anrui.terminal.api.autoservice.saleOrders.insurance.InsuranceInfoDto;
@@ -147,4 +148,9 @@ public class AppBusSalesOrderFeignFallback implements AppBusSalesOrderFeign {
     public ResultBean<InsuranceInfoVo> getInsurance(String sid) {
         return null;
     }
+
+    @Override
+    public ResultBean<DepositInfoVo> getDeposit(String sid) {
+        return null;
+    }
 }

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/depositinfo/DepositInfoListVo.java

@@ -0,0 +1,31 @@
+package com.yxt.anrui.terminal.api.autoservice.saleOrders.depositinfo;
+
+import com.yxt.common.core.vo.Vo;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * @Author dimengzhe
+ * @Date 2022/6/7 11:56
+ * @Description
+ */
+@Data
+public class DepositInfoListVo implements Vo {
+    private static final long serialVersionUID = 2325430180382750489L;
+
+    @ApiModelProperty(value = "虚拟订单sid")
+    private String virtualOrderSid;
+    @ApiModelProperty(value = "虚拟订单编号")
+    private String virtualOrderId;
+    @ApiModelProperty(value = "剩余金额")
+    private String remainderMoney;
+    @ApiModelProperty(value = "结转金额")
+    private String payMoney;
+    @ApiModelProperty(value = "款项支付委托书:销售订单与客户为同一人时，list为空")
+    private List<String> entrustImage = new ArrayList<>();
+
+    private Boolean showImage;
+}

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/depositinfo/DepositInfoVo.java

@@ -0,0 +1,30 @@
+package com.yxt.anrui.terminal.api.autoservice.saleOrders.depositinfo;
+
+import com.yxt.common.core.vo.Vo;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * @Author dimengzhe
+ * @Date 2022/6/7 11:51
+ * @Description
+ */
+@Data
+public class DepositInfoVo implements Vo {
+    private static final long serialVersionUID = -536852435105189707L;
+    @ApiModelProperty(value = "销售订单sid")
+    private String saleOrderSid;
+    @ApiModelProperty(value = "车辆数量")
+    private String carNumber;
+    @ApiModelProperty(value = "订金合计")
+    private String depositTotal;
+    @ApiModelProperty(value = "订金缴纳方式")
+    private String payType;
+    @ApiModelProperty(value = "订金缴纳方式key")
+    private String payTypeKey;
+
+    private List<DepositInfoListVo> virtualOrderList = new ArrayList<>();
+}

anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/saleOrders/AppBusSalesOrderRest.java

@@ -29,6 +29,7 @@ import com.yxt.anrui.buscenter.api.bussalesorder.app.*;
 import com.yxt.anrui.crm.api.crmvehicledemand.AppCrmOrderVehicleDemandQuery;
 import com.yxt.anrui.crm.api.crmvehicledemand.AppOrderCrmVehicleDemandVo;
 import com.yxt.anrui.terminal.api.autoservice.saleOrders.AppBusSalesOrderFeign;
+import com.yxt.anrui.terminal.api.autoservice.saleOrders.depositinfo.DepositInfoVo;
 import com.yxt.anrui.terminal.api.autoservice.saleOrders.discount.DiscountDto;
 import com.yxt.anrui.terminal.api.autoservice.saleOrders.discount.DiscountVo;
 import com.yxt.anrui.terminal.api.autoservice.saleOrders.insurance.InsuranceInfoDto;
@@ -229,4 +230,9 @@ public class AppBusSalesOrderRest implements AppBusSalesOrderFeign {
         return appBusSalesOrderService.getInsurance(sid);
     }
 
+    @Override
+    public ResultBean<DepositInfoVo> getDeposit(String sid) {
+        return appBusSalesOrderService.getDeposit(sid);
+    }
+
 }

anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/saleOrders/AppBusSalesOrderService.java

@@ -28,6 +28,8 @@ package com.yxt.anrui.terminal.biz.autoservice.saleOrders;
 import cn.hutool.core.bean.BeanUtil;
 import com.yxt.anrui.buscenter.api.bussalesorder.BusSalesOrderFeign;
 import com.yxt.anrui.buscenter.api.bussalesorder.app.*;
+import com.yxt.anrui.buscenter.api.bussalesorderdeposit.BusSalesOrderDepositFeign;
+import com.yxt.anrui.buscenter.api.bussalesorderdeposit.app.AppBusSalesOrderDepositVo;
 import com.yxt.anrui.buscenter.api.bussalesorderdiscount.BusSalesOrderDiscountFeign;
 import com.yxt.anrui.buscenter.api.bussalesorderdiscount.app.AppBusSalesOrderDiscountDto;
 import com.yxt.anrui.buscenter.api.bussalesorderdiscount.app.AppBusSalesOrderDiscountListVo;
@@ -45,6 +47,7 @@ import com.yxt.anrui.buscenter.api.bussalesorderprice.app.AppBusSalesOrderPriceV
 import com.yxt.anrui.crm.api.crmvehicledemand.AppCrmOrderVehicleDemandQuery;
 import com.yxt.anrui.crm.api.crmvehicledemand.AppOrderCrmVehicleDemandVo;
 import com.yxt.anrui.crm.api.crmvehicledemand.CrmVehicledemandFeign;
+import com.yxt.anrui.terminal.api.autoservice.saleOrders.depositinfo.DepositInfoVo;
 import com.yxt.anrui.terminal.api.autoservice.saleOrders.discount.DiscountDto;
 import com.yxt.anrui.terminal.api.autoservice.saleOrders.discount.DiscountListVo;
 import com.yxt.anrui.terminal.api.autoservice.saleOrders.discount.DiscountVo;
@@ -97,6 +100,8 @@ public class AppBusSalesOrderService {
     private BusSalesOrderPriceFeign busSalesOrderPriceFeign;
     @Autowired
     private BusSalesOrderInsuranceFeign busSalesOrderInsuranceFeign;
+    @Autowired
+    private BusSalesOrderDepositFeign busSalesOrderDepositFeign;
 
     /************************************* 销售订单接口 *********************************************/
 
@@ -292,4 +297,16 @@ public class AppBusSalesOrderService {
         BeanUtil.copyProperties(resultBean.getData(), insuranceInfoVo);
         return rb.success().setData(insuranceInfoVo);
     }
+
+    public ResultBean<DepositInfoVo> getDeposit(String sid) {
+        ResultBean<DepositInfoVo> rb = ResultBean.fireFail();
+        DepositInfoVo vo = new DepositInfoVo();
+        ResultBean<AppBusSalesOrderDepositVo> resultBean = busSalesOrderDepositFeign.getDepositInfo(sid);
+        if (!resultBean.getSuccess()) {
+            return rb.setMsg(resultBean.getMsg());
+        }
+        AppBusSalesOrderDepositVo appBusSalesOrderDepositVo = resultBean.getData();
+        BeanUtil.copyProperties(appBusSalesOrderDepositVo, vo);
+        return rb.success().setData(vo);
+    }
 }