From 30fdc3196512eacd466ab48f0448a2ae9b03d886 Mon Sep 17 00:00:00 2001
From: dimengzhe <251008545@qq.com>
Date: Tue, 7 Jun 2022 11:46:33 +0800
Subject: [PATCH] =?UTF-8?q?=E9=94=80=E5=94=AE=E8=AE=A2=E5=8D=95-=E7=A7=BB?=
 =?UTF-8?q?=E5=8A=A8=E7=AB=AF=E8=B0=83=E5=BC=8F=E4=BF=9D=E5=AD=98=E4=BF=9D?=
 =?UTF-8?q?=E9=99=A9=E5=8F=8A=E5=88=9D=E5=A7=8B=E5=8C=96=E4=BF=9D=E9=99=A9?=
 =?UTF-8?q?=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../app/AppBusSalesOrderInsuranceDto.java          |  3 ++-
 .../BusSalesOrderInsuranceMapper.xml               |  6 +++++-
 .../BusSalesOrderInsuranceService.java             | 14 +++++++-------
 .../saleOrders/AppBusSalesOrderFeign.java          |  2 +-
 .../saleOrders/insurance/InsuranceInfoDto.java     |  4 +++-
 5 files changed, 18 insertions(+), 11 deletions(-)

diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorderinsurance/app/AppBusSalesOrderInsuranceDto.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorderinsurance/app/AppBusSalesOrderInsuranceDto.java
index 42d9ffaa67..35a2e11d1b 100644
--- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorderinsurance/app/AppBusSalesOrderInsuranceDto.java
+++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorderinsurance/app/AppBusSalesOrderInsuranceDto.java
@@ -1,5 +1,6 @@
 package com.yxt.anrui.buscenter.api.bussalesorderinsurance.app;
 
+import com.fasterxml.jackson.annotation.JsonProperty;
 import com.yxt.common.core.dto.Dto;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -24,6 +25,6 @@ public class AppBusSalesOrderInsuranceDto implements Dto {
     @ApiModelProperty(value = "备注")
     private String remarks;
     @ApiModelProperty(value = "销售订单sid")
-    private String saleOrderSid;
+    private String salesOrderSid;
 
 }
diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderinsurance/BusSalesOrderInsuranceMapper.xml b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderinsurance/BusSalesOrderInsuranceMapper.xml
index f1e43e17b4..c41cc2f1dc 100644
--- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderinsurance/BusSalesOrderInsuranceMapper.xml
+++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderinsurance/BusSalesOrderInsuranceMapper.xml
@@ -45,7 +45,11 @@
 
     <select id="getInsurance"
             resultType="com.yxt.anrui.buscenter.api.bussalesorderinsurance.app.AppBusSalesOrderInsuranceVo">
-        select salesOrderSid, insuranceName as name, insuranceCarMoney as price, insuranceNum as number, remarks
+        select salesOrderSid     as saleOrderSid,
+               insuranceName     as name,
+               insuranceCarMoney as price,
+               insuranceNum      as number,
+               remarks
         from bus_sales_order_insurance
         where salesOrderSid = #{sid}
     </select>
diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderinsurance/BusSalesOrderInsuranceService.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderinsurance/BusSalesOrderInsuranceService.java
index a3a43a118e..480b6e2081 100644
--- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderinsurance/BusSalesOrderInsuranceService.java
+++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderinsurance/BusSalesOrderInsuranceService.java
@@ -95,14 +95,14 @@ public class BusSalesOrderInsuranceService extends MybatisBaseService<BusSalesOr
 
     public ResultBean saveAppInsurance(AppBusSalesOrderInsuranceDto dto) {
         ResultBean rb = ResultBean.fireFail();
-        BusSalesOrder busSalesOrder = busSalesOrderService.fetchBySid(dto.getSaleOrderSid());
+        BusSalesOrder busSalesOrder = busSalesOrderService.fetchBySid(dto.getSalesOrderSid());
         if (busSalesOrder == null) {
             return rb.setMsg("该销售订单单据不存在");
         }
         if ("1".equals(dto.getIsInsureType())) {
-            BusSalesOrderInsuranceDetailsVo busSalesOrderInsuranceDetailsVo = baseMapper.details(dto.getSaleOrderSid());
+            BusSalesOrderInsuranceDetailsVo busSalesOrderInsuranceDetailsVo = baseMapper.details(dto.getSalesOrderSid());
             if (busSalesOrderInsuranceDetailsVo != null) {
-                BusSalesOrderInsurance busSalesOrderInsurance = baseMapper.selectByOrderSid(dto.getSaleOrderSid());
+                BusSalesOrderInsurance busSalesOrderInsurance = baseMapper.selectByOrderSid(dto.getSalesOrderSid());
                 BeanUtil.copyProperties(dto, busSalesOrderInsurance, "sid");
                 updateById(busSalesOrderInsurance);
             } else {
@@ -113,21 +113,21 @@ public class BusSalesOrderInsuranceService extends MybatisBaseService<BusSalesOr
 
         } else if ("0".equals(dto.getIsInsureType())) {
             //查询保险信息是否有数据
-            BusSalesOrderInsurance busSalesOrderInsurance = baseMapper.selectByOrderSid(dto.getSaleOrderSid());
+            BusSalesOrderInsurance busSalesOrderInsurance = baseMapper.selectByOrderSid(dto.getSalesOrderSid());
             if (busSalesOrderInsurance != null) {
                 String remarks = dto.getRemarks();
-                updateByOrderSid(dto.getSaleOrderSid(), remarks);
+                updateByOrderSid(dto.getSalesOrderSid(), remarks);
             } else {
                 if (StringUtils.isNotBlank(dto.getRemarks())) {
                     BusSalesOrderInsurance busSalesOrderInsurance1 = new BusSalesOrderInsurance();
-                    busSalesOrderInsurance1.setSalesOrderSid(dto.getSaleOrderSid());
+                    busSalesOrderInsurance1.setSalesOrderSid(dto.getSalesOrderSid());
                     busSalesOrderInsurance1.setRemarks(dto.getRemarks());
                     baseMapper.insert(busSalesOrderInsurance1);
                 }
             }
         }
         //更新销售订单的是否包含保险的字段
-        busSalesOrderService.updateIsInsurance(dto.getIsInsureType(), dto.getSaleOrderSid());
+        busSalesOrderService.updateIsInsurance(dto.getIsInsureType(), dto.getSalesOrderSid());
         return rb.success().setMsg("保存成功");
 
     }
diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/AppBusSalesOrderFeign.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/AppBusSalesOrderFeign.java
index 3717b5ac69..9cff5ba2f8 100644
--- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/AppBusSalesOrderFeign.java
+++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/AppBusSalesOrderFeign.java
@@ -170,6 +170,6 @@ public interface AppBusSalesOrderFeign {
     @ApiOperation("初始化保险信息")
     @GetMapping("/init/InsuranceInfo/{saleOrderSid}")
     @ResponseBody
-    ResultBean<InsuranceInfoVo> getInsurance(@PathVariable(value = "saleOrdersSid") String sid);
+    ResultBean<InsuranceInfoVo> getInsurance(@PathVariable(value = "saleOrderSid") String sid);
 
 }
\ No newline at end of file
diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/insurance/InsuranceInfoDto.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/insurance/InsuranceInfoDto.java
index dd69338696..16a25f0bab 100644
--- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/insurance/InsuranceInfoDto.java
+++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/insurance/InsuranceInfoDto.java
@@ -28,6 +28,8 @@ public class InsuranceInfoDto implements Dto {
     @ApiModelProperty(value = "备注")
     private String remarks;
     @ApiModelProperty(value = "销售订单sid")
-    private String saleOrderSid;
+    @JsonProperty(value = "saleOrderSid")
+    private String salesOrderSid;
+
 
 }