修改city.json

liquidnet-bus-service/liquidnet-service-platform/liquidnet-service-platform-impl/src/main/java/com/liquidnet/service/platform/service/impl/kylin/KylinFreightChargeServiceImpl.java

@@ -2,11 +2,9 @@ package com.liquidnet.service.platform.service.impl.kylin;
 
 import com.alibaba.fastjson.JSONObject;
 import com.liquidnet.common.cache.redis.util.RedisDataSourceUtil;
-import com.liquidnet.common.cache.redis.util.RedisUtil;
-import com.liquidnet.commons.lang.util.CollectionUtil;
+
 import com.liquidnet.commons.lang.util.IDGenerator;
 import com.liquidnet.commons.lang.util.JsonUtils;
-
 import com.liquidnet.service.kylin.constant.KylinRedisConst;
 import com.liquidnet.service.kylin.dao.KylinFreightChargeDao;
 import com.liquidnet.service.kylin.dto.vo.KylinExpressModuleVo;
@@ -73,32 +71,36 @@ public class KylinFreightChargeServiceImpl {
                             hBody.put("dCity", dCity);
                             hBody.put("dAddress", dAddress);
                             KylinFreightChargeDao kylinFreightCharge = KylinFreightChargeDao.getNew();
+                            HashMap hashMap = null;
                             try {
                                 // 生成签名并请求
                                 String result = shunfengSignUtils.generateSignatureAndRequestNew(hBody, "/public/order/v1/getFreight");
-                                HashMap hashMap = JsonUtils.fromJson(result, HashMap.class);
+                                hashMap = JsonUtils.fromJson(result, HashMap.class);
                                 HashMap<String, String> map = (HashMap<String, String>) hashMap.get("result");
-                                String price = map.get("price");
-                                String p = price.replace("元",".00");
+
                                 kylinFreightCharge.setFieldsId(IDGenerator.nextTimeId2());
                                 kylinFreightCharge.setProvince(dProvince);
                                 kylinFreightCharge.setCity(dCity);
                                 kylinFreightCharge.setAdname(dAddress);
-                                kylinFreightCharge.setPrice(p);
                                 kylinFreightCharge.setAdcode(adcode);
+                                String price = map.get("price");
+                                String p = price.replace("元",".00");
+                                kylinFreightCharge.setPrice(p);
                                 kylinFreightCharge.setBusinessType(map.get("businessType"));
                                 kylinFreightCharge.setBusinessTypeDesc(map.get("businessTypeDesc"));
 
                             } catch (Exception e) {
-                                e.printStackTrace();
-                                log.error("顺丰接口调用失败", e, kylinFreightCharge.getProvince() + " " + kylinFreightCharge.getCity() + " " + kylinFreightCharge.getAdname());
+                                log.error("顺丰接口调用失败:"+kylinFreightCharge.getProvince() + " " + kylinFreightCharge.getCity() + " " + kylinFreightCharge.getAdname()+" "+kylinExpressModuleVo.getProductCode()+kylinExpressModuleVo.getTitle());
                             }
-
+                            //调用成功
+                            if(hashMap.get("succ").toString().equals("ok")){
                                //存数据库
                                int i = kylinFreightChargeMapper.setFreightCharge(kylinFreightCharge);
                                //存redis
                                redisDataSourceUtil.getRedisKylinUtil().set(KylinRedisConst.RETURN_ADDRESS_CODE + adcode + KylinRedisConst.EXPRESS_TYPE + productCode, kylinFreightCharge);
                            }
+
+                        }
                     }
                 }
             }