Commit 6db1c80d authored by Junling Bu's avatar Junling Bu
Browse files

refactor[litemall-admin-api, litemall-wx-api]: 规范VO和DTO

parent 6b187d9b
...@@ -2,7 +2,7 @@ package org.linlinjava.litemall.wx.service; ...@@ -2,7 +2,7 @@ package org.linlinjava.litemall.wx.service;
import org.linlinjava.litemall.db.domain.LitemallUser; import org.linlinjava.litemall.db.domain.LitemallUser;
import org.linlinjava.litemall.db.service.LitemallUserService; import org.linlinjava.litemall.db.service.LitemallUserService;
import org.linlinjava.litemall.wx.dao.UserInfo; import org.linlinjava.litemall.wx.dto.UserInfo;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import org.springframework.util.Assert; import org.springframework.util.Assert;
......
package org.linlinjava.litemall.wx.service; package org.linlinjava.litemall.wx.service;
import org.linlinjava.litemall.core.util.CharUtil; import org.linlinjava.litemall.core.util.CharUtil;
import org.linlinjava.litemall.wx.dao.UserToken; import org.linlinjava.litemall.wx.dto.UserToken;
import java.time.LocalDateTime; import java.time.LocalDateTime;
import java.util.HashMap; import java.util.HashMap;
......
package org.linlinjava.litemall.wx.dao; package org.linlinjava.litemall.wx.vo;
import java.time.LocalDateTime; import java.time.LocalDateTime;
public class CouponVo { public class CouponVo {
private Integer id; private Integer id;
private String name;
private String desc;
private String tag;
private String min;
private String discount;
private LocalDateTime startTime;
private LocalDateTime endTime;
public Integer getId() { public Integer getId() {
return id; return id;
...@@ -13,14 +20,6 @@ public class CouponVo { ...@@ -13,14 +20,6 @@ public class CouponVo {
this.id = id; this.id = id;
} }
private String name;
private String desc;
private String tag;
private String min;
private String discount;
private LocalDateTime startTime;
private LocalDateTime endTime;
public String getName() { public String getName() {
return name; return name;
} }
......
...@@ -16,9 +16,9 @@ import org.linlinjava.litemall.db.domain.LitemallUser; ...@@ -16,9 +16,9 @@ import org.linlinjava.litemall.db.domain.LitemallUser;
import org.linlinjava.litemall.db.service.CouponAssignService; import org.linlinjava.litemall.db.service.CouponAssignService;
import org.linlinjava.litemall.db.service.LitemallUserService; import org.linlinjava.litemall.db.service.LitemallUserService;
import org.linlinjava.litemall.wx.annotation.LoginUser; import org.linlinjava.litemall.wx.annotation.LoginUser;
import org.linlinjava.litemall.wx.dao.UserInfo; import org.linlinjava.litemall.wx.dto.UserInfo;
import org.linlinjava.litemall.wx.dao.UserToken; import org.linlinjava.litemall.wx.dto.UserToken;
import org.linlinjava.litemall.wx.dao.WxLoginInfo; import org.linlinjava.litemall.wx.dto.WxLoginInfo;
import org.linlinjava.litemall.wx.service.CaptchaCodeManager; import org.linlinjava.litemall.wx.service.CaptchaCodeManager;
import org.linlinjava.litemall.wx.service.UserTokenManager; import org.linlinjava.litemall.wx.service.UserTokenManager;
import org.linlinjava.litemall.core.util.IpUtil; import org.linlinjava.litemall.core.util.IpUtil;
......
...@@ -11,7 +11,7 @@ import org.linlinjava.litemall.db.service.LitemallGoodsService; ...@@ -11,7 +11,7 @@ import org.linlinjava.litemall.db.service.LitemallGoodsService;
import org.linlinjava.litemall.db.service.LitemallTopicService; import org.linlinjava.litemall.db.service.LitemallTopicService;
import org.linlinjava.litemall.db.service.LitemallUserService; import org.linlinjava.litemall.db.service.LitemallUserService;
import org.linlinjava.litemall.wx.annotation.LoginUser; import org.linlinjava.litemall.wx.annotation.LoginUser;
import org.linlinjava.litemall.wx.dao.UserInfo; import org.linlinjava.litemall.wx.dto.UserInfo;
import org.linlinjava.litemall.wx.service.UserInfoService; import org.linlinjava.litemall.wx.service.UserInfoService;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.validation.annotation.Validated; import org.springframework.validation.annotation.Validated;
......
...@@ -13,7 +13,7 @@ import org.linlinjava.litemall.db.domain.LitemallGrouponRules; ...@@ -13,7 +13,7 @@ import org.linlinjava.litemall.db.domain.LitemallGrouponRules;
import org.linlinjava.litemall.db.service.*; import org.linlinjava.litemall.db.service.*;
import org.linlinjava.litemall.db.util.CouponConstant; import org.linlinjava.litemall.db.util.CouponConstant;
import org.linlinjava.litemall.wx.annotation.LoginUser; import org.linlinjava.litemall.wx.annotation.LoginUser;
import org.linlinjava.litemall.wx.dao.CouponVo; import org.linlinjava.litemall.wx.vo.CouponVo;
import org.linlinjava.litemall.wx.util.WxResponseCode; import org.linlinjava.litemall.wx.util.WxResponseCode;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.validation.annotation.Validated; import org.springframework.validation.annotation.Validated;
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment