From 358ea88a4509e297c7a0933f4b5a02699db170c0 Mon Sep 17 00:00:00 2001
From: yang_shj <yang_shj@hisuntech.com>
Date: Thu, 3 Mar 2022 17:51:27 +0800
Subject: [PATCH] =?UTF-8?q?feat=200=20=E6=94=AF=E4=BB=98=E5=B7=A5=E7=A8=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 payment-base-app/pom.xml                                        | 1 +
 .../java/com/base/springcloud/service/imp/BillServiceImp.java   | 2 ++
 .../main/resources/com/base/payment/mapper/SaleBillMapper.xml   | 2 +-
 3 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/payment-base-app/pom.xml b/payment-base-app/pom.xml
index 4a44c0b..dc40eb1 100644
--- a/payment-base-app/pom.xml
+++ b/payment-base-app/pom.xml
@@ -215,6 +215,7 @@
                         <descriptorRef>jar-with-dependencies</descriptorRef>
                     </descriptorRefs>
                     <appendAssemblyId>false</appendAssemblyId>
+                    <outputDirectory>../target</outputDirectory>
                 </configuration>
                 <executions>
                     <execution>
diff --git a/payment-base-app/src/main/java/com/base/springcloud/service/imp/BillServiceImp.java b/payment-base-app/src/main/java/com/base/springcloud/service/imp/BillServiceImp.java
index 084acce..049f81c 100644
--- a/payment-base-app/src/main/java/com/base/springcloud/service/imp/BillServiceImp.java
+++ b/payment-base-app/src/main/java/com/base/springcloud/service/imp/BillServiceImp.java
@@ -27,7 +27,9 @@ public class BillServiceImp implements BillService {
 		SaleBill queryResult = saleBillMapper.queryBillInfo(saleBill);
 		if(!Optional.ofNullable(queryResult).isPresent()){
 			saleBill.setTotalAmount(new BigDecimal(1));
+			orderBO.setSaleBill(saleBill);
 			logger.warn("==================销售单据查询失败！=============================");
+			return;
 		}
 		orderBO.setSaleBill(queryResult);
 	}
diff --git a/payment-base-app/src/main/resources/com/base/payment/mapper/SaleBillMapper.xml b/payment-base-app/src/main/resources/com/base/payment/mapper/SaleBillMapper.xml
index 4863ea5..fd02912 100644
--- a/payment-base-app/src/main/resources/com/base/payment/mapper/SaleBillMapper.xml
+++ b/payment-base-app/src/main/resources/com/base/payment/mapper/SaleBillMapper.xml
@@ -534,6 +534,6 @@
     select
     <include refid="Base_Column_List" />
     from stk_io_bill
-    where id = #{Id,jdbcType=VARCHAR}
+    where id = #{id,jdbcType=VARCHAR}
   </select>
 </mapper>
\ No newline at end of file