From 6df1b67b41840f2990e9d08fb14a0f5710516f30 Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期三, 23 十二月 2020 09:41:10 +0800
Subject: [PATCH] 优化代码 手机支付问题

---
 service-front/src/main/java/com/java110/front/smo/payment/adapt/wechatPay/WechatOweFeeToNotifyAdapt.java |   23 +++++++++++++++++++----
 1 files changed, 19 insertions(+), 4 deletions(-)

diff --git a/service-front/src/main/java/com/java110/front/smo/payment/adapt/wechatPay/WechatOweFeeToNotifyAdapt.java b/service-front/src/main/java/com/java110/front/smo/payment/adapt/wechatPay/WechatOweFeeToNotifyAdapt.java
index dfeb4b7..4c602c7 100644
--- a/service-front/src/main/java/com/java110/front/smo/payment/adapt/wechatPay/WechatOweFeeToNotifyAdapt.java
+++ b/service-front/src/main/java/com/java110/front/smo/payment/adapt/wechatPay/WechatOweFeeToNotifyAdapt.java
@@ -19,12 +19,9 @@
 import com.alibaba.fastjson.JSONObject;
 import com.java110.core.factory.WechatFactory;
 import com.java110.dto.fee.FeeDto;
-import com.java110.dto.rentingPool.RentingPoolDto;
 import com.java110.dto.smallWeChat.SmallWeChatDto;
 import com.java110.front.properties.WechatAuthProperties;
-import com.java110.front.smo.payment.IOweFeeToNotifySMO;
 import com.java110.front.smo.payment.adapt.IOweFeeToNotifyAdapt;
-import com.java110.front.smo.payment.adapt.IPayNotifyAdapt;
 import com.java110.utils.cache.CommonCache;
 import com.java110.utils.constant.CommonConstant;
 import com.java110.utils.constant.ServiceConstant;
@@ -40,7 +37,6 @@
 import org.springframework.web.client.HttpStatusCodeException;
 import org.springframework.web.client.RestTemplate;
 
-import javax.servlet.http.HttpServletRequest;
 import java.util.*;
 
 /**
@@ -143,6 +139,7 @@
         //鏌ヨ鐢ㄦ埛ID
         JSONObject paramIn = JSONObject.parseObject(order);
         paramIn.put("oId", orderId);
+        freshFees(paramIn);
         String url = ServiceConstant.SERVICE_API_URL + "/api/fee.payOweFee";
         responseEntity = this.callCenterService(restTemplate, "-1", paramIn.toJSONString(), url, HttpMethod.POST);
 
@@ -152,6 +149,24 @@
         return 1;
     }
 
+    private void freshFees(JSONObject paramIn) {
+        if (!paramIn.containsKey("fees")) {
+            return;
+        }
+
+        JSONArray fees = paramIn.getJSONArray("fees");
+        JSONObject fee = null;
+        for(int feeIndex = 0; feeIndex < fees.size();feeIndex ++){
+            fee = fees.getJSONObject(feeIndex);
+            if(fee.containsKey("deadlineTime")){
+                fee.put("startTime",fee.getString("endTime"));
+                fee.put("endTime",fee.getString("deadlineTime"));
+                fee.put("receivedAmount",fee.getString("feePrice"));
+                fee.put("state","");
+            }
+        }
+    }
+
 
     /**
      * 璋冪敤涓績鏈嶅姟

--
Gitblit v1.8.0