Răsfoiți Sursa

Merge branch 'feature/relation_type_item' into feature/push_invoice

# Conflicts:
#	sp-server/src/main/resources/application-dev.yml
lzm 3 ani în urmă
părinte
comite
5f95168f1e

+ 5 - 0
sp-admin/sa-frame/menu-list.js

@@ -308,6 +308,11 @@ var menuList = [{
 						name: '账单确认',
 						isShow: false
 					},
+					{
+						id: 'tb-business-zx-print',
+						name: '装卸打印',
+						isShow: false
+					},
 				]
 			},
 

+ 227 - 0
sp-admin/sa-view/tb-business/print-zxbusiness.html

@@ -0,0 +1,227 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+        "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+    <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
+    <title>打印业务确认单</title>
+    <style type="text/css">
+        body {
+            left: 0px;
+            top: 0px;
+            right: 0px;
+            bottom: 0px;
+            margin: 0px;
+            font-family: Arial, Helvetica, sans-serif;
+            font-size: 12px;
+            overflow: hidden;
+            white-space: nowrap;
+        }
+
+
+    </style>
+    <script src="../../static/print/jquery-2.0.3.js" type="text/javascript"></script>
+    <script src="../../static/print/jquery.jPrintArea.js" type="text/javascript"></script>
+    <script src="../../static/sa.js"></script>
+
+</head>
+
+<body>
+
+<div>
+
+    <input type="button" style="height: 30;" id="print_button" value="打印"/>
+
+    <fieldset align="">
+        <legend>打印区</legend>
+        <div id="myPrintArea" style="height: 1500;">
+            <div align="center">
+                <SPAN style="font-size:15px">东兴二桥口岸疫情防控进口接驳区业务确认单</SPAN>
+                <br/><br/>
+            </div>
+            <div style="text-align:center; font-size:15px;">
+                <table id="one" width="100%" style="border-collapse:collapse;border:none;">
+                    <tr height="50">
+                        <td style="border:solid #000 1px;text-align: left;" colspan="4">单位:广西东兴北投口岸投资有限公司</td>
+                        <td style="border:solid #000 1px;text-align: left;" colspan="3">单证编号:
+                            <span id="businessNo"></span>
+                        </td>
+                    </tr>
+                    <tr height="50">
+                        <td style="border:solid #000 1px;text-align: left;" colspan="7">作业时间:
+                            <span id="operateTime"></span>
+                        </td>
+                    </tr>
+                    <tr height="50">
+                        <td style="border:solid #000 1px;text-align: left;" colspan="7"><b>车辆信息:</b></td>
+                    </tr>
+                    <tr height="50">
+                        <td style="border:solid #000 1px;text-align: center;">车牌号</td>
+                        <td style="border:solid #000 1px;text-align: center;">类型</td>
+                        <td style="border:solid #000 1px;text-align: center;">载重(kg)</td>
+                        <td style="border:solid #000 1px;text-align: center;">规格(米)</td>
+                        <td style="border:solid #000 1px;text-align: center;">支付状态</td>
+                        <td style="border:solid #000 1px;text-align: center;">车辆状态</td>
+                        <td style="border:solid #000 1px;text-align: center;">停车费</td>
+                    </tr>
+                </table>
+<!--                <table id="two" width="100%" style="border-collapse:collapse;border:none;">-->
+<!--                    <tr height="80">-->
+<!--                        <td style="border:solid #000 1px;text-align: left;" colspan="7"><b>具体业务项:</b></td>-->
+<!--                    </tr>-->
+<!--                    <tr height="80">-->
+<!--                        <td style="border:solid #000 1px;text-align: center;">收费项</td>-->
+<!--                        <td style="border:solid #000 1px;text-align: center;">收费明细项</td>-->
+<!--                        <td style="border:solid #000 1px;text-align: center;">单价</td>-->
+<!--                        <td style="border:solid #000 1px;text-align: center;">计费标准</td>-->
+<!--                        <td style="border:solid #000 1px;text-align: center;">数量</td>-->
+<!--                        <td style="border:solid #000 1px;text-align: center;">合计</td>-->
+<!--                        <td style="border:solid #000 1px;text-align: center;">支付状态</td>-->
+<!--                    </tr>-->
+
+<!--                </table>-->
+                <br/><br/>
+
+            </div>
+            <!--            <div align="right">-->
+            <!--                <br/><br/>-->
+            <!--                <SPAN style=";font-size:15px">      &nbsp&nbsp&nbsp&nbsp  年  &nbsp&nbsp&nbsp&nbsp 月   &nbsp&nbsp&nbsp&nbsp 日</SPAN>-->
+
+            <!--            </div>-->
+
+        </div>
+    </fieldset>
+
+</div>
+
+<script type="text/javascript">
+    $(function () {
+        $("#print_button").click(function () {
+            $("#myPrintArea").printArea();
+        });
+
+        function getUrlParam(name) {
+            var reg = new RegExp("(^|&)" + name + "=([^&]*)(&|$)"); //构造一个含有目标参数的正则表达式对象
+            var r = window.location.search.substr(1).match(reg);  //匹配目标参数
+            if (r != null) return unescape(r[2]);
+            return null; //返回参数值
+        }
+
+        var id = getUrlParam('id');
+        var kaiDanPeople = '';
+        $.ajax({
+            url: sa.cfg.api_url + '/admin/getByCurr',
+            type: 'post',
+            success: function (data) {
+                var name = data.data.nickname;
+                if(name === '' || name == null) {
+                    name = data.data.name;
+                }
+                kaiDanPeople = name;
+            }
+        });
+        $.ajax({
+            url: sa.cfg.api_url + '/TbBusiness/getZxBusinessById?id=' + id,
+            type: 'post',
+            success: function (data) {
+                $("#businessNo").html(data.data.no)
+                $("#operateTime").html(data.data.operateTime);
+
+                var carList = data.data.cars;
+                var html = [];
+                $.each(carList, function (index, item) {
+                    let carNo = item.carNo;
+                    let carType = item.carType;
+                    let netWeight = item.netWeight;
+                    let carSize = item.carSize;
+                    let payType = item.payType
+                    let isLock = item.isLock;
+                    let money = item.money;
+                    if(isLock === 0){
+                        isLock = "正常"
+                    }else if(isLock === 1) {
+                        isLock = "锁定"
+                    }
+                    html.push(
+                        "<tr height=\"50\">"
+                        + "<td style=\"border:solid #000 1px;text-align: center;\">" + carNo + "</td>"
+                        + "<td style=\"border:solid #000 1px;text-align: center;\">" + carType + "</td>"
+                        + "<td style=\"border:solid #000 1px;text-align: center;\">" + netWeight + "</td>"
+                        + "<td style=\"border:solid #000 1px;text-align: center;\">" + carSize + "</td>"
+                        + "<td style=\"border:solid #000 1px;text-align: center;\">" + payType + "</td>"
+                        + "<td style=\"border:solid #000 1px;text-align: center;\">" + isLock + "</td>"
+                        + "<td style=\"border:solid #000 1px;text-align: center;\">" + money + "</td>"
+                        + "<tr>"
+                    );
+                })
+                html.push(
+                    "<tr height=\"50\">"
+                    + "<td style=\"border:solid #000 1px;text-align: left;\" colspan=\"7\"><b>具体业务项:</b></td>"
+                    + "<tr>"
+                );
+                html.push(
+                    "<tr height=\"50\">"
+                    + "<td style=\"border:solid #000 1px;text-align: center;\">" + "收费项" + "</td>"
+                    + "<td style=\"border:solid #000 1px;text-align: center;\">" + "收费明细项" + "</td>"
+                    + "<td style=\"border:solid #000 1px;text-align: center;\">" + "单价" + "</td>"
+                    + "<td style=\"border:solid #000 1px;text-align: center;\">" + "计费标准" + "</td>"
+                    + "<td style=\"border:solid #000 1px;text-align: center;\">" + "数量" + "</td>"
+                    + "<td style=\"border:solid #000 1px;text-align: center;\">" + "合计" + "</td>"
+                    + "<td style=\"border:solid #000 1px;text-align: center;\">" + "支付状态" + "</td>"
+                    + "<tr>"
+                );
+                var pickCustomerName = '';
+                var itemList = data.data.items;
+                $.each(itemList, function (index, item) {
+                    pickCustomerName = pickCustomerName + item.pickCustomerName + ',';
+                    let itemTypeName = item.itemTypeName;
+                    let itemName = item.itemName;
+                    let itemPrice = item.itemPrice;
+                    let unit = item.unit;
+                    let num = item.num
+                    let total = item.total;
+                    let payStatus = item.payStatus;
+                    if(payStatus === 0){
+                        payStatus = "未支付"
+                    }else if(payStatus === 1) {
+                        payStatus = "已支付"
+                    }
+                    html.push(
+                        "<tr height=\"50\">"
+                        + "<td style=\"border:solid #000 1px;text-align: center;\">" + itemTypeName + "</td>"
+                        + "<td style=\"border:solid #000 1px;text-align: center;\">" + itemName + "</td>"
+                        + "<td style=\"border:solid #000 1px;text-align: center;\">" + itemPrice + "</td>"
+                        + "<td style=\"border:solid #000 1px;text-align: center;\">" + unit + "</td>"
+                        + "<td style=\"border:solid #000 1px;text-align: center;\">" + num + "</td>"
+                        + "<td style=\"border:solid #000 1px;text-align: center;\">" + total + "</td>"
+                        + "<td style=\"border:solid #000 1px;text-align: center;\">" + payStatus + "</td>"
+                        + "<tr>"
+                    );
+                })
+                pickCustomerName = pickCustomerName.substr(0, pickCustomerName.length-1);
+                console.log(pickCustomerName)
+                if(pickCustomerName === "null" || pickCustomerName == null){
+                    pickCustomerName = '';
+                }
+                var customerName = data.data.customerName
+                html.push(
+                    "<tr height=\"50\">"
+                    + "<td style=\"border:solid #000 1px;text-align: center;\">"+ "客户" +"</td>"
+                    + "<td style=\"border:solid #000 1px;text-align: center;\">"+ customerName +"</td>"
+                    + "<td style=\"border:solid #000 1px;text-align: center;\">"+ "开单员" +"</td>"
+                    + "<td style=\"border:solid #000 1px;text-align: center;\">"+ kaiDanPeople + "</td>"
+                    + "<td style=\"border:solid #000 1px;text-align: center;\">"+ "装卸公司" +"</td>"
+                    + "<td style=\"border:solid #000 1px;text-align: center;\" colspan=\"2\">"+ pickCustomerName +"</td>"
+                    + "<tr>"
+                );
+                $("#one").append(html.join(''));
+
+                $("#myPrintArea").printArea();
+            }
+        });
+
+    });
+</script>
+
+
+</body>
+</html>

+ 21 - 0
sp-admin/sa-view/tb-business/tb-car-disincle-list.html

@@ -104,6 +104,9 @@
 							<el-button v-if="sa.isAuth('tb-business-car-bind')" class="c-btn" type="primary"
 								@click="businessFn(s.row)">绑定车辆
 							</el-button>
+							<el-button v-if="sa.isAuth('tb-business-zx-print')&&zxShow(s.row.goodsName)" class="c-btn" type="success"
+									   @click="zxPrint(s.row.id)">装卸打印
+							</el-button>
 							<el-button class="c-btn" type="danger"
 								v-if="sa.isAuth('tb-flex-business-del')&&s.row.adminConfirmInput==0&&s.row.payMoney==0"
 								@click="del(s.row)">删除
@@ -175,6 +178,24 @@
 					goodsList: [],
 				},
 				methods: {
+					zxShow(goodsName){
+						var flag = goodsName.indexOf("整车");
+						if(flag > 0 || flag === 0){
+							return true;
+						}else {
+							return false;
+						}
+					},
+					zxPrint(id){
+						this.$confirm('    点击确定开始打印!', '提示', {
+							confirmButtonText: '确定',
+							cancelButtonText: '取消',
+						}).then(() => {
+							sa.showIframe('打印装卸业务确认单', 'print-zxbusiness.html?id=' + id , '1000px', '100%');
+						}).catch(() => {
+
+						});;
+					},
 					getGoodsList(){
 						sa.ajax('/TbGoods/getList', function(resp) {
 							this.goodsList = resp.data;

+ 11 - 7
sp-admin/sa-view/tb-invoice-order/tb-invoice-order-add.html

@@ -27,7 +27,7 @@
                     <div class="c-title" v-if="id == 0">上传账单</div>
 					<div class="c-title" v-else>数据修改</div>
 					<el-form v-if="m">
-<!--						<sa-item type="text" name="微信支付订单号" v-model="m.transactionId" br></sa-item>-->
+						<sa-item v-if="idShow === 1" type="text" name="交易单号" v-model="m.transactionId" br></sa-item>
 <!--						<sa-item type="text" name="账单金额" v-model="m.billMoney" br></sa-item>-->
 						<sa-item type="img" name="账单截图" v-model="m.billImage" br></sa-item>
 						<sa-item name="" class="s-ok" br>
@@ -51,7 +51,8 @@
 				el: '.vue-box',
 				data: {
 					id: sa.p('id', 0),		// 获取超链接中的id参数(0=添加,非0=修改) 
-					m: null,		// 实体对象 
+					m: null,		// 实体对象
+					idShow: 0,
 				},
 				methods: {
 					// 创建一个 默认Model 
@@ -82,11 +83,14 @@
 						// 开始增加或修改
 						if(this.id <= 0) {	// 添加
 							sa.ajax('/TbInvoiceOrder/add', m, function(res){
-								sa.alert('增加成功', this.clean); 
-							}.bind(this));
-						} else {	// 修改
-							sa.ajax('/TbInvoiceOrder/update', m, function(res){
-								sa.alert('修改成功', this.clean);
+								console.log("执行了");
+								if(res.msg === 'ok'){
+									sa.alert('增加成功', this.clean);
+								}else if(res.msg === 'fail'){
+									console.log("执行了");
+									this.idShow = 1;
+									sa.alert('失败:截图无法识别,或不存在与该账单关联的业务订单,请填写截图中的交易单号。');
+								}
 							}.bind(this));
 						}
 					},

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

@@ -228,7 +228,7 @@
 					},
 					// 新增
 					add: function(data) {
-						sa.showIframe('新增数据', 'tb-invoice-order-add.html?id=-1&customerId=' + this.currentCustomerId, '550px', '80%');
+						sa.showIframe('新增数据', 'tb-invoice-order-add.html?id=-1&customerId=' + this.currentCustomerId, '550px', '60%');
 					},
 					// 删除
 					del: function(data) {

+ 2 - 0
sp-server/src/main/java/com/pj/project/tb_business/TbBusiness.java

@@ -50,6 +50,8 @@ public class TbBusiness extends Model<TbBusiness> implements Serializable {
     //其他业务
     public static final String PERMISSION_FLAX_BUSINESS_ADD = "tb-flex-business-add";
     public static final String PERMISSION_FLAX_BUSINESS_EDIT = "tb-flex-business-edit";
+    //装卸打印
+    public static final String PERMISSION_ZX_PRINT = "tb-business-zx-print";
 
 
 

+ 4 - 0
sp-server/src/main/java/com/pj/project/tb_business/TbBusinessController.java

@@ -265,6 +265,10 @@ public class TbBusinessController {
     public AjaxJson getOtherBusinessById(String id) {
         return AjaxJson.getSuccessData(tbBusinessService.getOtherBusinessById(id));
     }
+    @RequestMapping("getZxBusinessById")
+    public AjaxJson getZxBusinessById(String id) {
+        return AjaxJson.getSuccessData(tbBusinessService.getZxBusinessById(id));
+    }
 
     @RequestMapping("deleteOtherBusiness")
     public AjaxJson deleteOtherBusiness(String id, String businessCarId) {

+ 9 - 0
sp-server/src/main/java/com/pj/project/tb_business/TbBusinessService.java

@@ -600,6 +600,15 @@ public class TbBusinessService extends ServiceImpl<TbBusinessMapper, TbBusiness>
         tbBusiness.setCars(cars);
         return tbBusiness;
     }
+    /**获取业务信息,但只取装卸类型的收费项*/
+    public TbBusiness getZxBusinessById(String id) {
+        TbBusiness tbBusiness = this.getById(id);
+        List<TbBusinessItem> tbBusinessItems = tbBusinessItemService.findZxByBusinessId(id);
+        tbBusiness.setItems(tbBusinessItems);
+        List<TbBusinessCar> cars = tbBusinessCarService.findOtherBusinessCar(id);
+        tbBusiness.setCars(cars);
+        return tbBusiness;
+    }
 
     public void deleteOtherBusiness(String id) {
         TbBusiness db = super.getById(id);

+ 10 - 0
sp-server/src/main/java/com/pj/project/tb_business_item/TbBusinessItemService.java

@@ -119,6 +119,16 @@ public class TbBusinessItemService extends ServiceImpl<TbBusinessItemMapper, TbB
         return list(ew);
     }
 
+    /**获取装卸类型的item*/
+    public List<TbBusinessItem> findZxByBusinessId(String businessId) {
+        QueryWrapper<TbBusinessItem> ew = new QueryWrapper<>();
+        ew.eq("business_id", businessId);
+        ew.like("item_type_name", "装卸");
+        ew.orderByDesc("pick");
+        ew.orderByAsc("confirm");
+        return list(ew);
+    }
+
 
     public void confirmBusinessItem(long id) {
         TbBusinessItem tbBusinessItem = this.getById(id);

+ 6 - 2
sp-server/src/main/java/com/pj/project/tb_invoice_order/TbInvoiceOrderController.java

@@ -34,8 +34,12 @@ public class TbInvoiceOrderController {
 	@SaCheckPermission(TbInvoiceOrder.PERMISSION_CODE)
 	@Transactional(rollbackFor = Exception.class)
 	public AjaxJson add(TbInvoiceOrder t){
-		tbInvoiceOrderService.add(t);
-		return AjaxJson.getSuccess();
+        String result = tbInvoiceOrderService.add(t);
+        if(StrUtil.equals("200", result)){
+            return AjaxJson.getSuccess();
+        }else {
+            return AjaxJson.getSuccess("fail");
+        }
 	}
 
 	/** 删 */  

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

@@ -71,20 +71,15 @@ public class TbInvoiceOrderService extends ServiceImpl<TbInvoiceOrderMapper, TbI
     @Resource
     OcrConfig ocrConfig;
 
-	/** 增 */
-	void add(TbInvoiceOrder t){
-//        String result = orcImage(t.getBillImage());
-//        String transactionId = getTransId(result);
+	/** 增 --PC后台上传截图的情况*/
+	String add(TbInvoiceOrder t){
         String transactionId;
-        boolean isWxNotify = false;
         if(StrUtil.isEmpty(t.getTransactionId())){
             //手动上传账单的情况
             String result = orcImage(t.getBillImage());
             transactionId = getTransId(result);
         }else{
-            //微信回调的情况
             transactionId = t.getTransactionId();
-            isWxNotify = true;
         }
 
         TbInvoiceOrder InOrder = findByTransactionId(transactionId);
@@ -96,7 +91,71 @@ public class TbInvoiceOrderService extends ServiceImpl<TbInvoiceOrderMapper, TbI
         List<String> carNos = new ArrayList<>();
         TbOrder tbOrder = tbOrderService.findByTransactionId(transactionId);
         if(tbOrder == null){
-            throw new BusinessException("不存在该交易单号的业务订单");
+//            throw new BusinessException("不存在该交易单号的业务订单");
+            return "500";
+        }
+        BigDecimal billMoney = new BigDecimal(tbOrder.getPrice());
+        String attachStr = tbOrder.getAttach();
+        Attach attach = JSONUtil.toBean(attachStr, Attach.class);
+        String businessId = attach.getB();
+        if (StrUtil.isNotEmpty(businessId)) {
+            List<String> businessIds = StrUtil.splitTrim(businessId, ",");
+            List<TbBusiness> businessList = tbBusinessService.listByIds(businessIds);
+
+            for (TbBusiness tbBusiness : businessList) {
+                businessNoList.add(tbBusiness.getNo());
+                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(), "、"));
+                }
+                for (String no : carNoList) {
+                    if(!carNos.contains(no)){
+                        carNos.add(no);
+                    }
+                }
+
+                TbGoods good = tbGoodsService.getById(tbBusiness.getGoodsId());
+                businessNameList.add(good.getName());
+            }
+        }
+        List<PriceBO> cars = JSONUtil.toList(attach.getC(), PriceBO.class);
+        if(cars.size()>0){
+            businessNameList.add("停车费");
+            for (PriceBO bo1 : cars) {
+                TbBusinessCar car = tbBusinessCarService.getById(bo1.getId());
+                businessNoList.add(car.getNo());
+                if(!carNos.contains(car.getCarNo())){
+                    carNos.add(car.getCarNo());
+                }
+            }
+        }
+
+        String businessNameStr = businessNameList.stream().map(String::valueOf).collect(Collectors.joining(","));
+        String businessNoStr = businessNoList.stream().map(String::valueOf).collect(Collectors.joining(","));
+        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);
+        return "200";
+	}
+
+	/**增 --微信回调自动生成整车业务开票订单的情况*/
+	public void addT(String transactionId){
+        TbInvoiceOrder t = new TbInvoiceOrder();
+        TbInvoiceOrder InOrder = findByTransactionId(transactionId);
+        if(InOrder != null){
+            throw new BusinessException("该账单已生成开票订单");
+        }
+        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("交易单号识别有误,或不存在该交易单号的业务订单");
         }
         BigDecimal billMoney = new BigDecimal(tbOrder.getPrice());
         String attachStr = tbOrder.getAttach();
@@ -116,8 +175,6 @@ public class TbInvoiceOrderService extends ServiceImpl<TbInvoiceOrderMapper, TbI
                 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);
@@ -127,15 +184,15 @@ public class TbInvoiceOrderService extends ServiceImpl<TbInvoiceOrderMapper, TbI
                 TbGoods good = tbGoodsService.getById(tbBusiness.getGoodsId());
                 businessNameList.add(good.getName());
                 //微信回调的情况下,获取整车业务的客户id
-                if(isWxNotify && !includZheng && StrUtil.contains(good.getName(), "整车")){
+                if(!includZheng && StrUtil.contains(good.getName(), "整车")){
                     includZheng = true;
                     t.setCustomerId(tbBusiness.getCustomerId());
                 }
             }
         }
-        if(isWxNotify && !includZheng){
+        if(!includZheng){
             log.error("该交易单号不包含整车业务,不自动生成开票订单, transactionId: " + transactionId );
-            return;
+            return ;
         }
         List<PriceBO> cars = JSONUtil.toList(attach.getC(), PriceBO.class);
         if(cars.size()>0){
@@ -148,7 +205,6 @@ 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(","));
         String carNoStr = carNos.stream().map(String::valueOf).collect(Collectors.joining(","));
@@ -156,14 +212,9 @@ public class TbInvoiceOrderService extends ServiceImpl<TbInvoiceOrderMapper, TbI
                 .setTransactionId(transactionId).setBillMoney(billMoney)
                 .setStatus(0).setCreateTime(new Date());
         tbInvoiceOrderMapper.add(t);
-	}
-
-	public void addT(String transactionId){
-        TbInvoiceOrder t = new TbInvoiceOrder();
-        t.setTransactionId(transactionId);
-        this.add(t);
     }
 
+
 	/** 删 */
 	int delete(Long id){
 		return tbInvoiceOrderMapper.delete(id);

+ 1 - 1
sp-server/src/main/java/com/pj/project/wx_send_msg/WxMsgTask.java

@@ -21,7 +21,7 @@ public class WxMsgTask {
     /**
      * 3分钟执行一次
      */
-    @Scheduled(fixedRate = 180000)
+    //@Scheduled(fixedRate = 180000)
     public void check() {
         List<WxSendMsg> list = wxSendMsgService.list();
         list.forEach(wxSendMsg -> {