From 637510ccf76816f43d732d9cd493bb67a309ef4b Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期日, 24 五月 2020 16:41:15 +0800
Subject: [PATCH] 优化订单支付

---
 Api/src/main/java/com/java110/api/bmo/fee/impl/FeeBMOImpl.java |   17 ++++++++++++-----
 1 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/Api/src/main/java/com/java110/api/bmo/fee/impl/FeeBMOImpl.java b/Api/src/main/java/com/java110/api/bmo/fee/impl/FeeBMOImpl.java
index 89cd02a..d94b19f 100644
--- a/Api/src/main/java/com/java110/api/bmo/fee/impl/FeeBMOImpl.java
+++ b/Api/src/main/java/com/java110/api/bmo/fee/impl/FeeBMOImpl.java
@@ -3,7 +3,6 @@
 
 import com.alibaba.fastjson.JSONObject;
 import com.java110.api.bmo.ApiBaseBMO;
-import com.java110.api.bmo.IApiBaseBMO;
 import com.java110.api.bmo.fee.IFeeBMO;
 import com.java110.core.context.DataFlowContext;
 import com.java110.core.smo.fee.IFeeConfigInnerServiceSMO;
@@ -16,10 +15,7 @@
 import com.java110.dto.fee.FeeDto;
 import com.java110.dto.hardwareAdapation.CarInoutDto;
 import com.java110.dto.parking.ParkingSpaceDto;
-import com.java110.entity.order.Orders;
-import com.java110.utils.constant.BusinessTypeConstant;
-import com.java110.utils.constant.CommonConstant;
-import com.java110.utils.constant.ResponseConstant;
+import com.java110.utils.constant.*;
 import com.java110.utils.exception.ListenerExecuteException;
 import com.java110.utils.util.Assert;
 import com.java110.utils.util.BeanConvertUtil;
@@ -97,6 +93,15 @@
         businessUnit.put("communityId", paramInJson.getString("communityId"));
         business.getJSONObject(CommonConstant.HTTP_BUSINESS_DATAS).put("businessFee", businessUnit);
 
+        return business;
+    }
+
+    public JSONObject updateFee(JSONObject paramInJson, DataFlowContext dataFlowContext) {
+        JSONObject business = JSONObject.parseObject("{\"datas\":{}}");
+        business.put(CommonConstant.HTTP_BUSINESS_TYPE_CD, BusinessTypeConstant.BUSINESS_TYPE_UPDATE_FEE_INFO);
+        business.put(CommonConstant.HTTP_SEQ, DEFAULT_SEQ + 1);
+        business.put(CommonConstant.HTTP_INVOKE_MODEL, CommonConstant.HTTP_INVOKE_MODEL_S);
+        business.getJSONObject(CommonConstant.HTTP_BUSINESS_DATAS).put("businessFee", paramInJson);
         return business;
     }
 
@@ -231,6 +236,8 @@
         feeMap.put("startTime", DateUtil.getFormatTimeString(feeInfo.getStartTime(), DateUtil.DATE_FORMATE_STRING_A));
         feeMap.put("endTime", DateUtil.getFormatTimeString(feeInfo.getEndTime(), DateUtil.DATE_FORMATE_STRING_A));
         feeMap.put("cycles", paramInJson.getString("cycles"));
+        feeMap.put("configEndTime",feeInfo.getConfigEndTime());
+
         businessFee.putAll(feeMap);
         business.getJSONObject(CommonConstant.HTTP_BUSINESS_DATAS).put("businessFee", businessFee);
 

--
Gitblit v1.8.0