销售订单开票金额移动

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/BusSalesOrderDetailsVo.java

@@ -40,6 +40,8 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.math.BigDecimal;
+import java.util.Date;
 import java.util.List;
 
 /**
@@ -96,7 +98,7 @@ public class BusSalesOrderDetailsVo implements Vo {
     private String isTop;
     @ApiModelProperty("销售订单车辆类型：1现车、2订单、3排产")
     private String type;
-    
+
     @ApiModelProperty(value = "主车车型信息")
     private BusSalesOrderModelVo busSalesOrderModel;
     @ApiModelProperty(value = "现车车辆信息")
@@ -116,4 +118,6 @@ public class BusSalesOrderDetailsVo implements Vo {
     @ApiModelProperty(value = "虚拟订单和订金关联信息")
     private List<BusDepositFictitiousVo> busDepositFictitiousList;
 
+    @ApiModelProperty("单台开票金额")
+    private String oneBillMoney; // 单台开票金额
 }

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

@@ -74,5 +74,4 @@ public interface BusSalesOrderModelFeign {
     @ResponseBody
     public ResultBean<BusSalesOrderModelDetailsVo> fetchDetailsBySid(@PathVariable("sid") String sid);
 
-//    ResultBean<>
 }

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorderprice/BusSalesOrderPriceFeign.java

@@ -75,4 +75,8 @@ public interface BusSalesOrderPriceFeign {
     @GetMapping("/fetchDetailsBySid/{sid}")
     @ResponseBody
     public ResultBean<BusSalesOrderPriceDetailsVo> fetchDetailsBySid(@PathVariable("sid") String sid);
+
+    @ApiOperation("根据订单sid查询单台成交价")
+    @GetMapping("/getPriceByOrderSid")
+    ResultBean<String> getPriceByOrderSid(@RequestParam(value = "busSid") String busSid);
 }

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorderprice/BusSalesOrderPriceFeignFallback.java

@@ -69,4 +69,9 @@ public class BusSalesOrderPriceFeignFallback implements BusSalesOrderPriceFeign
 		ResultBean rb = ResultBean.fireFail();
 		return rb.setMsg("接口anrui-buscenter/bussalesorderprice/fetchDetailsBySid无法访问");
 	}
+
+	@Override
+	public ResultBean<String> getPriceByOrderSid(String busSid) {
+		return null;
+	}
 }

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

@@ -56,6 +56,6 @@ public interface BusSalesOrderMapper extends BaseMapper<BusSalesOrder> {
                          @Param("procInstSid") String procInstSid, @Param("nodeSid") String nodeSid);
 
 
-    @Update("update bus_order set oneBillMoney = #{oneBillMoney} where sid = #{orderSid}")
+    @Update("update bus_sales_order set oneBillMoney = #{oneBillMoney} where sid = #{orderSid}")
     int updateOneBillMoneyByOrderSid(@Param("orderSid") String orderSid,@Param("oneBillMoney") String oneBillMoney);
 }

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

@@ -64,4 +64,7 @@ public interface BusSalesOrderPriceMapper extends BaseMapper<BusSalesOrderPrice>
     List<BusSalesOrderPriceVo> selectListVo();
 
     BusSalesOrderPrice selectBySalesOrderSid(String sid);
+
+    @Select("select singleFinalPrice from bus_sales_order_price where salesOrderSid = #{busSid}")
+    String getPriceByOrderSid(String busSid);
 }

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

@@ -90,4 +90,11 @@ public class BusSalesOrderPriceRest implements BusSalesOrderPriceFeign {
 		BusSalesOrderPriceDetailsVo vo = busSalesOrderPriceService.fetchDetailsVoBySid(sid);
 		return rb.success().setData(vo);
 	}
+
+	@Override
+	public ResultBean<String> getPriceByOrderSid(String busSid) {
+		ResultBean rb = ResultBean.fireFail();
+		String price = busSalesOrderPriceService.getPriceByOrderSid(busSid);
+		return rb.success().setData(price);
+	}
 }

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

@@ -96,4 +96,8 @@ public class BusSalesOrderPriceService extends MybatisBaseService<BusSalesOrderP
         baseMapper.updateById(busSalesOrderPrice);
 
     }
+
+    public String getPriceByOrderSid(String busSid) {
+        return baseMapper.getPriceByOrderSid(busSid);
+    }
 }

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillapplication/FinBillApplicationService.java

@@ -34,10 +34,10 @@ import com.yxt.anrui.base.api.commonappendix.CommonAppendixVo;
 import com.yxt.anrui.base.api.commonappendix.CommonAttachTypeEnum;
 import com.yxt.anrui.base.api.commoncontract.CommonContractFeign;
 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.BusSalesOrderDetailsVo;
 import com.yxt.anrui.buscenter.api.bussalesorder.BusSalesOrderFeign;
+import com.yxt.anrui.buscenter.api.bussalesordermodel.BusSalesOrderModelFeign;
+import com.yxt.anrui.buscenter.api.bussalesorderprice.BusSalesOrderPriceFeign;
 import com.yxt.anrui.fin.api.finbillapplication.*;
 import com.yxt.anrui.fin.api.finbillapplicationpublic.FinBillApplicationPublic;
 import com.yxt.anrui.fin.api.finbillapplicationpublic.FinBillApplicationPublicDto;
@@ -116,13 +116,13 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
     @Autowired
     private CommonContractFeign commonContractFeign;
     @Autowired
-    private BusOrderModelFeign busOrderModelFeign;
+    private BusSalesOrderModelFeign busSalesOrderModelFeign;
+    @Autowired
+    private BusSalesOrderPriceFeign busSalesOrderPriceFeign;
     @Autowired
     private SysOrganizationFeign sysOrganizationFeign;
     @Autowired
     private BusSalesOrderFeign busSalesOrderFeign;
-    @Autowired
-    private BusOrderFeign busOrderFeign;
 
     private QueryWrapper<FinBillApplication> createQueryWrapper(FinBillApplicationQuery query) {
         // todo: 这里根据具体业务调整查询条件
@@ -131,10 +131,10 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
         qw.eq("fba.useOrgSid", query.getUseOrgSid());
         qw.eq("fba.createBySid", query.getStaffSid());
         if (StringUtils.isNotBlank(query.getContractNo())) {
-            qw.eq("fba.contractNo", query.getContractNo());
+            qw.like("fba.contractNo", query.getContractNo());
         }
         if (StringUtils.isNotBlank(query.getCustomerName())) {
-            qw.eq("fba.customerName", query.getCustomerName());
+            qw.like("fba.customerName", query.getCustomerName());
         }
         if (StringUtils.isNotBlank(query.getBillTypeKey())) {
             qw.eq("fbv.billTypeKey", query.getBillTypeKey());
@@ -148,10 +148,10 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
                 apply(StringUtils.isNotEmpty(applyEndDate), "date_format (applyDate,'%Y-%m-%d') <= date_format('" + applyEndDate + "','%Y-%m-%d')"
                 );
         if (StringUtils.isNotBlank(query.getCreateByName())) {
-            qw.eq("fba.createByName", query.getCreateByName());
+            qw.like("fba.createByName", query.getCreateByName());
         }
         if (StringUtils.isNotBlank(query.getBillState())) {
-            qw.eq("fba.billState", query.getBillState());
+            qw.like("fba.billState", query.getBillState());
         }
         return qw;
     }
@@ -302,6 +302,9 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
             finBillFile.setCreateByName(commonAppendixDto.getName());
             ResultBean<CommonAppendixVo> commonAppendixVoResultBean = commonAppendixFeign.fetchByFilePath(filePath);
             CommonAppendixVo data = commonAppendixVoResultBean.getData();
+            if (data == null){
+                return rb.setMsg("请上传相关附件");
+            }
             String sid1 = data.getSid();
             finBillFile.setFileSid(sid1);
             finBillFileService.save(finBillFile);
@@ -324,6 +327,9 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
             finBillFile.setCreateByName(commonAppendixDto.getName());
             ResultBean<CommonAppendixVo> commonAppendixVoResultBean = commonAppendixFeign.fetchByFilePath(filePath);
             CommonAppendixVo data = commonAppendixVoResultBean.getData();
+            if (data == null){
+                return rb.setMsg("请上传相关附件");
+            }
             String sid1 = data.getSid();
             finBillFile.setFileSid(sid1);
             finBillFileService.save(finBillFile);
@@ -346,6 +352,9 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
             finBillFile.setCreateByName(commonAppendixDto.getName());
             ResultBean<CommonAppendixVo> commonAppendixVoResultBean = commonAppendixFeign.fetchByFilePath(filePath);
             CommonAppendixVo data = commonAppendixVoResultBean.getData();
+            if (data == null){
+                return rb.setMsg("请上传相关附件");
+            }
             String sid1 = data.getSid();
             finBillFile.setFileSid(sid1);
             finBillFileService.save(finBillFile);
@@ -359,10 +368,7 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
         String sid1 = dto.getContractSid();
         ResultBean<CommonContractVo> commonContractVoResultBean = commonContractFeign.fetchBySid(sid1);
         CommonContractVo data = commonContractVoResultBean.getData();
-        String busSid = data.getBusSid();
-        ResultBean<BusOrderVo> busOrderVoResultBean = busOrderFeign.fetchSid(busSid);
-        BusOrderVo data1 = busOrderVoResultBean.getData();
-        String orderSid = data1.getOrderSid();
+        String orderSid = data.getBusSid();
         if (StringUtils.isNotBlank(oneBillMoney)){
             busSalesOrderFeign.updateOneBillMoneyByOrderSid(orderSid,oneBillMoney);
         }
@@ -404,8 +410,8 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
         ResultBean<CommonContractVo> commonContractVoResultBean = commonContractFeign.fetchBySid(sid1);
         CommonContractVo data = commonContractVoResultBean.getData();
         String busSid = data.getBusSid();
-        ResultBean<BusOrderVo> busOrderVoResultBean = busOrderFeign.fetchSid(busSid);
-        BusOrderVo data1 = busOrderVoResultBean.getData();
+        ResultBean<BusSalesOrderDetailsVo> busSalesOrderDetailsVoResultBean = busSalesOrderFeign.fetchDetailsBySid(busSid);
+        BusSalesOrderDetailsVo data1 = busSalesOrderDetailsVoResultBean.getData();
         String oneBillMoney = data1.getOneBillMoney();
         if (StringUtils.isBlank(oneBillMoney)){
             vo.setOneBillState("0");
@@ -452,7 +458,8 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
         ResultBean<CommonContractVo> commonContractVoResultBean = commonContractFeign.fetchBySid(contractSid);
         CommonContractVo data1 = commonContractVoResultBean.getData();
         String busSid = data1.getBusSid();
-        String price = busOrderModelFeign.getPriceByOrderSid(busSid);
+        ResultBean<String> priceByOrderSid = busSalesOrderPriceFeign.getPriceByOrderSid(busSid);
+        String price = priceByOrderSid.getData();
         if (price.equals(oneBillMoney)) {
             variables.put("isHighAndLowOpen",false);
         } else {

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillfile/FinBillFileService.java

@@ -123,11 +123,11 @@ public class FinBillFileService extends MybatisBaseService<FinBillFileMapper, Fi
 	}
 
 	public List<FinBillFileAppendxVo> fetchFileBySid(String billAppSid, String fileType) {
-		FinBillFileAppendxVo finBillFileAppendxVo = new FinBillFileAppendxVo();
 		ArrayList<FinBillFileAppendxVo> finBillFileAppendxVos = new ArrayList<>();
 		List<FinBillFileDetailsVo> finBillFileDetailsVos = baseMapper.fetchFileBySid(billAppSid, fileType);
 		String path = "";
 		for (FinBillFileDetailsVo finBillFileDetailsVo : finBillFileDetailsVos) {
+			FinBillFileAppendxVo finBillFileAppendxVo = new FinBillFileAppendxVo();
 			String fileUrl = finBillFileDetailsVo.getFileUrl();
 			String urlPrefix = fileUploadComponent.getUrlPrefix();
 			path = urlPrefix + fileUrl;