Преглед изворни кода

fix bug

release_toaliyun_real
xiaohanzi пре 4 година
родитељ
комит
b1280fdfbd
2 измењених фајлова са 3 додато и 3 уклоњено
  1. +2
    -2
      mallinkBApi/src/main/java/com/iformall/controller/WxCouponOrderController.java
  2. +1
    -1
      mallinkService/src/main/java/com/iformall/domain/vo/WxCouponOrderCVo.java

+ 2
- 2
mallinkBApi/src/main/java/com/iformall/controller/WxCouponOrderController.java Прегледај датотеку

@@ -170,7 +170,7 @@ public class WxCouponOrderController extends BaseController {
logger.info("couponOrderController.detail。decode:[coid]" + couponOrderId+",[time]"+expiredtimeStr); logger.info("couponOrderController.detail。decode:[coid]" + couponOrderId+",[time]"+expiredtimeStr);
Date expiredtime = DateUtils.string2Date(expiredtimeStr).getTime(); Date expiredtime = DateUtils.string2Date(expiredtimeStr).getTime();
if (expiredtime.before(new Date())) { if (expiredtime.before(new Date())) {
return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(),"码已失效,请重新刷新");
return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(),"码已失效,请更新二维码后重试");
} }
} }
@@ -297,7 +297,7 @@ public class WxCouponOrderController 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())) {
return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(),"码已失效,请重新刷新");
return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(),"码已失效,请更新二维码后重试");
} }
} }


+ 1
- 1
mallinkService/src/main/java/com/iformall/domain/vo/WxCouponOrderCVo.java Прегледај датотеку

@@ -163,7 +163,7 @@ public class WxCouponOrderCVo extends WxCouponOrder {
} }
public static final int expiredSeconds = 30;
public static final int expiredSeconds = 60;
public static final String arg = "&"; public static final String arg = "&";
public static String calcuteExpiredCouponOrderId(String couponOrderId) { public static String calcuteExpiredCouponOrderId(String couponOrderId) {
if (StringUtils.isBlank(couponOrderId)) { if (StringUtils.isBlank(couponOrderId)) {


Loading…
Откажи
Сачувај