开票订单显示车牌

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

@@ -28,6 +28,10 @@
 						<el-input type="text" v-model="p.infoNo"></el-input>
 					</div>
 					<div class="c-item">
+						<label class="c1-label">车牌号：</label>
+						<el-input type="text" v-model="p.carNo"></el-input>
+					</div>
+					<div class="c-item">
 						<label class="c1-label">微信支付订单：</label>
 						<el-input type="text" v-model="p.transactionId"></el-input>
 					</div>
@@ -54,6 +58,7 @@
 					<sa-td type="selection"></sa-td>
 
 					<sa-td name="业务名称" prop="businessName" ></sa-td>
+					<sa-td name="车牌号" prop="carNo" width="100px"></sa-td>
 					<el-table-column label="业务订单号" width="150px">
 						<template slot-scope="s">
 							<el-tooltip :content="s.row.businessNo"placement="bottom"effect="light">
@@ -116,7 +121,8 @@
 						customerId: '',		// 客户id 
 						businessId: '',		// 业务订单id 
 						businessName: '',		// 业务名称 
-						businessNo: '',		// 业务订单号 
+						businessNo: '',		// 业务订单号
+						carNo: '',         //车牌号
 						transactionId: '',		// 微信支付订单号 
 						billMoney: '',		// 账单金额 
 						status: '',		// 支付状态(0=未开票,1=已开票) 

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

@@ -58,9 +58,13 @@ public class TbInvoiceOrder implements Serializable {
 	/**
 	 * 业务订单号 
 	 */
-	public String businessNo;	
+	public String businessNo;
 
-	/**
+    /**
+     * 车牌号
+     */
+    public String carNo;
+    /**
 	 * 微信支付订单号 
 	 */
 	public String transactionId;	

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

@@ -5,8 +5,8 @@
 	<!-- 增 [G] -->
 	<insert id="add">
 		insert into 
-		tb_invoice_order (id, customer_id, business_id, business_name, business_no, transaction_id, bill_money, bill_image, status, invoice_time, create_time, info_id, info_no)
-		values (#{id}, #{customerId}, #{businessId}, #{businessName}, #{businessNo}, #{transactionId}, #{billMoney}, #{billImage}, #{status}, #{invoiceTime}, #{createTime}, #{infoId},#{infoNo})
+		tb_invoice_order (id, customer_id, business_id, business_name, business_no, car_no, transaction_id, bill_money, bill_image, status, invoice_time, create_time, info_id, info_no)
+		values (#{id}, #{customerId}, #{businessId}, #{businessName}, #{businessNo}, #{carNo}, #{transactionId}, #{billMoney}, #{billImage}, #{status}, #{invoiceTime}, #{createTime}, #{infoId},#{infoNo})
 	</insert>
 
 	<!-- 删 -->
@@ -45,6 +45,7 @@
 		<result property="businessId" column="business_id" />
 		<result property="businessName" column="business_name" />
 		<result property="businessNo" column="business_no" />
+        <result property="carNo" column="car_no" />
 		<result property="transactionId" column="transaction_id" />
 		<result property="billMoney" column="bill_money" />
 		<result property="billImage" column="bill_image" />
@@ -76,6 +77,7 @@
 			<if test=' this.has("businessId") '> and business_id = #{businessId} </if>
 			<if test=' this.has("businessName") '> and business_name = #{businessName} </if>
 			<if test=' this.has("businessNo") '> and business_no = #{businessNo} </if>
+            <if test=' this.has("carNo") '> and car_no like concat('%',#{carNo},'%') </if>
 			<if test=' this.has("transactionId") '> and transaction_id = #{transactionId} </if>
 			<if test=' this.has("billMoney") '> and bill_money = #{billMoney} </if>
 			<if test=' this.has("status") '> and status = #{status} </if>

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

@@ -4,6 +4,7 @@ import java.io.File;
 import java.math.BigDecimal;
 import java.time.Month;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.Date;
 import java.util.List;
 import java.util.stream.Collectors;
@@ -92,6 +93,7 @@ public class TbInvoiceOrderService extends ServiceImpl<TbInvoiceOrderMapper, TbI
         }
         List<String> businessNameList = new ArrayList<>();
         List<String> businessNoList = new ArrayList<>();
+        List<String> carNos = new ArrayList<>();
         TbOrder tbOrder = tbOrderService.findByTransactionId(transactionId);
         if(tbOrder == null){
             throw new BusinessException("不存在该交易单号的业务订单");
@@ -107,6 +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);
+                for (String no : carNoList) {
+                    if(!carNos.contains(no)){
+                        carNos.add(no);
+                    }
+                }
+
                 TbGoods good = tbGoodsService.getById(tbBusiness.getGoodsId());
                 businessNameList.add(good.getName());
                 //微信回调的情况下，获取整车业务的客户id
@@ -131,7 +142,8 @@ public class TbInvoiceOrderService extends ServiceImpl<TbInvoiceOrderMapper, TbI
 
         String businessNameStr = businessNameList.stream().map(String::valueOf).collect(Collectors.joining(","));
         String businessNoStr = businessNoList.stream().map(String::valueOf).collect(Collectors.joining(","));
-        t.setBusinessName(businessNameStr).setBusinessNo(businessNoStr).setStatus(1)
+        String carNoStr = carNos.stream().map(String::valueOf).collect(Collectors.joining(","));
+        t.setBusinessName(businessNameStr).setBusinessNo(businessNoStr).setCarNo(carNoStr).setStatus(1)
                 .setTransactionId(transactionId).setBillMoney(billMoney)
                 .setStatus(0).setCreateTime(new Date());
         tbInvoiceOrderMapper.add(t);