From dbf5bb967a22cb5e8da9ab5a3483f742a95747d5 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Mon, 21 Dec 2020 20:10:30 +0800
Subject: [PATCH] modify
---
zq-erp/src/main/resources/mybatis/mapper/hive/AchieveNewDao.xml | 2
zq-erp/src/main/java/com/matrix/system/app/action/ApiOrderAction.java | 22 +++++++
zq-erp/src/main/java/com/matrix/system/app/vo/UserAchieveVo.java | 2
zq-erp/src/main/java/com/matrix/system/hive/dao/AchieveNewDao.java | 2
zq-erp/src/main/java/com/matrix/system/hive/service/imp/AchieveNewServiceImpl.java | 2
zq-erp/src/main/java/com/matrix/system/app/action/ApiCommonAction.java | 7 +-
zq-erp/src/main/java/com/matrix/system/app/vo/UserInfoVo.java | 2
zq-erp/src/main/java/com/matrix/system/app/dto/LoginDto.java | 2
zq-erp/src/main/java/com/matrix/system/app/dto/VipInfoListDto.java | 45 +++++++++++++++
zq-erp/src/main/java/com/matrix/system/app/action/ApiUsersAction.java | 8 +-
zq-erp/src/main/java/com/matrix/system/app/action/ApiVipInfoAction.java | 26 ++++++++
zq-erp/src/main/java/com/matrix/system/hive/service/AchieveNewService.java | 3
zq-erp/src/main/java/com/matrix/system/app/action/TestAction.java | 2
13 files changed, 108 insertions(+), 17 deletions(-)
diff --git a/zq-erp/src/main/java/com/matrix/system/api/action/ApiCommonAction.java b/zq-erp/src/main/java/com/matrix/system/app/action/ApiCommonAction.java
similarity index 94%
rename from zq-erp/src/main/java/com/matrix/system/api/action/ApiCommonAction.java
rename to zq-erp/src/main/java/com/matrix/system/app/action/ApiCommonAction.java
index eabef73..0da7a56 100644
--- a/zq-erp/src/main/java/com/matrix/system/api/action/ApiCommonAction.java
+++ b/zq-erp/src/main/java/com/matrix/system/app/action/ApiCommonAction.java
@@ -1,12 +1,11 @@
-package com.matrix.system.api.action;
+package com.matrix.system.app.action;
import com.alibaba.fastjson.JSONObject;
-import com.jcraft.jsch.UserInfo;
import com.matrix.component.redis.RedisClient;
import com.matrix.core.pojo.AjaxResult;
import com.matrix.core.tools.UUIDUtil;
-import com.matrix.system.api.dto.LoginDto;
-import com.matrix.system.api.vo.UserInfoVo;
+import com.matrix.system.app.dto.LoginDto;
+import com.matrix.system.app.vo.UserInfoVo;
import com.matrix.system.common.authority.DefaultAuthorityManager;
import com.matrix.system.common.authority.strategy.AccountPasswordLogin;
import com.matrix.system.common.authority.strategy.LoginStrategy;
diff --git a/zq-erp/src/main/java/com/matrix/system/app/action/ApiOrderAction.java b/zq-erp/src/main/java/com/matrix/system/app/action/ApiOrderAction.java
new file mode 100644
index 0000000..966de14
--- /dev/null
+++ b/zq-erp/src/main/java/com/matrix/system/app/action/ApiOrderAction.java
@@ -0,0 +1,22 @@
+package com.matrix.system.app.action;
+
+import com.matrix.core.pojo.AjaxResult;
+import io.swagger.annotations.Api;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+
+/**
+ * @author wzy
+ * @date 2020-12-21
+ **/
+@Api(value = "ApiOrderAction", tags = "订单接口类")
+@RequestMapping(value = "/api/order")
+public class ApiOrderAction {
+
+
+ @PostMapping(value = "/createOrder")
+ public AjaxResult createOrder() {
+ return null;
+ }
+
+}
diff --git a/zq-erp/src/main/java/com/matrix/system/api/action/UsersAction.java b/zq-erp/src/main/java/com/matrix/system/app/action/ApiUsersAction.java
similarity index 87%
rename from zq-erp/src/main/java/com/matrix/system/api/action/UsersAction.java
rename to zq-erp/src/main/java/com/matrix/system/app/action/ApiUsersAction.java
index 68402ca..36a6899 100644
--- a/zq-erp/src/main/java/com/matrix/system/api/action/UsersAction.java
+++ b/zq-erp/src/main/java/com/matrix/system/app/action/ApiUsersAction.java
@@ -1,7 +1,7 @@
-package com.matrix.system.api.action;
+package com.matrix.system.app.action;
import com.matrix.core.pojo.AjaxResult;
-import com.matrix.system.api.vo.UserAchieveVo;
+import com.matrix.system.app.vo.UserAchieveVo;
import com.matrix.system.hive.service.AchieveNewService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
@@ -17,10 +17,10 @@
* @author wzy
* @date 2020-12-21
**/
-@Api(value = "UsersAction", tags = "用户中心接口类")
+@Api(value = "ApiUsersAction", tags = "用户中心接口类")
@RestController
@RequestMapping(value = "/api/user")
-public class UsersAction {
+public class ApiUsersAction {
@Autowired
private AchieveNewService achieveNewService;
diff --git a/zq-erp/src/main/java/com/matrix/system/app/action/ApiVipInfoAction.java b/zq-erp/src/main/java/com/matrix/system/app/action/ApiVipInfoAction.java
new file mode 100644
index 0000000..591e8ae
--- /dev/null
+++ b/zq-erp/src/main/java/com/matrix/system/app/action/ApiVipInfoAction.java
@@ -0,0 +1,26 @@
+package com.matrix.system.app.action;
+
+import com.matrix.core.pojo.AjaxResult;
+import com.matrix.system.app.dto.VipInfoListDto;
+import io.swagger.annotations.Api;
+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.RestController;
+
+/**
+ * @author wzy
+ * @date 2020-12-21
+ **/
+@Api(value = "ApiVipInfoAction", tags = "会员接口类")
+@RestController
+@RequestMapping(value = "/api/vip")
+public class ApiVipInfoAction {
+
+
+ @PostMapping(value = "/findVipInfoList")
+ public AjaxResult findVipInfoList(@RequestBody VipInfoListDto vipInfoListDto) {
+ return null;
+ }
+
+}
diff --git a/zq-erp/src/main/java/com/matrix/system/api/action/TestAction.java b/zq-erp/src/main/java/com/matrix/system/app/action/TestAction.java
similarity index 94%
rename from zq-erp/src/main/java/com/matrix/system/api/action/TestAction.java
rename to zq-erp/src/main/java/com/matrix/system/app/action/TestAction.java
index 5951110..51d2742 100644
--- a/zq-erp/src/main/java/com/matrix/system/api/action/TestAction.java
+++ b/zq-erp/src/main/java/com/matrix/system/app/action/TestAction.java
@@ -1,4 +1,4 @@
-package com.matrix.system.api.action;
+package com.matrix.system.app.action;
import com.matrix.core.pojo.AjaxResult;
import io.swagger.annotations.Api;
diff --git a/zq-erp/src/main/java/com/matrix/system/api/dto/LoginDto.java b/zq-erp/src/main/java/com/matrix/system/app/dto/LoginDto.java
similarity index 95%
rename from zq-erp/src/main/java/com/matrix/system/api/dto/LoginDto.java
rename to zq-erp/src/main/java/com/matrix/system/app/dto/LoginDto.java
index 692a533..a06332d 100644
--- a/zq-erp/src/main/java/com/matrix/system/api/dto/LoginDto.java
+++ b/zq-erp/src/main/java/com/matrix/system/app/dto/LoginDto.java
@@ -1,4 +1,4 @@
-package com.matrix.system.api.dto;
+package com.matrix.system.app.dto;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
diff --git a/zq-erp/src/main/java/com/matrix/system/app/dto/VipInfoListDto.java b/zq-erp/src/main/java/com/matrix/system/app/dto/VipInfoListDto.java
new file mode 100644
index 0000000..ab8833d
--- /dev/null
+++ b/zq-erp/src/main/java/com/matrix/system/app/dto/VipInfoListDto.java
@@ -0,0 +1,45 @@
+package com.matrix.system.app.dto;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+
+/**
+ * @author wzy
+ * @date 2020-12-21
+ **/
+@ApiModel(value = "VipInfoListDto", description = "获取会员列表参数类")
+public class VipInfoListDto {
+
+ @ApiModelProperty(value = "查询参数(客户姓名/手机/会员编号/拼音)", example = "")
+ private String queryKey;
+
+ @ApiModelProperty(value = "排序字段")
+ private String order;
+
+ @ApiModelProperty(value = "排序 desc/asc")
+ private String sort;
+
+ public String getQueryKey() {
+ return queryKey;
+ }
+
+ public void setQueryKey(String queryKey) {
+ this.queryKey = queryKey;
+ }
+
+ public String getOrder() {
+ return order;
+ }
+
+ public void setOrder(String order) {
+ this.order = order;
+ }
+
+ public String getSort() {
+ return sort;
+ }
+
+ public void setSort(String sort) {
+ this.sort = sort;
+ }
+}
diff --git a/zq-erp/src/main/java/com/matrix/system/api/vo/UserAchieveVo.java b/zq-erp/src/main/java/com/matrix/system/app/vo/UserAchieveVo.java
similarity index 97%
rename from zq-erp/src/main/java/com/matrix/system/api/vo/UserAchieveVo.java
rename to zq-erp/src/main/java/com/matrix/system/app/vo/UserAchieveVo.java
index a8cbaa9..71cd735 100644
--- a/zq-erp/src/main/java/com/matrix/system/api/vo/UserAchieveVo.java
+++ b/zq-erp/src/main/java/com/matrix/system/app/vo/UserAchieveVo.java
@@ -1,4 +1,4 @@
-package com.matrix.system.api.vo;
+package com.matrix.system.app.vo;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
diff --git a/zq-erp/src/main/java/com/matrix/system/api/vo/UserInfoVo.java b/zq-erp/src/main/java/com/matrix/system/app/vo/UserInfoVo.java
similarity index 96%
rename from zq-erp/src/main/java/com/matrix/system/api/vo/UserInfoVo.java
rename to zq-erp/src/main/java/com/matrix/system/app/vo/UserInfoVo.java
index 6fa48e6..4054540 100644
--- a/zq-erp/src/main/java/com/matrix/system/api/vo/UserInfoVo.java
+++ b/zq-erp/src/main/java/com/matrix/system/app/vo/UserInfoVo.java
@@ -1,4 +1,4 @@
-package com.matrix.system.api.vo;
+package com.matrix.system.app.vo;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
diff --git a/zq-erp/src/main/java/com/matrix/system/hive/dao/AchieveNewDao.java b/zq-erp/src/main/java/com/matrix/system/hive/dao/AchieveNewDao.java
index 8695c69..1d54ac9 100644
--- a/zq-erp/src/main/java/com/matrix/system/hive/dao/AchieveNewDao.java
+++ b/zq-erp/src/main/java/com/matrix/system/hive/dao/AchieveNewDao.java
@@ -5,7 +5,7 @@
import java.util.Map;
import com.matrix.core.pojo.PaginationVO;
-import com.matrix.system.api.vo.UserAchieveVo;
+import com.matrix.system.app.vo.UserAchieveVo;
import com.matrix.system.hive.bean.AchieveNew;
import org.apache.ibatis.annotations.Param;
diff --git a/zq-erp/src/main/java/com/matrix/system/hive/service/AchieveNewService.java b/zq-erp/src/main/java/com/matrix/system/hive/service/AchieveNewService.java
index 05a4c25..a9e453a 100644
--- a/zq-erp/src/main/java/com/matrix/system/hive/service/AchieveNewService.java
+++ b/zq-erp/src/main/java/com/matrix/system/hive/service/AchieveNewService.java
@@ -2,14 +2,13 @@
import java.util.List;
-import com.matrix.system.api.vo.UserAchieveVo;
+import com.matrix.system.app.vo.UserAchieveVo;
import com.matrix.system.hive.bean.AchieveNew;
import com.matrix.system.hive.bean.SysOrder;
import com.matrix.system.hive.bean.SysProjServices;
import com.matrix.core.pojo.PaginationVO;
import com.matrix.system.hive.plugin.util.BaseServices;
-import org.apache.ibatis.annotations.Param;
/**
*
diff --git a/zq-erp/src/main/java/com/matrix/system/hive/service/imp/AchieveNewServiceImpl.java b/zq-erp/src/main/java/com/matrix/system/hive/service/imp/AchieveNewServiceImpl.java
index 2209a1c..d2466f9 100644
--- a/zq-erp/src/main/java/com/matrix/system/hive/service/imp/AchieveNewServiceImpl.java
+++ b/zq-erp/src/main/java/com/matrix/system/hive/service/imp/AchieveNewServiceImpl.java
@@ -7,7 +7,7 @@
import com.matrix.core.tools.ModelUtils;
import com.matrix.core.tools.StringUtils;
import com.matrix.core.tools.WebUtil;
-import com.matrix.system.api.vo.UserAchieveVo;
+import com.matrix.system.app.vo.UserAchieveVo;
import com.matrix.system.common.bean.SysUsers;
import com.matrix.system.common.dao.SysUsersDao;
import com.matrix.system.constance.Dictionary;
diff --git a/zq-erp/src/main/resources/mybatis/mapper/hive/AchieveNewDao.xml b/zq-erp/src/main/resources/mybatis/mapper/hive/AchieveNewDao.xml
index a3a562c..9eb3473 100644
--- a/zq-erp/src/main/resources/mybatis/mapper/hive/AchieveNewDao.xml
+++ b/zq-erp/src/main/resources/mybatis/mapper/hive/AchieveNewDao.xml
@@ -925,7 +925,7 @@
</select>
- <select id="selectUserAchieveByTime" resultType="com.matrix.system.api.vo.UserAchieveVo">
+ <select id="selectUserAchieveByTime" resultType="com.matrix.system.app.vo.UserAchieveVo">
select
sum(IFNULL(proj_cash,0) + IFNULL(goods_cash,0) + IFNULL(card_cash,0)) allCash,
sum(card_cash) card,
--
Gitblit v1.9.1