From dbb3887769756f4e35649b3c9b3e33a10cb37101 Mon Sep 17 00:00:00 2001
From: 邓实川 <544939826@qq.com>
Date: Wed, 6 May 2020 09:16:09 +0800
Subject: [PATCH] 企业中心接口优化
---
src/main/java/cn/timer/api/controller/qyzx/QyzxBusinessController.java | 13 +++++++------
1 file changed, 7 insertions(+), 6 deletions(-)
diff --git a/src/main/java/cn/timer/api/controller/qyzx/QyzxBusinessController.java b/src/main/java/cn/timer/api/controller/qyzx/QyzxBusinessController.java
index 299d8d0..96adee7 100644
--- a/src/main/java/cn/timer/api/controller/qyzx/QyzxBusinessController.java
+++ b/src/main/java/cn/timer/api/controller/qyzx/QyzxBusinessController.java
@@ -240,10 +240,9 @@ public class QyzxBusinessController {
@RequestBody QyzxInvoiceData qyzxInvoiceData) {
if (!ObjectUtil.isAllNotEmpty(
// qyzxInvoiceData,
- qyzxInvoiceData.getInvoiceTitle(),
- qyzxInvoiceData.getDutyParagraph(), qyzxInvoiceData.getCompanyAddress(),
- qyzxInvoiceData.getCompanyPhone(), qyzxInvoiceData.getBankName(), qyzxInvoiceData.getBankAccount(),
- qyzxInvoiceData.getInvoiceType(), qyzxInvoiceData.getInvoiceProject(),
+ qyzxInvoiceData.getInvoiceTitle(), qyzxInvoiceData.getDutyParagraph(),
+ qyzxInvoiceData.getCompanyAddress(), qyzxInvoiceData.getCompanyPhone(), qyzxInvoiceData.getBankName(),
+ qyzxInvoiceData.getBankAccount(), qyzxInvoiceData.getInvoiceType(), qyzxInvoiceData.getInvoiceProject(),
qyzxInvoiceData.getInvoiceValue(), qyzxInvoiceData.getConsignee(), qyzxInvoiceData.getConsigneePhone(),
qyzxInvoiceData.getEmail(), qyzxInvoiceData.getShippingArea(), qyzxInvoiceData.getShippingAddress(),
qyzxInvoiceData.getZipCode())) {
@@ -295,8 +294,10 @@ public class QyzxBusinessController {
@GetMapping(value = "/queryMsgUseRecord")
@ApiOperation(value = "查询短信使用记录", httpMethod = "GET", notes = "接口发布说明")
public Result<List<QyzxUseRecord>> queryMsgUseRecord(@CurrentUser UserBean userBean, String orderNo) {
- return ResultUtil.data(QyzxUseRecord.builder().build()
- .selectList(new LambdaQueryWrapper<QyzxUseRecord>().eq(QyzxUseRecord::getOrderNo, orderNo)), "查询成功");
+ return ResultUtil.data(
+ QyzxUseRecord.builder().build().selectList(new LambdaQueryWrapper<QyzxUseRecord>()
+ .eq(QyzxUseRecord::getPmid, 1).eq(orderNo != null, QyzxUseRecord::getOrderNo, orderNo)),
+ "查询成功");
}
// TODO 不同业务使用 不同数据表
--
libgit2 0.26.0