Przeglądaj źródła

fix jinmao

release_toaliyun_real
winter 4 lat temu
rodzic
commit
3f53e541ec
1 zmienionych plików z 8 dodań i 8 usunięć
  1. +8
    -8
      mallinkCallback/src/main/java/com/iformall/controller/callback/JinMaoController.java

+ 8
- 8
mallinkCallback/src/main/java/com/iformall/controller/callback/JinMaoController.java Wyświetl plik

@@ -317,19 +317,19 @@ public class JinMaoController extends BaseController {
String paramStr = IOUtils.toString(inputStream, "utf-8"); String paramStr = IOUtils.toString(inputStream, "utf-8");
logger.info("dfh verify: {}",paramStr); logger.info("dfh verify: {}",paramStr);
if (StringUtils.isBlank(paramStr)) { if (StringUtils.isBlank(paramStr)) {
generateResult(response,true,false, null, "参数不能为空paramStr", null, "参数非法");
generateResult(response,true,false, null, "参数不能为空paramStr", null, "参数非法",currentTime);
return ; return ;
} }
Map param = JSON.parseObject(paramStr, Map.class); Map param = JSON.parseObject(paramStr, Map.class);
String typeStr = param.get("type")==null?"":param.get("type").toString(); String typeStr = param.get("type")==null?"":param.get("type").toString();
if (StringUtils.isBlank(typeStr) || (!"9".equals(typeStr))) { 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 ; return ;
} }
String couponOrderIdStr = param.get("Card")==null?"":param.get("Card").toString(); String couponOrderIdStr = param.get("Card")==null?"":param.get("Card").toString();
if (StringUtils.isBlank(couponOrderIdStr)) { if (StringUtils.isBlank(couponOrderIdStr)) {
generateResult(response,true,false, null, "参数不能为空Card", null, "参数非法");
generateResult(response,true,false, null, "参数不能为空Card", null, "参数非法",currentTime);
return ; return ;
} }
String mac = (String)param.get("MAC"); String mac = (String)param.get("MAC");
@@ -342,7 +342,7 @@ public class JinMaoController extends BaseController {
String expiredtimeStr = decodeids[1]; String expiredtimeStr = decodeids[1];
Date expiredtime = DateUtils.string2Date(expiredtimeStr).getTime(); Date expiredtime = DateUtils.string2Date(expiredtimeStr).getTime();
if (expiredtime.before(new Date())) { if (expiredtime.before(new Date())) {
generateResult(response,true,false, null, "码已失效,请刷新", null, "码已失效");
generateResult(response,true,false, null, "码已失效,请刷新", null, "码已失效",currentTime);
return ; return ;
} }
} }
@@ -353,24 +353,24 @@ public class JinMaoController extends BaseController {
} catch (NumberFormatException e) { } catch (NumberFormatException e) {
couponOrderId = 0L; couponOrderId = 0L;
logger.error("couponOrderId参数不正确: " + param.toString()); logger.error("couponOrderId参数不正确: " + param.toString());
generateResult(response,true,false, null, "参数非法Card"+couponOrderIdStr, null, "参数非法");
generateResult(response,true,false, null, "参数非法Card"+couponOrderIdStr, null, "参数非法",currentTime);
return ; return ;
} }


try { try {
WxCouponOrder couponOrder = wxCouponOrderService.verifyByEquiment(couponOrderId, "789", "null", "闸机扫码核销[Serial:"+serial+",MAC:"+mac+"]"); 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 ; return ;
}catch(Exception e) { }catch(Exception e) {
logger.error("JinMaoController --dfhOrder",e); logger.error("JinMaoController --dfhOrder",e);
generateResult(response,true,false, null, "核销错误"+e.getMessage(), null, "核销错误");
generateResult(response,true,false, null, "核销错误"+e.getMessage(), null, "核销错误",currentTime);
return ; return ;
} }
}catch(Exception e){ }catch(Exception e){
logger.error("JinMaoController --dfhOrder",e); logger.error("JinMaoController --dfhOrder",e);
generateResult(response,true,false, null, "核销错误"+e.getMessage(), null, "核销错误");
generateResult(response,true,false, null, "核销错误"+e.getMessage(), null, "核销错误",currentTime);
return ; return ;
}finally { }finally {
if (null != inputStream ) { if (null != inputStream ) {


Ładowanie…
Anuluj
Zapisz