优化富友接口

service-api/src/main/java/com/java110/api/smo/payment/adapt/fuiouPay/FuiouOweFeeToNotifyAdapt.java

@@ -18,6 +18,7 @@ package com.java110.api.smo.payment.adapt.fuiouPay;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.java110.api.smo.DefaultAbstractComponentSMO;
+import com.java110.core.factory.CommunitySettingFactory;
 import com.java110.core.factory.WechatFactory;
 import com.java110.dto.fee.FeeDto;
 import com.java110.dto.smallWeChat.SmallWeChatDto;
@@ -126,12 +127,16 @@ public class FuiouOweFeeToNotifyAdapt extends DefaultAbstractComponentSMO implem
         }
 
         String orderId = map.get("out_trade_no").toString();
+        String orderPre = CommunitySettingFactory.getValue(smallWeChatDto.getObjId(), "FUIOU_ORDER_PRE");
+        orderId = orderId.substring(orderPre.length());
         String order = CommonCache.getAndRemoveValue(FeeDto.REDIS_PAY_OWE_FEE + orderId);
 
         if (StringUtil.isEmpty(order)) {
             return 1;// 说明已经处理过了 再不处理
         }
 
+
+
         //查询用户ID
         JSONObject paramIn = JSONObject.parseObject(order);
         paramIn.put("oId", orderId);

service-api/src/main/java/com/java110/api/smo/payment/adapt/fuiouPay/FuiouPayAdapt.java

@@ -16,6 +16,7 @@
 package com.java110.api.smo.payment.adapt.fuiouPay;
 
 import com.alibaba.fastjson.JSONObject;
+import com.java110.core.factory.CommunitySettingFactory;
 import com.java110.core.factory.WechatFactory;
 import com.java110.dto.smallWeChat.SmallWeChatDto;
 import com.java110.api.properties.WechatAuthProperties;
@@ -162,13 +163,14 @@ public class FuiouPayAdapt implements IPayAdapt {
                                             SmallWeChatDto smallWeChatDto, String notifyUrl) throws Exception {
 
         String systemName = MappingCache.getValue(WechatConstant.WECHAT_DOMAIN, WechatConstant.PAY_GOOD_NAME);
+        String orderPre = CommunitySettingFactory.getValue(smallWeChatDto.getObjId(), "FUIOU_ORDER_PRE");
 
         JSONObject paramMap = new JSONObject();
         paramMap.put("version", VERSION);
         paramMap.put("mchnt_cd", smallWeChatDto.getMchId()); // 富友分配给二级商户的商户号
         paramMap.put("random_str", PayUtil.makeUUID(32));
         paramMap.put("order_amt", PayUtil.moneyToIntegerStr(payAmount));
-        paramMap.put("mchnt_order_no", "9457" + orderNum);
+        paramMap.put("mchnt_order_no", orderPre + orderNum);
         paramMap.put("txn_begin_ts", DateUtil.getNow(DateUtil.DATE_FORMATE_STRING_DEFAULT));
         paramMap.put("goods_des", systemName + feeName);
         paramMap.put("term_id", "abcdefgh");

service-api/src/main/java/com/java110/api/smo/payment/adapt/fuiouPay/FuiouPayNotifyAdapt.java

@@ -18,6 +18,7 @@ package com.java110.api.smo.payment.adapt.fuiouPay;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.java110.api.smo.DefaultAbstractComponentSMO;
+import com.java110.core.factory.CommunitySettingFactory;
 import com.java110.core.factory.WechatFactory;
 import com.java110.dto.smallWeChat.SmallWeChatDto;
 import com.java110.api.properties.WechatAuthProperties;
@@ -125,10 +126,11 @@ public class FuiouPayNotifyAdapt extends DefaultAbstractComponentSMO implements
         }
 
         String outTradeNo = map.get("mchnt_order_no").toString();
+        String orderPre = CommunitySettingFactory.getValue(smallWeChatDto.getObjId(), "FUIOU_ORDER_PRE");
 
         //查询用户ID
         JSONObject paramIn = new JSONObject();
-        paramIn.put("oId", outTradeNo.substring(4));
+        paramIn.put("oId", outTradeNo.substring(orderPre.length()));
         String url = "fee.payFeeConfirm";
         responseEntity = this.callCenterService(getHeaders("-1"), paramIn.toJSONString(), url, HttpMethod.POST);