From 1417dbc64f5686fbab9f83fc62f7e555b48f6bc1 Mon Sep 17 00:00:00 2001 From: "376654749@qq.com" Date: Tue, 15 Mar 2022 14:59:42 +0800 Subject: [PATCH] adding CouponGetAllEntity logic --- .../smartadmin/module/system/royalcanin/CouponService.java | 2 +- .../module/system/royalcanin/coupon/CouponGetAllEntity.java | 2 +- .../src/main/java/net/lab1024/smartadmin/util/SmartJWTUtil.java | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/CouponService.java b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/CouponService.java index 9fda9f7b..90c24567 100644 --- a/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/CouponService.java +++ b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/CouponService.java @@ -45,7 +45,7 @@ public class CouponService { Map paramMap = MapRemoveNullUtil.setConditionMap(couponGetAllEntity); Date currentDate = SmartDateUtil.parseYMD(paramMap.get("useStartDate") == null ? "1990-01-01":paramMap.get("useStartDate")); paramMap.remove("productCodes"); - paramMap.put("status",StringUtil.toString(couponGetAllEntity.getStatus()).equals("0")?null:StringUtil.toString(couponGetAllEntity.getStatus())); + paramMap.put("status",StringUtil.toString(couponGetAllEntity.getStatus()).equals("")?null:StringUtil.toString(couponGetAllEntity.getStatus())); paramMap.put("page",StringUtil.toString(couponGetAllEntity.getPage()).equals("0")?null:StringUtil.toString(couponGetAllEntity.getPage())); paramMap.put("rows",StringUtil.toString(couponGetAllEntity.getRows()).equals("0")?null:StringUtil.toString(couponGetAllEntity.getRows())); paramMap.put("usestartDate",paramMap.get("useStartDate")); diff --git a/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/coupon/CouponGetAllEntity.java b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/coupon/CouponGetAllEntity.java index 2391c848..f9e05a7c 100644 --- a/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/coupon/CouponGetAllEntity.java +++ b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/coupon/CouponGetAllEntity.java @@ -47,7 +47,7 @@ public class CouponGetAllEntity { * 0:未使用,1已使用,2已作废 */ @ApiModelProperty(example = "1") - private int status; + private String status = ""; /** * 是否已经使用 diff --git a/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/util/SmartJWTUtil.java b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/util/SmartJWTUtil.java index f06863f0..0e2e8d47 100644 --- a/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/util/SmartJWTUtil.java +++ b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/util/SmartJWTUtil.java @@ -80,7 +80,7 @@ public class SmartJWTUtil { public static void main(String[] args) { String token = SmartJWTUtil.generateToken("884159"); System.out.println(token); - System.out.println(SmartJWTUtil.decodeToken("eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpZCI6Ijg4NDIzNCIsImV4cCI6MTY0ODI4MjAxNX0.itFA3bb0XNk2LSD3ey3_o33GYK3Rt0v9MXiRerhu-6A")); + System.out.println(SmartJWTUtil.decodeToken("eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpZCI6Ijg4NDEyNyIsImV4cCI6MTY0NTA5MTc5Nn0.UHEYiTkHtwQjTNjiAKg8CTP-Ab_KSfFzBiIip49gLUk")); } }