销售订单-移动端初始化确认提交接口

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/BusSalesOrderFeign.java

@@ -167,4 +167,9 @@ public interface BusSalesOrderFeign {
     @ResponseBody
     ResultBean isSubmit(@PathVariable(value = "sid") String sid);
 
+    @ApiOperation("初始化销售订单确认提交")
+    @GetMapping("/getSubmitInfo/{sid}")
+    @ResponseBody
+    ResultBean<AppBusSalesOrderSubmitInfoVo> getSubmitInfo(@PathVariable(value = "sid") String sid);
+
 }

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/BusSalesOrderFeignFallback.java

@@ -143,4 +143,9 @@ public class BusSalesOrderFeignFallback implements BusSalesOrderFeign {
     public ResultBean isSubmit(String sid) {
         return null;
     }
+
+    @Override
+    public ResultBean<AppBusSalesOrderSubmitInfoVo> getSubmitInfo(String sid) {
+        return null;
+    }
 }

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

@@ -0,0 +1,35 @@
+package com.yxt.anrui.buscenter.api.bussalesorder.app;
+
+import com.yxt.common.core.vo.Vo;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Author dimengzhe
+ * @Date 2022/6/9 14:08
+ * @Description
+ */
+@Data
+public class AppBusSalesOrderSubmitInfoVo implements Vo {
+    private static final long serialVersionUID = -4052428899340935804L;
+    @ApiModelProperty(value = "客户名称")
+    private String name;
+    @ApiModelProperty(value = "联系电话")
+    private String mobile;
+    @ApiModelProperty(value = "中介名称")
+    private String intermediaryName;
+    @ApiModelProperty(value = "中介sid")
+    private String intermediarySid;
+    @ApiModelProperty(value = "中介电话")
+    private String intermediaryMobile;
+    @ApiModelProperty(value = "单台中介费")
+    private String agencyFee;
+    @ApiModelProperty(value = "台数")
+    private String number;
+    @ApiModelProperty(value = "返利备注")
+    private String remarks;
+    @ApiModelProperty(value = "内部引荐人")
+    private String recommender;
+    @ApiModelProperty(value = "内部引荐人sid")
+    private String recommenderSid;
+}

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderMapper.java

@@ -32,6 +32,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.Constants;
 import com.yxt.anrui.buscenter.api.bussalesorder.*;
 import com.yxt.anrui.buscenter.api.bussalesorder.app.AppBusSalesOrderBillInfoVo;
+import com.yxt.anrui.buscenter.api.bussalesorder.app.AppBusSalesOrderSubmitInfoVo;
 import com.yxt.anrui.buscenter.api.bussalesorder.app.AppBusSalesOrderVo;
 import com.yxt.anrui.buscenter.api.bussalesorder.app.AppModelInfoVo;
 import org.apache.ibatis.annotations.Mapper;
@@ -141,4 +142,6 @@ public interface BusSalesOrderMapper extends BaseMapper<BusSalesOrder> {
      * @return
      */
     int updateNodesBySid(@Param("remarks") String remarks, @Param("sid") String sid);
+
+    AppBusSalesOrderSubmitInfoVo getSubmitInfo(String sid);
 }

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderMapper.xml

@@ -135,4 +135,18 @@
         set notes = #{remarks}
         where sid = #{sid}
     </update>
+
+    <select id="getSubmitInfo" resultType="com.yxt.anrui.buscenter.api.bussalesorder.app.AppBusSalesOrderSubmitInfoVo">
+        select bo.customerName        name,
+               bo.mobile,
+               bp.quantity         as number,
+               bs.remarks,
+               bs.userSid          as recommenderSid,
+               bs.name             as recommender,
+               bs.distributorPrice as agencyFee
+        from bus_sales_order bo
+                 left join bus_sales_order_price bp on bp.salesOrderSid = bo.sid
+                 left join bus_sales_order_submit bs on bo.sid = bs.salesOrderSid
+        where bo.sid = #{sid}
+    </select>
 </mapper>

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderRest.java

@@ -205,4 +205,9 @@ public class BusSalesOrderRest implements BusSalesOrderFeign {
     public ResultBean isSubmit(String sid) {
         return busSalesOrderService.isSubmit(sid);
     }
+
+    @Override
+    public ResultBean<AppBusSalesOrderSubmitInfoVo> getSubmitInfo(String sid) {
+        return busSalesOrderService.getSubmitInfo(sid);
+    }
 }

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java

@@ -1859,6 +1859,7 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
             List<String> vinNoList = new ArrayList<>();
             String modelSid = orderInfo.getModelSid();
             String configSid = orderInfo.getConfigSid();
+            List<AppReadyCarVo> appReadyCar = new ArrayList<>();
             ResultBean<List<AppBusVehicleApplyListVo>> applyListResultBean = busVehicleApplyDetailFeign.getAppApplyList(modelSid, configSid);
             if (applyListResultBean.getSuccess()) {
                 List<AppBusVehicleApplyListVo> applyListVos = applyListResultBean.getData();
@@ -1878,7 +1879,10 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
                         appReadyCarVo.setCanUseNum("0");
                     }
                     map.put(applyListVo.getOrderId(), appReadyCarVo.getCanUseNum());//可使用数量
+                    appReadyCar.add(appReadyCarVo);
                 }
+                appCarInfo.setReadyCar(appReadyCar);
+
                 List<AppReadyCarListVo> appReadyCarList = busSalesVehicleOrderService.selectAppDetailsVoBySaleOrderSid(sid);
                 appReadyCarList.parallelStream().filter(Objects::nonNull).collect(Collectors.toList());
                 if (!appReadyCarList.isEmpty()) {
@@ -1901,4 +1905,17 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
         }
         return isVehicleOrder;
     }
+
+    public ResultBean<AppBusSalesOrderSubmitInfoVo> getSubmitInfo(String sid) {
+        ResultBean<AppBusSalesOrderSubmitInfoVo> rb = ResultBean.fireFail();
+        BusSalesOrder busSalesOrder = fetchBySid(sid);
+        if (busSalesOrder == null) {
+            return rb.setMsg("该销售订单单据不存在");
+        }
+        AppBusSalesOrderSubmitInfoVo vo = baseMapper.getSubmitInfo(sid);
+        if (vo == null) {
+            vo = new AppBusSalesOrderSubmitInfoVo();
+        }
+        return rb.success().setData(vo);
+    }
 }

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

@@ -40,6 +40,7 @@ import com.yxt.anrui.terminal.api.autoservice.saleOrders.insurance.InsuranceInfo
 import com.yxt.anrui.terminal.api.autoservice.saleOrders.model.DepositListQuery;
 import com.yxt.anrui.terminal.api.autoservice.saleOrders.model.ModelDto;
 import com.yxt.anrui.terminal.api.autoservice.saleOrders.order.OrderRemarksDto;
+import com.yxt.anrui.terminal.api.autoservice.saleOrders.order.OrderSubmitInfoVo;
 import com.yxt.anrui.terminal.api.autoservice.saleOrders.price.PriceDto;
 import com.yxt.anrui.terminal.api.autoservice.saleOrders.price.PriceVo;
 import com.yxt.anrui.terminal.api.autoservice.saleOrders.topinfo.TopDto;
@@ -214,5 +215,10 @@ public interface AppBusSalesOrderFeign {
     @ResponseBody
     ResultBean isSubmit(@PathVariable(value = "saleOrderSid") String sid);
 
+    @ApiOperation("初始化销售订单确认提交")
+    @GetMapping("/init/confirmSubmitInfo/{saleOrderSid}")
+    @ResponseBody
+    ResultBean<OrderSubmitInfoVo> getSubmitInfo(@PathVariable(value = "saleOrderSid") String sid);
+
 
 }

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

@@ -39,6 +39,7 @@ import com.yxt.anrui.terminal.api.autoservice.saleOrders.insurance.InsuranceInfo
 import com.yxt.anrui.terminal.api.autoservice.saleOrders.model.DepositListQuery;
 import com.yxt.anrui.terminal.api.autoservice.saleOrders.model.ModelDto;
 import com.yxt.anrui.terminal.api.autoservice.saleOrders.order.OrderRemarksDto;
+import com.yxt.anrui.terminal.api.autoservice.saleOrders.order.OrderSubmitInfoVo;
 import com.yxt.anrui.terminal.api.autoservice.saleOrders.price.PriceDto;
 import com.yxt.anrui.terminal.api.autoservice.saleOrders.price.PriceVo;
 import com.yxt.anrui.terminal.api.autoservice.saleOrders.topinfo.TopDto;
@@ -183,4 +184,9 @@ public class AppBusSalesOrderFeignFallback implements AppBusSalesOrderFeign {
     public ResultBean isSubmit(String sid) {
         return null;
     }
+
+    @Override
+    public ResultBean<OrderSubmitInfoVo> getSubmitInfo(String sid) {
+        return null;
+    }
 }

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

@@ -0,0 +1,36 @@
+package com.yxt.anrui.terminal.api.autoservice.saleOrders.order;
+
+import com.yxt.common.core.vo.Vo;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Author dimengzhe
+ * @Date 2022/6/9 13:40
+ * @Description
+ */
+@Data
+public class OrderSubmitInfoVo implements Vo {
+    private static final long serialVersionUID = -8205513740857837566L;
+    @ApiModelProperty(value = "客户名称")
+    private String name;
+    @ApiModelProperty(value = "联系电话")
+    private String mobile;
+    @ApiModelProperty(value = "中介名称")
+    private String intermediaryName;
+    @ApiModelProperty(value = "中介sid")
+    private String intermediarySid;
+    @ApiModelProperty(value = "中介电话")
+    private String intermediaryMobile;
+    @ApiModelProperty(value = "单台中介费")
+    private String agencyFee;
+    @ApiModelProperty(value = "台数")
+    private String number;
+    @ApiModelProperty(value = "返利备注")
+    private String remarks;
+    @ApiModelProperty(value = "内部引荐人")
+    private String recommender;
+    @ApiModelProperty(value = "内部引荐人sid")
+    private String recommenderSid;
+
+}

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

@@ -40,6 +40,7 @@ import com.yxt.anrui.terminal.api.autoservice.saleOrders.insurance.InsuranceInfo
 import com.yxt.anrui.terminal.api.autoservice.saleOrders.model.DepositListQuery;
 import com.yxt.anrui.terminal.api.autoservice.saleOrders.model.ModelDto;
 import com.yxt.anrui.terminal.api.autoservice.saleOrders.order.OrderRemarksDto;
+import com.yxt.anrui.terminal.api.autoservice.saleOrders.order.OrderSubmitInfoVo;
 import com.yxt.anrui.terminal.api.autoservice.saleOrders.price.PriceDto;
 import com.yxt.anrui.terminal.api.autoservice.saleOrders.price.PriceVo;
 import com.yxt.anrui.terminal.api.autoservice.saleOrders.topinfo.TopDto;
@@ -271,4 +272,9 @@ public class AppBusSalesOrderRest implements AppBusSalesOrderFeign {
         return appBusSalesOrderService.isSubmit(sid);
     }
 
+    @Override
+    public ResultBean<OrderSubmitInfoVo> getSubmitInfo(String sid) {
+        return appBusSalesOrderService.getSubmitInfo(sid);
+    }
+
 }

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

@@ -26,6 +26,7 @@
 package com.yxt.anrui.terminal.biz.autoservice.saleOrders;
 
 import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.db.sql.Order;
 import com.yxt.anrui.buscenter.api.busmaindeposit.BusMainDepositFeign;
 import com.yxt.anrui.buscenter.api.busmaindeposit.app.AppBusMainDepositOrderQuery;
 import com.yxt.anrui.buscenter.api.busmaindeposit.app.AppBusMainDepositOrderVo;
@@ -65,6 +66,7 @@ import com.yxt.anrui.terminal.api.autoservice.saleOrders.insurance.InsuranceInfo
 import com.yxt.anrui.terminal.api.autoservice.saleOrders.model.DepositListQuery;
 import com.yxt.anrui.terminal.api.autoservice.saleOrders.model.ModelDto;
 import com.yxt.anrui.terminal.api.autoservice.saleOrders.order.OrderRemarksDto;
+import com.yxt.anrui.terminal.api.autoservice.saleOrders.order.OrderSubmitInfoVo;
 import com.yxt.anrui.terminal.api.autoservice.saleOrders.price.PriceDto;
 import com.yxt.anrui.terminal.api.autoservice.saleOrders.price.PriceVo;
 import com.yxt.anrui.terminal.api.autoservice.saleOrders.topinfo.TopDto;
@@ -359,4 +361,12 @@ public class AppBusSalesOrderService {
     }
 
 
+    public ResultBean<OrderSubmitInfoVo> getSubmitInfo(String sid) {
+        ResultBean<OrderSubmitInfoVo> rb = ResultBean.fireFail();
+        OrderSubmitInfoVo v = new OrderSubmitInfoVo();
+        ResultBean<AppBusSalesOrderSubmitInfoVo> resultBean = busSalesOrderFeign.getSubmitInfo(sid);
+        AppBusSalesOrderSubmitInfoVo vo = resultBean.getData();
+        BeanUtil.copyProperties(vo, v);
+        return rb.success().setData(v);
+    }
 }