Merge remote-tracking branch 'origin/master'

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorderinsurance/BusSalesOrderInsuranceFeign.java

@@ -26,10 +26,13 @@
 package com.yxt.anrui.buscenter.api.bussalesorderinsurance;
 
 import com.yxt.anrui.buscenter.api.bussalesorderinsurance.app.AppBusSalesOrderInsuranceDto;
+import com.yxt.anrui.buscenter.api.bussalesorderinsurance.app.AppBusSalesOrderInsuranceVo;
 import com.yxt.common.core.result.ResultBean;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 
@@ -58,5 +61,9 @@ public interface BusSalesOrderInsuranceFeign {
     @PostMapping("/save")
     ResultBean save(@RequestBody AppBusSalesOrderInsuranceDto dto);
 
+    @ApiOperation("初始化保险信息")
+    @GetMapping("/getInsurance/{sid}")
+    ResultBean<AppBusSalesOrderInsuranceVo> getInsurance(@PathVariable(value = "sid") String sid);
+
 
 }

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorderinsurance/BusSalesOrderInsuranceFeignFallback.java

@@ -26,6 +26,7 @@
 package com.yxt.anrui.buscenter.api.bussalesorderinsurance;
 
 import com.yxt.anrui.buscenter.api.bussalesorderinsurance.app.AppBusSalesOrderInsuranceDto;
+import com.yxt.anrui.buscenter.api.bussalesorderinsurance.app.AppBusSalesOrderInsuranceVo;
 import com.yxt.common.core.result.ResultBean;
 import org.springframework.stereotype.Component;
 
@@ -49,4 +50,9 @@ public class BusSalesOrderInsuranceFeignFallback implements BusSalesOrderInsuran
     public ResultBean save(AppBusSalesOrderInsuranceDto dto) {
         return null;
     }
+
+    @Override
+    public ResultBean<AppBusSalesOrderInsuranceVo> getInsurance(String sid) {
+        return null;
+    }
 }

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderinsurance/BusSalesOrderInsuranceMapper.java

@@ -28,6 +28,7 @@ package com.yxt.anrui.buscenter.biz.bussalesorderinsurance;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.yxt.anrui.buscenter.api.bussalesorderinsurance.BusSalesOrderInsurance;
 import com.yxt.anrui.buscenter.api.bussalesorderinsurance.BusSalesOrderInsuranceDetailsVo;
+import com.yxt.anrui.buscenter.api.bussalesorderinsurance.app.AppBusSalesOrderInsuranceVo;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
@@ -69,4 +70,12 @@ public interface BusSalesOrderInsuranceMapper extends BaseMapper<BusSalesOrderIn
      * @return
      */
     BusSalesOrderInsurance selectByOrderSid(String saleOrderSid);
+
+    /**
+     * 根据销售订单sid查询保险信息
+     *
+     * @param sid 销售订单sid
+     * @return
+     */
+    AppBusSalesOrderInsuranceVo getInsurance(String sid);
 }

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderinsurance/BusSalesOrderInsuranceMapper.xml

@@ -42,4 +42,11 @@
         from bus_sales_order_insurance
         where salesOrderSid = #{saleOrderSid}
     </select>
+
+    <select id="getInsurance"
+            resultType="com.yxt.anrui.buscenter.api.bussalesorderinsurance.app.AppBusSalesOrderInsuranceVo">
+        select salesOrderSid, insuranceName as name, insuranceCarMoney as price, insuranceNum as number, remarks
+        from bus_sales_order_insurance
+        where salesOrderSid = #{sid}
+    </select>
 </mapper>

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderinsurance/BusSalesOrderInsuranceRest.java

@@ -27,6 +27,7 @@ package com.yxt.anrui.buscenter.biz.bussalesorderinsurance;
 
 import com.yxt.anrui.buscenter.api.bussalesorderinsurance.BusSalesOrderInsuranceFeign;
 import com.yxt.anrui.buscenter.api.bussalesorderinsurance.app.AppBusSalesOrderInsuranceDto;
+import com.yxt.anrui.buscenter.api.bussalesorderinsurance.app.AppBusSalesOrderInsuranceVo;
 import com.yxt.common.core.result.ResultBean;
 import io.swagger.annotations.Api;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -58,4 +59,9 @@ public class BusSalesOrderInsuranceRest implements BusSalesOrderInsuranceFeign {
     public ResultBean save(AppBusSalesOrderInsuranceDto dto) {
         return busSalesOrderInsuranceService.saveAppInsurance(dto);
     }
+
+    @Override
+    public ResultBean<AppBusSalesOrderInsuranceVo> getInsurance(String sid) {
+        return busSalesOrderInsuranceService.getInsurance(sid);
+    }
 }

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderinsurance/BusSalesOrderInsuranceService.java

@@ -31,6 +31,7 @@ import com.yxt.anrui.buscenter.api.bussalesorderinsurance.BusSalesOrderInsurance
 import com.yxt.anrui.buscenter.api.bussalesorderinsurance.BusSalesOrderInsuranceDetailsVo;
 import com.yxt.anrui.buscenter.api.bussalesorderinsurance.BusSalesOrderInsuranceDto;
 import com.yxt.anrui.buscenter.api.bussalesorderinsurance.app.AppBusSalesOrderInsuranceDto;
+import com.yxt.anrui.buscenter.api.bussalesorderinsurance.app.AppBusSalesOrderInsuranceVo;
 import com.yxt.anrui.buscenter.biz.bussalesorder.BusSalesOrderService;
 import com.yxt.common.base.service.MybatisBaseService;
 import com.yxt.common.base.utils.StringUtils;
@@ -130,4 +131,27 @@ public class BusSalesOrderInsuranceService extends MybatisBaseService<BusSalesOr
         return rb.success().setMsg("保存成功");
 
     }
+
+    public ResultBean<AppBusSalesOrderInsuranceVo> getInsurance(String sid) {
+        ResultBean<AppBusSalesOrderInsuranceVo> rb = ResultBean.fireFail();
+        //根据销售订单sid查询销售订单是否存在
+        BusSalesOrder busSalesOrder = busSalesOrderService.fetchBySid(sid);
+        if (busSalesOrder == null) {
+            return rb.setMsg("该销售订单单据不存在");
+        }
+        AppBusSalesOrderInsuranceVo vo = baseMapper.getInsurance(sid);
+        if (vo == null) {
+            vo = new AppBusSalesOrderInsuranceVo();
+            vo.setSaleOrderSid(sid);
+        }
+        if (StringUtils.isNotBlank(busSalesOrder.getIsInsurance())) {
+            vo.setIsInsureType(busSalesOrder.getIsInsurance());
+            if ("1".equals(busSalesOrder.getIsInsurance())) {
+                vo.setIsInsureValue("是");
+            } else {
+                vo.setIsInsureValue("否");
+            }
+        }
+        return rb.success().setData(vo);
+    }
 }

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

@@ -32,6 +32,7 @@ import com.yxt.anrui.crm.api.crmvehicledemand.AppOrderCrmVehicleDemandVo;
 import com.yxt.anrui.terminal.api.autoservice.saleOrders.discount.DiscountDto;
 import com.yxt.anrui.terminal.api.autoservice.saleOrders.discount.DiscountVo;
 import com.yxt.anrui.terminal.api.autoservice.saleOrders.insurance.InsuranceInfoDto;
+import com.yxt.anrui.terminal.api.autoservice.saleOrders.insurance.InsuranceInfoVo;
 import com.yxt.anrui.terminal.api.autoservice.saleOrders.model.ModelDto;
 import com.yxt.anrui.terminal.api.autoservice.saleOrders.price.PriceDto;
 import com.yxt.anrui.terminal.api.autoservice.saleOrders.price.PriceVo;
@@ -166,4 +167,9 @@ public interface AppBusSalesOrderFeign {
     @ResponseBody
     ResultBean saveInsurance(@RequestBody InsuranceInfoDto dto);
 
+    @ApiOperation("初始化保险信息")
+    @GetMapping("/init/InsuranceInfo/{saleOrderSid}")
+    @ResponseBody
+    ResultBean<InsuranceInfoVo> getInsurance(@PathVariable(value = "saleOrdersSid") String sid);
+
 }

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

@@ -31,6 +31,7 @@ import com.yxt.anrui.crm.api.crmvehicledemand.AppOrderCrmVehicleDemandVo;
 import com.yxt.anrui.terminal.api.autoservice.saleOrders.discount.DiscountDto;
 import com.yxt.anrui.terminal.api.autoservice.saleOrders.discount.DiscountVo;
 import com.yxt.anrui.terminal.api.autoservice.saleOrders.insurance.InsuranceInfoDto;
+import com.yxt.anrui.terminal.api.autoservice.saleOrders.insurance.InsuranceInfoVo;
 import com.yxt.anrui.terminal.api.autoservice.saleOrders.model.ModelDto;
 import com.yxt.anrui.terminal.api.autoservice.saleOrders.price.PriceDto;
 import com.yxt.anrui.terminal.api.autoservice.saleOrders.price.PriceVo;
@@ -141,4 +142,9 @@ public class AppBusSalesOrderFeignFallback implements AppBusSalesOrderFeign {
     public ResultBean saveInsurance(InsuranceInfoDto dto) {
         return null;
     }
+
+    @Override
+    public ResultBean<InsuranceInfoVo> getInsurance(String sid) {
+        return null;
+    }
 }

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

@@ -32,6 +32,7 @@ import com.yxt.anrui.terminal.api.autoservice.saleOrders.AppBusSalesOrderFeign;
 import com.yxt.anrui.terminal.api.autoservice.saleOrders.discount.DiscountDto;
 import com.yxt.anrui.terminal.api.autoservice.saleOrders.discount.DiscountVo;
 import com.yxt.anrui.terminal.api.autoservice.saleOrders.insurance.InsuranceInfoDto;
+import com.yxt.anrui.terminal.api.autoservice.saleOrders.insurance.InsuranceInfoVo;
 import com.yxt.anrui.terminal.api.autoservice.saleOrders.model.ModelDto;
 import com.yxt.anrui.terminal.api.autoservice.saleOrders.price.PriceDto;
 import com.yxt.anrui.terminal.api.autoservice.saleOrders.price.PriceVo;
@@ -223,4 +224,9 @@ public class AppBusSalesOrderRest implements AppBusSalesOrderFeign {
         return appBusSalesOrderService.saveInsurance(dto);
     }
 
+    @Override
+    public ResultBean<InsuranceInfoVo> getInsurance(String sid) {
+        return appBusSalesOrderService.getInsurance(sid);
+    }
+
 }

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

@@ -33,6 +33,7 @@ import com.yxt.anrui.buscenter.api.bussalesorderdiscount.app.AppBusSalesOrderDis
 import com.yxt.anrui.buscenter.api.bussalesorderdiscount.app.AppBusSalesOrderDiscountListVo;
 import com.yxt.anrui.buscenter.api.bussalesorderinsurance.BusSalesOrderInsuranceFeign;
 import com.yxt.anrui.buscenter.api.bussalesorderinsurance.app.AppBusSalesOrderInsuranceDto;
+import com.yxt.anrui.buscenter.api.bussalesorderinsurance.app.AppBusSalesOrderInsuranceVo;
 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;
@@ -48,6 +49,7 @@ import com.yxt.anrui.terminal.api.autoservice.saleOrders.discount.DiscountDto;
 import com.yxt.anrui.terminal.api.autoservice.saleOrders.discount.DiscountListVo;
 import com.yxt.anrui.terminal.api.autoservice.saleOrders.discount.DiscountVo;
 import com.yxt.anrui.terminal.api.autoservice.saleOrders.insurance.InsuranceInfoDto;
+import com.yxt.anrui.terminal.api.autoservice.saleOrders.insurance.InsuranceInfoVo;
 import com.yxt.anrui.terminal.api.autoservice.saleOrders.model.ModelDto;
 import com.yxt.anrui.terminal.api.autoservice.saleOrders.price.PriceDto;
 import com.yxt.anrui.terminal.api.autoservice.saleOrders.price.PriceVo;
@@ -279,4 +281,15 @@ public class AppBusSalesOrderService {
         ResultBean resultBean = busSalesOrderInsuranceFeign.save(appBusSalesOrderInsuranceDto);
         return resultBean;
     }
+
+    public ResultBean<InsuranceInfoVo> getInsurance(String sid) {
+        ResultBean<InsuranceInfoVo> rb = ResultBean.fireFail();
+        ResultBean<AppBusSalesOrderInsuranceVo> resultBean = busSalesOrderInsuranceFeign.getInsurance(sid);
+        if (!resultBean.getSuccess()) {
+            return rb.setMsg(resultBean.getMsg());
+        }
+        InsuranceInfoVo insuranceInfoVo = new InsuranceInfoVo();
+        BeanUtil.copyProperties(resultBean.getData(), insuranceInfoVo);
+        return rb.success().setData(insuranceInfoVo);
+    }
 }