修改移动端销售订单问题

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

@@ -17,6 +17,8 @@ public class AppCarConfigSummaryVo implements Vo {
     @ApiModelProperty("车型名称")
     private String model;
 
-    @ApiModelProperty(value = "销售指导价")
+    @ApiModelProperty(value = "全款销售指导价")
     private String price;
+    @ApiModelProperty("贷款销售指导价")
+    private String manufactorSettlementPrice;
 }

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

@@ -254,7 +254,8 @@
                bmc.fuelTank,
                bmc.multimedia,
                bvc.guidedPrice  as price,
-               bmc.otherConfig
+               bmc.otherConfig,
+               bvc.manufactorSettlementPrice
         FROM base_vehmodel_config bvc
                      LEFT JOIN base_model_config bmc ON bvc.configurationItemsSid = bmc.sid
                      LEFT JOIN base_vehicle_model bvm ON bvc.modelSid = bvm.sid

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

@@ -27,4 +27,11 @@ public class AppBusSaleOrderInitModelInfoQuery implements Query {
 
     @ApiModelProperty(value = "用户sid")
     private String userSid;
+
+    @ApiModelProperty("公告型号sid")
+    private String publicModelSid;
+    @ApiModelProperty("公告型号")
+    private String publicModel;
+
+    private String saleOrderSid;
 }

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

@@ -41,4 +41,9 @@ public class AppOrderInfoVo implements Vo {
     @ApiModelProperty(value = "销售指导价:后端内部使用")
     private String price;
 
+    @ApiModelProperty("公告型号sid")
+    private String publicModelSid;
+    @ApiModelProperty("公告型号")
+    private String publicModel;
+
 }

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

@@ -73,5 +73,9 @@ public class BusSalesOrderModel extends BaseEntity {
     private BigDecimal guildPrice;
     @ApiModelProperty("单台成交价")
     private BigDecimal finalPrice;
+    @ApiModelProperty("公告型号")
+    private String publicModel;
+    @ApiModelProperty("公告型号sid")
+    private String publicModelSid;
 
 }

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

@@ -32,4 +32,9 @@ public class AppOrderInfoDto implements Dto {
     private List<AppBusSalesOrderVehicleDto> nowCarList;
     @ApiModelProperty(value = "已选择的采购订单列表")
     private List<AppBusSalesVehicleOrderDto> readyCarList;
+
+    @ApiModelProperty("公告型号")
+    private String publicModel;
+    @ApiModelProperty("公告型号sid")
+    private String publicModelSid;
 }

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

@@ -1261,7 +1261,7 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
     /**
      * App初始化销售订单单据信息
      *
-     * @param saleOrderSid 销售订单sid
+     * @param appOrderInitQuery
      * @return
      */
     public AppBusSalesOrderBillInfoVo getBillInfo(AppOrderInitQuery appOrderInitQuery) {
@@ -1550,7 +1550,10 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
             }
             vo.setOrderInfo(orderInfo);
             vo.setState(type);
-            vo.setPrice(orderInfo.getPrice());
+            if(StringUtils.isNotBlank(orderInfo.getPrice())){
+                vo.setPrice(String.valueOf((int)Math.floor(Double.valueOf(orderInfo.getPrice()))));
+            }
+
 
         }
         return rb.success().setData(vo);
@@ -1609,6 +1612,8 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
         String userSid = appBusSaleOrderInitModelInfoQuery.getUserSid();
         String orgSid = sysStaffOrgFeign.getPathSidByUserSid(userSid).getData();
         String special = appBusSaleOrderInitModelInfoQuery.getSpecial();
+        String saleOrderSid = appBusSaleOrderInitModelInfoQuery.getSaleOrderSid();
+        BusSalesOrder busSalesOrder = fetchBySid(saleOrderSid);
         AppBusSaleOrderInitModelInfoVo vo = new AppBusSaleOrderInitModelInfoVo();
         //选择的车型信息的数据
         AppOrderInfoVo orderInfo = new AppOrderInfoVo();
@@ -1642,8 +1647,21 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
             orderInfo.setNowCarList(appNowCarLists);
             //订单选择的采购订单列表
             orderInfo.setReadyCarList(appReadyCarLists);
-            vo.setPrice(data.getPrice());
+            if("1".equals(busSalesOrder.getPayTypeKey())){//全款
+                if(StringUtils.isNotBlank(data.getPrice())){
+                    Double doublePrice = Double.valueOf(data.getPrice());
+                    vo.setPrice(String.valueOf((int)Math.floor(doublePrice)));
+                }
+            }else{
+                if(StringUtils.isNotBlank(data.getManufactorSettlementPrice())){
+                    vo.setPrice(String.valueOf((int)Math.floor(Double.valueOf(data.getManufactorSettlementPrice()))));
+                }
+            }
+
         }
+        orderInfo.setPublicModel(appBusSaleOrderInitModelInfoQuery.getPublicModel());
+        orderInfo.setPublicModelSid(appBusSaleOrderInitModelInfoQuery.getPublicModelSid());
+
 
         vo.setOrderInfo(orderInfo);
         //查询该车型下的现车列表
@@ -1921,6 +1939,20 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
         if (!isDeposit) {
             return rb.setMsg("请完善订金信息");
         }
+        if(StringUtils.isNotBlank(busSalesOrder.getIsInsurance())){
+            return rb.setMsg("请完善保险信息");
+        }else{
+            if("0".equals(busSalesOrder.getIsInsurance())){
+                BusSalesOrderInsuranceDetailsVo busSalesOrderInsurance = busSalesOrderInsuranceService.details(sid);
+                if(busSalesOrderInsurance != null){
+                    if(StringUtils.isBlank(busSalesOrderInsurance.getRemarks())){
+                        return rb.setMsg("请先完善保险信息");
+                    }
+                }else{
+                    return rb.setMsg("请先完善保险信息");
+                }
+            }
+        }
         //现车判断车架号是否已经锁定，已经锁定需要提示更换车架号。采购判断选择数量是否大于采购订单可用数量，提示车型数量超出可选数量
         if ("1".equals(busSalesOrder.getType())) {
             boolean isVehicle = isVehicle(sid);
@@ -2226,7 +2258,11 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
                 if (StringUtils.isNotBlank(topInfo.getContractPath())) {
                     List<String> stringList = Arrays.asList(topInfo.getContractPath().split(","));
                     if (!stringList.isEmpty()) {
-                        topInfo.setContractImages(stringList);
+                        List<String> stringList1 = new ArrayList<>();
+                        stringList.stream().forEach(i->{
+                            stringList1.add(fileUploadComponent.getUrlPrefix()+i);
+                        });
+                        topInfo.setContractImages(stringList1);
                     }
                 }
                 vo.setTopInfo(topInfo);

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

@@ -39,7 +39,9 @@
                modelConfigSid as configSid,
                modelSid,
                specialConfig  as specialInstructions,
-               guildPrice     as price
+               guildPrice     as price,
+               publicModel,
+               publicModelSid
         from bus_sales_order_model
         where salesOrderSid = #{saleOrderSid}
     </select>

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

@@ -156,6 +156,21 @@ public class BusSalesOrderPriceService extends MybatisBaseService<BusSalesOrderP
             vo.setOverallPrice(bigDecimalFinalPrice.toString());
         }
         vo.setSaleOrderSid(sid);
+        if(StringUtils.isNotBlank(vo.getGuidancePrice())){
+            vo.setGuidancePrice(String.valueOf((int)Math.floor(Double.valueOf(vo.getGuidancePrice()))));
+        }
+        if(StringUtils.isNotBlank(vo.getTransactionPrice())){
+            vo.setTransactionPrice(String.valueOf((int)Math.floor(Double.valueOf(vo.getTransactionPrice()))));
+        }
+        if(StringUtils.isNotBlank(vo.getOverallPrice())){
+            vo.setOverallPrice(String.valueOf((int)Math.floor(Double.valueOf(vo.getOverallPrice()))));
+        }
+        if(StringUtils.isNotBlank(vo.getTopAndTrailerPrice())){
+            vo.setTopAndTrailerPrice(String.valueOf((int)Math.floor(Double.valueOf(vo.getTopAndTrailerPrice()))));
+        }
+        if(StringUtils.isNotBlank(vo.getTotalPrice())){
+            vo.setTotalPrice(String.valueOf((int)Math.floor(Double.valueOf(vo.getTotalPrice()))));
+        }
         return rb.success().setData(vo);
     }
 

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

@@ -27,4 +27,11 @@ public class BusSaleOrderInitModelInfoQuery implements Query {
 
     @ApiModelProperty(value = "用户sid")
     private String userSid;
+
+    @ApiModelProperty("公告型号sid")
+    private String publicModelSid;
+    @ApiModelProperty("公告型号")
+    private String publicModel;
+
+    private String saleOrderSid;
 }

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

@@ -35,4 +35,6 @@ public class ModelDto implements Dto {
     @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

@@ -40,4 +40,9 @@ public class OrderInfoDto implements Dto {
     private List<VehicleDto> nowCarList;
     @ApiModelProperty(value = "已选择的采购订单列表")
     private List<VehicleOrderDto> readyCarList;
+
+    @ApiModelProperty("公告型号")
+    private String publicModel;
+    @ApiModelProperty("公告型号sid")
+    private String publicModelSid;
 }

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

@@ -45,4 +45,9 @@ public class OrderInfoVo implements Vo {
 
     @ApiModelProperty(value = "销售指导价:后端内部使用")
     private String price;
+
+    @ApiModelProperty("公告型号sid")
+    private String publicModelSid;
+    @ApiModelProperty("公告型号")
+    private String publicModel;
 }