目录更改

ch-admin-api/src/main/java/com/wwdz/ch/admin/web/AdminAdminController.java → ch-admin-api/src/main/java/com/wwdz/ch/admin/controller/AdminAdminController.java

-package com.wwdz.ch.admin.web;
+package com.wwdz.ch.admin.controller;
 
 import java.util.HashMap;
 import java.util.List;

ch-admin-api/src/main/java/com/wwdz/ch/admin/web/AdminAuthController.java → ch-admin-api/src/main/java/com/wwdz/ch/admin/controller/AdminAuthController.java

-package com.wwdz.ch.admin.web;
+package com.wwdz.ch.admin.controller;
 
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;

ch-admin-api/src/main/java/com/wwdz/ch/admin/web/AdminCollectController.java → ch-admin-api/src/main/java/com/wwdz/ch/admin/controller/AdminCollectController.java

-package com.wwdz.ch.admin.web;
+package com.wwdz.ch.admin.controller;
 
 import java.util.HashMap;
 import java.util.List;

ch-admin-api/src/main/java/com/wwdz/ch/admin/web/AdminDashbordController.java → ch-admin-api/src/main/java/com/wwdz/ch/admin/controller/AdminDashbordController.java

-package com.wwdz.ch.admin.web;
+package com.wwdz.ch.admin.controller;
 
 import java.math.BigDecimal;
 import java.util.ArrayList;
@@ -9,8 +9,8 @@ import java.util.List;
 import java.util.Map;
 import java.util.Set;
 
-import com.wwdz.ch.admin.entity.OrderAmtsVo;
-import com.wwdz.ch.admin.entity.UserOrderCntVo;
+import com.wwdz.ch.admin.entity.vo.OrderAmtsVo;
+import com.wwdz.ch.admin.entity.vo.UserOrderCntVo;
 import com.wwdz.ch.admin.util.AuthSupport;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

ch-admin-api/src/main/java/com/wwdz/ch/admin/web/AdminFeedbackController.java → ch-admin-api/src/main/java/com/wwdz/ch/admin/controller/AdminFeedbackController.java

-package com.wwdz.ch.admin.web;
+package com.wwdz.ch.admin.controller;
 
 import java.util.HashMap;
 import java.util.List;

ch-admin-api/src/main/java/com/wwdz/ch/admin/web/AdminFootprintController.java → ch-admin-api/src/main/java/com/wwdz/ch/admin/controller/AdminFootprintController.java

-package com.wwdz.ch.admin.web;
+package com.wwdz.ch.admin.controller;
 
 import java.util.HashMap;
 import java.util.List;

ch-admin-api/src/main/java/com/wwdz/ch/admin/web/AdminGoodsController.java → ch-admin-api/src/main/java/com/wwdz/ch/admin/controller/AdminGoodsController.java

-package com.wwdz.ch.admin.web;
+package com.wwdz.ch.admin.controller;
 
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -8,7 +8,7 @@ import java.util.Map;
 import javax.validation.constraints.NotNull;
 
 import com.wwdz.ch.admin.annotation.RequiresPermissionsDesc;
-import com.wwdz.ch.admin.entity.ItemVo;
+import com.wwdz.ch.admin.entity.vo.ItemVo;
 import com.wwdz.ch.admin.service.AdminDataAuthService;
 import com.wwdz.ch.admin.service.AdminGoodsService;
 import com.wwdz.ch.admin.util.AuthSupport;

ch-admin-api/src/main/java/com/wwdz/ch/admin/web/AdminHistoryController.java → ch-admin-api/src/main/java/com/wwdz/ch/admin/controller/AdminHistoryController.java

-package com.wwdz.ch.admin.web;
+package com.wwdz.ch.admin.controller;
 
 import java.util.HashMap;
 import java.util.List;

ch-admin-api/src/main/java/com/wwdz/ch/admin/web/AdminIndexController.java → ch-admin-api/src/main/java/com/wwdz/ch/admin/controller/AdminIndexController.java

-package com.wwdz.ch.admin.web;
+package com.wwdz.ch.admin.controller;
 
 import com.wwdz.ch.admin.annotation.RequiresPermissionsDesc;
 import org.apache.shiro.authz.annotation.RequiresAuthentication;

ch-admin-api/src/main/java/com/wwdz/ch/admin/web/AdminIssueController.java → ch-admin-api/src/main/java/com/wwdz/ch/admin/controller/AdminIssueController.java

-package com.wwdz.ch.admin.web;
+package com.wwdz.ch.admin.controller;
 
 import java.util.HashMap;
 import java.util.List;

ch-admin-api/src/main/java/com/wwdz/ch/admin/web/AdminKeywordController.java → ch-admin-api/src/main/java/com/wwdz/ch/admin/controller/AdminKeywordController.java

-package com.wwdz.ch.admin.web;
+package com.wwdz.ch.admin.controller;
 
 import java.util.HashMap;
 import java.util.List;

ch-admin-api/src/main/java/com/wwdz/ch/admin/web/AdminProfileController.java → ch-admin-api/src/main/java/com/wwdz/ch/admin/controller/AdminProfileController.java

-package com.wwdz.ch.admin.web;
+package com.wwdz.ch.admin.controller;
 
 import com.wwdz.ch.admin.util.AdminResponseCode;
 import com.wwdz.ch.admin.util.AdminResponseUtil;

ch-admin-api/src/main/java/com/wwdz/ch/admin/web/AdminRoleController.java → ch-admin-api/src/main/java/com/wwdz/ch/admin/controller/AdminRoleController.java

-package com.wwdz.ch.admin.web;
+package com.wwdz.ch.admin.controller;
 
 import java.util.ArrayList;
 import java.util.HashMap;

ch-admin-api/src/main/java/com/wwdz/ch/admin/web/AdminStatController.java → ch-admin-api/src/main/java/com/wwdz/ch/admin/controller/AdminStatController.java

-package com.wwdz.ch.admin.web;
+package com.wwdz.ch.admin.controller;
 
 import java.util.List;
 import java.util.Map;

ch-admin-api/src/main/java/com/wwdz/ch/admin/web/AdminStorageController.java → ch-admin-api/src/main/java/com/wwdz/ch/admin/controller/AdminStorageController.java

-package com.wwdz.ch.admin.web;
+package com.wwdz.ch.admin.controller;
 
 import cn.hutool.core.util.RandomUtil;
 import com.alibaba.fastjson.JSONObject;

ch-admin-api/src/main/java/com/wwdz/ch/admin/web/AdminUserController.java → ch-admin-api/src/main/java/com/wwdz/ch/admin/controller/AdminUserController.java

-package com.wwdz.ch.admin.web;
+package com.wwdz.ch.admin.controller;
 
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
-import javax.validation.constraints.NotNull;
-
 import com.wwdz.ch.admin.annotation.RequiresPermissionsDesc;
 import com.wwdz.ch.admin.util.AuthSupport;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
@@ -14,22 +12,16 @@ import org.slf4j.LoggerFactory;
 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.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
 import com.alibaba.fastjson.JSONObject;
 import com.github.pagehelper.PageInfo;
-import com.wwdz.ch.core.qcode.QCodeService;
-import com.wwdz.ch.core.util.JacksonUtil;
 import com.wwdz.ch.core.util.ResponseUtil;
 import com.wwdz.ch.core.validator.Order;
 import com.wwdz.ch.core.validator.Sort;
 import com.wwdz.ch.db.domain.DtsUser;
-import com.wwdz.ch.db.domain.DtsUserAccount;
-import com.wwdz.ch.db.service.DtsAccountService;
 import com.wwdz.ch.db.service.DtsUserService;
 
 @RestController

ch-admin-api/src/main/java/com/wwdz/ch/admin/web/BidRecordController.java → ch-admin-api/src/main/java/com/wwdz/ch/admin/controller/BidRecordController.java

-package com.wwdz.ch.admin.web;
+package com.wwdz.ch.admin.controller;
 
 
-import com.wwdz.ch.admin.entity.BidRecordVo;
+import com.wwdz.ch.admin.entity.vo.BidRecordVo;
 import com.wwdz.ch.admin.util.AuthSupport;
 import com.wwdz.ch.core.type.ListResult;
 import com.wwdz.ch.core.type.SimpleResult;

ch-admin-api/src/main/java/com/wwdz/ch/admin/web/CategoryController.java → ch-admin-api/src/main/java/com/wwdz/ch/admin/controller/CategoryController.java

-package com.wwdz.ch.admin.web;
+package com.wwdz.ch.admin.controller;
 
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -9,7 +9,7 @@ import java.util.stream.Collectors;
 import javax.validation.constraints.NotNull;
 
 import com.wwdz.ch.admin.annotation.RequiresPermissionsDesc;
-import com.wwdz.ch.admin.entity.CategoryVo;
+import com.wwdz.ch.admin.entity.vo.CategoryVo;
 import com.wwdz.ch.admin.util.AuthSupport;
 import com.wwdz.ch.core.type.ListResult;
 import com.wwdz.ch.db.domain.Category;

ch-admin-api/src/main/java/com/wwdz/ch/admin/entity/AccountVo.java

-package com.wwdz.ch.admin.entity;
-
-import java.io.Serializable;
-import java.math.BigDecimal;
-
-public class AccountVo implements Serializable {
-
-	private static final long serialVersionUID = 1567048369574496965L;
-
-	private Integer userId;
-
-	private BigDecimal remainAmount;
-
-	private BigDecimal totalAmount;
-
-	public Integer getUserId() {
-		return userId;
-	}
-
-	public void setUserId(Integer userId) {
-		this.userId = userId;
-	}
-
-	public BigDecimal getRemainAmount() {
-		return remainAmount;
-	}
-
-	public void setRemainAmount(BigDecimal remainAmount) {
-		this.remainAmount = remainAmount;
-	}
-
-	public BigDecimal getTotalAmount() {
-		return totalAmount;
-	}
-
-	public void setTotalAmount(BigDecimal totalAmount) {
-		this.totalAmount = totalAmount;
-	}
-
-}

ch-admin-api/src/main/java/com/wwdz/ch/admin/entity/CategorySellVo.java

-package com.wwdz.ch.admin.entity;
-
-import java.io.Serializable;
-import java.util.List;
-
-import com.wwdz.ch.db.bean.CategorySellAmts;
-
-public class CategorySellVo implements Serializable{
-	
-	private static final long serialVersionUID = 96458407347975166L;
-
-    private String[] categoryNames;//一级大类目录名称
-	
-	private List<CategorySellAmts> categorySellData;//大类销售金额集合
-
-	public String[] getCategoryNames() {
-		return categoryNames;
-	}
-
-	public void setCategoryNames(String[] categoryNames) {
-		this.categoryNames = categoryNames;
-	}
-
-	public List<CategorySellAmts> getCategorySellData() {
-		return categorySellData;
-	}
-
-	public void setCategorySellData(List<CategorySellAmts> categorySellData) {
-		this.categorySellData = categorySellData;
-	}
-
-	
-}

ch-admin-api/src/main/java/com/wwdz/ch/admin/entity/BidRecordVo.java → ch-admin-api/src/main/java/com/wwdz/ch/admin/entity/vo/BidRecordVo.java

-package com.wwdz.ch.admin.entity;
+package com.wwdz.ch.admin.entity.vo;
 
 import com.qiniu.util.StringUtils;
 import com.wwdz.ch.db.domain.BidRecord;

ch-admin-api/src/main/java/com/wwdz/ch/admin/entity/CategoryVo.java → ch-admin-api/src/main/java/com/wwdz/ch/admin/entity/vo/CategoryVo.java

-package com.wwdz.ch.admin.entity;
+package com.wwdz.ch.admin.entity.vo;
 
 import com.alibaba.druid.support.json.JSONUtils;
 import com.wwdz.ch.db.domain.Category;

ch-admin-api/src/main/java/com/wwdz/ch/admin/entity/ItemVo.java → ch-admin-api/src/main/java/com/wwdz/ch/admin/entity/vo/ItemVo.java

-package com.wwdz.ch.admin.entity;
+package com.wwdz.ch.admin.entity.vo;
 
 import com.qiniu.util.StringUtils;
 import com.wwdz.ch.core.util.PriceUtil;

ch-admin-api/src/main/java/com/wwdz/ch/admin/entity/OrderAmtsVo.java → ch-admin-api/src/main/java/com/wwdz/ch/admin/entity/vo/OrderAmtsVo.java

-package com.wwdz.ch.admin.entity;
+package com.wwdz.ch.admin.entity.vo;
 
 import java.io.Serializable;
 import java.math.BigDecimal;

ch-admin-api/src/main/java/com/wwdz/ch/admin/entity/UserOrderCntVo.java → ch-admin-api/src/main/java/com/wwdz/ch/admin/entity/vo/UserOrderCntVo.java

-package com.wwdz.ch.admin.entity;
+package com.wwdz.ch.admin.entity.vo;
 
 import java.io.Serializable;
 

ch-admin-api/src/main/java/com/wwdz/ch/admin/service/AdminGoodsService.java

@@ -7,7 +7,7 @@ import java.util.List;
 import java.util.Map;
 import java.util.stream.Collectors;
 
-import com.wwdz.ch.admin.entity.ItemVo;
+import com.wwdz.ch.admin.entity.vo.ItemVo;
 import com.wwdz.ch.db.domain.*;
 import com.wwdz.ch.db.service.*;
 import org.slf4j.Logger;