Merge branch 'features/mo' of http://git.quantgroup.cn/QG/cash-loan-flow-boss into features/mo

# By xiangwei.wang
# Via xiangwei.wang
* 'features/mo' of http://git.quantgroup.cn/QG/cash-loan-flow-boss:
  查询渠道信息productId为空时处理
  多订单渠道改为apollo配置
  二次风控审核bizType对乐信单独判断
  二次风控乐信bizType传9
  乐信bizType传9
  乐信bizType传9
  放款接口 返回值结果判断
  放款接口 返回值结果判断

src/main/java/cn/quantgroup/cashloanflowboss/api/channel/util/ChannelConfUtil.java

@@ -227,7 +227,9 @@ public class ChannelConfUtil {
             channelConfBaseModel.setEnv("");
             channelConfBaseModel.setFundId(0);
             channelConfBaseModel.setP2pFundId(0);
-            channelConfBaseModel.setBizType(Integer.valueOf(channelConfiguration.getXyqbProductId()));
+            if(channelConfiguration.getXyqbProductId() != null){
+                channelConfBaseModel.setBizType(Integer.valueOf(channelConfiguration.getXyqbProductId()));
+            }
             channelConfBaseModel.setAesKey(channelConfiguration.getAesKey());
             channelConfBaseModel.setMd5Key(channelConfiguration.getMd5Key());
             channelConfBaseModel.setAuthCode(channelConfiguration.getSpiderCenterMerchantChannelCode());

src/main/java/cn/quantgroup/cashloanflowboss/spi/koala/service/KoalaCenterService.java

@@ -20,6 +20,7 @@ import org.springframework.stereotype.Service;
 import java.math.BigDecimal;
 import java.util.HashMap;
 import java.util.Map;
+import java.util.Objects;
 
 /**
  * Created by WeiWei on 2019/8/12.
@@ -72,8 +73,8 @@ public class KoalaCenterService {
                 put("peopleLimit", pepoleLimit);
             }});
 
-            JsonResult jsonObject = JSONObject.parseObject(data, JsonResult.class);
-            return jsonObject.isSuccess();
+            //JsonResult jsonObject = JSONObject.parseObject(data, JsonResult.class);
+            return Objects.nonNull(data) && "success".equalsIgnoreCase(data);
         } else {
             return false;
         }

src/main/java/cn/quantgroup/cashloanflowboss/spi/mo_clotho/service/MoClothoServiceImpl.java

@@ -11,6 +11,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.util.Map;
+import java.util.Objects;
 
 /**
  * @author Wang Xiangwei
@@ -33,8 +34,9 @@ public class MoClothoServiceImpl implements MoClothoService{
             paramMap.put("payStatus", expectPayResult ? 3 : 4);
             String result = moClothoCenter.pushLendingResult(paramMap);
             log.info("[放款结果通知]moClotho返回结果result={}", result);
-            JsonResult jsonResult = JSONObject.parseObject(result,JsonResult.class);
-            return jsonResult.isSuccess();
+            //JsonResult jsonResult = JSONObject.parseObject(result,JsonResult.class);
+            //return jsonResult.isSuccess();
+            return Objects.nonNull(result) && "success".equalsIgnoreCase(result);
         } else {
             return false;
         }