diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorderdeposit/BusSalesOrderDepositFeign.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorderdeposit/BusSalesOrderDepositFeign.java index 8a10dfc2f7..4c4e84c4ac 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorderdeposit/BusSalesOrderDepositFeign.java +++ b/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(业务管理)
@@ -49,5 +54,9 @@ import org.springframework.cloud.openfeign.FeignClient; fallback = BusSalesOrderDepositFeignFallback.class) public interface BusSalesOrderDepositFeign { - + @ApiOperation("初始化订金信息") + @GetMapping(value = "/getDepositInfo/{sid}") + ResultBean getDepositInfo(@PathVariable(value = "sid") String sid); + + } \ No newline at end of file diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorderdeposit/BusSalesOrderDepositFeignFallback.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorderdeposit/BusSalesOrderDepositFeignFallback.java index 9b01667521..1fd85ddcaa 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorderdeposit/BusSalesOrderDepositFeignFallback.java +++ b/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 getDepositInfo(String sid) { + return null; + } } \ No newline at end of file diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorderdeposit/app/AppBusSalesOrderDepositListVo.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorderdeposit/app/AppBusSalesOrderDepositListVo.java new file mode 100644 index 0000000000..917d7b06d7 --- /dev/null +++ b/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 entrustImage = new ArrayList<>(); + @ApiModelProperty(value = "款项支付委托书") + private String payPath; + + private Boolean showImage; +} diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorderdeposit/app/AppBusSalesOrderDepositVo.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorderdeposit/app/AppBusSalesOrderDepositVo.java new file mode 100644 index 0000000000..b22794e991 --- /dev/null +++ b/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 virtualOrderList = new ArrayList<>(); +} diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdepositfictitious/BusDepositFictitiousMapper.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdepositfictitious/BusDepositFictitiousMapper.java index 88933000e5..81551ac42a 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdepositfictitious/BusDepositFictitiousMapper.java +++ b/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 getDepositRecords(@Param("depositBillNo") String depositBillNo); + + /** + * 根据订金信息sid查询虚拟订单和订金信息的关联 + * + * @param sid 订金信息sid + * @return + */ + List getList(String sid); } \ No newline at end of file diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdepositfictitious/BusDepositFictitiousMapper.xml b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdepositfictitious/BusDepositFictitiousMapper.xml index 17205d4a31..dee40389d5 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdepositfictitious/BusDepositFictitiousMapper.xml +++ b/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} + + \ No newline at end of file diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdepositfictitious/BusDepositFictitiousService.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdepositfictitious/BusDepositFictitiousService.java index 797a6eb8d2..88138745a9 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdepositfictitious/BusDepositFictitiousService.java +++ b/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.baomidou.mybatisplus.core.metadata.IPage; -import com.yxt.anrui.buscenter.api.busdepositfictitious.*; -import com.yxt.anrui.buscenter.biz.bussalesorderdeposit.BusSalesOrderDepositService; +import com.yxt.anrui.buscenter.api.busdepositfictitious.BusDepositFictitious; +import com.yxt.anrui.buscenter.api.busdepositfictitious.BusDepositFictitiousDetailsVo; +import com.yxt.anrui.buscenter.api.busdepositfictitious.BusDepositFictitiousDto; +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 list = baseMapper.getDepositRecords(depositBillNo); return list; } + + public List getList(String sid) { + return baseMapper.getList(sid); + } } \ No newline at end of file diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderdeposit/BusSalesOrderDepositMapper.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderdeposit/BusSalesOrderDepositMapper.java index 82e29eda0b..3943901029 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderdeposit/BusSalesOrderDepositMapper.java +++ b/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(业务管理)
@@ -72,4 +65,12 @@ public interface BusSalesOrderDepositMapper extends BaseMapper - + + 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} + \ No newline at end of file diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderdeposit/BusSalesOrderDepositRest.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderdeposit/BusSalesOrderDepositRest.java index 2f35ef35c0..16b4dce511 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderdeposit/BusSalesOrderDepositRest.java +++ b/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.common.core.query.PagerQuery; +import com.yxt.anrui.buscenter.api.bussalesorderdeposit.BusSalesOrderDepositFeign; +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(业务管理)
@@ -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 getDepositInfo(String sid) { + return busSalesOrderDepositService.getDepositInfo(sid); + } } 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 d33a288854..17d1e3b3d5 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 @@ -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.baomidou.mybatisplus.core.metadata.IPage; -import com.yxt.anrui.buscenter.api.bussalesorderdeposit.*; +import com.yxt.anrui.buscenter.api.bussalesorder.BusSalesOrder; +import com.yxt.anrui.buscenter.api.bussalesorderdeposit.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.query.PagerQuery; -import com.yxt.common.core.vo.PagerVo; +import com.yxt.common.core.result.ResultBean; +import org.springframework.beans.factory.annotation.Autowired; 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(业务管理)
* File: BusSalesOrderDepositService.java
@@ -51,6 +62,14 @@ import org.springframework.stereotype.Service; @Service public class BusSalesOrderDepositService extends MybatisBaseService { + + @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 getDepositInfo(String sid) { + ResultBean 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 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 stringList = Arrays.asList(payPath.split(",")); + listVo.setEntrustImage(stringList); + } + } + vo.setVirtualOrderList(listVos); + } + if (busSalesOrderPrice != null) { + vo.setCarNumber(busSalesOrderPrice.getQuantity().toString()); + } + return rb.success().setData(vo); + } } \ No newline at end of file diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/AppBusSalesOrderFeign.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/AppBusSalesOrderFeign.java index 9cff5ba2f8..3f3cc7273e 100644 --- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/AppBusSalesOrderFeign.java +++ b/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 getInsurance(@PathVariable(value = "saleOrderSid") String sid); + /*-----------------------------------------订金信息------------------------------------------*/ + + @ApiOperation("初始化订金信息") + @GetMapping("/init/depositInfo/{saleOrderSid}") + @ResponseBody + ResultBean getDeposit(@PathVariable(value = "saleOrderSid") String sid); + + } \ No newline at end of file diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/AppBusSalesOrderFeignFallback.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/AppBusSalesOrderFeignFallback.java index 3e465644b4..941175a725 100644 --- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/AppBusSalesOrderFeignFallback.java +++ b/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 getInsurance(String sid) { return null; } + + @Override + public ResultBean getDeposit(String sid) { + return null; + } } \ No newline at end of file diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/depositinfo/DepositInfoListVo.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/depositinfo/DepositInfoListVo.java new file mode 100644 index 0000000000..691ed3a4a5 --- /dev/null +++ b/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 entrustImage = new ArrayList<>(); + + private Boolean showImage; +} diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/depositinfo/DepositInfoVo.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/depositinfo/DepositInfoVo.java new file mode 100644 index 0000000000..27d88a0c47 --- /dev/null +++ b/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 virtualOrderList = new ArrayList<>(); +} diff --git a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/saleOrders/AppBusSalesOrderRest.java b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/saleOrders/AppBusSalesOrderRest.java index 377a6ba62a..8715ab71f6 100644 --- a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/saleOrders/AppBusSalesOrderRest.java +++ b/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 getDeposit(String sid) { + return appBusSalesOrderService.getDeposit(sid); + } + } diff --git a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/saleOrders/AppBusSalesOrderService.java b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/saleOrders/AppBusSalesOrderService.java index 641aa56c05..71376d33c8 100644 --- a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/saleOrders/AppBusSalesOrderService.java +++ b/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 getDeposit(String sid) { + ResultBean rb = ResultBean.fireFail(); + DepositInfoVo vo = new DepositInfoVo(); + ResultBean 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); + } } \ No newline at end of file