From ad31648c6f7a8bff1f7ccdf84b76006b9ffb78f8 Mon Sep 17 00:00:00 2001
From: jyy <jyy>
Date: Sat, 17 Jul 2021 15:59:10 +0800
Subject: [PATCH] 1.	新增套餐中有效和无效的操作 2.	会员修改门店功能 3.	套餐新增编辑次数功能 4.	计算是否为赠送的条件为,全部为赠送金额购买且支付金额大于0 5.	打印小票功能调整间距,和收银人 6.	PC端服务单新增划扣金额展示

---
 zq-erp/src/main/java/com/matrix/component/wechat/externalInterface/business/JsApiPayBusiness.java |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/zq-erp/src/main/java/com/matrix/component/wechat/externalInterface/business/JsApiPayBusiness.java b/zq-erp/src/main/java/com/matrix/component/wechat/externalInterface/business/JsApiPayBusiness.java
index 9eab399..37b94c2 100644
--- a/zq-erp/src/main/java/com/matrix/component/wechat/externalInterface/business/JsApiPayBusiness.java
+++ b/zq-erp/src/main/java/com/matrix/component/wechat/externalInterface/business/JsApiPayBusiness.java
@@ -14,6 +14,7 @@
 import com.matrix.component.wechat.externalInterface.service.RefundService;
 import com.matrix.component.wechat.externalInterface.service.ScanPayQueryService;
 import org.apache.log4j.Logger;
+import org.springframework.beans.BeanUtils;
 
 /**
  * User: rizenguo Date: 2014/12/1 Time: 17:05
@@ -55,9 +56,10 @@
 		log.info("------------------request createPrapareOrder taking :" + totalTimeCost + "ms"+"--response="+payServiceResponseString);
 
 		// 将从API返回的XML数据映射到Java对象
-		JsApiPayResData jsApiPayResData = (JsApiPayResData) Util.getObjectFromXML(payServiceResponseString,
+		Object data =  Util.getObjectFromXML(payServiceResponseString,
 				JsApiPayResData.class);
-		
+		JsApiPayResData jsApiPayResData=new JsApiPayResData();
+		BeanUtils.copyProperties(data,jsApiPayResData);
 		return jsApiPayResData;
 	}
 	

--
Gitblit v1.9.1