bug调整

sp-admin/sa-view/tb-invoice-order/tb-invoice-order-list.html

@@ -57,8 +57,8 @@
 				<el-table class="data-table" ref="data-table" :data="dataList" >
 					<sa-td type="selection"></sa-td>
 
-					<sa-td name="业务名称" prop="businessName" ></sa-td>
-					<sa-td name="车牌号" prop="carNo" width="100px"></sa-td>
+					<sa-td name="业务名称" prop="businessName" width="150px" ></sa-td>
+					<sa-td name="车牌号" prop="carNo" width="150px"></sa-td>
 					<el-table-column label="业务订单号" width="150px">
 						<template slot-scope="s">
 							<el-tooltip :content="s.row.businessNo"placement="bottom"effect="light">
@@ -72,7 +72,7 @@
 					<sa-td name="账单金额" prop="billMoney" ></sa-td>
 					<sa-td name="账单截图" prop="billImage" type="img"></sa-td>
 					<sa-td name="开票状态" prop="status" type="enum" :jv="{0: '待申请', 1: '已申请', 2: '已开票'}"></sa-td>
-					<sa-td name="开票时间" prop="invoiceTime" ></sa-td>
+					<sa-td name="开票时间" prop="invoiceTime" width="100px"></sa-td>
 					<sa-td name="开票信息" prop="infoNo" width="130"></sa-td>
 					<el-table-column label="操作" fixed="right"  width="240px">
 						<template slot-scope="s">

sp-server/src/main/java/com/pj/project/tb_invoice_info/TbInvoiceInfoService.java

@@ -186,7 +186,8 @@ public class TbInvoiceInfoService extends ServiceImpl<TbInvoiceInfoMapper, TbInv
             List<FeeDeatilsGroup> partGroups = collect.get(key);
             FeeDeatilsGroup realGroup = new FeeDeatilsGroup();
             realGroup.setItemTypeName(partGroups.get(0).getItemTypeName())
-            .setUnitPrice(partGroups.get(0).getUnitPrice());
+            .setUnitPrice(partGroups.get(0).getUnitPrice())
+            .setTaxRate(partGroups.get(0).getTaxRate());
             for (FeeDeatilsGroup partGroup : partGroups) {
                 realGroup.setItemPrice(realGroup.getItemPrice().add(partGroup.getItemPrice()))
                 .setNoTaxPrice(realGroup.getNoTaxPrice().add(partGroup.getNoTaxPrice()))

sp-server/src/main/java/com/pj/project/tb_invoice_order/TbInvoiceOrderService.java

@@ -109,9 +109,15 @@ public class TbInvoiceOrderService extends ServiceImpl<TbInvoiceOrderMapper, TbI
 
             for (TbBusiness tbBusiness : businessList) {
                 businessNoList.add(tbBusiness.getNo());
-                List<String> carNoList = StrUtil.split(tbBusiness.getCardNo(), "、");
-                List<String> chinaCarNoList = StrUtil.split(tbBusiness.getChinaCarNo(), "、");
-                carNoList.addAll(chinaCarNoList);
+                List<String> carNoList = new ArrayList<>();
+                if(StrUtil.isNotEmpty(tbBusiness.getCardNo())){
+                    carNoList.addAll(StrUtil.split(tbBusiness.getCardNo(), "、"));
+                }
+                if(StrUtil.isNotEmpty(tbBusiness.getChinaCarNo())){
+                    carNoList.addAll(StrUtil.split(tbBusiness.getChinaCarNo(), "、"));
+                }
+//                List<String> yuecarNoList = StrUtil.split(tbBusiness.getCardNo(), "、");
+//                List<String> chinaCarNoList = StrUtil.split(tbBusiness.getChinaCarNo(), "、");
                 for (String no : carNoList) {
                     if(!carNos.contains(no)){
                         carNos.add(no);
@@ -137,6 +143,9 @@ public class TbInvoiceOrderService extends ServiceImpl<TbInvoiceOrderMapper, TbI
             for (PriceBO bo1 : cars) {
                 TbBusinessCar car = tbBusinessCarService.getById(bo1.getId());
                 businessNoList.add(car.getNo());
+                if(!carNos.contains(car.getCarNo())){
+                    carNos.add(car.getCarNo());
+                }
             }
         }