优化 支付接口

Api/src/main/java/com/java110/api/bmo/ApiBaseBMO.java

@@ -5,6 +5,7 @@ import com.alibaba.fastjson.JSONObject;
 import com.java110.core.context.DataFlowContext;
 import com.java110.core.factory.DataFlowFactory;
 import com.java110.entity.center.AppService;
+import com.java110.entity.order.Orders;
 import com.java110.event.service.api.ServiceDataFlowEvent;
 import com.java110.utils.constant.CommonConstant;
 import com.java110.utils.constant.ServiceCodeConstant;
@@ -195,6 +196,10 @@ public class ApiBaseBMO implements IApiBaseBMO{
             if (CommonConstant.HTTP_USER_ID.equals(key)) {
                 orders.put("userId", headers.get(key));
             }
+
+            if(CommonConstant.ORDER_PROCESS.equals(key)){
+                orders.put("orderProcess", headers.get(CommonConstant.ORDER_PROCESS));
+            }
         }
 
     }
@@ -222,6 +227,8 @@ public class ApiBaseBMO implements IApiBaseBMO{
             if (CommonConstant.HTTP_USER_ID.equals(key)) {
                 httpHeaders.add("user_id", headers.get(key));
             }
+
+
         }
 
     }

Api/src/main/java/com/java110/api/bmo/fee/impl/FeeBMOImpl.java

@@ -1,11 +1,15 @@
 package com.java110.api.bmo.fee.impl;
 
 
+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.entity.order.Orders;
 import org.springframework.stereotype.Service;
 
+import java.util.Map;
+
 /**
  * @ClassName FeeBMOImpl
  * @Description TODO
@@ -16,4 +20,6 @@ import org.springframework.stereotype.Service;
  **/
 @Service("feeBMOImpl")
 public class FeeBMOImpl extends ApiBaseBMO implements IFeeBMO {
+
+
 }

Api/src/main/java/com/java110/api/listener/fee/PayFeeConfirmListener.java

@@ -64,7 +64,7 @@ public class PayFeeConfirmListener extends AbstractServiceApiDataFlowListener {
         dataFlowContext.getRequestCurrentHeaders().put(CommonConstant.HTTP_ORDER_TYPE_CD, "D");
         JSONArray businesses = new JSONArray();
         dataFlowContext.getRequestCurrentHeaders().put("oId", paramObj.getString("oId"));
-
+        dataFlowContext.getRequestCurrentHeaders().put(CommonConstant.ORDER_PROCESS,Orders.ORDER_PROCESS_ORDER_CONFIRM_SUBMIT);
         ResponseEntity<String> responseEntity = feeBMOImpl.callService(dataFlowContext, service.getServiceCode(), businesses);
 
         dataFlowContext.setResponseEntity(responseEntity);

Api/src/main/java/com/java110/api/listener/fee/PayFeePreListener.java

@@ -89,16 +89,15 @@ public class PayFeePreListener extends AbstractServiceApiDataFlowListener {
 
         //校验数据
         validate(paramIn);
-        JSONObject paramObj = JSONObject.parseObject(paramIn);
+        JSONObject paramObj = JSONObject.parseObject(paramIn)   ;
 
-        HttpHeaders header = new HttpHeaders();
         dataFlowContext.getRequestCurrentHeaders().put(CommonConstant.HTTP_ORDER_TYPE_CD, "D");
         JSONArray businesses = new JSONArray();
 
         //添加单元信息
         businesses.add(addFeeDetail(paramObj, dataFlowContext));
         businesses.add(modifyFee(paramObj, dataFlowContext));
-
+        dataFlowContext.getRequestCurrentHeaders().put(CommonConstant.ORDER_PROCESS,Orders.ORDER_PROCESS_ORDER_PRE_SUBMIT);
         ResponseEntity<String> responseEntity = feeBMOImpl.callService(dataFlowContext, service.getServiceCode(), businesses);
         if (responseEntity.getStatusCode() != HttpStatus.OK) {
             dataFlowContext.setResponseEntity(responseEntity);
@@ -112,17 +111,7 @@ public class PayFeePreListener extends AbstractServiceApiDataFlowListener {
         dataFlowContext.setResponseEntity(responseEntity);
     }
 
-    /**
-     * 刷入order信息
-     *
-     * @param orders  订单信息
-     * @param headers 头部信息
-     */
-    protected void freshOrderProtocol(JSONObject orders, Map<String, String> headers) {
-        feeBMOImpl.freshOrderProtocol(orders, headers);
-        orders.put("orderProcess", Orders.ORDER_PROCESS_ORDER_PRE_SUBMIT);
 
-    }
 
     /**
      * 添加费用明细信息

Api/src/main/java/com/java110/api/listener/fee/PayFeePreTempCarInoutListener.java

@@ -99,7 +99,7 @@ public class PayFeePreTempCarInoutListener extends AbstractServiceApiDataFlowLis
         businesses.add(modifyFee(paramObj, dataFlowContext));
         businesses.add(modifyCarInout(paramObj, dataFlowContext));
 
-
+        dataFlowContext.getRequestCurrentHeaders().put(CommonConstant.ORDER_PROCESS,Orders.ORDER_PROCESS_ORDER_PRE_SUBMIT);
         ResponseEntity<String> responseEntity = feeBMOImpl.callService(dataFlowContext, service.getServiceCode(), businesses);
         if (responseEntity.getStatusCode() != HttpStatus.OK) {
             dataFlowContext.setResponseEntity(responseEntity);

FrontService/src/main/java/com/java110/front/components/company/HasCompanyComponent.java

@@ -26,7 +26,7 @@ public class HasCompanyComponent {
 
     /**
      * 查询小区列表
-     * @param pd 页面数据封装
+     * @param pd 页面数据封装ApiServiceSMOImpl
      * @return 返回 ResponseEntity 对象
      */
     public ResponseEntity<String> check(IPageData pd){

java110-utils/src/main/java/com/java110/utils/constant/CommonConstant.java

@@ -147,6 +147,7 @@ public class CommonConstant {
     public final static String HTTP_PARAM = "params";
     public final static String HTTP_ORDER_TYPE_CD = "order_type_cd";
     public final static String HTTP_USER_ID = "user_id";
+    public final static String ORDER_PROCESS = "order_process";
 
 
     public final static String HTTP_METHOD_POST = "POST";