Merge branch 'master' into 2.0-dev

* master:
  修改配置星巴克 肯德基 会员充值 话费 微信商户号
  修改配置星巴克 肯德基 会员充值 话费 微信商户号

# Conflicts:
#	hai-cweb/src/main/java/com/cweb/controller/pay/CzOrderController.java
#	hai-cweb/src/main/java/com/cweb/controller/pay/ThirdOrderController.java

hai-service/src/main/java/com/hai/service/impl/OutRechargeOrderServiceImpl.java

@@ -194,7 +194,6 @@ public class OutRechargeOrderServiceImpl implements OutRechargeOrderService {
     }
 
     @Override
-    @Cached(cacheType = CacheType.REMOTE,name="mobile:", key = "#orderNo",expire = 3600*24*30)
     public OutRechargeOrder findByOrderNo(String orderNo) {
 
         OutRechargeOrderExample example = new OutRechargeOrderExample();
@@ -933,7 +932,6 @@ public class OutRechargeOrderServiceImpl implements OutRechargeOrderService {
 
         for (String s : rechargePlatform) {
             // 尖椒充值
-            System.out.println("话费定时任务 -> 需要重新充值：尖椒开始");
             if (s.equals("1") && type == 1) {
                 object.put("out_order_id", orderNo);
                 object.put("amount", outRechargePrice.getRechargePrice());
@@ -955,14 +953,13 @@ public class OutRechargeOrderServiceImpl implements OutRechargeOrderService {
                 map.put("sourceId" , outRechargePrice.getId());
                 map.put("rechargePlatform" , type);
                 BsRechargeCode rechargeCode = rechargeCodeService.findByMap(map);
-                System.out.println("话费定时任务 -> 需要重新充值：龙阅开始");
                 object.put("out_trade_num", orderNo);
                 object.put("product_id", rechargeCode.getGoodsId());
                 object.put("mobile", outRechargeOrder.getRechargeContent());
                 object.put("notifyUrl", CommonSysConst.getSysConfig().getLyNotifyUrl());
                 JSONObject returnObject = RechargeConfig.rechargeOrderByLy(object);
                 object.put("return_content", returnObject);
-                if (returnObject != null && returnObject.getLong("errno") == 0) {
+                if (returnObject.getLong("errno") == 0) {
                     childOrder.setStatus(102);
                 } else {
                     childOrder.setStatus(103);
@@ -976,8 +973,6 @@ public class OutRechargeOrderServiceImpl implements OutRechargeOrderService {
                 map.put("sourceId" , outRechargePrice.getId());
                 map.put("rechargePlatform" , type);
                 BsRechargeCode rechargeCode = rechargeCodeService.findByMap(map);
-
-                System.out.println("话费定时任务 -> 需要重新充值：龙阅开始");
                 object.put("agentOrderId", orderNo);
                 object.put("productId", rechargeCode.getGoodsId());
                 object.put("mobile", outRechargeOrder.getRechargeContent());