modify

Helius

2020-12-21 dbf5bb967a22cb5e8da9ab5a3483f742a95747d5

modify

 zq-erp/src/main/java/com/matrix/system/app/action/ApiCommonAction.java

File was renamed from zq-erp/src/main/java/com/matrix/system/api/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;

 zq-erp/src/main/java/com/matrix/system/app/action/ApiOrderAction.java

New file
@@ -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;
    }

}

 zq-erp/src/main/java/com/matrix/system/app/action/ApiUsersAction.java

File was renamed from zq-erp/src/main/java/com/matrix/system/api/action/UsersAction.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;

 zq-erp/src/main/java/com/matrix/system/app/action/ApiVipInfoAction.java

New file
@@ -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;
    }

}

 zq-erp/src/main/java/com/matrix/system/app/action/TestAction.java

File was renamed from zq-erp/src/main/java/com/matrix/system/api/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;

 zq-erp/src/main/java/com/matrix/system/app/dto/LoginDto.java

File was renamed from zq-erp/src/main/java/com/matrix/system/api/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;

 zq-erp/src/main/java/com/matrix/system/app/dto/VipInfoListDto.java

New file
@@ -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;
    }
}

 zq-erp/src/main/java/com/matrix/system/app/vo/UserAchieveVo.java

File was renamed from zq-erp/src/main/java/com/matrix/system/api/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;

 zq-erp/src/main/java/com/matrix/system/app/vo/UserInfoVo.java

File was renamed from zq-erp/src/main/java/com/matrix/system/api/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;

 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;


 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;

/**
 *

 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;

 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,