销售订单-移动端初始化上装、上装保存接口

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesordermakeup/BusSalesOrderMakeupFeign.java

@@ -25,16 +25,14 @@
  *********************************************************/
 package com.yxt.anrui.buscenter.api.bussalesordermakeup;
 
+import com.yxt.anrui.buscenter.api.bussalesordermakeup.app.AppBusSalesOrderMakeUpDto;
+import com.yxt.anrui.buscenter.api.bussalesordermakeup.app.AppBusSalesOrderMakeUpVo;
+import com.yxt.common.core.result.ResultBean;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
-import com.yxt.common.core.query.PagerQuery;
-import com.yxt.common.core.result.ResultBean;
-import com.yxt.common.core.vo.PagerVo;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.*;
 
-import java.util.List;
-
 /**
  * Project: anrui-buscenter(业务管理) <br/>
  * File: BusSalesOrderMakeupFeign.java <br/>
@@ -55,5 +53,15 @@ import java.util.List;
         path = "v1/bussalesordermakeup",
         fallback = BusSalesOrderMakeupFeignFallback.class)
 public interface BusSalesOrderMakeupFeign {
-    
+
+    @ApiOperation("保存上装信息")
+    @PutMapping("/save")
+    @ResponseBody
+    ResultBean save(@RequestBody AppBusSalesOrderMakeUpDto dto);
+
+    @ApiOperation("初始化上装信息")
+    @GetMapping("/getTopInfo/{saleOrderSid}")
+    @ResponseBody
+    ResultBean<AppBusSalesOrderMakeUpVo> getTopInfo(@PathVariable(value = "salesOrderSid") String sid);
+
 }

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesordermakeup/BusSalesOrderMakeupFeignFallback.java

@@ -25,13 +25,11 @@
  *********************************************************/
 package com.yxt.anrui.buscenter.api.bussalesordermakeup;
 
-import com.yxt.common.core.query.PagerQuery;
+import com.yxt.anrui.buscenter.api.bussalesordermakeup.app.AppBusSalesOrderMakeUpDto;
+import com.yxt.anrui.buscenter.api.bussalesordermakeup.app.AppBusSalesOrderMakeUpVo;
 import com.yxt.common.core.result.ResultBean;
-import com.yxt.common.core.vo.PagerVo;
 import org.springframework.stereotype.Component;
 
-import java.util.List;
-
 /**
  * Project: anrui-buscenter(业务管理) <br/>
  * File: BusSalesOrderMakeupFeignFallback.java <br/>
@@ -47,5 +45,14 @@ import java.util.List;
  */
 @Component
 public class BusSalesOrderMakeupFeignFallback implements BusSalesOrderMakeupFeign {
-	
+
+    @Override
+    public ResultBean save(AppBusSalesOrderMakeUpDto dto) {
+        return null;
+    }
+
+    @Override
+    public ResultBean<AppBusSalesOrderMakeUpVo> getTopInfo(String sid) {
+        return null;
+    }
 }

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesordermakeup/app/AppBusSalesOrderMakeUpDto.java

@@ -0,0 +1,47 @@
+package com.yxt.anrui.buscenter.api.bussalesordermakeup.app;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.yxt.common.core.dto.Dto;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * @Author dimengzhe
+ * @Date 2022/6/1 16:20
+ * @Description
+ */
+@Data
+public class AppBusSalesOrderMakeUpDto implements Dto {
+    private static final long serialVersionUID = -3186861025206903302L;
+
+    @ApiModelProperty(value = "上装名称")
+    private String topName;
+    @ApiModelProperty(value = "板材材质")
+    private String plateMaterial;
+    @ApiModelProperty(value = "外廓尺寸")
+    private String overallDimension;
+    @ApiModelProperty(value = "委改厂")
+    private String refitFactory;
+    @ApiModelProperty(value = "委改方式")
+    private String refitMethod;
+    @ApiModelProperty(value = "更多配置")
+    private String moreConfig;
+    @ApiModelProperty(value = "上装价格")
+    private String topPrice;
+    @ApiModelProperty(value = "公告型号")
+    private String announcementModel;
+    @ApiModelProperty(value = "板材厚度")
+    private String plateThickness;
+    @ApiModelProperty(value = "备注说明")
+    private String remarks;
+    @ApiModelProperty(value = "合同集合")
+    private List<String> contractImages;
+    @ApiModelProperty(value = "有无上装信息")
+    private Boolean topInfoState;
+    @ApiModelProperty(value = "销售订单sid")
+    private String saleOrderSid;
+
+
+}

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesordermakeup/app/AppBusSalesOrderMakeUpVo.java

@@ -0,0 +1,46 @@
+package com.yxt.anrui.buscenter.api.bussalesordermakeup.app;
+
+import com.yxt.common.core.vo.Vo;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * @Author dimengzhe
+ * @Date 2022/6/1 17:10
+ * @Description
+ */
+@Data
+public class AppBusSalesOrderMakeUpVo implements Vo {
+    private static final long serialVersionUID = 3352650950677072919L;
+
+    @ApiModelProperty(value = "上装名称")
+    private String topName;
+    @ApiModelProperty(value = "板材材质")
+    private String texture;
+    @ApiModelProperty(value = "外廓尺寸")
+    private String size;
+    @ApiModelProperty(value = "委改厂")
+    private String commissionReformManufactor;
+    @ApiModelProperty(value = "委改方式")
+    private String commissionReformType;
+    @ApiModelProperty(value = "更多配置")
+    private String moreConfig;
+    @ApiModelProperty(value = "上装价格")
+    private String price;
+    @ApiModelProperty(value = "公告型号")
+    private String noticeModel;
+    @ApiModelProperty(value = "板材厚度")
+    private String thickness;
+    @ApiModelProperty(value = "备注说明")
+    private String remarks;
+    @ApiModelProperty(value = "合同集合")
+    private List<String> contractImages;
+    @ApiModelProperty(value = "合同")
+    private String contractPath;
+    @ApiModelProperty(value = "有无上装信息")
+    private Boolean topInfoState;
+    @ApiModelProperty(value = "销售订单sid")
+    private String saleOrderSid;
+}

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

@@ -37,7 +37,7 @@ public class AppBusSalesOrderModelDto implements Dto {
     private String arrangeNumber;
 
     @ApiModelProperty(value = "销售指导价")
-    @JsonProperty(value = "price")
+//    @JsonProperty(value = "price")
     private String guildPrice;
 
 }

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

@@ -1,6 +1,5 @@
 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;
@@ -18,22 +17,22 @@ import java.util.List;
 public class AppOrderInfoDto implements Dto {
     private static final long serialVersionUID = 37103730602607567L;
     @ApiModelProperty(value = "车型sid")
-    @JsonProperty(value = "modelSid")
+//    @JsonProperty(value = "modelSid")
     private String modelSid;
     @ApiModelProperty(value = "配置sid")
-    @JsonProperty(value = "configSid")
+//    @JsonProperty(value = "configSid")
     private String modelConfigSid;
     @ApiModelProperty(value = "车型名称")
-    @JsonProperty(value = "modelName")
+//    @JsonProperty(value = "modelName")
     private String modelName;
     @ApiModelProperty(value = "常用配置")
-    @JsonProperty(value = "commonlyConfig")
+//    @JsonProperty(value = "commonlyConfig")
     private String config;
     @ApiModelProperty(value = "更多配置")
-    @JsonProperty(value = "moreConfig")
+//    @JsonProperty(value = "moreConfig")
     private String moreConfig;
     @ApiModelProperty(value = "特殊说明")
-    @JsonProperty(value = "specialInstructions")
+//    @JsonProperty(value = "specialInstructions")
     private String specialConfig;
     @ApiModelProperty(value = "已选择的现车列表")
     private List<AppBusSalesOrderVehicleDto> nowCarList;

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

@@ -14,14 +14,14 @@ import lombok.Data;
 public class AppBusSalesOrderVehicleDto implements Dto {
     private static final long serialVersionUID = 6958330553023971485L;
     @ApiModelProperty(value = "车架号")
-    @JsonProperty(value = "vin")
+//    @JsonProperty(value = "vin")
     private String linkNo;
 
     @ApiModelProperty(value = "存放地点")
-    @JsonProperty(value = "address")
+//    @JsonProperty(value = "address")
     private String linkText;
 
     @ApiModelProperty(value = "车辆sid")
-    @JsonProperty(value = "carSid")
+//    @JsonProperty(value = "carSid")
     private String linkSid;
 }

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

@@ -1,6 +1,5 @@
 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;
@@ -14,16 +13,16 @@ import lombok.Data;
 public class AppBusSalesVehicleOrderDto implements Dto {
     private static final long serialVersionUID = -3624372305974273450L;
     @ApiModelProperty(value = "采购订单sid")
-    @JsonProperty(value = "sid")
+//    @JsonProperty(value = "sid")
     private String linkSid;
     @ApiModelProperty(value = "采购订单编号")
-    @JsonProperty(value = "orderId")
+//    @JsonProperty(value = "orderId")
     private String linkNo;
     @ApiModelProperty(value = "采购订单日期")
-    @JsonProperty(value = "date")
+//    @JsonProperty(value = "date")
     private String linkText;
     @ApiModelProperty(value = "选择数量")
-    @JsonProperty(value = "selectNum")
+//    @JsonProperty(value = "selectNum")
     private String usingNum;
 
 }

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

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

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

@@ -69,10 +69,10 @@
     </select>
     <!--根据销售订单sid查询车型信息-->
     <select id="selectModelInfoByOrderSid" resultType="com.yxt.anrui.buscenter.api.bussalesorder.app.AppModelInfoVo">
-        SELECT bm.modelName  AS model,
-               bm.brandName  AS brand,
+        SELECT bm.modelName       AS model,
+               bm.brandName       AS brand,
                p.singleFinalPrice AS price,
-               p.quantity    as number
+               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}
@@ -117,4 +117,10 @@
         set type = #{type}
         where sid = #{sid}
     </update>
+
+    <update id="updateIsTop">
+        update bus_sales_order
+        set isTop = #{state}
+        where sid = #{salesOrderSid}
+    </update>
 </mapper>

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

@@ -1631,4 +1631,8 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
     public int updateTypeBySid(String type, String salesOrderSid) {
         return baseMapper.updateTypeBySid(type, salesOrderSid);
     }
+
+    public int updateIsTop(String salesOrderSid, String state) {
+        return baseMapper.updateIsTop(salesOrderSid, state);
+    }
 }

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordermakeup/BusSalesOrderMakeupMapper.java

@@ -28,6 +28,7 @@ package com.yxt.anrui.buscenter.biz.bussalesordermakeup;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.yxt.anrui.buscenter.api.bussalesordermakeup.BusSalesOrderMakeup;
 import com.yxt.anrui.buscenter.api.bussalesordermakeup.BusSalesOrderMakeupDetailsVo;
+import com.yxt.anrui.buscenter.api.bussalesordermakeup.app.AppBusSalesOrderMakeUpVo;
 import org.apache.ibatis.annotations.Mapper;
 
 /**
@@ -63,4 +64,6 @@ public interface BusSalesOrderMakeupMapper extends BaseMapper<BusSalesOrderMakeu
      * @return
      */
     BusSalesOrderMakeupDetailsVo details(String sid);
+
+    AppBusSalesOrderMakeUpVo getTopInfo(String sid);
 }

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordermakeup/BusSalesOrderMakeupMapper.xml

@@ -26,4 +26,21 @@
         from bus_sales_order_makeup
         where salesOrderSid = #{sid}
     </select>
+
+    <select id="getTopInfo" resultType="com.yxt.anrui.buscenter.api.bussalesordermakeup.app.AppBusSalesOrderMakeUpVo">
+        select bm.topName,
+               bm.refitMethod       as commissionReformType,
+               bm.refitFactory      as commissionReformManufactor,
+               bm.overallDimension  as size,
+               bm.plateMaterial     as texture,
+               bm.plateThickness    as thickness,
+               bm.announcementModel as noticeModel,
+               bm.topPrice          as price,
+               bm.moreConfig        as moreConfig,
+               bm.contractPath,
+               bm.remarks
+        from bus_sales_order_makeup bm
+                 left join bus_sales_order b on bm.salesOrderSid = b.sid
+        where salesOrderSid = #{sid}
+    </select>
 </mapper>

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordermakeup/BusSalesOrderMakeupRest.java

@@ -25,14 +25,14 @@
  *********************************************************/
 package com.yxt.anrui.buscenter.biz.bussalesordermakeup;
 
-import com.yxt.anrui.buscenter.api.bussalesordermakeup.*;
-import com.yxt.common.core.query.PagerQuery;
+import com.yxt.anrui.buscenter.api.bussalesordermakeup.BusSalesOrderMakeupFeign;
+import com.yxt.anrui.buscenter.api.bussalesordermakeup.app.AppBusSalesOrderMakeUpDto;
+import com.yxt.anrui.buscenter.api.bussalesordermakeup.app.AppBusSalesOrderMakeUpVo;
 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.stereotype.Controller;
+import org.springframework.web.bind.annotation.RequestMapping;
 
 /**
  * Project: anrui-buscenter(业务管理) <br/>
@@ -48,8 +48,20 @@ import org.springframework.web.bind.annotation.*;
  * @since 1.0
  */
 @Api(tags = "销售订单-上装配置")
-@RestController("com.yxt.anrui.buscenter.biz.bussalesordermakeup.BusSalesOrderMakeupRest")
+@Controller
 @RequestMapping("v1/bussalesordermakeup")
 public class BusSalesOrderMakeupRest implements BusSalesOrderMakeupFeign {
-	
+
+    @Autowired
+    private BusSalesOrderMakeupService busSalesOrderMakeupService;
+
+    @Override
+    public ResultBean save(AppBusSalesOrderMakeUpDto dto) {
+        return busSalesOrderMakeupService.saveTopInfo(dto);
+    }
+
+    @Override
+    public ResultBean<AppBusSalesOrderMakeUpVo> getTopInfo(String sid) {
+        return busSalesOrderMakeupService.getTopInfo(sid);
+    }
 }

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordermakeup/BusSalesOrderMakeupService.java

@@ -26,15 +26,23 @@
 package com.yxt.anrui.buscenter.biz.bussalesordermakeup;
 
 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.bussalesordermakeup.*;
+import com.google.common.base.Joiner;
+import com.yxt.anrui.buscenter.api.bussalesorder.BusSalesOrder;
+import com.yxt.anrui.buscenter.api.bussalesordermakeup.BusSalesOrderMakeup;
+import com.yxt.anrui.buscenter.api.bussalesordermakeup.BusSalesOrderMakeupDetailsVo;
+import com.yxt.anrui.buscenter.api.bussalesordermakeup.BusSalesOrderMakeupDto;
+import com.yxt.anrui.buscenter.api.bussalesordermakeup.app.AppBusSalesOrderMakeUpDto;
+import com.yxt.anrui.buscenter.api.bussalesordermakeup.app.AppBusSalesOrderMakeUpVo;
+import com.yxt.anrui.buscenter.biz.bussalesorder.BusSalesOrderService;
 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.base.utils.StringUtils;
+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;
+
 /**
  * Project: anrui-buscenter(业务管理) <br/>
  * File: BusSalesOrderMakeupService.java <br/>
@@ -51,6 +59,9 @@ import org.springframework.stereotype.Service;
 @Service
 public class BusSalesOrderMakeupService extends MybatisBaseService<BusSalesOrderMakeupMapper, BusSalesOrderMakeup> {
 
+    @Autowired
+    private BusSalesOrderService busSalesOrderService;
+
     public void saveMake(BusSalesOrderMakeupDto busSalesOrderMakeupDto, String sid) {
         BusSalesOrderMakeup busSalesOrderMakeup = new BusSalesOrderMakeup();
         BeanUtil.copyProperties(busSalesOrderMakeupDto, busSalesOrderMakeup, "sid");
@@ -77,5 +88,46 @@ public class BusSalesOrderMakeupService extends MybatisBaseService<BusSalesOrder
     public BusSalesOrderMakeupDetailsVo details(String sid) {
         return baseMapper.details(sid);
     }
-    
+
+    public ResultBean saveTopInfo(AppBusSalesOrderMakeUpDto dto) {
+        ResultBean rb = ResultBean.fireFail();
+        String salesOrderSid = dto.getSaleOrderSid();
+        BusSalesOrder busSalesOrder = busSalesOrderService.fetchBySid(salesOrderSid);
+        if (busSalesOrder == null) {
+            return rb.setMsg("该销售订单单据信息不存在");
+        }
+        Boolean topInfoState = dto.getTopInfoState();
+        String state = "0";
+        if (topInfoState) {
+            state = "1";
+        }
+        busSalesOrderService.updateIsTop(salesOrderSid, state);
+        BusSalesOrderMakeupDetailsVo busSalesOrderMakeupDetailsVo = baseMapper.details(salesOrderSid);
+        if (busSalesOrderMakeupDetailsVo != null) {
+            baseMapper.deleteBySalesOrderSid(salesOrderSid);
+        }
+        if ("1".equals(state)) {
+            BusSalesOrderMakeup busSalesOrderMakeup = new BusSalesOrderMakeup();
+            BeanUtil.copyProperties(dto, busSalesOrderMakeup, "sid");
+            if (!dto.getContractImages().isEmpty()) {
+                busSalesOrderMakeup.setContractPath(Joiner.on(",").join(dto.getContractImages()));
+            }
+            save(busSalesOrderMakeup);
+        }
+        return rb.success().setMsg("成功");
+    }
+
+    public ResultBean<AppBusSalesOrderMakeUpVo> getTopInfo(String sid) {
+        ResultBean<AppBusSalesOrderMakeUpVo> rb = ResultBean.fireFail();
+        AppBusSalesOrderMakeUpVo appBusSalesOrderMakeUpVo = baseMapper.getTopInfo(sid);
+        if (appBusSalesOrderMakeUpVo != null) {
+            if (StringUtils.isNotBlank(appBusSalesOrderMakeUpVo.getContractPath())) {
+                String path = appBusSalesOrderMakeUpVo.getContractPath();
+                List<String> contractImages = Arrays.asList(path.split(","));
+                appBusSalesOrderMakeUpVo.setContractImages(contractImages);
+            }
+        }
+        appBusSalesOrderMakeUpVo.setSaleOrderSid(sid);
+        return rb.success().setData(appBusSalesOrderMakeUpVo);
+    }
 }

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

@@ -30,6 +30,8 @@ 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.anrui.terminal.api.autoservice.saleOrders.topinfo.TopDto;
+import com.yxt.anrui.terminal.api.autoservice.saleOrders.topinfo.TopVo;
 import com.yxt.common.core.query.PagerQuery;
 import com.yxt.common.core.result.ResultBean;
 import com.yxt.common.core.vo.PagerVo;
@@ -108,4 +110,14 @@ public interface AppBusSalesOrderFeign {
     @PutMapping("/save/modelInfo")
     @ResponseBody
     ResultBean saveModelInfo(@RequestBody ModelDto dto);
+
+    @ApiOperation("保存上装信息")
+    @PutMapping("/save/topInfo")
+    @ResponseBody
+    ResultBean saveTopInfo(@RequestBody TopDto dto);
+
+    @ApiOperation("初始化上装信息")
+    @GetMapping("/init/topInfo/{saleOrderSid}")
+    @ResponseBody
+    ResultBean<TopVo> getTopInfo(@PathVariable(value = "saleOrderSid") String sid);
 }

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

@@ -29,6 +29,8 @@ 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.anrui.terminal.api.autoservice.saleOrders.topinfo.TopDto;
+import com.yxt.anrui.terminal.api.autoservice.saleOrders.topinfo.TopVo;
 import com.yxt.common.core.query.PagerQuery;
 import com.yxt.common.core.result.ResultBean;
 import com.yxt.common.core.vo.PagerVo;
@@ -94,4 +96,14 @@ public class AppBusSalesOrderFeignFallback implements AppBusSalesOrderFeign {
     public ResultBean saveModelInfo(ModelDto dto) {
         return null;
     }
+
+    @Override
+    public ResultBean saveTopInfo(TopDto dto) {
+        return null;
+    }
+
+    @Override
+    public ResultBean<TopVo> getTopInfo(String sid) {
+        return null;
+    }
 }

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

@@ -0,0 +1,54 @@
+package com.yxt.anrui.terminal.api.autoservice.saleOrders.topinfo;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.yxt.common.core.dto.Dto;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * @Author dimengzhe
+ * @Date 2022/6/1 16:02
+ * @Description 上装信息
+ */
+@Data
+public class TopDto implements Dto {
+    private static final long serialVersionUID = -5639301713184743169L;
+
+    @ApiModelProperty(value = "上装名称")
+    private String topName;
+    @ApiModelProperty(value = "板材材质")
+    @JsonProperty(value = "texture")
+    private String plateMaterial;
+    @ApiModelProperty(value = "外廓尺寸")
+    @JsonProperty(value = "size")
+    private String overallDimension;
+    @ApiModelProperty(value = "委改厂")
+    @JsonProperty(value = "commissionReformManufactor")
+    private String refitFactory;
+    @ApiModelProperty(value = "委改方式")
+    @JsonProperty(value = "commissionReformType")
+    private String refitMethod;
+    @ApiModelProperty(value = "更多配置")
+    @JsonProperty(value = "moreConfig")
+    private String moreConfig;
+    @ApiModelProperty(value = "上装价格")
+    @JsonProperty(value = "price")
+    private String topPrice;
+    @ApiModelProperty(value = "公告型号")
+    @JsonProperty(value = "noticeModel")
+    private String announcementModel;
+    @ApiModelProperty(value = "板材厚度")
+    @JsonProperty(value = "thickness")
+    private String plateThickness;
+    @ApiModelProperty(value = "备注说明")
+    private String remarks;
+    @ApiModelProperty(value = "合同集合")
+    private List<String> contractImages;
+    @ApiModelProperty(value = "有无上装信息")
+    private Boolean topInfoState;
+    @ApiModelProperty(value = "销售订单sid")
+    private String saleOrderSid;
+
+}

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

@@ -0,0 +1,44 @@
+package com.yxt.anrui.terminal.api.autoservice.saleOrders.topinfo;
+
+import com.yxt.common.core.vo.Vo;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * @Author dimengzhe
+ * @Date 2022/6/1 16:50
+ * @Description
+ */
+@Data
+public class TopVo implements Vo {
+    private static final long serialVersionUID = -3335749304423168769L;
+
+    @ApiModelProperty(value = "上装名称")
+    private String topName;
+    @ApiModelProperty(value = "板材材质")
+    private String texture;
+    @ApiModelProperty(value = "外廓尺寸")
+    private String size;
+    @ApiModelProperty(value = "委改厂")
+    private String commissionReformManufactor;
+    @ApiModelProperty(value = "委改方式")
+    private String commissionReformType;
+    @ApiModelProperty(value = "更多配置")
+    private String moreConfig;
+    @ApiModelProperty(value = "上装价格")
+    private String price;
+    @ApiModelProperty(value = "公告型号")
+    private String noticeModel;
+    @ApiModelProperty(value = "板材厚度")
+    private String thickness;
+    @ApiModelProperty(value = "备注说明")
+    private String remarks;
+    @ApiModelProperty(value = "合同集合")
+    private List<String> contractImages;
+    @ApiModelProperty(value = "有无上装信息")
+    private Boolean topInfoState;
+    @ApiModelProperty(value = "销售订单sid")
+    private String saleOrderSid;
+}

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

@@ -30,6 +30,8 @@ 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.anrui.terminal.api.autoservice.saleOrders.topinfo.TopDto;
+import com.yxt.anrui.terminal.api.autoservice.saleOrders.topinfo.TopVo;
 import com.yxt.common.core.query.PagerQuery;
 import com.yxt.common.core.result.ResultBean;
 import com.yxt.common.core.vo.PagerVo;
@@ -115,4 +117,14 @@ public class AppBusSalesOrderRest implements AppBusSalesOrderFeign {
         return appBusSalesOrderService.saveModelInfo(dto);
     }
 
+    @Override
+    public ResultBean saveTopInfo(TopDto dto) {
+        return appBusSalesOrderService.saveTopInfo(dto);
+    }
+
+    @Override
+    public ResultBean<TopVo> getTopInfo(String sid) {
+        return appBusSalesOrderService.getTopInfo(sid);
+    }
+
 }

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

@@ -28,12 +28,17 @@ 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.bussalesordermakeup.BusSalesOrderMakeupFeign;
+import com.yxt.anrui.buscenter.api.bussalesordermakeup.app.AppBusSalesOrderMakeUpDto;
+import com.yxt.anrui.buscenter.api.bussalesordermakeup.app.AppBusSalesOrderMakeUpVo;
 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.anrui.terminal.api.autoservice.saleOrders.topinfo.TopDto;
+import com.yxt.anrui.terminal.api.autoservice.saleOrders.topinfo.TopVo;
 import com.yxt.common.core.query.PagerQuery;
 import com.yxt.common.core.result.ResultBean;
 import com.yxt.common.core.vo.PagerVo;
@@ -64,6 +69,8 @@ public class AppBusSalesOrderService {
     private CrmVehicledemandFeign crmVehicledemandFeign;
     @Autowired
     private BusSalesOrderModelFeign busSalesOrderModelFeign;
+    @Autowired
+    private BusSalesOrderMakeupFeign busSalesOrderMakeupFeign;
 
     /************************************* 销售订单接口 *********************************************/
 
@@ -132,11 +139,7 @@ public class AppBusSalesOrderService {
     /**
      * 初始化销售订单(第一次选择或重选) 车型信息
      *
-     * @param special
-     * @param customerSid
-     * @param userSid
-     * @param modelSid
-     * @param configSid
+     * @param appBusSaleOrderInitModelInfoQuery
      * @return
      */
     public ResultBean<AppBusSaleOrderInitModelInfoVo> getInitModelInfo2(@SpringQueryMap AppBusSaleOrderInitModelInfoQuery appBusSaleOrderInitModelInfoQuery) {
@@ -163,10 +166,25 @@ public class AppBusSalesOrderService {
     }
 
     public ResultBean saveModelInfo(ModelDto dto) {
-        ResultBean rb = ResultBean.fireFail();
         AppBusSalesOrderModelDto appBusSalesOrderModelDto = new AppBusSalesOrderModelDto();
         BeanUtil.copyProperties(dto, appBusSalesOrderModelDto);
         ResultBean resultBean = busSalesOrderModelFeign.save(appBusSalesOrderModelDto);
         return resultBean;
     }
+
+    public ResultBean saveTopInfo(TopDto dto) {
+        AppBusSalesOrderMakeUpDto appBusSalesOrderMakeUpDto = new AppBusSalesOrderMakeUpDto();
+        BeanUtil.copyProperties(dto, appBusSalesOrderMakeUpDto);
+        ResultBean resultBean = busSalesOrderMakeupFeign.save(appBusSalesOrderMakeUpDto);
+        return resultBean;
+    }
+
+    public ResultBean<TopVo> getTopInfo(String sid) {
+        ResultBean<TopVo> rb = ResultBean.fireFail();
+        ResultBean<AppBusSalesOrderMakeUpVo> resultBean = busSalesOrderMakeupFeign.getTopInfo(sid);
+        AppBusSalesOrderMakeUpVo appBusSalesOrderMakeUpVo = resultBean.getData();
+        TopVo topVo = new TopVo();
+        BeanUtil.copyProperties(appBusSalesOrderMakeUpVo, topVo);
+        return rb.setData(topVo);
+    }
 }