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 845e52fa0..1c9618a42 100644 --- a/mallinkCallback/src/main/java/com/iformall/controller/callback/JinMaoController.java +++ b/mallinkCallback/src/main/java/com/iformall/controller/callback/JinMaoController.java @@ -382,7 +382,7 @@ public class JinMaoController extends BaseController { } PrintWriter out; try { - response.setContentType("text/html"); + response.setContentType("application/json"); response.setCharacterEncoding("GB2312"); out = response.getWriter(); out.print("DATA="+JSON.toJSONString(retMap)); diff --git a/mallinkService/src/main/java/com/iformall/domain/vo/WxCouponOrderCVo.java b/mallinkService/src/main/java/com/iformall/domain/vo/WxCouponOrderCVo.java index 0c3df95d8..932e516f4 100644 --- a/mallinkService/src/main/java/com/iformall/domain/vo/WxCouponOrderCVo.java +++ b/mallinkService/src/main/java/com/iformall/domain/vo/WxCouponOrderCVo.java @@ -178,4 +178,8 @@ public class WxCouponOrderCVo extends WxCouponOrder { } return new String(Base64Util.decode(couponOrderId)); } + + public static void main(String[] args) { + System.out.println(calcuteExpiredCouponOrderId("596868905409503232",300)); + } }