Merge branch 'pre' into 'master'

修改快递价格

See merge request !159

liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-impl/src/main/java/com/liquidnet/service/kylin/controller/KylinGetShunFengPriceController.java

@@ -35,6 +35,7 @@ public class KylinGetShunFengPriceController {
             }
         }*/
         Object obj = redisUtil.get(KylinRedisConst.RETURN_ADDRESS_CODE + adcode + KylinRedisConst.EXPRESS_TYPE + productCode);
+        log.error("[ERROR-DATA]=" + KylinRedisConst.RETURN_ADDRESS_CODE + adcode + KylinRedisConst.EXPRESS_TYPE + productCode);
         if (obj != null) {
             KylinFreightChargeDao k = (KylinFreightChargeDao) obj;
             //运费为0元时返23元
@@ -44,7 +45,6 @@ public class KylinGetShunFengPriceController {
             return ResponseDto.success(k.getPrice());
         } else {
             //查询不到运费数据时返回23元
-            log.error("[ERROR]=" + KylinRedisConst.RETURN_ADDRESS_CODE + adcode + KylinRedisConst.EXPRESS_TYPE + productCode);
             return ResponseDto.success("23.00");
 //            return ResponseDto.failure("查询失败");
         }