From f1baf802c7bd2750c1cff87cc784e3ac72943d95 Mon Sep 17 00:00:00 2001
From: God <10745413@qq.com>
Date: Sat, 7 May 2022 09:31:08 +0800
Subject: [PATCH] =?UTF-8?q?=E9=94=80=E5=94=AE=E8=AE=A2=E5=8D=95=E5=BC=80?=
 =?UTF-8?q?=E7=A5=A8=E9=87=91=E9=A2=9D=E7=A7=BB=E5=8A=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/yxt/anrui/buscenter/api/busorder/BusOrder.java     | 3 ---
 .../yxt/anrui/buscenter/api/busorder/BusOrderFeign.java    | 3 ---
 .../buscenter/api/busorder/BusOrderFeignFallback.java      | 5 -----
 .../anrui/buscenter/api/bussalesorder/BusSalesOrder.java   | 4 +++-
 .../buscenter/api/bussalesorder/BusSalesOrderFeign.java    | 3 +++
 .../api/bussalesorder/BusSalesOrderFeignFallback.java      | 5 +++++
 .../yxt/anrui/buscenter/biz/busorder/BusOrderMapper.java   | 2 --
 .../com/yxt/anrui/buscenter/biz/busorder/BusOrderRest.java | 6 ------
 .../yxt/anrui/buscenter/biz/busorder/BusOrderService.java  | 5 -----
 .../buscenter/biz/bussalesorder/BusSalesOrderMapper.java   | 4 ++++
 .../buscenter/biz/bussalesorder/BusSalesOrderRest.java     | 7 +++++++
 .../buscenter/biz/bussalesorder/BusSalesOrderService.java  | 5 +++++
 .../biz/finbillapplication/FinBillApplicationService.java  | 6 ++++--
 13 files changed, 31 insertions(+), 27 deletions(-)

diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busorder/BusOrder.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busorder/BusOrder.java
index df25ace011..5b440e434c 100644
--- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busorder/BusOrder.java
+++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busorder/BusOrder.java
@@ -108,7 +108,4 @@ public class BusOrder extends BaseEntity {
 
     @ApiModelProperty(value = "分公司sid")
     private String useOrgSid;
-
-    @ApiModelProperty("单台开票金额")
-    private BigDecimal oneBillMoney; // 单台开票金额
 }
diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busorder/BusOrderFeign.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busorder/BusOrderFeign.java
index 8af6d2519e..582c768be9 100644
--- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busorder/BusOrderFeign.java
+++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busorder/BusOrderFeign.java
@@ -189,7 +189,4 @@ public interface BusOrderFeign {
      */
     @PostMapping("/doneTaskList/{userSid}")
     public ResultBean doneTaskList(@ApiParam(value = "用户sid") @PathVariable(value = "userSid") String userSid,@ApiParam(value = "变量集合,json对象") @RequestBody PagerQuery<TaskQuery> pQuery);
-
-    @PostMapping("/updateOneBillMoneyByOrderSid")
-    ResultBean<Integer> updateOneBillMoneyByOrderSid(@RequestParam("orderSid") String orderSid,@RequestParam("oneBillMoney") String oneBillMoney);
 }
\ No newline at end of file
diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busorder/BusOrderFeignFallback.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busorder/BusOrderFeignFallback.java
index 04bb39bc9b..e8ef558431 100644
--- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busorder/BusOrderFeignFallback.java
+++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busorder/BusOrderFeignFallback.java
@@ -200,9 +200,4 @@ public class BusOrderFeignFallback implements BusOrderFeign {
         return null;
     }
 
-    @Override
-    public ResultBean<Integer> updateOneBillMoneyByOrderSid(String orderSid, String oneBillMoney) {
-        return null;
-    }
-
 }
\ No newline at end of file
diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/BusSalesOrder.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/BusSalesOrder.java
index a4ffc10139..9ed200c8b9 100644
--- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/BusSalesOrder.java
+++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/BusSalesOrder.java
@@ -32,6 +32,7 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.math.BigDecimal;
 import java.util.Date;
 
 /**
@@ -101,5 +102,6 @@ public class BusSalesOrder extends BaseEntity {
     private String procInstId;
     @ApiModelProperty("销售订单车辆类型：1现车、2订单、3排产")
     private String type;
-
+    @ApiModelProperty("单台开票金额")
+    private BigDecimal oneBillMoney; // 单台开票金额
 }
diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/BusSalesOrderFeign.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/BusSalesOrderFeign.java
index c46712245a..8286764848 100644
--- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/BusSalesOrderFeign.java
+++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/BusSalesOrderFeign.java
@@ -74,6 +74,9 @@ public interface BusSalesOrderFeign {
     @ResponseBody
     public ResultBean<BusSalesOrderDetailsVo> fetchDetailsBySid(@PathVariable("sid") String sid);
 
+    @PostMapping("/updateOneBillMoneyByOrderSid")
+    ResultBean<Integer> updateOneBillMoneyByOrderSid(@RequestParam("orderSid") String orderSid,@RequestParam("oneBillMoney") String oneBillMoney);
+
     @ApiOperation("提交")
     @PostMapping("/submit")
     @ResponseBody
diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/BusSalesOrderFeignFallback.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/BusSalesOrderFeignFallback.java
index 616e383cd8..b096438dc8 100644
--- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/BusSalesOrderFeignFallback.java
+++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/BusSalesOrderFeignFallback.java
@@ -68,6 +68,11 @@ public class BusSalesOrderFeignFallback implements BusSalesOrderFeign {
 		return rb.setMsg("接口anrui-buscenter/bussalesorder/fetchDetailsBySid无法访问");
 	}
 
+	@Override
+	public ResultBean<Integer> updateOneBillMoneyByOrderSid(String orderSid, String oneBillMoney) {
+		return null;
+	}
+
 	@Override
 	public ResultBean submit(BusSalesOrderAllDto dto) {
 		return null;
diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busorder/BusOrderMapper.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busorder/BusOrderMapper.java
index c1fffd1694..2f1fdceb2a 100644
--- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busorder/BusOrderMapper.java
+++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busorder/BusOrderMapper.java
@@ -78,6 +78,4 @@ public interface BusOrderMapper extends BaseMapper<BusOrder> {
 
     int selectCountByOrgSidAndMonth(@Param("orgSid") String orgSid);
 
-    @Update("update bus_order set oneBillMoney = #{oneBillMoney} where sid = #{orderSid}")
-    int updateOneBillMoneyByOrderSid(@Param("orderSid") String orderSid,@Param("oneBillMoney") String oneBillMoney);
 }
\ No newline at end of file
diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busorder/BusOrderRest.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busorder/BusOrderRest.java
index 3be5c9a967..d8b2322800 100644
--- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busorder/BusOrderRest.java
+++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busorder/BusOrderRest.java
@@ -501,11 +501,5 @@ public class BusOrderRest implements BusOrderFeign {
         return busOrderService.doneTaskList(userSid,pQuery);
     }
 
-    @Override
-    public ResultBean<Integer> updateOneBillMoneyByOrderSid(String orderSid,String oneBillMoney) {
-        ResultBean rb = ResultBean.fireFail();
-        int i = busOrderService.updateOneBillMoneyByOrderSid(orderSid, oneBillMoney);
-        return rb.success().setMsg("操作成功");
-    }
 /***********-------------流程----------********************/
 }
diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busorder/BusOrderService.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busorder/BusOrderService.java
index 9b63ba0575..b5b176346d 100644
--- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busorder/BusOrderService.java
+++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busorder/BusOrderService.java
@@ -989,9 +989,4 @@ public class BusOrderService extends MybatisBaseService<BusOrderMapper, BusOrder
             busOrderDiscountService.deleteBySid(s);
         }
     }
-
-    public int updateOneBillMoneyByOrderSid(String orderSid,String oneBillMoney) {
-        int i = baseMapper.updateOneBillMoneyByOrderSid(orderSid, oneBillMoney);
-        return i;
-    }
 }
\ No newline at end of file
diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderMapper.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderMapper.java
index 2156b7846c..842e7921da 100644
--- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderMapper.java
+++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderMapper.java
@@ -33,6 +33,7 @@ import com.yxt.anrui.buscenter.api.bussalesorder.BusSalesOrder;
 import com.yxt.anrui.buscenter.api.bussalesorder.BusSalesOrderVo;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Update;
 
 /**
  * Project: anrui-buscenter(业务管理) <br/>
@@ -54,4 +55,7 @@ public interface BusSalesOrderMapper extends BaseMapper<BusSalesOrder> {
     void modifyFlowState(@Param("businessSid") String businessSid, @Param("procDefId") String procDefId, @Param("nodeState") String nodeState,
                          @Param("procInstSid") String procInstSid, @Param("nodeSid") String nodeSid);
 
+
+    @Update("update bus_order set oneBillMoney = #{oneBillMoney} where sid = #{orderSid}")
+    int updateOneBillMoneyByOrderSid(@Param("orderSid") String orderSid,@Param("oneBillMoney") String oneBillMoney);
 }
\ No newline at end of file
diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderRest.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderRest.java
index 7063bdc32f..0e96b26199 100644
--- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderRest.java
+++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderRest.java
@@ -93,6 +93,13 @@ public class BusSalesOrderRest implements BusSalesOrderFeign {
         return rb.success().setData(vo);
     }
 
+    @Override
+    public ResultBean<Integer> updateOneBillMoneyByOrderSid(String orderSid,String oneBillMoney) {
+        ResultBean rb = ResultBean.fireFail();
+        int i = busSalesOrderService.updateOneBillMoneyByOrderSid(orderSid, oneBillMoney);
+        return rb.success().setMsg("操作成功");
+    }
+
     @Override
     public ResultBean submit(BusSalesOrderAllDto dto) {
         return busSalesOrderService.submit(dto);
diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java
index 2d92294200..a2c3e71cbe 100644
--- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java
+++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java
@@ -465,4 +465,9 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
         sysFormLinkFeign.updateFiled(map);
         return new ResultBean().success();
     }
+
+    public int updateOneBillMoneyByOrderSid(String orderSid,String oneBillMoney) {
+        int i = baseMapper.updateOneBillMoneyByOrderSid(orderSid, oneBillMoney);
+        return i;
+    }
 }
\ No newline at end of file
diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillapplication/FinBillApplicationService.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillapplication/FinBillApplicationService.java
index 5acf8dad18..d32a7864f8 100644
--- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillapplication/FinBillApplicationService.java
+++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillapplication/FinBillApplicationService.java
@@ -37,6 +37,7 @@ import com.yxt.anrui.base.api.commoncontract.CommonContractVo;
 import com.yxt.anrui.buscenter.api.busorder.BusOrderFeign;
 import com.yxt.anrui.buscenter.api.busorder.BusOrderVo;
 import com.yxt.anrui.buscenter.api.busordermodel.BusOrderModelFeign;
+import com.yxt.anrui.buscenter.api.bussalesorder.BusSalesOrderFeign;
 import com.yxt.anrui.fin.api.finbillapplication.*;
 import com.yxt.anrui.fin.api.finbillapplicationpublic.FinBillApplicationPublic;
 import com.yxt.anrui.fin.api.finbillapplicationpublic.FinBillApplicationPublicDto;
@@ -74,7 +75,6 @@ import com.yxt.common.core.vo.PagerVo;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
-import java.math.BigDecimal;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -120,6 +120,8 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
     @Autowired
     private SysOrganizationFeign sysOrganizationFeign;
     @Autowired
+    private BusSalesOrderFeign busSalesOrderFeign;
+    @Autowired
     private BusOrderFeign busOrderFeign;
 
     private QueryWrapper<FinBillApplication> createQueryWrapper(FinBillApplicationQuery query) {
@@ -362,7 +364,7 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
         BusOrderVo data1 = busOrderVoResultBean.getData();
         String orderSid = data1.getOrderSid();
         if (StringUtils.isNotBlank(oneBillMoney)){
-            busOrderFeign.updateOneBillMoneyByOrderSid(orderSid,oneBillMoney);
+            busSalesOrderFeign.updateOneBillMoneyByOrderSid(orderSid,oneBillMoney);
         }
         updateBySid(dto, dtoSid);
         BeanUtil.copyProperties(finBillApplicationPublic, finBillApplicationPublicDto);