diff --git a/mallinkService/src/main/java/com/iformall/service/park/impl/haikangweishi/HaiKangWeiShiParkService.java b/mallinkService/src/main/java/com/iformall/service/park/impl/haikangweishi/HaiKangWeiShiParkService.java index 950748703..9c7ee91d6 100644 --- a/mallinkService/src/main/java/com/iformall/service/park/impl/haikangweishi/HaiKangWeiShiParkService.java +++ b/mallinkService/src/main/java/com/iformall/service/park/impl/haikangweishi/HaiKangWeiShiParkService.java @@ -165,7 +165,7 @@ public class HaiKangWeiShiParkService extends BaseParkService implements ParkAda String _endTime = attribute.getString("costTime");//离场时间,格式为“yyyy-MM-dd HH:mi:ss” String payPath = ""; return new ResultData(new ParkStopFee(parkOrderId,haikang.utcToLocal(_createTime),haikang.utcToLocal(_endTime), - String.valueOf(attribute.getDouble("shouldCost")),appId,payPath,null,null,"请支付后15分钟内离场")); + String.valueOf(attribute.getDouble("shouldCost")),appId,payPath,null,null,"0元请勿使用优惠券,无法退回。支付后15分钟内离场")); } /** @@ -192,12 +192,12 @@ public class HaiKangWeiShiParkService extends BaseParkService implements ParkAda return new ResultData(ErrorCode.COUPON_IS_EMPTY.getCode(),"当前停车券没有关联停车场优惠券配置[planNo]。"+coupon.getTitle()); } JSONObject retObj = haikang.useCoupon(park,planNo,carNumber,orderNo, getCacheToken(park),haikang.getAuthorization(park,getCacheToken(park))); - if (retObj.getIntValue("code") == 0){ + if (retObj.getString("code").equals("0")){ return new ResultData(); }else { logger.error("haikangweishi useCoupon error. paramMap: {} . haikangResult: {}",JSON.toJSONString(paramMap),retObj); String msg = retObj.getString("msg"); - return new ResultData(retObj.getIntValue("code"), "当前用户领用到海康威视停车券失败:"+msg); + return new ResultData(ErrorCode.CYF_STOP_FEE_FAIL.getCode(), "当前用户领用到海康威视停车券失败:["+retObj.getString("code")+"]"+msg); } } diff --git a/mallinkService/src/main/java/com/iformall/service/park/impl/haikangweishi/HaiKangWeiShiUtil.java b/mallinkService/src/main/java/com/iformall/service/park/impl/haikangweishi/HaiKangWeiShiUtil.java index ec80a1e89..4eb2c83f4 100644 --- a/mallinkService/src/main/java/com/iformall/service/park/impl/haikangweishi/HaiKangWeiShiUtil.java +++ b/mallinkService/src/main/java/com/iformall/service/park/impl/haikangweishi/HaiKangWeiShiUtil.java @@ -227,7 +227,9 @@ public class HaiKangWeiShiUtil { Map couponmap = new HashMap(); couponmap.put("plateNo", carNumber); couponmap.put("ruleId", couponNo); - params.put("coupons", "["+JSON.toJSONString(couponmap)+"]");//商户编号 + List coupons = new ArrayList(); + coupons.add(couponmap); + params.put("coupons", coupons);//商户编号 String retCode = ProcBussiness(COUPON_USE, params,token,Authrozitaion); if (StringUtils.isBlank(retCode)) { throw new MallinkException(ErrorCode.SYS_SERVER_ERROR.getCode(), "haikang useCoupon error. has no result"); @@ -239,7 +241,7 @@ public class HaiKangWeiShiUtil { throw new MallinkException(errStatus,"haikang useCoupon error.["+result.getString("error")+"]"+result.getString("message")); } - if (!result.getString("code").equals("200") ) { + if (!result.getString("code").equals("0") ) { String message = result.getString("msg"); throw new MallinkException(result.getInteger("code"), "haikang useCoupon error."+message); } @@ -325,10 +327,14 @@ public class HaiKangWeiShiUtil { } } + long currentTime = System.currentTimeMillis(); + StringBuffer requestlog = new StringBuffer(); if (null != pairs) { log.info("haikangweishi httpRequest:[url]"+url+"[params]"+JSON.toJSONString(pairs)); + requestlog.append("haikangweishi httpRequest:[url]").append(url).append("[params]").append(JSON.toJSONString(pairs)); }else { log.info("haikangweishi httpRequest:[url]"+url); + requestlog.append("haikangweishi httpRequest:[url]").append(url); } HttpResponse response = null; try { @@ -336,7 +342,7 @@ public class HaiKangWeiShiUtil { } catch (Exception e) { log.error(e.getLocalizedMessage(),e); } - + long responseCostTime = (System.currentTimeMillis()-currentTime)/1000; String result = null; //打印StatusLine @@ -345,7 +351,8 @@ public class HaiKangWeiShiUtil { //获取实体 HttpEntity httpEntity= response.getEntity(); result = EntityUtils.toString(httpEntity, "UTF-8"); - log.debug(result); + requestlog.append("[response]").append(result).append("[costTime(seconds)]").append(responseCostTime); + log.debug(requestlog.toString()); } catch (Exception e) { log.error(e.getLocalizedMessage(),e); } @@ -375,11 +382,14 @@ public class HaiKangWeiShiUtil { } HttpEntity entity = builder.build(); httpPost.setEntity(entity); - + long currentTime = System.currentTimeMillis(); + StringBuffer requestlog = new StringBuffer(); if (null != pairs) { - log.info("haikangweishi httpRequest:[url]"+url+"[params]"+JSON.toJSONString(pairs)); + log.info("haikangweishi httpRequest start :[url]"+url+"[params]"+JSON.toJSONString(pairs)); + requestlog.append("haikangweishi httpRequest:[url]").append(url).append("[params]").append(JSON.toJSONString(pairs)); }else { - log.info("haikangweishi httpRequest:[url]"+url); + log.info("haikangweishi httpRequest start :[url]"+url); + requestlog.append("haikangweishi httpRequest:[url]").append(url); } HttpResponse response = null; try { @@ -387,7 +397,7 @@ public class HaiKangWeiShiUtil { } catch (Exception e) { log.error(e.getLocalizedMessage(),e); } - + long responseCostTime = (System.currentTimeMillis()-currentTime)/1000; String result = null; //打印StatusLine @@ -396,7 +406,8 @@ public class HaiKangWeiShiUtil { //获取实体 HttpEntity httpEntity= response.getEntity(); result = EntityUtils.toString(httpEntity, "UTF-8"); - log.debug(result); + requestlog.append("[response]").append(result).append("[costTime(seconds)]").append(responseCostTime); + log.debug(requestlog.toString()); } catch (Exception e) { log.error(e.getLocalizedMessage(),e); }