From 3f53e541ec272effd8069b2ba8c3fe752e3f99b5 Mon Sep 17 00:00:00 2001 From: winter Date: Fri, 31 Dec 2021 12:28:35 +0800 Subject: [PATCH] fix jinmao --- .../controller/callback/JinMaoController.java | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/mallinkCallback/src/main/java/com/iformall/controller/callback/JinMaoController.java b/mallinkCallback/src/main/java/com/iformall/controller/callback/JinMaoController.java index fc491a479..159ed7594 100644 --- a/mallinkCallback/src/main/java/com/iformall/controller/callback/JinMaoController.java +++ b/mallinkCallback/src/main/java/com/iformall/controller/callback/JinMaoController.java @@ -317,19 +317,19 @@ public class JinMaoController extends BaseController { String paramStr = IOUtils.toString(inputStream, "utf-8"); logger.info("dfh verify: {}",paramStr); if (StringUtils.isBlank(paramStr)) { - generateResult(response,true,false, null, "参数不能为空paramStr", null, "参数非法"); + generateResult(response,true,false, null, "参数不能为空paramStr", null, "参数非法",currentTime); return ; } Map param = JSON.parseObject(paramStr, Map.class); String typeStr = param.get("type")==null?"":param.get("type").toString(); if (StringUtils.isBlank(typeStr) || (!"9".equals(typeStr))) { - generateResult(response,true,false, null, "参数非法type"+typeStr, null, "参数非法"); + generateResult(response,true,false, null, "参数非法type"+typeStr, null, "参数非法",currentTime); return ; } String couponOrderIdStr = param.get("Card")==null?"":param.get("Card").toString(); if (StringUtils.isBlank(couponOrderIdStr)) { - generateResult(response,true,false, null, "参数不能为空Card", null, "参数非法"); + generateResult(response,true,false, null, "参数不能为空Card", null, "参数非法",currentTime); return ; } String mac = (String)param.get("MAC"); @@ -342,7 +342,7 @@ public class JinMaoController extends BaseController { String expiredtimeStr = decodeids[1]; Date expiredtime = DateUtils.string2Date(expiredtimeStr).getTime(); if (expiredtime.before(new Date())) { - generateResult(response,true,false, null, "码已失效,请刷新", null, "码已失效"); + generateResult(response,true,false, null, "码已失效,请刷新", null, "码已失效",currentTime); return ; } } @@ -353,24 +353,24 @@ public class JinMaoController extends BaseController { } catch (NumberFormatException e) { couponOrderId = 0L; logger.error("couponOrderId参数不正确: " + param.toString()); - generateResult(response,true,false, null, "参数非法Card"+couponOrderIdStr, null, "参数非法"); + generateResult(response,true,false, null, "参数非法Card"+couponOrderIdStr, null, "参数非法",currentTime); return ; } try { WxCouponOrder couponOrder = wxCouponOrderService.verifyByEquiment(couponOrderId, "789", "null", "闸机扫码核销[Serial:"+serial+",MAC:"+mac+"]"); - generateResult(response,false,true, couponOrder.getCouponName(), "核销成功:"+(System.currentTimeMillis()-currentTime), String.valueOf(couponOrder.getId()), "核销成功"); + generateResult(response,false,true, couponOrder.getCouponName(), "核销成功", String.valueOf(couponOrder.getId()), "核销成功",currentTime); return ; }catch(Exception e) { logger.error("JinMaoController --dfhOrder",e); - generateResult(response,true,false, null, "核销错误"+e.getMessage(), null, "核销错误"); + generateResult(response,true,false, null, "核销错误"+e.getMessage(), null, "核销错误",currentTime); return ; } }catch(Exception e){ logger.error("JinMaoController --dfhOrder",e); - generateResult(response,true,false, null, "核销错误"+e.getMessage(), null, "核销错误"); + generateResult(response,true,false, null, "核销错误"+e.getMessage(), null, "核销错误",currentTime); return ; }finally { if (null != inputStream ) {