|
|
@@ -3,7 +3,6 @@ package com.java110.api.listener.fee;
|
|
|
import com.alibaba.fastjson.JSONArray;
|
|
|
import com.alibaba.fastjson.JSONObject;
|
|
|
import com.java110.api.bmo.fee.IFeeBMO;
|
|
|
-import com.java110.api.bmo.payFeeDetailDiscount.IPayFeeDetailDiscountBMO;
|
|
|
import com.java110.api.listener.AbstractServiceApiDataFlowListener;
|
|
|
import com.java110.core.annotation.Java110Listener;
|
|
|
import com.java110.core.context.DataFlowContext;
|
|
|
@@ -19,8 +18,11 @@ import com.java110.intf.community.IParkingSpaceInnerServiceSMO;
|
|
|
import com.java110.intf.community.IRepairInnerServiceSMO;
|
|
|
import com.java110.intf.community.IRepairUserInnerServiceSMO;
|
|
|
import com.java110.intf.community.IRoomInnerServiceSMO;
|
|
|
-import com.java110.intf.fee.*;
|
|
|
-import com.java110.intf.user.IOwnerCarInnerServiceSMO;
|
|
|
+import com.java110.intf.fee.IFeeAttrInnerServiceSMO;
|
|
|
+import com.java110.intf.fee.IFeeConfigInnerServiceSMO;
|
|
|
+import com.java110.intf.fee.IFeeInnerServiceSMO;
|
|
|
+import com.java110.intf.fee.IFeeReceiptDetailInnerServiceSMO;
|
|
|
+import com.java110.intf.fee.IFeeReceiptInnerServiceSMO;
|
|
|
import com.java110.po.feeReceipt.FeeReceiptPo;
|
|
|
import com.java110.po.feeReceiptDetail.FeeReceiptDetailPo;
|
|
|
import com.java110.po.owner.RepairPoolPo;
|
|
|
@@ -110,7 +112,7 @@ public class PayOweFeeListener extends AbstractServiceApiDataFlowListener {
|
|
|
//校验数据
|
|
|
validate(paramIn);
|
|
|
JSONObject paramObj = JSONObject.parseObject(paramIn);
|
|
|
- logger.info("======欠费缴费返回======："+JSONArray.toJSONString(paramObj));
|
|
|
+ logger.info("======欠费缴费返回======：" + JSONArray.toJSONString(paramObj));
|
|
|
HttpHeaders header = new HttpHeaders();
|
|
|
dataFlowContext.getRequestCurrentHeaders().put(CommonConstant.HTTP_ORDER_TYPE_CD, "D");
|
|
|
JSONArray businesses = new JSONArray();
|
|
|
@@ -132,7 +134,7 @@ public class PayOweFeeListener extends AbstractServiceApiDataFlowListener {
|
|
|
remark = "";
|
|
|
}
|
|
|
feeObj.put("remark", paySource + remark);
|
|
|
- if (AppDto.WECHAT_OWNER_APP_ID.equals(appId)) { //微信公众号支付
|
|
|
+ if (!feeObj.containsKey("primeRate") && AppDto.OWNER_WECHAT_PAY.equals(appId)) { //微信公众号支付
|
|
|
feeObj.put("primeRate", "5");
|
|
|
feeObj.put("remark", "线上公众号支付");
|
|
|
}
|
|
|
@@ -178,11 +180,11 @@ public class PayOweFeeListener extends AbstractServiceApiDataFlowListener {
|
|
|
paramObj.put("primeRate", "6");
|
|
|
}
|
|
|
String appId = dataFlowContext.getAppId();
|
|
|
- logger.info("======支付方式======：" + appId + "+======+" + paramObj.containsKey("primeRate")+"======:"+JSONArray.toJSONString(dataFlowContext));
|
|
|
+ logger.info("======支付方式======：" + appId + "+======+" + paramObj.containsKey("primeRate") + "======:" + JSONArray.toJSONString(dataFlowContext));
|
|
|
if (AppDto.OWNER_WECHAT_PAY.equals(appId)) { //微信支付（欠费缴费无法区分小程序还是微信公众号）
|
|
|
paramObj.put("remark", "微信支付");
|
|
|
}
|
|
|
- paramObj.put("state","1400");
|
|
|
+ paramObj.put("state", "1400");
|
|
|
businesses.add(feeBMOImpl.addOweFeeDetail(paramObj, dataFlowContext, feeReceiptDetailPos, feeReceiptPos));
|
|
|
businesses.add(feeBMOImpl.modifyOweFee(paramObj, dataFlowContext));
|
|
|
|
java110