From d937205d5824dc44ab1567cf6f84fbfa817baa92 Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期一, 17 一月 2022 17:56:13 +0800
Subject: [PATCH] 优化代码

---
 service-job/src/main/java/com/java110/job/adapt/fee/ReturnPayFeeToPlutusAdapt.java |   10 ++++++----
 1 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/service-job/src/main/java/com/java110/job/adapt/fee/ReturnPayFeeToPlutusAdapt.java b/service-job/src/main/java/com/java110/job/adapt/fee/ReturnPayFeeToPlutusAdapt.java
index aee7fca..b627b13 100644
--- a/service-job/src/main/java/com/java110/job/adapt/fee/ReturnPayFeeToPlutusAdapt.java
+++ b/service-job/src/main/java/com/java110/job/adapt/fee/ReturnPayFeeToPlutusAdapt.java
@@ -20,6 +20,7 @@
 import com.java110.utils.constant.WechatConstant;
 import com.java110.utils.util.BeanConvertUtil;
 import com.java110.utils.util.PayUtil;
+import com.java110.utils.util.StringUtil;
 import org.bouncycastle.util.encoders.Base64;
 import org.slf4j.Logger;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -160,20 +161,21 @@
         byte[] bb = PlutusFactory.decrypt(Base64.decode(content), payPassword);
         //鏈嶅姟鍣ㄨ繑鍥炲唴瀹�
         String paramOut = new String(bb);
+        System.out.println(paramOut);
 
         JSONObject paramObj = JSONObject.parseObject(paramOut);
 
-        if (paramObj.getIntValue("status") == 1) {
-            doUpdateOnlinePay(onlinePayDtos.get(0).getOrderId(), OnlinePayDto.STATE_CT, "閫�娆惧畬鎴�");
-        } else {
+        if (paramObj.getIntValue("status") != 2) {
             doUpdateOnlinePay(onlinePayDtos.get(0).getOrderId(), OnlinePayDto.STATE_FT, paramObj.getString("remark"));
+        } else {
+            doUpdateOnlinePay(onlinePayDtos.get(0).getOrderId(), OnlinePayDto.STATE_CT, "閫�娆惧畬鎴�");
         }
 
     }
 
     private void doUpdateOnlinePay(String orderId, String state, String message) {
         OnlinePayPo onlinePayPo = new OnlinePayPo();
-        onlinePayPo.setMessage(message.length() > 1000 ? message.substring(0, 1000) : message);
+        onlinePayPo.setMessage(!StringUtil.isEmpty(message) && message.length() > 1000 ? message.substring(0, 1000) : message);
         onlinePayPo.setOrderId(orderId);
         onlinePayPo.setState(state);
         onlinePayV1InnerServiceSMOImpl.updateOnlinePay(onlinePayPo);

--
Gitblit v1.8.0