diff --git a/litemall-admin-api/src/main/java/org/linlinjava/litemall/admin/dao/Product.java b/litemall-admin-api/src/main/java/org/linlinjava/litemall/admin/dao/Product.java deleted file mode 100644 index b2636a10..00000000 --- a/litemall-admin-api/src/main/java/org/linlinjava/litemall/admin/dao/Product.java +++ /dev/null @@ -1,42 +0,0 @@ -package org.linlinjava.litemall.admin.dao; - -import java.math.BigDecimal; - -public class Product { - String[] specifications; - BigDecimal price; - Integer number; - String url; - - public String[] getSpecifications() { - return specifications; - } - - public void setSpecifications(String[] specifications) { - this.specifications = specifications; - } - - public BigDecimal getPrice() { - return price; - } - - public void setPrice(BigDecimal price) { - this.price = price; - } - - public Integer getNumber() { - return number; - } - - public void setNumber(Integer number) { - this.number = number; - } - - public String getUrl() { - return url; - } - - public void setUrl(String url) { - this.url = url; - } -} diff --git a/litemall-admin-api/src/main/java/org/linlinjava/litemall/admin/dao/GoodsAllinone.java b/litemall-admin-api/src/main/java/org/linlinjava/litemall/admin/dto/GoodsAllinone.java similarity index 92% rename from litemall-admin-api/src/main/java/org/linlinjava/litemall/admin/dao/GoodsAllinone.java rename to litemall-admin-api/src/main/java/org/linlinjava/litemall/admin/dto/GoodsAllinone.java index 84c037fa..5bd93c50 100644 --- a/litemall-admin-api/src/main/java/org/linlinjava/litemall/admin/dao/GoodsAllinone.java +++ b/litemall-admin-api/src/main/java/org/linlinjava/litemall/admin/dto/GoodsAllinone.java @@ -1,4 +1,4 @@ -package org.linlinjava.litemall.admin.dao; +package org.linlinjava.litemall.admin.dto; import org.linlinjava.litemall.db.domain.LitemallGoods; import org.linlinjava.litemall.db.domain.LitemallGoodsAttribute; @@ -9,7 +9,6 @@ public class GoodsAllinone { LitemallGoods goods; LitemallGoodsSpecification[] specifications; LitemallGoodsAttribute[] attributes; - // 这里采用 Product 再转换到 LitemallGoodsProduct LitemallGoodsProduct[] products; public LitemallGoods getGoods() { diff --git a/litemall-admin-api/src/main/java/org/linlinjava/litemall/admin/service/AdminGoodsService.java b/litemall-admin-api/src/main/java/org/linlinjava/litemall/admin/service/AdminGoodsService.java index df98de11..9ac2fc05 100644 --- a/litemall-admin-api/src/main/java/org/linlinjava/litemall/admin/service/AdminGoodsService.java +++ b/litemall-admin-api/src/main/java/org/linlinjava/litemall/admin/service/AdminGoodsService.java @@ -3,8 +3,8 @@ package org.linlinjava.litemall.admin.service; import com.github.pagehelper.PageInfo; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.linlinjava.litemall.admin.dao.GoodsAllinone; -import org.linlinjava.litemall.admin.util.CatVo; +import org.linlinjava.litemall.admin.dto.GoodsAllinone; +import org.linlinjava.litemall.admin.vo.CatVo; import org.linlinjava.litemall.core.qcode.QCodeService; import org.linlinjava.litemall.core.util.ResponseUtil; import org.linlinjava.litemall.db.domain.*; @@ -21,7 +21,6 @@ import java.util.List; import java.util.Map; import static org.linlinjava.litemall.admin.util.AdminResponseCode.GOODS_NAME_EXIST; -import static org.linlinjava.litemall.admin.util.AdminResponseCode.GOODS_UPDATE_NOT_ALLOWED; @Service public class AdminGoodsService { diff --git a/litemall-admin-api/src/main/java/org/linlinjava/litemall/admin/util/PermissionUtil.java b/litemall-admin-api/src/main/java/org/linlinjava/litemall/admin/util/PermissionUtil.java index 3a095b9d..4c9991ac 100644 --- a/litemall-admin-api/src/main/java/org/linlinjava/litemall/admin/util/PermissionUtil.java +++ b/litemall-admin-api/src/main/java/org/linlinjava/litemall/admin/util/PermissionUtil.java @@ -4,6 +4,7 @@ import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.reflect.MethodUtils; import org.apache.shiro.authz.annotation.RequiresPermissions; import org.linlinjava.litemall.admin.annotation.RequiresPermissionsDesc; +import org.linlinjava.litemall.admin.vo.PermVo; import org.springframework.context.ApplicationContext; import org.springframework.core.annotation.AnnotationUtils; import org.springframework.stereotype.Controller; diff --git a/litemall-admin-api/src/main/java/org/linlinjava/litemall/admin/util/CatVo.java b/litemall-admin-api/src/main/java/org/linlinjava/litemall/admin/vo/CatVo.java similarity index 92% rename from litemall-admin-api/src/main/java/org/linlinjava/litemall/admin/util/CatVo.java rename to litemall-admin-api/src/main/java/org/linlinjava/litemall/admin/vo/CatVo.java index 033bb944..05a04df2 100644 --- a/litemall-admin-api/src/main/java/org/linlinjava/litemall/admin/util/CatVo.java +++ b/litemall-admin-api/src/main/java/org/linlinjava/litemall/admin/vo/CatVo.java @@ -1,4 +1,4 @@ -package org.linlinjava.litemall.admin.util; +package org.linlinjava.litemall.admin.vo; import java.util.List; diff --git a/litemall-admin-api/src/main/java/org/linlinjava/litemall/admin/vo/CategoryVO.java b/litemall-admin-api/src/main/java/org/linlinjava/litemall/admin/vo/CategoryVo.java similarity index 88% rename from litemall-admin-api/src/main/java/org/linlinjava/litemall/admin/vo/CategoryVO.java rename to litemall-admin-api/src/main/java/org/linlinjava/litemall/admin/vo/CategoryVo.java index da3a1b87..27fe89ef 100644 --- a/litemall-admin-api/src/main/java/org/linlinjava/litemall/admin/vo/CategoryVO.java +++ b/litemall-admin-api/src/main/java/org/linlinjava/litemall/admin/vo/CategoryVo.java @@ -2,7 +2,7 @@ package org.linlinjava.litemall.admin.vo; import java.util.List; -public class CategoryVO { +public class CategoryVo { private Integer id; private String name; private String keywords; @@ -10,13 +10,13 @@ public class CategoryVO { private String iconUrl; private String picUrl; private String level; - private List children; + private List children; - public List getChildren() { + public List getChildren() { return children; } - public void setChildren(List children) { + public void setChildren(List children) { this.children = children; } diff --git a/litemall-admin-api/src/main/java/org/linlinjava/litemall/admin/util/PermVo.java b/litemall-admin-api/src/main/java/org/linlinjava/litemall/admin/vo/PermVo.java similarity index 94% rename from litemall-admin-api/src/main/java/org/linlinjava/litemall/admin/util/PermVo.java rename to litemall-admin-api/src/main/java/org/linlinjava/litemall/admin/vo/PermVo.java index 83c6055a..6bd3958a 100644 --- a/litemall-admin-api/src/main/java/org/linlinjava/litemall/admin/util/PermVo.java +++ b/litemall-admin-api/src/main/java/org/linlinjava/litemall/admin/vo/PermVo.java @@ -1,4 +1,4 @@ -package org.linlinjava.litemall.admin.util; +package org.linlinjava.litemall.admin.vo; import java.util.List; diff --git a/litemall-admin-api/src/main/java/org/linlinjava/litemall/admin/vo/RegionVO.java b/litemall-admin-api/src/main/java/org/linlinjava/litemall/admin/vo/RegionVo.java similarity index 82% rename from litemall-admin-api/src/main/java/org/linlinjava/litemall/admin/vo/RegionVO.java rename to litemall-admin-api/src/main/java/org/linlinjava/litemall/admin/vo/RegionVo.java index 56e46f4b..1ca43e2f 100644 --- a/litemall-admin-api/src/main/java/org/linlinjava/litemall/admin/vo/RegionVO.java +++ b/litemall-admin-api/src/main/java/org/linlinjava/litemall/admin/vo/RegionVo.java @@ -2,13 +2,13 @@ package org.linlinjava.litemall.admin.vo; import java.util.List; -public class RegionVO { +public class RegionVo { private Integer id; private String name; private Byte type; private Integer code; - private List children; + private List children; public Integer getId() { return id; @@ -18,7 +18,7 @@ public class RegionVO { this.id = id; } - public List getChildren() { + public List getChildren() { return children; } @@ -46,7 +46,7 @@ public class RegionVO { this.code = code; } - public void setChildren(List children) { + public void setChildren(List children) { this.children = children; } } diff --git a/litemall-admin-api/src/main/java/org/linlinjava/litemall/admin/util/StatVo.java b/litemall-admin-api/src/main/java/org/linlinjava/litemall/admin/vo/StatVo.java similarity index 92% rename from litemall-admin-api/src/main/java/org/linlinjava/litemall/admin/util/StatVo.java rename to litemall-admin-api/src/main/java/org/linlinjava/litemall/admin/vo/StatVo.java index 04005d25..dcd9c76b 100644 --- a/litemall-admin-api/src/main/java/org/linlinjava/litemall/admin/util/StatVo.java +++ b/litemall-admin-api/src/main/java/org/linlinjava/litemall/admin/vo/StatVo.java @@ -1,4 +1,4 @@ -package org.linlinjava.litemall.admin.util; +package org.linlinjava.litemall.admin.vo; import java.util.ArrayList; import java.util.Arrays; diff --git a/litemall-admin-api/src/main/java/org/linlinjava/litemall/admin/web/AdminCategoryController.java b/litemall-admin-api/src/main/java/org/linlinjava/litemall/admin/web/AdminCategoryController.java index 347f492c..9bc40264 100644 --- a/litemall-admin-api/src/main/java/org/linlinjava/litemall/admin/web/AdminCategoryController.java +++ b/litemall-admin-api/src/main/java/org/linlinjava/litemall/admin/web/AdminCategoryController.java @@ -1,14 +1,11 @@ package org.linlinjava.litemall.admin.web; -import com.github.pagehelper.PageInfo; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.apache.shiro.authz.annotation.RequiresPermissions; import org.linlinjava.litemall.admin.annotation.RequiresPermissionsDesc; -import org.linlinjava.litemall.admin.vo.CategoryVO; +import org.linlinjava.litemall.admin.vo.CategoryVo; import org.linlinjava.litemall.core.util.ResponseUtil; -import org.linlinjava.litemall.core.validator.Order; -import org.linlinjava.litemall.core.validator.Sort; import org.linlinjava.litemall.db.domain.LitemallCategory; import org.linlinjava.litemall.db.service.LitemallCategoryService; import org.springframework.beans.factory.annotation.Autowired; @@ -35,11 +32,11 @@ public class AdminCategoryController { @RequiresPermissionsDesc(menu={"商场管理" , "类目管理"}, button="查询") @GetMapping("/list") public Object list() { - List categoryVOList = new ArrayList<>(); + List categoryVoList = new ArrayList<>(); List categoryList = categoryService.queryByPid(0); for(LitemallCategory category : categoryList){ - CategoryVO categoryVO = new CategoryVO(); + CategoryVo categoryVO = new CategoryVo(); categoryVO.setId(category.getId()); categoryVO.setDesc(category.getDesc()); categoryVO.setIconUrl(category.getIconUrl()); @@ -48,26 +45,26 @@ public class AdminCategoryController { categoryVO.setName(category.getName()); categoryVO.setLevel(category.getLevel()); - List children = new ArrayList<>(); + List children = new ArrayList<>(); List subCategoryList = categoryService.queryByPid(category.getId()); for(LitemallCategory subCategory : subCategoryList){ - CategoryVO subCategoryVO = new CategoryVO(); - subCategoryVO.setId(subCategory.getId()); - subCategoryVO.setDesc(subCategory.getDesc()); - subCategoryVO.setIconUrl(subCategory.getIconUrl()); - subCategoryVO.setPicUrl(subCategory.getPicUrl()); - subCategoryVO.setKeywords(subCategory.getKeywords()); - subCategoryVO.setName(subCategory.getName()); - subCategoryVO.setLevel(subCategory.getLevel()); + CategoryVo subCategoryVo = new CategoryVo(); + subCategoryVo.setId(subCategory.getId()); + subCategoryVo.setDesc(subCategory.getDesc()); + subCategoryVo.setIconUrl(subCategory.getIconUrl()); + subCategoryVo.setPicUrl(subCategory.getPicUrl()); + subCategoryVo.setKeywords(subCategory.getKeywords()); + subCategoryVo.setName(subCategory.getName()); + subCategoryVo.setLevel(subCategory.getLevel()); - children.add(subCategoryVO); + children.add(subCategoryVo); } categoryVO.setChildren(children); - categoryVOList.add(categoryVO); + categoryVoList.add(categoryVO); } - return ResponseUtil.ok(categoryVOList); + return ResponseUtil.ok(categoryVoList); } private Object validate(LitemallCategory category) { diff --git a/litemall-admin-api/src/main/java/org/linlinjava/litemall/admin/web/AdminGoodsController.java b/litemall-admin-api/src/main/java/org/linlinjava/litemall/admin/web/AdminGoodsController.java index 120f5ec1..edf2792a 100644 --- a/litemall-admin-api/src/main/java/org/linlinjava/litemall/admin/web/AdminGoodsController.java +++ b/litemall-admin-api/src/main/java/org/linlinjava/litemall/admin/web/AdminGoodsController.java @@ -4,7 +4,7 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.apache.shiro.authz.annotation.RequiresPermissions; import org.linlinjava.litemall.admin.annotation.RequiresPermissionsDesc; -import org.linlinjava.litemall.admin.dao.GoodsAllinone; +import org.linlinjava.litemall.admin.dto.GoodsAllinone; import org.linlinjava.litemall.admin.service.AdminGoodsService; import org.linlinjava.litemall.core.validator.Order; import org.linlinjava.litemall.core.validator.Sort; diff --git a/litemall-admin-api/src/main/java/org/linlinjava/litemall/admin/web/AdminRegionController.java b/litemall-admin-api/src/main/java/org/linlinjava/litemall/admin/web/AdminRegionController.java index bfc82727..133b7166 100644 --- a/litemall-admin-api/src/main/java/org/linlinjava/litemall/admin/web/AdminRegionController.java +++ b/litemall-admin-api/src/main/java/org/linlinjava/litemall/admin/web/AdminRegionController.java @@ -1,26 +1,20 @@ package org.linlinjava.litemall.admin.web; -import com.github.pagehelper.PageInfo; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.linlinjava.litemall.admin.vo.RegionVO; +import org.linlinjava.litemall.admin.vo.RegionVo; import org.linlinjava.litemall.core.util.ResponseUtil; -import org.linlinjava.litemall.core.validator.Order; -import org.linlinjava.litemall.core.validator.Sort; import org.linlinjava.litemall.db.domain.LitemallRegion; import org.linlinjava.litemall.db.service.LitemallRegionService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RestController; import javax.validation.constraints.NotNull; import java.util.ArrayList; -import java.util.HashMap; import java.util.List; -import java.util.Map; @RestController @RequestMapping("/admin/region") @@ -39,29 +33,29 @@ public class AdminRegionController { @GetMapping("/list") public Object list() { - List regionVOList = new ArrayList<>(); + List regionVoList = new ArrayList<>(); List provinceList = regionService.queryByPid(0); for(LitemallRegion province : provinceList){ - RegionVO provinceVO = new RegionVO(); + RegionVo provinceVO = new RegionVo(); provinceVO.setId(province.getId()); provinceVO.setName(province.getName()); provinceVO.setCode(province.getCode()); provinceVO.setType(province.getType()); List cityList = regionService.queryByPid(province.getId()); - List cityVOList = new ArrayList<>(); + List cityVOList = new ArrayList<>(); for(LitemallRegion city : cityList){ - RegionVO cityVO = new RegionVO(); + RegionVo cityVO = new RegionVo(); cityVO.setId(city.getId()); cityVO.setName(city.getName()); cityVO.setCode(city.getCode()); cityVO.setType(city.getType()); List areaList = regionService.queryByPid(city.getId()); - List areaVOList = new ArrayList<>(); + List areaVOList = new ArrayList<>(); for(LitemallRegion area : areaList){ - RegionVO areaVO = new RegionVO(); + RegionVo areaVO = new RegionVo(); areaVO.setId(area.getId()); areaVO.setName(area.getName()); areaVO.setCode(area.getCode()); @@ -73,9 +67,9 @@ public class AdminRegionController { cityVOList.add(cityVO); } provinceVO.setChildren(cityVOList); - regionVOList.add(provinceVO); + regionVoList.add(provinceVO); } - return ResponseUtil.ok(regionVOList); + return ResponseUtil.ok(regionVoList); } } diff --git a/litemall-admin-api/src/main/java/org/linlinjava/litemall/admin/web/AdminRoleController.java b/litemall-admin-api/src/main/java/org/linlinjava/litemall/admin/web/AdminRoleController.java index 44bb645e..6d3df828 100644 --- a/litemall-admin-api/src/main/java/org/linlinjava/litemall/admin/web/AdminRoleController.java +++ b/litemall-admin-api/src/main/java/org/linlinjava/litemall/admin/web/AdminRoleController.java @@ -3,12 +3,10 @@ package org.linlinjava.litemall.admin.web; import com.github.pagehelper.PageInfo; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.apache.shiro.SecurityUtils; import org.apache.shiro.authz.annotation.RequiresPermissions; -import org.apache.shiro.subject.Subject; import org.linlinjava.litemall.admin.annotation.RequiresPermissionsDesc; import org.linlinjava.litemall.admin.util.AdminResponseCode; -import org.linlinjava.litemall.admin.util.PermVo; +import org.linlinjava.litemall.admin.vo.PermVo; import org.linlinjava.litemall.admin.util.Permission; import org.linlinjava.litemall.admin.util.PermissionUtil; import org.linlinjava.litemall.core.util.JacksonUtil; @@ -16,7 +14,6 @@ import org.linlinjava.litemall.core.util.ResponseUtil; import org.linlinjava.litemall.core.validator.Order; import org.linlinjava.litemall.core.validator.Sort; import org.linlinjava.litemall.db.domain.LitemallAdmin; -import org.linlinjava.litemall.db.domain.LitemallBrand; import org.linlinjava.litemall.db.domain.LitemallPermission; import org.linlinjava.litemall.db.domain.LitemallRole; import org.linlinjava.litemall.db.service.LitemallAdminService; diff --git a/litemall-admin-api/src/main/java/org/linlinjava/litemall/admin/web/AdminStatController.java b/litemall-admin-api/src/main/java/org/linlinjava/litemall/admin/web/AdminStatController.java index a0832005..90b4a05c 100644 --- a/litemall-admin-api/src/main/java/org/linlinjava/litemall/admin/web/AdminStatController.java +++ b/litemall-admin-api/src/main/java/org/linlinjava/litemall/admin/web/AdminStatController.java @@ -4,7 +4,7 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.apache.shiro.authz.annotation.RequiresPermissions; import org.linlinjava.litemall.admin.annotation.RequiresPermissionsDesc; -import org.linlinjava.litemall.admin.util.StatVo; +import org.linlinjava.litemall.admin.vo.StatVo; import org.linlinjava.litemall.core.util.ResponseUtil; import org.linlinjava.litemall.db.service.StatService; import org.springframework.beans.factory.annotation.Autowired; diff --git a/litemall-admin-api/src/test/java/org/linlinjava/litemall/admin/PermissionTest.java b/litemall-admin-api/src/test/java/org/linlinjava/litemall/admin/PermissionTest.java index 2f4bc8ec..0906aa2b 100644 --- a/litemall-admin-api/src/test/java/org/linlinjava/litemall/admin/PermissionTest.java +++ b/litemall-admin-api/src/test/java/org/linlinjava/litemall/admin/PermissionTest.java @@ -2,7 +2,7 @@ package org.linlinjava.litemall.admin; import org.junit.Test; import org.junit.runner.RunWith; -import org.linlinjava.litemall.admin.util.PermVo; +import org.linlinjava.litemall.admin.vo.PermVo; import org.linlinjava.litemall.admin.util.Permission; import org.linlinjava.litemall.admin.util.PermissionUtil; import org.springframework.beans.factory.annotation.Autowired; diff --git a/litemall-wx-api/src/main/java/org/linlinjava/litemall/wx/dao/CaptchaItem.java b/litemall-wx-api/src/main/java/org/linlinjava/litemall/wx/dto/CaptchaItem.java similarity index 94% rename from litemall-wx-api/src/main/java/org/linlinjava/litemall/wx/dao/CaptchaItem.java rename to litemall-wx-api/src/main/java/org/linlinjava/litemall/wx/dto/CaptchaItem.java index 59848e4a..765c9e8e 100644 --- a/litemall-wx-api/src/main/java/org/linlinjava/litemall/wx/dao/CaptchaItem.java +++ b/litemall-wx-api/src/main/java/org/linlinjava/litemall/wx/dto/CaptchaItem.java @@ -1,4 +1,4 @@ -package org.linlinjava.litemall.wx.dao; +package org.linlinjava.litemall.wx.dto; import java.time.LocalDateTime; diff --git a/litemall-wx-api/src/main/java/org/linlinjava/litemall/wx/dao/UserInfo.java b/litemall-wx-api/src/main/java/org/linlinjava/litemall/wx/dto/UserInfo.java similarity index 96% rename from litemall-wx-api/src/main/java/org/linlinjava/litemall/wx/dao/UserInfo.java rename to litemall-wx-api/src/main/java/org/linlinjava/litemall/wx/dto/UserInfo.java index 70f168f8..6b934999 100644 --- a/litemall-wx-api/src/main/java/org/linlinjava/litemall/wx/dao/UserInfo.java +++ b/litemall-wx-api/src/main/java/org/linlinjava/litemall/wx/dto/UserInfo.java @@ -1,4 +1,4 @@ -package org.linlinjava.litemall.wx.dao; +package org.linlinjava.litemall.wx.dto; public class UserInfo { private String nickName; diff --git a/litemall-wx-api/src/main/java/org/linlinjava/litemall/wx/dao/UserToken.java b/litemall-wx-api/src/main/java/org/linlinjava/litemall/wx/dto/UserToken.java similarity index 96% rename from litemall-wx-api/src/main/java/org/linlinjava/litemall/wx/dao/UserToken.java rename to litemall-wx-api/src/main/java/org/linlinjava/litemall/wx/dto/UserToken.java index e890a45c..329473b4 100644 --- a/litemall-wx-api/src/main/java/org/linlinjava/litemall/wx/dao/UserToken.java +++ b/litemall-wx-api/src/main/java/org/linlinjava/litemall/wx/dto/UserToken.java @@ -1,4 +1,4 @@ -package org.linlinjava.litemall.wx.dao; +package org.linlinjava.litemall.wx.dto; import java.time.LocalDateTime; diff --git a/litemall-wx-api/src/main/java/org/linlinjava/litemall/wx/dao/WxLoginInfo.java b/litemall-wx-api/src/main/java/org/linlinjava/litemall/wx/dto/WxLoginInfo.java similarity index 90% rename from litemall-wx-api/src/main/java/org/linlinjava/litemall/wx/dao/WxLoginInfo.java rename to litemall-wx-api/src/main/java/org/linlinjava/litemall/wx/dto/WxLoginInfo.java index 89f072ed..bfa763cf 100644 --- a/litemall-wx-api/src/main/java/org/linlinjava/litemall/wx/dao/WxLoginInfo.java +++ b/litemall-wx-api/src/main/java/org/linlinjava/litemall/wx/dto/WxLoginInfo.java @@ -1,4 +1,4 @@ -package org.linlinjava.litemall.wx.dao; +package org.linlinjava.litemall.wx.dto; public class WxLoginInfo { private String code; diff --git a/litemall-wx-api/src/main/java/org/linlinjava/litemall/wx/service/CaptchaCodeManager.java b/litemall-wx-api/src/main/java/org/linlinjava/litemall/wx/service/CaptchaCodeManager.java index 4008c684..8b9ab573 100644 --- a/litemall-wx-api/src/main/java/org/linlinjava/litemall/wx/service/CaptchaCodeManager.java +++ b/litemall-wx-api/src/main/java/org/linlinjava/litemall/wx/service/CaptchaCodeManager.java @@ -1,6 +1,6 @@ package org.linlinjava.litemall.wx.service; -import org.linlinjava.litemall.wx.dao.CaptchaItem; +import org.linlinjava.litemall.wx.dto.CaptchaItem; import java.time.LocalDateTime; import java.util.HashMap; diff --git a/litemall-wx-api/src/main/java/org/linlinjava/litemall/wx/service/UserInfoService.java b/litemall-wx-api/src/main/java/org/linlinjava/litemall/wx/service/UserInfoService.java index a12c6253..a8182173 100644 --- a/litemall-wx-api/src/main/java/org/linlinjava/litemall/wx/service/UserInfoService.java +++ b/litemall-wx-api/src/main/java/org/linlinjava/litemall/wx/service/UserInfoService.java @@ -2,7 +2,7 @@ package org.linlinjava.litemall.wx.service; import org.linlinjava.litemall.db.domain.LitemallUser; 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.stereotype.Service; import org.springframework.util.Assert; diff --git a/litemall-wx-api/src/main/java/org/linlinjava/litemall/wx/service/UserTokenManager.java b/litemall-wx-api/src/main/java/org/linlinjava/litemall/wx/service/UserTokenManager.java index 67717b68..c87147c4 100644 --- a/litemall-wx-api/src/main/java/org/linlinjava/litemall/wx/service/UserTokenManager.java +++ b/litemall-wx-api/src/main/java/org/linlinjava/litemall/wx/service/UserTokenManager.java @@ -1,7 +1,7 @@ package org.linlinjava.litemall.wx.service; 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.util.HashMap; diff --git a/litemall-wx-api/src/main/java/org/linlinjava/litemall/wx/dao/CouponVo.java b/litemall-wx-api/src/main/java/org/linlinjava/litemall/wx/vo/CouponVo.java similarity index 97% rename from litemall-wx-api/src/main/java/org/linlinjava/litemall/wx/dao/CouponVo.java rename to litemall-wx-api/src/main/java/org/linlinjava/litemall/wx/vo/CouponVo.java index 5b8150b0..fdbf5984 100644 --- a/litemall-wx-api/src/main/java/org/linlinjava/litemall/wx/dao/CouponVo.java +++ b/litemall-wx-api/src/main/java/org/linlinjava/litemall/wx/vo/CouponVo.java @@ -1,9 +1,16 @@ -package org.linlinjava.litemall.wx.dao; +package org.linlinjava.litemall.wx.vo; import java.time.LocalDateTime; public class CouponVo { 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() { return id; @@ -13,14 +20,6 @@ public class CouponVo { 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() { return name; } diff --git a/litemall-wx-api/src/main/java/org/linlinjava/litemall/wx/web/WxAuthController.java b/litemall-wx-api/src/main/java/org/linlinjava/litemall/wx/web/WxAuthController.java index 40d0c259..3e4a192f 100644 --- a/litemall-wx-api/src/main/java/org/linlinjava/litemall/wx/web/WxAuthController.java +++ b/litemall-wx-api/src/main/java/org/linlinjava/litemall/wx/web/WxAuthController.java @@ -16,9 +16,9 @@ import org.linlinjava.litemall.db.domain.LitemallUser; import org.linlinjava.litemall.db.service.CouponAssignService; import org.linlinjava.litemall.db.service.LitemallUserService; import org.linlinjava.litemall.wx.annotation.LoginUser; -import org.linlinjava.litemall.wx.dao.UserInfo; -import org.linlinjava.litemall.wx.dao.UserToken; -import org.linlinjava.litemall.wx.dao.WxLoginInfo; +import org.linlinjava.litemall.wx.dto.UserInfo; +import org.linlinjava.litemall.wx.dto.UserToken; +import org.linlinjava.litemall.wx.dto.WxLoginInfo; import org.linlinjava.litemall.wx.service.CaptchaCodeManager; import org.linlinjava.litemall.wx.service.UserTokenManager; import org.linlinjava.litemall.core.util.IpUtil; diff --git a/litemall-wx-api/src/main/java/org/linlinjava/litemall/wx/web/WxCommentController.java b/litemall-wx-api/src/main/java/org/linlinjava/litemall/wx/web/WxCommentController.java index 953844a6..b371e469 100644 --- a/litemall-wx-api/src/main/java/org/linlinjava/litemall/wx/web/WxCommentController.java +++ b/litemall-wx-api/src/main/java/org/linlinjava/litemall/wx/web/WxCommentController.java @@ -11,7 +11,7 @@ import org.linlinjava.litemall.db.service.LitemallGoodsService; import org.linlinjava.litemall.db.service.LitemallTopicService; import org.linlinjava.litemall.db.service.LitemallUserService; 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.springframework.beans.factory.annotation.Autowired; import org.springframework.validation.annotation.Validated; diff --git a/litemall-wx-api/src/main/java/org/linlinjava/litemall/wx/web/WxCouponController.java b/litemall-wx-api/src/main/java/org/linlinjava/litemall/wx/web/WxCouponController.java index 03641a5e..1963e904 100644 --- a/litemall-wx-api/src/main/java/org/linlinjava/litemall/wx/web/WxCouponController.java +++ b/litemall-wx-api/src/main/java/org/linlinjava/litemall/wx/web/WxCouponController.java @@ -13,7 +13,7 @@ import org.linlinjava.litemall.db.domain.LitemallGrouponRules; import org.linlinjava.litemall.db.service.*; import org.linlinjava.litemall.db.util.CouponConstant; 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.springframework.beans.factory.annotation.Autowired; import org.springframework.validation.annotation.Validated;