销售订单-移动端初始化销售订单车型、车型信息保存

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemodelconfig/AppCarConfigSummaryVo.java

@@ -1,11 +1,13 @@
 package com.yxt.anrui.base.api.basemodelconfig;
 
+import com.yxt.common.core.vo.Vo;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 @Data
-public class AppCarConfigSummaryVo {
+public class AppCarConfigSummaryVo implements Vo {
 
+    private static final long serialVersionUID = 6775893964666833494L;
     @ApiModelProperty("常用配置")
     private String config;
 
@@ -14,4 +16,7 @@ public class AppCarConfigSummaryVo {
 
     @ApiModelProperty("车型名称")
     private String model;
+
+    @ApiModelProperty(value = "销售指导价")
+    private String price;
 }

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehmodelconfig/BaseVehmodelConfigService.java

@@ -534,6 +534,7 @@ public class BaseVehmodelConfigService extends MybatisBaseService<BaseVehmodelCo
         vo.setConfig(configName);
         vo.setModel(appModelConfigListVo.getModel());
         vo.setMoreConfig(appModelConfigListVo.getOtherConfig());
+        vo.setPrice(appModelConfigListVo.getPrice());
         return vo;
     }
 

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

@@ -150,7 +150,7 @@ public interface BusSalesOrderFeign {
     @ApiOperation("初始化销售订单 车型信息")
     @GetMapping("/init/modelInfo")
     @ResponseBody
-    public ResultBean<AppBusSaleOrderInitModelInfoVo> getInitModelInfo(@RequestParam("saleOrderSid") String saleOrderSid, @RequestParam("customerSid") String customerSid, @RequestParam("userSid") String userSid);
+    public ResultBean<AppBusSaleOrderInitModelInfoVo> getInitModelInfo(@SpringQueryMap AppInitModelQuery appInitModelQuery);
 
     @ApiOperation("初始化销售订单(第一次选择或重选) 车型信息")
     @GetMapping("/init/modelInfo2")

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

@@ -125,7 +125,7 @@ public class BusSalesOrderFeignFallback implements BusSalesOrderFeign {
     }
 
     @Override
-    public ResultBean<AppBusSaleOrderInitModelInfoVo> getInitModelInfo(String saleOrderSid, String customerSid, String userSid) {
+    public ResultBean<AppBusSaleOrderInitModelInfoVo> getInitModelInfo(AppInitModelQuery appInitModelQuery) {
         return null;
     }
 

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

@@ -9,7 +9,7 @@ public class AppBusSaleOrderInitModelInfoVo implements Vo {
 
     private static final long serialVersionUID = 342793087650993718L;
     @ApiModelProperty("选择的车型信息的数据")
-    private AppOrderInfo orderInfo;
+    private AppOrderInfoVo orderInfo;
 
     @ApiModelProperty("根据车型查询出来的现车和采购订单数据")
     private AppCarInfo carInfo;
@@ -23,4 +23,7 @@ public class AppBusSaleOrderInitModelInfoVo implements Vo {
     @ApiModelProperty("排产数量")
     private String arrangeNumber;
 
+    @ApiModelProperty(value = "销售指导价")
+    private String price;
+
 }

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

@@ -0,0 +1,26 @@
+package com.yxt.anrui.buscenter.api.bussalesorder.app;
+
+import com.yxt.common.core.query.Query;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Author dimengzhe
+ * @Date 2022/6/1 9:10
+ * @Description
+ */
+@Data
+public class AppInitModelQuery implements Query {
+    private static final long serialVersionUID = -2023494380640473941L;
+
+    @ApiModelProperty(value = "销售订单sid")
+    private String salesOrderSid;
+
+    @ApiModelProperty(value = "客户sid")
+    private String customerSid;
+
+    @ApiModelProperty(value = "用户sid")
+    private String userSid;
+
+
+}

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

@@ -14,7 +14,7 @@ public class AppModelInfoVo implements Vo {
     private String model;
     @ApiModelProperty("品牌")
     private String brand;
-    @ApiModelProperty("价格")
+    @ApiModelProperty("价格:价格信息中的成交价")
     private String price;
     @ApiModelProperty("数量")
     private String number;

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/app/AppNowCarList.java → anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/app/AppNowCarListVo.java

@@ -5,7 +5,7 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 @Data
-public class AppNowCarList implements Vo {
+public class AppNowCarListVo implements Vo {
 
     private static final long serialVersionUID = 2686499164252521275L;
     @ApiModelProperty("车架号")
@@ -17,7 +17,7 @@ public class AppNowCarList implements Vo {
     @ApiModelProperty("存放地点")
     private String address;
 
-    @ApiModelProperty("车库sid")
+    @ApiModelProperty("车辆sid")
     private String carSid;
 
     @ApiModelProperty("是否虚拟订单锁定的")

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/app/AppOrderInfo.java → anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/app/AppOrderInfoVo.java

@@ -8,7 +8,7 @@ import java.util.ArrayList;
 import java.util.List;
 
 @Data
-public class AppOrderInfo implements Vo {
+public class AppOrderInfoVo implements Vo {
 
     private static final long serialVersionUID = 360634636966708686L;
     @ApiModelProperty("提示")
@@ -33,9 +33,9 @@ public class AppOrderInfo implements Vo {
     private String specialInstructions;
 
     @ApiModelProperty("销售订单-车型确认-现车")
-    private List<AppNowCarList> nowCarList = new ArrayList<>();
+    private List<AppNowCarListVo> nowCarList = new ArrayList<>();
 
     @ApiModelProperty("销售订单-车型确认-排产")
-    private List<AppReadyCarList> readyCarList = new ArrayList<>();
+    private List<AppReadyCarListVo> readyCarList = new ArrayList<>();
 
 }

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/app/AppReadyCarList.java → anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/app/AppReadyCarListVo.java

@@ -5,7 +5,7 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 @Data
-public class AppReadyCarList implements Vo {
+public class AppReadyCarListVo implements Vo {
 
     private static final long serialVersionUID = 5257855685147744221L;
     @ApiModelProperty("排产订单编号")

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesordermodel/BusSalesOrderModelFeign.java

@@ -31,6 +31,7 @@ import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 
 /**
@@ -55,7 +56,7 @@ import org.springframework.web.bind.annotation.RequestBody;
 public interface BusSalesOrderModelFeign {
 
     @ApiOperation("保存")
-    @PostMapping("/saveOrUpdate")
+    @PutMapping("/saveOrUpdate")
     ResultBean save(@RequestBody AppBusSalesOrderModelDto dto);
 
 

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesordermodel/app/AppBusSalesOrderModelDto.java

@@ -1,11 +1,14 @@
 package com.yxt.anrui.buscenter.api.bussalesordermodel.app;
 
+import com.fasterxml.jackson.annotation.JsonProperty;
 import com.yxt.anrui.buscenter.api.bussalesorder.app.AppCarInfo;
-import com.yxt.anrui.buscenter.api.bussalesorder.app.AppOrderInfo;
 import com.yxt.common.core.dto.Dto;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+
 /**
  * @Author dimengzhe
  * @Date 2022/5/30 16:26
@@ -16,18 +19,25 @@ public class AppBusSalesOrderModelDto implements Dto {
     private static final long serialVersionUID = -1189347148270757235L;
 
     @ApiModelProperty("选择的车型信息的数据")
-    private AppOrderInfo orderInfo;
+    @NotNull(message = "参数错误：选择的车型信息不能为空")
+    private AppOrderInfoDto orderInfo;
 
     @ApiModelProperty("根据车型查询出来的现车和采购订单数据")
     private AppCarInfo carInfo;
 
     @ApiModelProperty("订单sid")
+    @NotBlank(message = "参数错误：订单sid不能为空")
     private String saleOrderSid;
 
-    @ApiModelProperty("选择类型")
+    @ApiModelProperty("选择类型:0现车，1采购，2排产")
+    @NotBlank(message = "参数错误：类型不能为空")
     private String state;
 
     @ApiModelProperty("排产数量")
     private String arrangeNumber;
 
+    @ApiModelProperty(value = "销售指导价")
+    @JsonProperty(value = "price")
+    private String guildPrice;
+
 }

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesordermodel/app/AppOrderInfoDto.java

@@ -0,0 +1,42 @@
+package com.yxt.anrui.buscenter.api.bussalesordermodel.app;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.yxt.anrui.buscenter.api.bussalesordervehicle.app.AppBusSalesOrderVehicleDto;
+import com.yxt.anrui.buscenter.api.bussalesvehicleorder.app.AppBusSalesVehicleOrderDto;
+import com.yxt.common.core.dto.Dto;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * @Author dimengzhe
+ * @Date 2022/5/31 14:56
+ * @Description
+ */
+@Data
+public class AppOrderInfoDto implements Dto {
+    private static final long serialVersionUID = 37103730602607567L;
+    @ApiModelProperty(value = "车型sid")
+    @JsonProperty(value = "modelSid")
+    private String modelSid;
+    @ApiModelProperty(value = "配置sid")
+    @JsonProperty(value = "configSid")
+    private String modelConfigSid;
+    @ApiModelProperty(value = "车型名称")
+    @JsonProperty(value = "modelName")
+    private String modelName;
+    @ApiModelProperty(value = "常用配置")
+    @JsonProperty(value = "commonlyConfig")
+    private String config;
+    @ApiModelProperty(value = "更多配置")
+    @JsonProperty(value = "moreConfig")
+    private String moreConfig;
+    @ApiModelProperty(value = "特殊说明")
+    @JsonProperty(value = "specialInstructions")
+    private String specialConfig;
+    @ApiModelProperty(value = "已选择的现车列表")
+    private List<AppBusSalesOrderVehicleDto> nowCarList;
+    @ApiModelProperty(value = "已选择的采购订单列表")
+    private List<AppBusSalesVehicleOrderDto> readyCarList;
+}

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesordervehicle/app/AppBusSalesOrderVehicleDto.java

@@ -0,0 +1,27 @@
+package com.yxt.anrui.buscenter.api.bussalesordervehicle.app;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.yxt.common.core.dto.Dto;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Author dimengzhe
+ * @Date 2022/5/31 15:09
+ * @Description
+ */
+@Data
+public class AppBusSalesOrderVehicleDto implements Dto {
+    private static final long serialVersionUID = 6958330553023971485L;
+    @ApiModelProperty(value = "车架号")
+    @JsonProperty(value = "vin")
+    private String linkNo;
+
+    @ApiModelProperty(value = "存放地点")
+    @JsonProperty(value = "address")
+    private String linkText;
+
+    @ApiModelProperty(value = "车辆sid")
+    @JsonProperty(value = "carSid")
+    private String linkSid;
+}

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesvehicleorder/app/AppBusSalesVehicleOrderDto.java

@@ -0,0 +1,29 @@
+package com.yxt.anrui.buscenter.api.bussalesvehicleorder.app;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.yxt.common.core.dto.Dto;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Author dimengzhe
+ * @Date 2022/5/31 15:14
+ * @Description
+ */
+@Data
+public class AppBusSalesVehicleOrderDto implements Dto {
+    private static final long serialVersionUID = -3624372305974273450L;
+    @ApiModelProperty(value = "采购订单sid")
+    @JsonProperty(value = "sid")
+    private String linkSid;
+    @ApiModelProperty(value = "采购订单编号")
+    @JsonProperty(value = "orderId")
+    private String linkNo;
+    @ApiModelProperty(value = "采购订单日期")
+    @JsonProperty(value = "date")
+    private String linkText;
+    @ApiModelProperty(value = "选择数量")
+    @JsonProperty(value = "selectNum")
+    private String usingNum;
+
+}

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

@@ -105,4 +105,6 @@ public interface BusSalesOrderMapper extends BaseMapper<BusSalesOrder> {
      * @return
      */
     int updateCompanySidBySid(String sid);
+
+    int updateTypeBySid(@Param("type") String type, @Param("sid") String salesOrderSid);
 }

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

@@ -69,10 +69,12 @@
     </select>
     <!--根据销售订单sid查询车型信息-->
     <select id="selectModelInfoByOrderSid" resultType="com.yxt.anrui.buscenter.api.bussalesorder.app.AppModelInfoVo">
-        SELECT modelName  AS model,
+        SELECT bm.modelName  AS model,
-               brandName  AS brand,
+               bm.brandName  AS brand,
-               guildPrice AS price
+               p.singleFinalPrice AS price,
+               p.quantity    as number
         from bus_sales_order_model bm
+                 left join bus_sales_order_price p on bm.salesOrderSid = p.salesOrderSid
         where bm.salesOrderSid = #{saleOrderSid}
     </select>
     <!--App初始化销售订单单据信息-->
@@ -109,4 +111,10 @@
         set affiliatedCompanySid = NULL
         where sid = #{sid}
     </update>
+
+    <update id="updateTypeBySid">
+        update bus_sales_order
+        set type = #{type}
+        where sid = #{sid}
+    </update>
 </mapper>

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

@@ -183,10 +183,9 @@ public class BusSalesOrderRest implements BusSalesOrderFeign {
 
     @Override
     @ApiOperation("App初始化销售订单 车型信息 需要详细沟通")
-    public ResultBean<AppBusSaleOrderInitModelInfoVo> getInitModelInfo(String saleOrderSid, String customerSid, String userSid) {
+    public ResultBean<AppBusSaleOrderInitModelInfoVo> getInitModelInfo(AppInitModelQuery appInitModelQuery) {
-        ResultBean rb = ResultBean.fireFail();
+        return busSalesOrderService.getInitModelInfo(appInitModelQuery);
-        AppBusSaleOrderInitModelInfoVo vo = busSalesOrderService.getInitModelInfo(saleOrderSid, customerSid, userSid);
+
-        return rb.success().setData(vo);
     }
 
     @Override

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

@@ -110,6 +110,7 @@ import org.springframework.transaction.annotation.Transactional;
 
 import java.math.BigDecimal;
 import java.util.*;
+import java.util.stream.Collectors;
 
 /**
  * Project: anrui-buscenter(业务管理) <br/>
@@ -525,6 +526,8 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
         baseMapper.updateById(busSalesOrder);
         //主车车型信息保存
         busSalesOrderModelService.saveModel(busSalesOrderModelDto, dto.getSid());
+        busSalesOrderVehicleService.deleteByOrderSid(dto.getSid());
+        busSalesVehicleOrderService.deleteByOrderSid(dto.getSid());
         if ("1".equals(dto.getType())) {
             //现车车辆信息
             busSalesOrderVehicleService.saveVehicle(list, dto.getSid());
@@ -1037,10 +1040,15 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
             //查询是否有价格信息
             BusSalesOrderPriceDetailsVo priceDetailsVo = busSalesOrderPriceService.details(saleOrderSid);
             if (priceDetailsVo != null) {
+                if (priceDetailsVo.getSingleFinalPrice() != null) {
                     vo.setPriceInfoState(1);
                 } else {
                     vo.setPriceInfoState(0);
                 }
+
+            } else {
+                vo.setPriceInfoState(0);
+            }
             //订金状态
             BusSalesOrderDepositDetailsVo depositDetailsVo = busSalesOrderDepositService.details(saleOrderSid);
             if (depositDetailsVo != null) {
@@ -1178,6 +1186,9 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
             //查询车型信息
             AppModelInfoVo appModelInfo = baseMapper.selectModelInfoByOrderSid(record.getSaleOrderSid());
             if (appModelInfo != null) {
+                if (StringUtils.isBlank(appModelInfo.getPrice())) {
+                    appModelInfo.setPrice("-");
+                }
                 record.setModelInfo(appModelInfo);
             }
             //是否保险
@@ -1291,39 +1302,123 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
         return rb.success().setData(sid);
     }
 
-    public AppBusSaleOrderInitModelInfoVo getInitModelInfo(String saleOrderSid, String customerSid, String userSid) {
+    public ResultBean<AppBusSaleOrderInitModelInfoVo> getInitModelInfo(AppInitModelQuery appInitModelQuery) {
+        ResultBean<AppBusSaleOrderInitModelInfoVo> rb = ResultBean.fireFail();
+        String saleOrderSid = appInitModelQuery.getSalesOrderSid();
+        String customerSid = appInitModelQuery.getCustomerSid();
+        String userSid = appInitModelQuery.getUserSid();
 
+        BusSalesOrder busSalesOrder = fetchBySid(saleOrderSid);
+        if (busSalesOrder == null) {
+            return rb.setMsg("销售订单单据信息不存在");
+        }
+        String type = "";
         AppBusSaleOrderInitModelInfoVo vo = new AppBusSaleOrderInitModelInfoVo();
-        List<AppReadyCarList> appReadyCar = new ArrayList<>();
+        vo.setSaleOrderSid(saleOrderSid);
-        List<AppNowCarList> appNowCars = new ArrayList<>();
+        //根据销售订单查询是否有车型信息
-        AppOrderInfo orderInfo = new AppOrderInfo();
+        AppOrderInfoVo orderInfo = busSalesOrderModelService.selectAppDetailsVoBySaleOrderSid(saleOrderSid);
-
+        if (orderInfo != null) {
-        AppOrderInfo appOrderInfo = busSalesOrderModelService.selectAppDetailsVoBySaleOrderSid(saleOrderSid);
+            List<String> vinNoList = new ArrayList<>();
+            Map<String, Object> map = new HashMap<>();
+            String modelSid = orderInfo.getModelSid();
+            String configSid = orderInfo.getConfigSid();
+            AppCarInfo appCarInfo = new AppCarInfo();
+            List<AppNowCarVo> appNowCars = new ArrayList<>();
+            List<AppReadyCarVo> appReadyCar = new ArrayList<>();
+            //根据车型sid及配置sid查询现车列表
+            ResultBean<List<AppBaseVehicleOrderVo>> orderVoResultBean = baseVehicleFeign.selectAppList(modelSid, configSid);
+            if (orderVoResultBean.getSuccess()) {
+                List<AppBaseVehicleOrderVo> voList = orderVoResultBean.getData();
+                for (AppBaseVehicleOrderVo vehicleOrderVo : voList) {
+                    AppNowCarVo appNowCarVo = new AppNowCarVo();
+                    BeanUtil.copyProperties(vehicleOrderVo, appNowCarVo);
+                    vinNoList.add(vehicleOrderVo.getVin());
+                    appNowCars.add(appNowCarVo);
+                }
+                appCarInfo.setNowCar(appNowCars);
+            }
+            //排产采购订单
+            ResultBean<List<AppBusVehicleApplyListVo>> applyListResultBean = busVehicleApplyDetailFeign.getAppApplyList(modelSid, configSid);
+            if (applyListResultBean.getSuccess()) {
+                List<AppBusVehicleApplyListVo> applyListVos = applyListResultBean.getData();
+                for (AppBusVehicleApplyListVo applyListVo : applyListVos) {
+                    AppReadyCarVo appReadyCarVo = new AppReadyCarVo();
+                    BeanUtil.copyProperties(applyListVo, appReadyCarVo);
+                    map.put(applyListVo.getOrderId(), applyListVo.getCanUseNum());//可使用数量
+                    appReadyCar.add(appReadyCarVo);
+                }
+                appCarInfo.setReadyCar(appReadyCar);
+            }
+            vo.setCarInfo(appCarInfo);
+            //查询是否有车辆信息:1现车、2采购订单、3排产。需要对应apifox中对应的类型：0现车、1采购订单、2排产
+            if ("1".equals(busSalesOrder.getType())) {
+                //类型为现车，查询该销售订单的现车车辆信息
+                List<AppNowCarListVo> nowCarList = busSalesOrderVehicleService.selectAppDetailsVoBySaleOrderSid(saleOrderSid);
+                nowCarList.parallelStream().filter(Objects::nonNull).collect(Collectors.toList());
+                if (!nowCarList.isEmpty()) {
+                    orderInfo.setNowCarList(nowCarList);
+                    boolean isCheck = isCheck(vinNoList, nowCarList);
+                    if (isCheck) {
+                        orderInfo.setNotice("当前车型已经更新，请进行确认");
+                    }
+                }
+                type = "0";
+            }
+            if ("2".equals(busSalesOrder.getType())) {
+                List<AppReadyCarListVo> appReadyCarList = busSalesVehicleOrderService.selectAppDetailsVoBySaleOrderSid(saleOrderSid);
+                appReadyCarList.parallelStream().filter(Objects::nonNull).collect(Collectors.toList());
+                if (!appReadyCarList.isEmpty()) {
+                    orderInfo.setReadyCarList(appReadyCarList);
+                    boolean isCheck = isCheck2(map, appReadyCarList);
+                    if (isCheck) {
+                        orderInfo.setNotice("当前车型已经更新，请进行确认");
+                    }
+                }
+                type = "1";
 
-        orderInfo.setNotice("提示");
+            }
-        orderInfo.setModelSid(appOrderInfo.getModelSid());
+            if ("3".equals(busSalesOrder.getType())) {
-        orderInfo.setModelName(appOrderInfo.getModelName());
+                type = "2";
-        orderInfo.setConfigSid(appOrderInfo.getConfigSid());
-        orderInfo.setCommonlyConfig(appOrderInfo.getCommonlyConfig());
-        orderInfo.setMoreConfig(appOrderInfo.getMoreConfig());
-        orderInfo.setModelName(appOrderInfo.getModelName());
 
-        //现车
+            }
-        List<AppNowCarList> appNowCarList = busSalesOrderVehicleService.selectAppDetailsVoBySaleOrderSid(saleOrderSid);
-        BeanUtil.copyProperties(appNowCarList, appNowCars);
-        orderInfo.setNowCarList(appNowCars);
-        //排产
-        List<AppReadyCarList> appReadyCarList = busSalesVehicleOrderService.selectAppDetailsVoBySaleOrderSid(saleOrderSid);
-        BeanUtil.copyProperties(appReadyCarList, appReadyCar);
-        orderInfo.setReadyCarList(appReadyCarList);
             vo.setOrderInfo(orderInfo);
-        AppCarInfo carInfo = new AppCarInfo();
+            vo.setState(type);
-        List<AppReadyCarVo> readyCars = new ArrayList<>();
+
-        carInfo.setReadyCar(readyCars);
+        }
-        List<AppNowCarVo> nowCars = new ArrayList<>();
+        return rb.success().setData(vo);
-        carInfo.setNowCar(nowCars);
+    }
-        vo.setCarInfo(carInfo);
+
-        return vo;
+    /**
+     * 查询现车是否有变化
+     *
+     * @param vinNoList     查询出来的车辆集合
+     * @param appNowCarList 选择的现车集合
+     * @return
+     */
+    public Boolean isCheck(List<String> vinNoList, List<AppNowCarListVo> appNowCarList) {
+        Boolean isCheck = false;
+        for (AppNowCarListVo car : appNowCarList) {
+            String vinNo = car.getVin();
+            if (!vinNoList.contains(vinNo)) {
+                isCheck = true;
+                break;
+            }
+        }
+        return isCheck;
+    }
+
+    public Boolean isCheck2(Map<String, Object> orderIdMap, List<AppReadyCarListVo> appReadyCarList) {
+        Boolean isCheck = false;
+        for (AppReadyCarListVo order : appReadyCarList) {
+            String orderId = order.getOrderId();
+            if (orderIdMap.containsKey(orderId)) {
+                if (Integer.parseInt(orderIdMap.get(orderId).toString()) == 0) {
+                    isCheck = true;
+                    break;
+                }
+            }
+        }
+        return isCheck;
     }
 
     public AppBusSaleOrderInitModelInfoVo getInitModelInfo2(AppBusSaleOrderInitModelInfoQuery appBusSaleOrderInitModelInfoQuery) {
@@ -1334,14 +1429,14 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
         String special = appBusSaleOrderInitModelInfoQuery.getSpecial();
         AppBusSaleOrderInitModelInfoVo vo = new AppBusSaleOrderInitModelInfoVo();
         //选择的车型信息的数据
-        AppOrderInfo orderInfo = new AppOrderInfo();
+        AppOrderInfoVo orderInfo = new AppOrderInfoVo();
         //根据车型及配置查询除的现车及排产采购订单的列表数据
         AppCarInfo appCarInfo = new AppCarInfo();
         //根据车型及配置查询除的现车列表
         List<AppNowCarVo> appNowCars = new ArrayList<>();
         List<AppReadyCarVo> appReadyCar = new ArrayList<>();
-        List<AppNowCarList> appNowCarLists = new ArrayList<>();
+        List<AppNowCarListVo> appNowCarLists = new ArrayList<>();
-        List<AppReadyCarList> appReadyCarLists = new ArrayList<>();
+        List<AppReadyCarListVo> appReadyCarLists = new ArrayList<>();
         //根据车型及配置查询车型信息
         ResultBean<AppCarConfigSummaryVo> appCarConfigSummaryVoResultBean = baseVehmodelConfigFeign.selectCarConfigSummary(modelSid, configSid, userSid);
         AppCarConfigSummaryVo data = appCarConfigSummaryVoResultBean.getData();
@@ -1353,6 +1448,7 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
         orderInfo.setSpecialInstructions(special);
         orderInfo.setNowCarList(appNowCarLists);
         orderInfo.setReadyCarList(appReadyCarLists);
+        vo.setPrice(data.getPrice());
         vo.setOrderInfo(orderInfo);
         //根据车型sid及配置sid查询现车列表
         ResultBean<List<AppBaseVehicleOrderVo>> orderVoResultBean = baseVehicleFeign.selectAppList(modelSid, configSid);
@@ -1366,12 +1462,12 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
             appCarInfo.setNowCar(appNowCars);
         }
         //排产采购订单
-        ResultBean<List<AppBusVehicleApplyListVo>> applyListResultBean = busVehicleApplyDetailFeign.getAppApplyList(modelSid,configSid);
+        ResultBean<List<AppBusVehicleApplyListVo>> applyListResultBean = busVehicleApplyDetailFeign.getAppApplyList(modelSid, configSid);
-        if(applyListResultBean.getSuccess()){
+        if (applyListResultBean.getSuccess()) {
             List<AppBusVehicleApplyListVo> applyListVos = applyListResultBean.getData();
-            for (AppBusVehicleApplyListVo applyListVo : applyListVos){
+            for (AppBusVehicleApplyListVo applyListVo : applyListVos) {
                 AppReadyCarVo appReadyCarVo = new AppReadyCarVo();
-                BeanUtil.copyProperties(applyListVo,appReadyCarVo);
+                BeanUtil.copyProperties(applyListVo, appReadyCarVo);
                 appReadyCar.add(appReadyCarVo);
             }
             appCarInfo.setReadyCar(appReadyCar);
@@ -1531,4 +1627,8 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
     public int selectCountByOrgSid(String billsType, String date, String orgSid) {
         return baseMapper.selectCountByOrgSid(billsType, date, orgSid);
     }
+
+    public int updateTypeBySid(String type, String salesOrderSid) {
+        return baseMapper.updateTypeBySid(type, salesOrderSid);
+    }
 }

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordermodel/BusSalesOrderModelMapper.java

@@ -25,18 +25,11 @@
  *********************************************************/
 package com.yxt.anrui.buscenter.biz.bussalesordermodel;
 
-import com.baomidou.mybatisplus.core.conditions.Wrapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.yxt.anrui.buscenter.api.bussalesorder.app.AppOrderInfoVo;
-import com.baomidou.mybatisplus.core.toolkit.Constants;
 import com.yxt.anrui.buscenter.api.bussalesordermodel.BusSalesOrderModel;
 import com.yxt.anrui.buscenter.api.bussalesordermodel.BusSalesOrderModelDetailsVo;
-import com.yxt.anrui.buscenter.api.bussalesordermodel.BusSalesOrderModelVo;
 import org.apache.ibatis.annotations.Mapper;
-import org.apache.ibatis.annotations.Param;
-import org.apache.ibatis.annotations.Select;
-
-import java.util.List;
 
 /**
  * Project: anrui-buscenter(业务管理) <br/>
@@ -73,4 +66,12 @@ public interface BusSalesOrderModelMapper extends BaseMapper<BusSalesOrderModel>
      * @return
      */
     int deleteByOrderSid(String sid);
+
+    /**
+     * 移动端-根据销售订单sid查询车型信息
+     *
+     * @param saleOrderSid 销售订单sid
+     * @return
+     */
+    AppOrderInfoVo selectAppModelBySid(String saleOrderSid);
 }

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordermodel/BusSalesOrderModelMapper.xml

@@ -32,4 +32,15 @@
         from bus_sales_order_model
         where salesOrderSid = #{sid}
     </delete>
+
+    <select id="selectAppModelBySid" resultType="com.yxt.anrui.buscenter.api.bussalesorder.app.AppOrderInfoVo">
+        select modelName,
+               moreConfig,
+               config         as commonlyConfig,
+               modelConfigSid as configSid,
+               modelSid,
+               specialConfig  as specialInstructions
+        from bus_sales_order_model
+        where salesOrderSid = #{saleOrderSid}
+    </select>
 </mapper>

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordermodel/BusSalesOrderModelService.java

@@ -26,15 +26,31 @@
 package com.yxt.anrui.buscenter.biz.bussalesordermodel;
 
 import cn.hutool.core.bean.BeanUtil;
-import com.yxt.anrui.buscenter.api.bussalesorder.app.AppOrderInfo;
+import com.yxt.anrui.buscenter.api.bussalesorder.BusSalesOrder;
+import com.yxt.anrui.buscenter.api.bussalesorder.app.AppOrderInfoVo;
+import com.yxt.anrui.buscenter.api.bussalesordermakeup.BusSalesOrderMakeupDetailsVo;
 import com.yxt.anrui.buscenter.api.bussalesordermodel.BusSalesOrderModel;
 import com.yxt.anrui.buscenter.api.bussalesordermodel.BusSalesOrderModelDetailsVo;
 import com.yxt.anrui.buscenter.api.bussalesordermodel.BusSalesOrderModelDto;
 import com.yxt.anrui.buscenter.api.bussalesordermodel.app.AppBusSalesOrderModelDto;
+import com.yxt.anrui.buscenter.api.bussalesordermodel.app.AppOrderInfoDto;
+import com.yxt.anrui.buscenter.api.bussalesorderprice.BusSalesOrderPrice;
+import com.yxt.anrui.buscenter.api.bussalesordervehicle.app.AppBusSalesOrderVehicleDto;
+import com.yxt.anrui.buscenter.api.bussalesvehicleorder.app.AppBusSalesVehicleOrderDto;
+import com.yxt.anrui.buscenter.biz.bussalesorder.BusSalesOrderService;
+import com.yxt.anrui.buscenter.biz.bussalesordermakeup.BusSalesOrderMakeupService;
+import com.yxt.anrui.buscenter.biz.bussalesorderprice.BusSalesOrderPriceService;
+import com.yxt.anrui.buscenter.biz.bussalesordervehicle.BusSalesOrderVehicleService;
+import com.yxt.anrui.buscenter.biz.bussalesvehicleorder.BusSalesVehicleOrderService;
 import com.yxt.common.base.service.MybatisBaseService;
+import com.yxt.common.base.utils.StringUtils;
 import com.yxt.common.core.result.ResultBean;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.math.BigDecimal;
+import java.util.List;
+
 /**
  * Project: anrui-buscenter(业务管理) <br/>
  * File: BusSalesOrderModelService.java <br/>
@@ -51,6 +67,18 @@ import org.springframework.stereotype.Service;
 @Service
 public class BusSalesOrderModelService extends MybatisBaseService<BusSalesOrderModelMapper, BusSalesOrderModel> {
 
+    @Autowired
+    private BusSalesOrderService busSalesOrderService;
+    @Autowired
+    private BusSalesOrderVehicleService busSalesOrderVehicleService;
+    @Autowired
+    private BusSalesVehicleOrderService busSalesVehicleOrderService;
+    @Autowired
+    private BusSalesOrderPriceService busSalesOrderPriceService;
+    @Autowired
+    private BusSalesOrderMakeupService busSalesOrderMakeupService;
+
+
     public void saveModel(BusSalesOrderModelDto busSalesOrderModelDto, String sid) {
         //根据销售订单sid查询该订单的主车型
         BusSalesOrderModel busSalesOrderModel = baseMapper.selectBySalesSid(sid);
@@ -87,24 +115,95 @@ public class BusSalesOrderModelService extends MybatisBaseService<BusSalesOrderM
         return baseMapper.deleteByOrderSid(sid);
     }
 
-    public AppOrderInfo selectAppDetailsVoBySaleOrderSid(String saleOrderSid) {
+    /**
-        BusSalesOrderModel busSalesOrderModel = baseMapper.selectBySalesSid(saleOrderSid);
+     * 移动端-根据销售订单sid查询销售订单的车型信息
-        AppOrderInfo appOrderInfo = new AppOrderInfo();
+     *
-        if (busSalesOrderModel != null) {
+     * @param saleOrderSid 销售订单sid
-            appOrderInfo.setModelSid(busSalesOrderModel.getModelSid());
+     * @return
-            appOrderInfo.setModelName(busSalesOrderModel.getModelName());
+     */
-            appOrderInfo.setConfigSid(busSalesOrderModel.getModelConfigSid());
+    public AppOrderInfoVo selectAppDetailsVoBySaleOrderSid(String saleOrderSid) {
-            appOrderInfo.setCommonlyConfig(busSalesOrderModel.getConfig());
+        return baseMapper.selectAppModelBySid(saleOrderSid);
-            appOrderInfo.setMoreConfig(busSalesOrderModel.getMoreConfig());
-            appOrderInfo.setModelName(busSalesOrderModel.getModelName());
-            return appOrderInfo;
-        } else {
-            return new AppOrderInfo();
-        }
     }
 
+    /**
+     * 移动端-保存更新车型信息
+     *
+     * @param dto 数据传输对象
+     * @return
+     */
     public ResultBean saveApp(AppBusSalesOrderModelDto dto) {
-        AppOrderInfo orderInfo = dto.getOrderInfo();
+        ResultBean rb = ResultBean.fireFail();
-        return null;
+        String salesOrderSid = dto.getSaleOrderSid();
+        String guildPrice = dto.getGuildPrice();
+        BusSalesOrder busSalesOrder = busSalesOrderService.fetchBySid(salesOrderSid);
+        if (busSalesOrder == null) {
+            return rb.setMsg("该销售订单单据不存在");
+        }
+        AppOrderInfoDto orderInfo = dto.getOrderInfo();
+        //根据销售订单查询车型信息
+        BusSalesOrderModel busSalesOrderModel = baseMapper.selectBySalesSid(salesOrderSid);
+        if (busSalesOrderModel == null) {
+            BusSalesOrderModel busSalesOrderModel1 = new BusSalesOrderModel();
+            if (orderInfo != null) {
+                BeanUtil.copyProperties(orderInfo, busSalesOrderModel1, "sid");
+                busSalesOrderModel1.setSalesOrderSid(salesOrderSid);
+                busSalesOrderModel1.setGuildPrice(new BigDecimal(guildPrice));
+                save(busSalesOrderModel1);
+            }
+        } else {
+            BeanUtil.copyProperties(orderInfo, busSalesOrderModel, "sid");
+            busSalesOrderModel.setGuildPrice(new BigDecimal(dto.getGuildPrice()));
+            updateById(busSalesOrderModel);
+        }
+        //删除现车、采购订单的数据、若类型为现车，添加现车数据，若为采购订单，则新增采购订单数据
+        busSalesOrderVehicleService.deleteByOrderSid(salesOrderSid);
+        busSalesVehicleOrderService.deleteByOrderSid(salesOrderSid);
+        //0现车，1采购订单，2排产
+        //数据库中：1现车，2采购订单，3排产
+        String type = "";
+        String state = dto.getState();
+        int num = 0;
+        if ("0".equals(state)) {
+            type = "1";
+            List<AppBusSalesOrderVehicleDto> nowCarList = orderInfo.getNowCarList();
+            busSalesOrderVehicleService.saveAppVehicle(nowCarList, salesOrderSid);
+            num = nowCarList.size();
+        }
+        if ("1".equals(state)) {
+            List<AppBusSalesVehicleOrderDto> readyCarList = orderInfo.getReadyCarList();
+            busSalesVehicleOrderService.saveAppOrder(readyCarList, salesOrderSid);
+            type = "2";
+            for (AppBusSalesVehicleOrderDto dt : readyCarList) {
+                int a = Integer.parseInt(dt.getUsingNum());
+                num = num + a;
+            }
+        }
+        if ("2".equals(state)) {
+            type = "3";
+            num = Integer.parseInt(dto.getArrangeNumber());
+        }
+        //新增或更新价格信息中的台数及单台销售指导价
+        BigDecimal bigDecimalPrice = new BigDecimal(dto.getGuildPrice());
+        if ("1".equals(busSalesOrder.getIsTop())) {
+            BusSalesOrderMakeupDetailsVo busSalesOrderMakeupVo = busSalesOrderMakeupService.details(salesOrderSid);
+            if (busSalesOrderMakeupVo != null) {
+                if (StringUtils.isNotBlank(busSalesOrderMakeupVo.getTopPrice())) {
+                    bigDecimalPrice = bigDecimalPrice.add(new BigDecimal(busSalesOrderMakeupVo.getTopPrice()));
+                }
+            }
+        }
+        BusSalesOrderPrice busSalesOrderPrice = busSalesOrderPriceService.selectBySalesOrderSid(salesOrderSid);
+        if (busSalesOrderPrice == null) {
+            busSalesOrderPrice = new BusSalesOrderPrice();
+            busSalesOrderPrice.setQuantity(num);
+            busSalesOrderPrice.setSalesOrderSid(salesOrderSid);
+            busSalesOrderPrice.setSingleGuildPrice(bigDecimalPrice);
+            busSalesOrderPriceService.save(busSalesOrderPrice);
+        } else {
+            busSalesOrderPriceService.updateBySalesSid(num, salesOrderSid,bigDecimalPrice);
+        }
+        //更新销售订单的车辆类型
+        busSalesOrderService.updateTypeBySid(type, salesOrderSid);
+        return rb.success().setMsg("成功");
     }
 }

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

@@ -25,18 +25,14 @@
  *********************************************************/
 package com.yxt.anrui.buscenter.biz.bussalesorderprice;
 
-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.bussalesorderprice.BusSalesOrderPrice;
 import com.yxt.anrui.buscenter.api.bussalesorderprice.BusSalesOrderPriceDetailsVo;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
-import com.yxt.anrui.buscenter.api.bussalesorderprice.BusSalesOrderPrice;
-import com.yxt.anrui.buscenter.api.bussalesorderprice.BusSalesOrderPriceVo;
 
-import java.util.List;
+import java.math.BigDecimal;
 
 /**
  * Project: anrui-buscenter(业务管理) <br/>
@@ -75,4 +71,6 @@ public interface BusSalesOrderPriceMapper extends BaseMapper<BusSalesOrderPrice>
      * @return
      */
     int deleteByOrderSid(String sid);
+
+    int updateBySalesSid(@Param("num") int num, @Param("sid") String salesOrderSid, @Param("price") BigDecimal price);
 }

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

@@ -26,4 +26,11 @@
         from bus_sales_order_price
         where salesOrderSid = #{sid}
     </delete>
+
+    <update id="updateBySalesSid">
+        update bus_sales_order_price
+        set quantity         = #{num},
+            singleGuildPrice = #{price}
+        where salesOrderSid = #{sid}
+    </update>
 </mapper>

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

@@ -26,13 +26,10 @@
 package com.yxt.anrui.buscenter.biz.bussalesorderprice;
 
 import cn.hutool.core.bean.BeanUtil;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.yxt.anrui.buscenter.api.bussalesorderprice.BusSalesOrderPrice;
-import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.yxt.anrui.buscenter.api.bussalesorderprice.BusSalesOrderPriceDetailsVo;
-import com.yxt.anrui.buscenter.api.bussalesorderprice.*;
+import com.yxt.anrui.buscenter.api.bussalesorderprice.BusSalesOrderPriceDto;
 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.stereotype.Service;
 
 import java.math.BigDecimal;
@@ -99,4 +96,12 @@ public class BusSalesOrderPriceService extends MybatisBaseService<BusSalesOrderP
     public int deleteByOrderSid(String sid) {
         return baseMapper.deleteByOrderSid(sid);
     }
+
+    public BusSalesOrderPrice selectBySalesOrderSid(String salesOrderSid) {
+        return baseMapper.selectBySalesOrderSid(salesOrderSid);
+    }
+
+    public int updateBySalesSid(int num, String salesOrderSid, BigDecimal price) {
+        return baseMapper.updateBySalesSid(num, salesOrderSid, price);
+    }
 }

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordervehicle/BusSalesOrderVehicleMapper.java

@@ -26,6 +26,7 @@
 package com.yxt.anrui.buscenter.biz.bussalesordervehicle;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.yxt.anrui.buscenter.api.bussalesorder.app.AppNowCarListVo;
 import com.yxt.anrui.buscenter.api.bussalesordervehicle.BusSalesOrderVehicle;
 import com.yxt.anrui.buscenter.api.bussalesordervehicle.BusSalesOrderVehicleDetailsVo;
 import org.apache.ibatis.annotations.Mapper;
@@ -68,4 +69,6 @@ public interface BusSalesOrderVehicleMapper extends BaseMapper<BusSalesOrderVehi
      * @return
      */
     int deleteByOrderSid(String sid);
+
+    List<AppNowCarListVo> selectAppDetailsVoBySaleOrderSid(String saleOrderSid);
 }

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordervehicle/BusSalesOrderVehicleMapper.xml

@@ -30,4 +30,13 @@
         from bus_sales_order_vehicle
         where salesOrderSid = #{sid}
     </delete>
+
+    <select id="selectAppDetailsVoBySaleOrderSid"
+            resultType="com.yxt.anrui.buscenter.api.bussalesorder.app.AppNowCarListVo">
+        select linkSid  as carSid,
+               linkText as address,
+               linkNo   as vin
+        from bus_sales_order_vehicle
+        where salesOrderSid = #{saleOrderSid}
+    </select>
 </mapper>

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordervehicle/BusSalesOrderVehicleService.java

@@ -26,17 +26,14 @@
 package com.yxt.anrui.buscenter.biz.bussalesordervehicle;
 
 import cn.hutool.core.bean.BeanUtil;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.yxt.anrui.buscenter.api.bussalesorder.app.AppNowCarListVo;
-import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.yxt.anrui.buscenter.api.bussalesordervehicle.BusSalesOrderVehicle;
-import com.yxt.anrui.buscenter.api.bussalesorder.app.AppNowCarList;
+import com.yxt.anrui.buscenter.api.bussalesordervehicle.BusSalesOrderVehicleDetailsVo;
-import com.yxt.anrui.buscenter.api.bussalesordervehicle.*;
+import com.yxt.anrui.buscenter.api.bussalesordervehicle.BusSalesOrderVehicleDto;
+import com.yxt.anrui.buscenter.api.bussalesordervehicle.app.AppBusSalesOrderVehicleDto;
 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.stereotype.Service;
 
-import java.util.ArrayList;
 import java.util.List;
 
 /**
@@ -56,11 +53,7 @@ import java.util.List;
 public class BusSalesOrderVehicleService extends MybatisBaseService<BusSalesOrderVehicleMapper, BusSalesOrderVehicle> {
 
     public void saveVehicle(List<BusSalesOrderVehicleDto> list, String sid) {
-        List<BusSalesOrderVehicle> stringList = baseMapper.selectVehicleList(sid);
+        if (list.size() > 0) {
-        if (stringList.size() > 0) {
-            //删除
-            baseMapper.deleteBySalesOrderSid(sid);
-        }
             for (int i = 0; i < list.size(); i++) {
                 BusSalesOrderVehicleDto busSalesOrderVehicleDto = list.get(i);
                 BusSalesOrderVehicle busSalesOrderVehicle = new BusSalesOrderVehicle();
@@ -70,6 +63,8 @@ public class BusSalesOrderVehicleService extends MybatisBaseService<BusSalesOrde
             }
         }
 
+    }
+
     public List<BusSalesOrderVehicleDetailsVo> detailsList(String sid) {
         return baseMapper.detailsList(sid);
     }
@@ -84,8 +79,9 @@ public class BusSalesOrderVehicleService extends MybatisBaseService<BusSalesOrde
         return baseMapper.deleteByOrderSid(sid);
     }
 
-    public List<AppNowCarList> selectAppDetailsVoBySaleOrderSid(String saleOrderSid) {
+    public List<AppNowCarListVo> selectAppDetailsVoBySaleOrderSid(String saleOrderSid) {
-        List<BusSalesOrderVehicle> stringList = baseMapper.selectVehicleList(saleOrderSid);
+        return baseMapper.selectAppDetailsVoBySaleOrderSid(saleOrderSid);
+       /* List<BusSalesOrderVehicle> stringList = baseMapper.selectVehicleList(saleOrderSid);
         List<AppNowCarList> appNowCars = new ArrayList<>();
         for (BusSalesOrderVehicle busSalesOrderVehicle : stringList) {
             AppNowCarList appNowCar = new AppNowCarList();
@@ -94,6 +90,20 @@ public class BusSalesOrderVehicleService extends MybatisBaseService<BusSalesOrde
             appNowCar.setAddress(busSalesOrderVehicle.getLinkText());
             appNowCars.add(appNowCar);
         }
-        return appNowCars;
+        return appNowCars;*/
+    }
+
+    public void saveAppVehicle(List<AppBusSalesOrderVehicleDto> nowCarList, String salesOrderSid) {
+        if (nowCarList.size() > 0) {
+            for (int i = 0; i < nowCarList.size(); i++) {
+                AppBusSalesOrderVehicleDto appBusSalesOrderVehicleDto = nowCarList.get(i);
+                if (appBusSalesOrderVehicleDto != null) {
+                    BusSalesOrderVehicle busSalesOrderVehicle = new BusSalesOrderVehicle();
+                    BeanUtil.copyProperties(appBusSalesOrderVehicleDto, busSalesOrderVehicle, "sid");
+                    busSalesOrderVehicle.setSalesOrderSid(salesOrderSid);
+                    save(busSalesOrderVehicle);
+                }
+            }
+        }
     }
 }

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesvehicleorder/BusSalesVehicleOrderMapper.java

@@ -25,16 +25,12 @@
  *********************************************************/
 package com.yxt.anrui.buscenter.biz.bussalesvehicleorder;
 
-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.bussalesorder.app.AppReadyCarListVo;
+import com.yxt.anrui.buscenter.api.bussalesvehicleorder.BusSalesVehicleOrder;
 import com.yxt.anrui.buscenter.api.bussalesvehicleorder.BusSalesVehicleOrderDetailsVo;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
-import org.apache.ibatis.annotations.Select;
-import com.yxt.anrui.buscenter.api.bussalesvehicleorder.BusSalesVehicleOrder;
-import com.yxt.anrui.buscenter.api.bussalesvehicleorder.BusSalesVehicleOrderVo;
 
 import java.util.List;
 
@@ -74,4 +70,6 @@ public interface BusSalesVehicleOrderMapper extends BaseMapper<BusSalesVehicleOr
      * @return
      */
     int deleteByOrderSid(String sid);
+
+    List<AppReadyCarListVo> selectAppDetailsVoBySaleOrderSid(String saleOrderSid);
 }

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesvehicleorder/BusSalesVehicleOrderMapper.xml

@@ -31,4 +31,14 @@
         from bus_sales_vehicle_order
         where salesOrderSid = #{sid}
     </delete>
+
+    <select id="selectAppDetailsVoBySaleOrderSid"
+            resultType="com.yxt.anrui.buscenter.api.bussalesorder.app.AppReadyCarListVo">
+        select linkNo   as orderId,
+               linkText as date,
+               linkSid  as sid,
+               usingNum as selectNum
+        from bus_sales_vehicle_order
+        where salesOrderSid = #{saleOrderSid}
+    </select>
 </mapper>

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesvehicleorder/BusSalesVehicleOrderService.java

@@ -26,14 +26,12 @@
 package com.yxt.anrui.buscenter.biz.bussalesvehicleorder;
 
 import cn.hutool.core.bean.BeanUtil;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.yxt.anrui.buscenter.api.bussalesorder.app.AppReadyCarListVo;
-import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.yxt.anrui.buscenter.api.bussalesvehicleorder.BusSalesVehicleOrder;
-import com.yxt.anrui.buscenter.api.bussalesorder.app.AppReadyCarList;
+import com.yxt.anrui.buscenter.api.bussalesvehicleorder.BusSalesVehicleOrderDetailsVo;
-import com.yxt.anrui.buscenter.api.bussalesvehicleorder.*;
+import com.yxt.anrui.buscenter.api.bussalesvehicleorder.BusSalesVehicleOrderDto;
+import com.yxt.anrui.buscenter.api.bussalesvehicleorder.app.AppBusSalesVehicleOrderDto;
 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.stereotype.Service;
 
 import java.util.ArrayList;
@@ -56,11 +54,7 @@ import java.util.List;
 public class BusSalesVehicleOrderService extends MybatisBaseService<BusSalesVehicleOrderMapper, BusSalesVehicleOrder> {
 
     public void saveOrder(List<BusSalesVehicleOrderDto> vehicleList, String sid) {
-        List<BusSalesVehicleOrder> stringList = baseMapper.selectVehicleList(sid);
+        if (vehicleList.size() > 0) {
-        if (stringList.size() > 0) {
-            //删除
-            baseMapper.deleteBySalesOrderSid(sid);
-        }
             for (int i = 0; i < vehicleList.size(); i++) {
                 BusSalesVehicleOrderDto busSalesVehicleOrderDto = vehicleList.get(i);
                 BusSalesVehicleOrder busSalesVehicleOrder = new BusSalesVehicleOrder();
@@ -70,6 +64,8 @@ public class BusSalesVehicleOrderService extends MybatisBaseService<BusSalesVehi
             }
         }
 
+    }
+
     /**
      * 根据销售订单sid查询销售订单的采购订单
      *
@@ -90,16 +86,29 @@ public class BusSalesVehicleOrderService extends MybatisBaseService<BusSalesVehi
         return baseMapper.deleteByOrderSid(sid);
     }
 
-    public List<AppReadyCarList> selectAppDetailsVoBySaleOrderSid(String saleOrderSid) {
+    public List<AppReadyCarListVo> selectAppDetailsVoBySaleOrderSid(String saleOrderSid) {
-        List<BusSalesVehicleOrder> stringList = baseMapper.selectVehicleList(saleOrderSid);
+        return baseMapper.selectAppDetailsVoBySaleOrderSid(saleOrderSid);
-        List<AppReadyCarList> appReadyCar = new ArrayList<>();
+      /*  List<BusSalesVehicleOrder> stringList = baseMapper.selectVehicleList(saleOrderSid);
+        List<AppReadyCarListVo> appReadyCar = new ArrayList<>();
         for (BusSalesVehicleOrder busSalesVehicleOrder : stringList) {
-            AppReadyCarList appReadyCarList = new AppReadyCarList();
+            AppReadyCarListVo appReadyCarList = new AppReadyCarListVo();
             appReadyCarList.setOrderId(busSalesVehicleOrder.getLinkNo());
             appReadyCarList.setSid(busSalesVehicleOrder.getLinkSid());
             appReadyCarList.setDate(busSalesVehicleOrder.getLinkText());
             appReadyCar.add(appReadyCarList);
         }
-        return appReadyCar;
+        return appReadyCar;*/
+    }
+
+    public void saveAppOrder(List<AppBusSalesVehicleOrderDto> readyCarList, String salesOrderSid) {
+        if (readyCarList.size() > 0) {
+            for (int i = 0; i < readyCarList.size(); i++) {
+                AppBusSalesVehicleOrderDto appBusSalesVehicleOrderDto = readyCarList.get(i);
+                BusSalesVehicleOrder busSalesVehicleOrder = new BusSalesVehicleOrder();
+                BeanUtil.copyProperties(appBusSalesVehicleOrderDto, busSalesVehicleOrder, "sid");
+                busSalesVehicleOrder.setSalesOrderSid(salesOrderSid);
+                save(busSalesVehicleOrder);
+            }
+        }
     }
 }

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.model.ModelDto;
 import com.yxt.common.core.query.PagerQuery;
 import com.yxt.common.core.result.ResultBean;
 import com.yxt.common.core.vo.PagerVo;
@@ -102,4 +103,9 @@ public interface AppBusSalesOrderFeign {
     @PostMapping("/init/wantCarList")
     @ResponseBody
     ResultBean<PagerVo<AppOrderCrmVehicleDemandVo>> getWantCarList(@RequestBody PagerQuery<AppCrmOrderVehicleDemandQuery> pagerQuery);
+
+    @ApiOperation("保存车型信息")
+    @PutMapping("/save/modelInfo")
+    @ResponseBody
+    ResultBean saveModelInfo(@RequestBody ModelDto dto);
 }

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.model.ModelDto;
 import com.yxt.common.core.query.PagerQuery;
 import com.yxt.common.core.result.ResultBean;
 import com.yxt.common.core.vo.PagerVo;
@@ -88,4 +89,9 @@ public class AppBusSalesOrderFeignFallback implements AppBusSalesOrderFeign {
     public ResultBean<PagerVo<AppOrderCrmVehicleDemandVo>> getWantCarList(PagerQuery<AppCrmOrderVehicleDemandQuery> pagerQuery) {
         return null;
     }
+
+    @Override
+    public ResultBean saveModelInfo(ModelDto dto) {
+        return null;
+    }
 }

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

@@ -0,0 +1,38 @@
+package com.yxt.anrui.terminal.api.autoservice.saleOrders.model;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.yxt.common.core.dto.Dto;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+
+/**
+ * @Author dimengzhe
+ * @Date 2022/5/31 17:13
+ * @Description
+ */
+@Data
+public class ModelDto implements Dto {
+    private static final long serialVersionUID = 6939925835873684534L;
+
+    @ApiModelProperty("选择的车型信息的数据")
+    @NotNull(message = "参数错误：选择的车型信息不能为空")
+    private OrderInfoDto orderInfo;
+
+    @ApiModelProperty("订单sid")
+    @NotBlank(message = "参数错误：订单sid不能为空")
+    private String saleOrderSid;
+
+    @ApiModelProperty("选择类型:0现车，1采购，2排产")
+    @NotBlank(message = "参数错误：类型不能为空")
+    private String state;
+
+    @ApiModelProperty("排产数量")
+    private String arrangeNumber;
+
+    @ApiModelProperty(value = "销售指导价")
+    @JsonProperty(value = "price")
+    private String guildPrice;
+}

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

@@ -0,0 +1,43 @@
+package com.yxt.anrui.terminal.api.autoservice.saleOrders.model;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.yxt.anrui.terminal.api.autoservice.saleOrders.vehicle.VehicleDto;
+import com.yxt.anrui.terminal.api.autoservice.saleOrders.vehicleorder.VehicleOrderDto;
+import com.yxt.common.core.dto.Dto;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * @Author dimengzhe
+ * @Date 2022/5/31 17:14
+ * @Description
+ */
+@Data
+public class OrderInfoDto implements Dto {
+    private static final long serialVersionUID = -3071762623252133849L;
+
+    @ApiModelProperty(value = "车型sid")
+    @JsonProperty(value = "modelSid")
+    private String modelSid;
+    @ApiModelProperty(value = "配置sid")
+    @JsonProperty(value = "configSid")
+    private String modelConfigSid;
+    @ApiModelProperty(value = "车型名称")
+    @JsonProperty(value = "modelName")
+    private String modelName;
+    @ApiModelProperty(value = "常用配置")
+    @JsonProperty(value = "commonlyConfig")
+    private String config;
+    @ApiModelProperty(value = "更多配置")
+    @JsonProperty(value = "moreConfig")
+    private String moreConfig;
+    @ApiModelProperty(value = "特殊说明")
+    @JsonProperty(value = "specialInstructions")
+    private String specialConfig;
+    @ApiModelProperty(value = "已选择的现车列表")
+    private List<VehicleDto> nowCarList;
+    @ApiModelProperty(value = "已选择的采购订单列表")
+    private List<VehicleOrderDto> readyCarList;
+}

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

@@ -0,0 +1,28 @@
+package com.yxt.anrui.terminal.api.autoservice.saleOrders.vehicle;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.yxt.common.core.dto.Dto;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Author dimengzhe
+ * @Date 2022/5/31 17:19
+ * @Description
+ */
+@Data
+public class VehicleDto implements Dto {
+    private static final long serialVersionUID = -8249464039650634642L;
+
+    @ApiModelProperty(value = "车架号")
+    @JsonProperty(value = "vin")
+    private String linkNo;
+
+    @ApiModelProperty(value = "存放地点")
+    @JsonProperty(value = "address")
+    private String linkText;
+
+    @ApiModelProperty(value = "车辆sid")
+    @JsonProperty(value = "carSid")
+    private String linkSid;
+}

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

@@ -0,0 +1,29 @@
+package com.yxt.anrui.terminal.api.autoservice.saleOrders.vehicleorder;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.yxt.common.core.dto.Dto;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Author dimengzhe
+ * @Date 2022/5/31 17:23
+ * @Description
+ */
+@Data
+public class VehicleOrderDto implements Dto {
+    private static final long serialVersionUID = -6316868553385809547L;
+
+    @ApiModelProperty(value = "采购订单sid")
+    @JsonProperty(value = "sid")
+    private String linkSid;
+    @ApiModelProperty(value = "采购订单编号")
+    @JsonProperty(value = "orderId")
+    private String linkNo;
+    @ApiModelProperty(value = "采购订单日期")
+    @JsonProperty(value = "date")
+    private String linkText;
+    @ApiModelProperty(value = "选择数量")
+    @JsonProperty(value = "selectNum")
+    private String usingNum;
+}

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.model.ModelDto;
 import com.yxt.common.core.query.PagerQuery;
 import com.yxt.common.core.result.ResultBean;
 import com.yxt.common.core.vo.PagerVo;
@@ -109,4 +110,9 @@ public class AppBusSalesOrderRest implements AppBusSalesOrderFeign {
         return appBusSalesOrderService.getWantCarList(pagerQuery);
     }
 
+    @Override
+    public ResultBean saveModelInfo(ModelDto dto) {
+        return appBusSalesOrderService.saveModelInfo(dto);
+    }
+
 }

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

@@ -25,11 +25,15 @@
  *********************************************************/
 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.bussalesordermodel.BusSalesOrderModelFeign;
+import com.yxt.anrui.buscenter.api.bussalesordermodel.app.AppBusSalesOrderModelDto;
 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.model.ModelDto;
 import com.yxt.common.core.query.PagerQuery;
 import com.yxt.common.core.result.ResultBean;
 import com.yxt.common.core.vo.PagerVo;
@@ -58,6 +62,8 @@ public class AppBusSalesOrderService {
     BusSalesOrderFeign busSalesOrderFeign;
     @Autowired
     private CrmVehicledemandFeign crmVehicledemandFeign;
+    @Autowired
+    private BusSalesOrderModelFeign busSalesOrderModelFeign;
 
     /************************************* 销售订单接口 *********************************************/
 
@@ -115,7 +121,11 @@ public class AppBusSalesOrderService {
      * @return
      */
     public ResultBean<AppBusSaleOrderInitModelInfoVo> getInitModelInfo(String saleOrderSid, String customerSid, String userSid) {
-        ResultBean resultBean = busSalesOrderFeign.getInitModelInfo(saleOrderSid, customerSid, userSid);
+        AppInitModelQuery appInitModelQuery = new AppInitModelQuery();
+        appInitModelQuery.setSalesOrderSid(saleOrderSid);
+        appInitModelQuery.setCustomerSid(customerSid);
+        appInitModelQuery.setUserSid(userSid);
+        ResultBean resultBean = busSalesOrderFeign.getInitModelInfo(appInitModelQuery);
         return resultBean;
     }
 
@@ -151,4 +161,12 @@ public class AppBusSalesOrderService {
         ResultBean<PagerVo<AppOrderCrmVehicleDemandVo>> resultBean = crmVehicledemandFeign.getWantCarList(pagerQuery);
         return resultBean;
     }
+
+    public ResultBean saveModelInfo(ModelDto dto) {
+        ResultBean rb = ResultBean.fireFail();
+        AppBusSalesOrderModelDto appBusSalesOrderModelDto = new AppBusSalesOrderModelDto();
+        BeanUtil.copyProperties(dto, appBusSalesOrderModelDto);
+        ResultBean resultBean = busSalesOrderModelFeign.save(appBusSalesOrderModelDto);
+        return resultBean;
+    }
 }