Skip to content

D
data-server
Commit 3c66f801 authored by liqin's avatar liqin 💬
Browse files
Options

Merge branch 'master' of http://111.203.232.171:8888/licc/shop-mall into master

parents 0050c7ff d35e8b88
Hide whitespace changes
Inline Side-by-side
Showing with 5022 additions and 1053 deletions
pom.xml
View file @ 3c66f801
......@@ -162,7 +162,12 @@
<artifactId>ffmpeg-platform</artifactId>
<version>4.0.2-1.4.3</version>
</dependency>
<!--获取服务器硬件信息-->
<dependency>
<groupId>org.fusesource</groupId>
<artifactId>sigar</artifactId>
<version>${sigar.version}</version>
</dependency>
<!--druid数据源 -->
<dependency>
......
wisenergy-common/wisenergy-common.iml
View file @ 3c66f801
<?xml version="1.0" encoding="UTF-8"?>
<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" version="4">
<component name="FacetManager">
<facet type="Spring" name="Spring">
<configuration />
......@@ -10,4 +10,200 @@
</configuration>
</facet>
</component>
<component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8">
<output url="file://$MODULE_DIR$/target/classes" />
<output-test url="file://$MODULE_DIR$/target/test-classes" />
<content url="file://$MODULE_DIR$">
<sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
<excludeFolder url="file://$MODULE_DIR$/target" />
</content>
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-web:2.4.3" level="project" />
<orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter:2.4.3" level="project" />
<orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-logging:2.4.3" level="project" />
<orderEntry type="library" name="Maven: ch.qos.logback:logback-classic:1.2.3" level="project" />
<orderEntry type="library" name="Maven: ch.qos.logback:logback-core:1.2.3" level="project" />
<orderEntry type="library" name="Maven: org.apache.logging.log4j:log4j-to-slf4j:2.13.3" level="project" />
<orderEntry type="library" name="Maven: org.apache.logging.log4j:log4j-api:2.13.3" level="project" />
<orderEntry type="library" name="Maven: org.slf4j:jul-to-slf4j:1.7.30" level="project" />
<orderEntry type="library" name="Maven: jakarta.annotation:jakarta.annotation-api:1.3.5" level="project" />
<orderEntry type="library" name="Maven: org.yaml:snakeyaml:1.27" level="project" />
<orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-json:2.4.3" level="project" />
<orderEntry type="library" name="Maven: com.fasterxml.jackson.datatype:jackson-datatype-jdk8:2.11.4" level="project" />
<orderEntry type="library" name="Maven: com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.11.4" level="project" />
<orderEntry type="library" name="Maven: com.fasterxml.jackson.module:jackson-module-parameter-names:2.11.4" level="project" />
<orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-tomcat:2.4.3" level="project" />
<orderEntry type="library" name="Maven: org.apache.tomcat.embed:tomcat-embed-core:9.0.43" level="project" />
<orderEntry type="library" name="Maven: org.apache.tomcat.embed:tomcat-embed-websocket:9.0.43" level="project" />
<orderEntry type="library" name="Maven: org.springframework:spring-web:5.3.4" level="project" />
<orderEntry type="library" name="Maven: org.springframework:spring-beans:5.3.4" level="project" />
<orderEntry type="library" name="Maven: org.springframework:spring-webmvc:5.3.4" level="project" />
<orderEntry type="library" name="Maven: org.springframework:spring-context:5.3.4" level="project" />
<orderEntry type="library" name="Maven: org.springframework:spring-expression:5.3.4" level="project" />
<orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-undertow:2.4.3" level="project" />
<orderEntry type="library" name="Maven: io.undertow:undertow-core:2.2.4.Final" level="project" />
<orderEntry type="library" name="Maven: org.jboss.logging:jboss-logging:3.4.1.Final" level="project" />
<orderEntry type="library" name="Maven: org.jboss.xnio:xnio-api:3.8.0.Final" level="project" />
<orderEntry type="library" name="Maven: org.wildfly.common:wildfly-common:1.5.2.Final" level="project" />
<orderEntry type="library" name="Maven: org.wildfly.client:wildfly-client-config:1.0.1.Final" level="project" />
<orderEntry type="library" scope="RUNTIME" name="Maven: org.jboss.xnio:xnio-nio:3.8.0.Final" level="project" />
<orderEntry type="library" name="Maven: org.jboss.threads:jboss-threads:3.1.0.Final" level="project" />
<orderEntry type="library" name="Maven: io.undertow:undertow-servlet:2.2.4.Final" level="project" />
<orderEntry type="library" name="Maven: org.jboss.spec.javax.annotation:jboss-annotations-api_1.3_spec:2.0.1.Final" level="project" />
<orderEntry type="library" name="Maven: io.undertow:undertow-websockets-jsr:2.2.4.Final" level="project" />
<orderEntry type="library" name="Maven: org.jboss.spec.javax.websocket:jboss-websocket-api_1.1_spec:2.0.0.Final" level="project" />
<orderEntry type="library" name="Maven: jakarta.servlet:jakarta.servlet-api:4.0.4" level="project" />
<orderEntry type="library" name="Maven: org.glassfish:jakarta.el:3.0.3" level="project" />
<orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-aop:2.4.3" level="project" />
<orderEntry type="library" name="Maven: org.springframework:spring-aop:5.3.4" level="project" />
<orderEntry type="library" name="Maven: org.aspectj:aspectjweaver:1.9.6" level="project" />
<orderEntry type="library" scope="TEST" name="Maven: org.springframework.boot:spring-boot-starter-test:2.4.3" level="project" />
<orderEntry type="library" scope="TEST" name="Maven: org.springframework.boot:spring-boot-test:2.4.3" level="project" />
<orderEntry type="library" scope="TEST" name="Maven: org.springframework.boot:spring-boot-test-autoconfigure:2.4.3" level="project" />
<orderEntry type="library" scope="TEST" name="Maven: com.jayway.jsonpath:json-path:2.4.0" level="project" />
<orderEntry type="library" scope="TEST" name="Maven: net.minidev:json-smart:2.3" level="project" />
<orderEntry type="library" scope="TEST" name="Maven: net.minidev:accessors-smart:1.2" level="project" />
<orderEntry type="library" scope="TEST" name="Maven: org.ow2.asm:asm:5.0.4" level="project" />
<orderEntry type="library" scope="TEST" name="Maven: jakarta.xml.bind:jakarta.xml.bind-api:2.3.3" level="project" />
<orderEntry type="library" scope="TEST" name="Maven: jakarta.activation:jakarta.activation-api:1.2.2" level="project" />
<orderEntry type="library" scope="TEST" name="Maven: org.assertj:assertj-core:3.18.1" level="project" />
<orderEntry type="library" scope="TEST" name="Maven: org.hamcrest:hamcrest:2.2" level="project" />
<orderEntry type="library" scope="TEST" name="Maven: org.junit.jupiter:junit-jupiter:5.7.1" level="project" />
<orderEntry type="library" scope="TEST" name="Maven: org.junit.jupiter:junit-jupiter-api:5.7.1" level="project" />
<orderEntry type="library" scope="TEST" name="Maven: org.apiguardian:apiguardian-api:1.1.0" level="project" />
<orderEntry type="library" scope="TEST" name="Maven: org.opentest4j:opentest4j:1.2.0" level="project" />
<orderEntry type="library" scope="TEST" name="Maven: org.junit.platform:junit-platform-commons:1.7.1" level="project" />
<orderEntry type="library" scope="TEST" name="Maven: org.junit.jupiter:junit-jupiter-params:5.7.1" level="project" />
<orderEntry type="library" scope="TEST" name="Maven: org.junit.jupiter:junit-jupiter-engine:5.7.1" level="project" />
<orderEntry type="library" scope="TEST" name="Maven: org.junit.platform:junit-platform-engine:1.7.1" level="project" />
<orderEntry type="library" scope="TEST" name="Maven: org.mockito:mockito-core:3.6.28" level="project" />
<orderEntry type="library" name="Maven: net.bytebuddy:byte-buddy:1.10.20" level="project" />
<orderEntry type="library" scope="TEST" name="Maven: net.bytebuddy:byte-buddy-agent:1.10.20" level="project" />
<orderEntry type="library" scope="TEST" name="Maven: org.objenesis:objenesis:3.1" level="project" />
<orderEntry type="library" scope="TEST" name="Maven: org.mockito:mockito-junit-jupiter:3.6.28" level="project" />
<orderEntry type="library" scope="TEST" name="Maven: org.skyscreamer:jsonassert:1.5.0" level="project" />
<orderEntry type="library" scope="TEST" name="Maven: com.vaadin.external.google:android-json:0.0.20131108.vaadin1" level="project" />
<orderEntry type="library" name="Maven: org.springframework:spring-core:5.3.4" level="project" />
<orderEntry type="library" name="Maven: org.springframework:spring-jcl:5.3.4" level="project" />
<orderEntry type="library" scope="TEST" name="Maven: org.springframework:spring-test:5.3.4" level="project" />
<orderEntry type="library" scope="TEST" name="Maven: org.xmlunit:xmlunit-core:2.7.0" level="project" />
<orderEntry type="library" name="Maven: org.mybatis.spring.boot:mybatis-spring-boot-starter:2.1.4" level="project" />
<orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-jdbc:2.4.3" level="project" />
<orderEntry type="library" name="Maven: com.zaxxer:HikariCP:3.4.5" level="project" />
<orderEntry type="library" name="Maven: org.springframework:spring-jdbc:5.3.4" level="project" />
<orderEntry type="library" name="Maven: org.mybatis.spring.boot:mybatis-spring-boot-autoconfigure:2.1.4" level="project" />
<orderEntry type="library" name="Maven: org.mybatis:mybatis:3.5.6" level="project" />
<orderEntry type="library" name="Maven: org.mybatis:mybatis-spring:2.0.6" level="project" />
<orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-configuration-processor:2.4.3" level="project" />
<orderEntry type="library" name="Maven: com.github.pagehelper:pagehelper-spring-boot-starter:1.3.0" level="project" />
<orderEntry type="library" name="Maven: com.github.pagehelper:pagehelper-spring-boot-autoconfigure:1.3.0" level="project" />
<orderEntry type="library" name="Maven: com.github.pagehelper:pagehelper:5.2.0" level="project" />
<orderEntry type="library" name="Maven: com.github.jsqlparser:jsqlparser:3.2" level="project" />
<orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-devtools:2.4.3" level="project" />
<orderEntry type="library" name="Maven: org.springframework.boot:spring-boot:2.4.3" level="project" />
<orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-autoconfigure:2.4.3" level="project" />
<orderEntry type="library" name="Maven: mysql:mysql-connector-java:8.0.23" level="project" />
<orderEntry type="library" name="Maven: com.baomidou:mybatis-plus-boot-starter:3.3.2" level="project" />
<orderEntry type="library" name="Maven: com.baomidou:mybatis-plus:3.3.2" level="project" />
<orderEntry type="library" name="Maven: com.baomidou:mybatis-plus-extension:3.3.2" level="project" />
<orderEntry type="library" name="Maven: com.baomidou:mybatis-plus-core:3.3.2" level="project" />
<orderEntry type="library" name="Maven: com.baomidou:mybatis-plus-annotation:3.3.2" level="project" />
<orderEntry type="library" name="Maven: com.alibaba:druid-spring-boot-starter:1.2.5" level="project" />
<orderEntry type="library" name="Maven: com.alibaba:druid:1.2.5" level="project" />
<orderEntry type="library" name="Maven: org.slf4j:slf4j-api:1.7.30" level="project" />
<orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-data-redis:2.4.3" level="project" />
<orderEntry type="library" name="Maven: org.springframework.data:spring-data-redis:2.4.5" level="project" />
<orderEntry type="library" name="Maven: org.springframework.data:spring-data-keyvalue:2.4.5" level="project" />
<orderEntry type="library" name="Maven: org.springframework.data:spring-data-commons:2.4.5" level="project" />
<orderEntry type="library" name="Maven: org.springframework:spring-tx:5.3.4" level="project" />
<orderEntry type="library" name="Maven: org.springframework:spring-oxm:5.3.4" level="project" />
<orderEntry type="library" name="Maven: org.springframework:spring-context-support:5.3.4" level="project" />
<orderEntry type="library" name="Maven: io.lettuce:lettuce-core:6.0.2.RELEASE" level="project" />
<orderEntry type="library" name="Maven: io.netty:netty-common:4.1.59.Final" level="project" />
<orderEntry type="library" name="Maven: io.netty:netty-handler:4.1.59.Final" level="project" />
<orderEntry type="library" name="Maven: io.netty:netty-resolver:4.1.59.Final" level="project" />
<orderEntry type="library" name="Maven: io.netty:netty-buffer:4.1.59.Final" level="project" />
<orderEntry type="library" name="Maven: io.netty:netty-codec:4.1.59.Final" level="project" />
<orderEntry type="library" name="Maven: io.netty:netty-transport:4.1.59.Final" level="project" />
<orderEntry type="library" name="Maven: io.projectreactor:reactor-core:3.4.3" level="project" />
<orderEntry type="library" name="Maven: org.reactivestreams:reactive-streams:1.0.3" level="project" />
<orderEntry type="library" name="Maven: org.bouncycastle:bcprov-jdk15on:1.54" level="project" />
<orderEntry type="library" name="Maven: io.springfox:springfox-swagger2:2.9.2" level="project" />
<orderEntry type="library" name="Maven: io.springfox:springfox-spi:2.9.2" level="project" />
<orderEntry type="library" name="Maven: io.springfox:springfox-core:2.9.2" level="project" />
<orderEntry type="library" name="Maven: io.springfox:springfox-schema:2.9.2" level="project" />
<orderEntry type="library" name="Maven: io.springfox:springfox-swagger-common:2.9.2" level="project" />
<orderEntry type="library" name="Maven: io.springfox:springfox-spring-web:2.9.2" level="project" />
<orderEntry type="library" name="Maven: com.fasterxml:classmate:1.5.1" level="project" />
<orderEntry type="library" name="Maven: org.springframework.plugin:spring-plugin-core:1.2.0.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.springframework.plugin:spring-plugin-metadata:1.2.0.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.mapstruct:mapstruct:1.2.0.Final" level="project" />
<orderEntry type="library" name="Maven: io.springfox:springfox-swagger-ui:2.9.2" level="project" />
<orderEntry type="library" name="Maven: io.swagger:swagger-annotations:1.6.2" level="project" />
<orderEntry type="library" name="Maven: io.swagger:swagger-models:1.6.2" level="project" />
<orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-annotations:2.11.4" level="project" />
<orderEntry type="library" name="Maven: io.jsonwebtoken:jjwt:0.9.1" level="project" />
<orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-databind:2.11.4" level="project" />
<orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-core:2.11.4" level="project" />
<orderEntry type="library" name="Maven: joda-time:joda-time:2.10.8" level="project" />
<orderEntry type="library" name="Maven: org.apache.shiro:shiro-core:1.7.1" level="project" />
<orderEntry type="library" name="Maven: org.apache.shiro:shiro-lang:1.7.1" level="project" />
<orderEntry type="library" name="Maven: org.apache.shiro:shiro-cache:1.7.1" level="project" />
<orderEntry type="library" name="Maven: org.apache.shiro:shiro-crypto-hash:1.7.1" level="project" />
<orderEntry type="library" name="Maven: org.apache.shiro:shiro-crypto-core:1.7.1" level="project" />
<orderEntry type="library" name="Maven: org.apache.shiro:shiro-crypto-cipher:1.7.1" level="project" />
<orderEntry type="library" name="Maven: org.apache.shiro:shiro-config-core:1.7.1" level="project" />
<orderEntry type="library" name="Maven: org.apache.shiro:shiro-config-ogdl:1.7.1" level="project" />
<orderEntry type="library" name="Maven: commons-beanutils:commons-beanutils:1.9.4" level="project" />
<orderEntry type="library" name="Maven: commons-collections:commons-collections:3.2.2" level="project" />
<orderEntry type="library" name="Maven: org.apache.shiro:shiro-event:1.7.1" level="project" />
<orderEntry type="library" name="Maven: org.apache.shiro:shiro-spring:1.7.1" level="project" />
<orderEntry type="library" name="Maven: org.apache.shiro:shiro-web:1.7.1" level="project" />
<orderEntry type="library" name="Maven: org.owasp.encoder:encoder:1.2.2" level="project" />
<orderEntry type="library" name="Maven: org.apache.poi:poi:3.9" level="project" />
<orderEntry type="library" name="Maven: commons-codec:commons-codec:1.15" level="project" />
<orderEntry type="library" name="Maven: org.apache.poi:poi-ooxml:3.9" level="project" />
<orderEntry type="library" name="Maven: dom4j:dom4j:1.6.1" level="project" />
<orderEntry type="library" name="Maven: xml-apis:xml-apis:1.0.b2" level="project" />
<orderEntry type="library" name="Maven: org.apache.poi:poi-ooxml-schemas:3.9" level="project" />
<orderEntry type="library" name="Maven: org.apache.xmlbeans:xmlbeans:2.3.0" level="project" />
<orderEntry type="library" name="Maven: stax:stax-api:1.0.1" level="project" />
<orderEntry type="library" name="Maven: cn.hutool:hutool-all:4.6.17" level="project" />
<orderEntry type="library" name="Maven: com.alibaba:fastjson:1.2.75" level="project" />
<orderEntry type="library" name="Maven: com.aliyun:aliyun-java-sdk-core:4.4.0" level="project" />
<orderEntry type="library" name="Maven: com.google.code.gson:gson:2.8.6" level="project" />
<orderEntry type="library" name="Maven: org.apache.httpcomponents:httpclient:4.5.8" level="project" />
<orderEntry type="library" name="Maven: org.apache.httpcomponents:httpcore:4.4.11" level="project" />
<orderEntry type="library" name="Maven: commons-logging:commons-logging:1.2" level="project" />
<orderEntry type="library" name="Maven: javax.xml.bind:jaxb-api:2.3.1" level="project" />
<orderEntry type="library" name="Maven: javax.activation:javax.activation-api:1.2.0" level="project" />
<orderEntry type="library" name="Maven: org.jacoco:org.jacoco.agent:runtime:0.8.3" level="project" />
<orderEntry type="library" name="Maven: org.ini4j:ini4j:0.5.4" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Maven: org.projectlombok:lombok:1.18.18" level="project" />
<orderEntry type="library" name="Maven: org.apache.commons:commons-lang3:3.11" level="project" />
<orderEntry type="library" name="Maven: commons-lang:commons-lang:2.6" level="project" />
<orderEntry type="library" name="Maven: commons-io:commons-io:2.8.0" level="project" />
<orderEntry type="library" name="Maven: com.google.guava:guava:30.1-jre" level="project" />
<orderEntry type="library" name="Maven: com.google.guava:failureaccess:1.0.1" level="project" />
<orderEntry type="library" name="Maven: com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava" level="project" />
<orderEntry type="library" name="Maven: com.google.code.findbugs:jsr305:3.0.2" level="project" />
<orderEntry type="library" name="Maven: org.checkerframework:checker-qual:3.5.0" level="project" />
<orderEntry type="library" name="Maven: com.google.errorprone:error_prone_annotations:2.3.4" level="project" />
<orderEntry type="library" name="Maven: com.google.j2objc:j2objc-annotations:1.3" level="project" />
<orderEntry type="library" name="Maven: org.bytedeco:javacv:1.4.3" level="project" />
<orderEntry type="library" name="Maven: org.bytedeco:javacpp:1.4.3" level="project" />
<orderEntry type="library" name="Maven: org.bytedeco.javacpp-presets:opencv:3.4.3-1.4.3" level="project" />
<orderEntry type="library" name="Maven: org.bytedeco.javacpp-presets:ffmpeg:4.0.2-1.4.3" level="project" />
<orderEntry type="library" name="Maven: org.bytedeco.javacpp-presets:flycapture:2.11.3.121-1.4.3" level="project" />
<orderEntry type="library" name="Maven: org.bytedeco.javacpp-presets:libdc1394:2.2.5-1.4.3" level="project" />
<orderEntry type="library" name="Maven: org.bytedeco.javacpp-presets:libfreenect:0.5.3-1.4.3" level="project" />
<orderEntry type="library" name="Maven: org.bytedeco.javacpp-presets:libfreenect2:0.2.0-1.4.3" level="project" />
<orderEntry type="library" name="Maven: org.bytedeco.javacpp-presets:librealsense:1.12.1-1.4.3" level="project" />
<orderEntry type="library" name="Maven: org.bytedeco.javacpp-presets:videoinput:0.200-1.4.3" level="project" />
<orderEntry type="library" name="Maven: org.bytedeco.javacpp-presets:artoolkitplus:2.3.1-1.4.3" level="project" />
<orderEntry type="library" name="Maven: org.bytedeco.javacpp-presets:flandmark:1.07-1.4.3" level="project" />
<orderEntry type="library" name="Maven: org.bytedeco.javacpp-presets:leptonica:1.76.0-1.4.3" level="project" />
<orderEntry type="library" name="Maven: org.bytedeco.javacpp-presets:tesseract:4.0.0-rc2-1.4.3" level="project" />
</component>
</module>
\ No newline at end of file
wisenergy-mapper/src/main/java/cn/wisenergy/mapper/AccountMapper.java
View file @ 3c66f801
......@@ -5,6 +5,9 @@ import cn.wisenergy.model.app.AccountInfo;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.apache.ibatis.annotations.Param;
import java.util.List;
import java.util.Map;
/**
* @author 86187
*/
......@@ -57,4 +60,17 @@ public interface AccountMapper extends BaseMapper<AccountInfo> {
* @return
*/
int updateEarningsMonthAndEarningsTotalByid(AccountInfo accountInfo);
/**
* 统计
* @return 数量
*/
int count();
/**
* 获取账户列表
* @param map 条件
* @return 账户列表
*/
List<AccountInfo> getList(Map<String,Object> map);
}
wisenergy-mapper/src/main/java/cn/wisenergy/mapper/CultivatingPrizeInfoMapper.java
View file @ 3c66f801
package cn.wisenergy.mapper;
import cn.wisenergy.model.app.CultivatingPrizeInfo;
import cn.wisenergy.model.vo.CultivatingPrizeInfoVo;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.apache.ibatis.annotations.Param;
import java.math.BigDecimal;
import java.util.List;
import java.util.Map;
/**
* 培育奖详情记录
......@@ -15,4 +16,19 @@ public interface CultivatingPrizeInfoMapper extends BaseMapper<CultivatingPrizeI
CultivatingPrizeInfo getOneByUserId(String userId);
int add(CultivatingPrizeInfo cultivatingPrizeInfo);
/**
* 分页查询所有信息
* @param map
* @return
*/
List<CultivatingPrizeInfoVo> getCultivatingPrizeInfoList(Map<String, Object> map);
/**
* 统计总记录数
*
* @param map 入参
* @return 结果
*/
int count( Map<String, Object> map);
}
wisenergy-mapper/src/main/java/cn/wisenergy/mapper/CultivatingPrizeMapper.java
View file @ 3c66f801
......@@ -3,7 +3,7 @@ package cn.wisenergy.mapper;
import cn.wisenergy.model.app.CultivatingPrize;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import java.math.BigDecimal;
import java.util.List;
/**
* 培育奖金额对应表
......@@ -16,4 +16,11 @@ public interface CultivatingPrizeMapper extends BaseMapper<CultivatingPrize> {
* @return
*/
CultivatingPrize getcultivatingPrizeByUserLevel(int userLevel);
/**
* 查询所有信息
* @return
*/
List<CultivatingPrize> getCultivatingPrizeList();
}
wisenergy-mapper/src/main/java/cn/wisenergy/mapper/MemberPercentMapper.java
View file @ 3c66f801
......@@ -4,6 +4,9 @@ import cn.wisenergy.model.app.MemberPercent;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.apache.ibatis.annotations.Param;
import java.util.List;
import java.util.Map;
/**
* @author 86187
*/
......@@ -39,4 +42,17 @@ public interface MemberPercentMapper extends BaseMapper<MemberPercent> {
*/
MemberPercent getByLevelAndType(@Param("userLevel") Integer userLevel, @Param("type") Integer type);
/**
* 统计条数
* @return 条数
*/
int count();
/**
* 获取会员优惠比列
* @param map 参数条件
* @return 列表
*/
List<MemberPercent> getList(Map<String,Object> map);
}
wisenergy-mapper/src/main/java/cn/wisenergy/mapper/MonthAwardMapper.java
View file @ 3c66f801
......@@ -5,6 +5,8 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.apache.ibatis.annotations.Param;
import java.util.Date;
import java.util.List;
import java.util.Map;
/**
* @author 86187
......@@ -41,4 +43,19 @@ public interface MonthAwardMapper extends BaseMapper<MonthAward> {
* @return 月度奖金
*/
MonthAward getByTime(@Param("yearMonth") String yearMonth);
/**
* 统计数据条数
* @param map 条件
* @return 条数
*/
int count(Map<String,Object> map);
/**
* 获取列表
* @param map 条件
* @return 列表
*/
List<MonthAward> getList(Map<String,Object> map);
}
wisenergy-mapper/src/main/java/cn/wisenergy/mapper/ProgressPrizeMapper.java
View file @ 3c66f801
......@@ -5,8 +5,8 @@ import cn.wisenergy.model.vo.ProgressPrizeVo;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.apache.ibatis.annotations.Param;
import java.util.Date;
import java.util.List;
import java.util.Map;
/**
* @author 86187
......@@ -38,10 +38,25 @@ public interface ProgressPrizeMapper extends BaseMapper<ProgressPrize> {
/**
* 根据 userId 年月 获取月的最大进步奖用户
*
* @param userId 用户id
* @param yearMonth 年月
* @return 最大进步奖用户列表
*/
ProgressPrize getByUserIdYearMonth(@Param("userId") String userId,@Param("yearMonth") String yearMonth);
/**
* 统计最大进步奖总记录数
*
* @param map 入参
* @return 结果
*/
int count( Map<String, Object> map);
/**
* 获取最大进步奖列表
* @param map 入参
* @return 结果集
*/
List<ProgressPrize> getList(Map<String, Object> map);
}
wisenergy-mapper/src/main/java/cn/wisenergy/mapper/RecommendUserMapper.java
View file @ 3c66f801
package cn.wisenergy.mapper;
import cn.wisenergy.model.app.RecommendUser;
import cn.wisenergy.model.vo.RecommendUserVo;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.apache.ibatis.annotations.Param;
import java.util.List;
import java.util.Map;
/**
* @author zw
......@@ -33,4 +37,19 @@ public interface RecommendUserMapper extends BaseMapper<RecommendUser> {
* @return
*/
int add(RecommendUser recommendUser);
/**
* 分页查询所有用户信息
* @param map
* @return
*/
List<RecommendUserVo> getRecommendUserList(Map<String, Object> map);
/**
* 统计总记录数
* @param map 入参
* @return 结果
*/
int count( Map<String, Object> map);
}
wisenergy-mapper/src/main/java/cn/wisenergy/mapper/ShopZxMapper.java
View file @ 3c66f801
......@@ -2,13 +2,13 @@ package cn.wisenergy.mapper;
import cn.wisenergy.model.app.shopZx;
import cn.wisenergy.model.app.zxUserDto;
import cn.wisenergy.model.app.zxUserVo;
import cn.wisenergy.model.vo.ShopZxUserVo;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import java.util.List;
import java.util.Map;
/**
......@@ -34,15 +34,15 @@ public interface ShopZxMapper extends BaseMapper<shopZx> {
/**
* 倒叙查询资讯与用户发布数据
*/
List<zxUserDto> selectPage(@Param("pageNum") Integer pageNum, @Param("pageSize") Integer pageSize);
/**
* 用于查询资讯单表全部信息
* @param pageNum
* @param pageSize
* @return
*/
List<zxUserVo> selectAll(@Param("pageNum") Integer pageNum, @Param("pageSize") Integer pageSize);
List<ShopZxUserVo> selectPage(@Param("pageNum") Integer pageNum, @Param("pageSize") Integer pageSize);
//
// /**
// * 用于查询资讯单表全部信息
// * @param pageNum
// * @param pageSize
// * @return
// */
// List<zxUserVo> selectAll(@Param("pageNum") Integer pageNum, @Param("pageSize") Integer pageSize);
/**
* 点赞接口专用
......@@ -58,4 +58,18 @@ public interface ShopZxMapper extends BaseMapper<shopZx> {
* @return
*/
int updateZxToExaminezxid(@Param("zxid")Integer zxid,@Param("ZxToExamine") Integer ZxToExamine);
/**
* 分页查询所有用户信息
* @param map
* @return
*/
List<ShopZxUserVo> getShopZxList(Map<String, Object> map);
/**
* 统计总记录数
* @param map 入参
* @return 结果
*/
int count( Map<String, Object> map);
}
wisenergy-mapper/src/main/java/cn/wisenergy/mapper/SysUserMapper.java 0 → 100644
View file @ 3c66f801
package cn.wisenergy.mapper;
import cn.wisenergy.model.app.SysUser;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.apache.ibatis.annotations.Param;
/**
* @author 86187
*/
public interface SysUserMapper extends BaseMapper<SysUser> {
/**
* 获取后台账户信息
*
* @param id 用户主键id
* @return 后台账户信息
*/
SysUser getById(@Param("id") Integer id);
/**
* 更据账户，获取后台用户信息
*
* @param account 账户
* @return 后台用户信息
*/
SysUser getByAccount(@Param("account") String account);
}
wisenergy-mapper/src/main/java/cn/wisenergy/mapper/TeamPerformanceMapper.java
View file @ 3c66f801
package cn.wisenergy.mapper;
import cn.wisenergy.model.app.TeamPerformance;
import cn.wisenergy.model.app.User;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.apache.ibatis.annotations.Param;
......
wisenergy-mapper/src/main/java/cn/wisenergy/mapper/TeamUserInfoMapper.java
View file @ 3c66f801
package cn.wisenergy.mapper;
import cn.wisenergy.model.app.RecommendUser;
import cn.wisenergy.model.app.TeamUserInfo;
import cn.wisenergy.model.vo.TeamUserInfoVo;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import java.util.List;
import java.util.Map;
/**
* 团队Mapper
* @author zw
......@@ -30,4 +33,19 @@ public interface TeamUserInfoMapper extends BaseMapper<TeamUserInfo> {
int add(TeamUserInfo teamUserInfo);
int edit(TeamUserInfo teamUserInfo);
/**
* 分页查询所有信息
* @param map
* @return
*/
List<TeamUserInfoVo> getTeamUserInfoList(Map<String, Object> map);
/**
* 统计总记录数
*
* @param map 入参
* @return 结果
*/
int count( Map<String, Object> map);
}
wisenergy-mapper/src/main/java/cn/wisenergy/mapper/UsersMapper.java
View file @ 3c66f801
package cn.wisenergy.mapper;
import cn.wisenergy.model.app.User;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.apache.ibatis.annotations.Mapper;
......@@ -40,7 +41,7 @@ public interface UsersMapper extends BaseMapper<User> {
*/
int delById(@Param("id") Integer id);
List<User> getList(Map<String, Object> map);
List<User> getList(Map<String, Object> map);
/**
* 获取所有的非普通用户列表
......@@ -49,7 +50,7 @@ public interface UsersMapper extends BaseMapper<User> {
*/
List<User> findAllNotZeroUser();
User findByName(String name);
User findByName(String name);
String findPswByName(String UserName);
......@@ -104,6 +105,7 @@ public interface UsersMapper extends BaseMapper<User> {
/**
* 查询用户
*
*
* @param param
* @return
*/
......@@ -127,7 +129,7 @@ public interface UsersMapper extends BaseMapper<User> {
Integer save(@Param("userId") String userId, @Param("beInvitedCode") String beInvitedCode);
User edit1(int userLevel, String intiveCode, String userId);
User edit1(int userLevel, String intiveCode, String userId);
Integer getuserIdById(@Param("userId") String userId);
......@@ -157,7 +159,7 @@ public interface UsersMapper extends BaseMapper<User> {
* @param userLevel 用户等级
* @return 等级用户列表
*/
List<User> getByLevel(@Param("userLevel") Integer userLevel);
List<cn.wisenergy.model.app.User> getByLevel(@Param("userLevel") Integer userLevel);
/**
* @param
......@@ -191,7 +193,7 @@ public interface UsersMapper extends BaseMapper<User> {
* @return
*/
List<User> getAerialDeliveryUserBeforOneMonth(@Param("before") String before,
@Param("now") String now);
@Param("now") String now);
/**
* 随机获取一条小于当前id的用户 即： 比当前用户早注册的用户
......@@ -236,4 +238,19 @@ public interface UsersMapper extends BaseMapper<User> {
*/
User getUserByUserId(String userId);
/**
* 分页查询所有用户信息
* @param map
* @return
*/
List<User> getUserList(Map<String, Object> map);
/**
* 统计用户总记录数
*
* @param map 入参
* @return 结果
*/
int countUser( Map<String, Object> map);
}
wisenergy-mapper/src/main/resources/mapper/AccountInfoMapper.xml
View file @ 3c66f801
......@@ -108,6 +108,21 @@
</where>
</select>
<select id="count" resultType="java.lang.Integer">
select count(1)
from
<include refid="table"/>
</select>
<select id="getList" resultType="cn.wisenergy.model.app.AccountInfo">
select
<include refid="cols_all"/>
from
<include refid="table"/>
order by create_time desc
limit #{startNum},#{endNum}
</select>
<update id="updateEarningsMonthAndEarningsTotalByid" parameterType="cn.wisenergy.model.app.AccountInfo">
UPDATE
<include refid="table"/>
......
wisenergy-mapper/src/main/resources/mapper/CultivatingPrizeInfoMapper.xml
View file @ 3c66f801
......@@ -76,4 +76,37 @@
(<include refid="vals"/>)
</insert>
<select id="getCultivatingPrizeInfoList" resultType="cn.wisenergy.model.vo.CultivatingPrizeInfoVo">
select
<include refid="cols_all"/>
from
<include refid="table"/>
<where>
1=1
<if test="userId != null and userId != ''">
and user_id = #{userId}
</if>
<if test="queryTime != null and queryTime != ''">
and (YEAR(create_time) = YEAR(#{queryTime})
AND MONTH(create_time) =MONTH(#{queryTime})
AND DAY(create_time)=DAY(#{queryTime}))
</if>
</where>
order by create_time desc
limit #{startNum},#{endNum}
</select>
<select id="count" resultType="java.lang.Integer">
select count(1)
from
<include refid="table"/>
<where>
<if test="userId != null and userId != ''">
user_id=#{userId}
</if>
<if test="queryTime != null and queryTime != ''">
and `create_time` = #{queryTime}
</if>
</where>
</select>
</mapper>
\ No newline at end of file
wisenergy-mapper/src/main/resources/mapper/CultivatingPrizeMapper.xml
View file @ 3c66f801
......@@ -50,4 +50,14 @@
</where>
</select>
<select id="getCultivatingPrizeList" resultType="cn.wisenergy.model.app.CultivatingPrize">
select
<include refid="cols_all"/>
from
<include refid="table"/>
</select>
</mapper>
\ No newline at end of file
wisenergy-mapper/src/main/resources/mapper/MemberPercentMapper.xml
View file @ 3c66f801
......@@ -83,4 +83,19 @@
</where>
</select>
<select id="count" resultType="java.lang.Integer">
select count(1)
from
<include refid="table"/>
</select>
<select id="getList" resultType="cn.wisenergy.model.app.MemberPercent">
select
<include refid="cols_all"/>
from
<include refid="table"/>
order by create_time desc
limit #{startNum},#{endNum}
</select>
</mapper>
wisenergy-mapper/src/main/resources/mapper/MonthAwardMapper.xml
View file @ 3c66f801
......@@ -103,4 +103,29 @@
limit 1
</select>
<select id="count" resultType="java.lang.Integer">
select count(1)
from
<include refid="table"/>
<where>
<if test="queryTime != null and queryTime != ''">
`year_month` = #{queryTime}
</if>
</where>
</select>
<select id="getList" resultType="cn.wisenergy.model.app.MonthAward">
select
<include refid="cols_all"/>
from
<include refid="table"/>
<where>
<if test="queryTime != null and queryTime != ''">
`year_month` = #{queryTime}
</if>
</where>
order by create_time desc
limit #{startNum},#{endNum}
</select>
</mapper>
\ No newline at end of file
wisenergy-mapper/src/main/resources/mapper/ProgressPrizeMapper.xml
View file @ 3c66f801
......@@ -109,4 +109,29 @@
</where>
</select>
<select id="count" resultType="java.lang.Integer">
select count(1)
from
<include refid="table"/>
<where>
<if test="queryTime != null and queryTime != ''">
`year_month` = #{queryTime}
</if>
</where>
</select>
<select id="getList" resultType="cn.wisenergy.model.app.ProgressPrize">
select
<include refid="cols_all"/>
from
<include refid="table"/>
<where>
<if test="queryTime != null and queryTime != ''">
`year_month` = #{queryTime}
</if>
</where>
order by create_time desc
limit #{startNum},#{endNum}
</select>
</mapper>
\ No newline at end of file
wisenergy-mapper/src/main/resources/mapper/RecommendUserMapper.xml
View file @ 3c66f801
......@@ -42,13 +42,13 @@
<if test="normalUserNum != null">normal_user_num =#{normalUserNum},</if>
<if test="seedlingNum != null">seedling_num =#{seedlingNum},</if>
<if test="bronzeTreeNum != null">bronze_tree_num =#{bronzeTreeNum},</if>
<if test="silverTreeNum != null">referrer_num =#{silverTreeNum},</if>
<if test="goldTreeNum != null">referrer_num =#{goldTreeNum},</if>
<if test="farmerNum != null">referrer_num =#{farmerNum},</if>
<if test="forestStartNum != null">referrer_num =#{forestStartNum},</if>
<if test="partnerNum != null">referrer_num =#{partnerNum},</if>
<if test="monthyCount != null">referrer_num =#{monthyCount},</if>
<if test="historyCount != null">referrer_num =#{historyCount},</if>
<if test="silverTreeNum != null">silver_tree_num =#{silverTreeNum},</if>
<if test="goldTreeNum != null">gold_tree_num =#{goldTreeNum},</if>
<if test="farmerNum != null">farmer_num =#{farmerNum},</if>
<if test="forestStartNum != null">forest_start_num =#{forestStartNum},</if>
<if test="partnerNum != null">partner_num =#{partnerNum},</if>
<if test="monthyCount != null">monthy_count =#{monthyCount},</if>
<if test="historyCount != null">history_count =#{historyCount},</if>
update_time =now()
</sql>
......@@ -57,11 +57,11 @@
<if test="normalUserNum != null">and normal_user_num =#{normalUserNum},</if>
<if test="seedlingNum != null">and seedling_num =#{seedlingNum},</if>
<if test="bronzeTreeNum != null">and bronze_tree_num =#{bronzeTreeNum},</if>
<if test="silverTreeNum != null">and referrer_num =#{silverTreeNum},</if>
<if test="goldTreeNum != null">and referrer_num =#{goldTreeNum},</if>
<if test="farmerNum != null">and referrer_num =#{farmerNum},</if>
<if test="forestStartNum != null">and referrer_num =#{forestStartNum},</if>
<if test="partnerNum != null">and referrer_num =#{partnerNum},</if>
<if test="silverTreeNum != null">and silver_tree_num =#{silverTreeNum},</if>
<if test="goldTreeNum != null">and gold_tree_num =#{goldTreeNum},</if>
<if test="farmerNum != null">and farmer_num =#{farmerNum},</if>
<if test="forestStartNum != null">and forest_start_num =#{forestStartNum},</if>
<if test="partnerNum != null">and partner_num =#{partnerNum},</if>
<if test="createTime != null">and create_time &gt;= #{createTime}</if>
<if test="updateTime != null">and #{updateTime} &gt;= update_time</if>
<if test="monthyCount != null">and #{monthyCount} &gt;= monthyCount</if>
......@@ -107,4 +107,39 @@
value
(<include refid="vals"/>)
</insert>
<select id="getRecommendUserList" resultType="cn.wisenergy.model.app.RecommendUser">
select
<include refid="cols_all"/>
from
<include refid="table"/>
<where>
1=1
<if test="userId != null and userId != ''">
and user_id = #{userId}
</if>
<if test="queryTime != null and queryTime != ''">
and (YEAR(create_time) = YEAR(#{queryTime})
AND MONTH(create_time) =MONTH(#{queryTime})
AND DAY(create_time)=DAY(#{queryTime}))
</if>
</where>
order by create_time desc
limit #{startNum},#{endNum}
</select>
<select id="count" resultType="java.lang.Integer">
select count(1)
from
<include refid="table"/>
<where>
<if test="userId != null and userId != ''">
user_id=#{userId}
</if>
<if test="queryTime != null and queryTime != ''">
and `create_time` = #{queryTime}
</if>
</where>
</select>
</mapper>
\ No newline at end of file
wisenergy-mapper/src/main/resources/mapper/ShopZxMapper.xml
View file @ 3c66f801
......@@ -55,7 +55,7 @@
<!--资讯内容倒叙查询-->
<select id="selectPage" parameterType="java.lang.Integer" resultType="cn.wisenergy.model.app.zxUserDto">
<select id="selectPage" parameterType="java.lang.Integer" resultType="cn.wisenergy.model.vo.UserVo">
select
b.zx_id as zxid,
b.zx_url as zxUrl,
......@@ -68,6 +68,7 @@
from shop_zx b left join user_info a ON a.invite_code=b.invite_code
WHERE zx_to_examine != 0
AND a.user_id !=0
and a.user_id !=null
order by zxid desc limit #{pageNum},#{pageSize}
</select>
<!--资讯总记录数查询-->
......@@ -106,7 +107,7 @@
</where>
</update>
<!--资讯内容与用户内容倒叙查询-->
<select id="selectAll" parameterType="java.lang.Integer" resultType="cn.wisenergy.model.app.zxUserVo">
<select id="getShopZxList" resultType="cn.wisenergy.model.vo.ShopZxUserVo">
select
b.zx_id as zxid,
b.zx_url as zxUrl,
......@@ -115,9 +116,27 @@
b.zx_date as zxDate,
b.invite_code as inviteCode,
a.user_id as userId,
a.head_image as headImage
b.zx_to_examine as ZxToExamine
from shop_zx b left join user_info a ON a.invite_code=b.invite_code
order by zx_id desc limit #{pageNum},#{pageSize}
<where>
1=1
<if test="userId != null and userId != ''">
and user_id = #{userId}
</if>
</where>
order by zx_id desc
limit #{startNum},#{endNum}
</select>
<select id="count" resultType="java.lang.Integer">
select count(1)
from
<include refid="table"/>
<where>
<if test="userId != null and userId != ''">
zx_id = #{zxId}
</if>
</where>
</select>
</mapper>
\ No newline at end of file
wisenergy-mapper/src/main/resources/mapper/SysUserMapper.xml 0 → 100644
View file @ 3c66f801
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="cn.wisenergy.mapper.SysUserMapper">
<resultMap id="sysMap" type="cn.wisenergy.model.app.SysUser">
<id column="id" property="id"/>
<result column="account" property="account"/>
<result column="password" property="password"/>
<result column="user_name" property="userName"/>
<result column="create_time" property="createTime"/>
<result column="update_time" property="updateTime"/>
</resultMap>
<sql id="table">
sys_user
</sql>
<sql id="cols_all">
id,
<include refid="cols_exclude_id"/>
</sql>
<sql id="cols_exclude_id">
account,password,user_name,create_time,update_time
</sql>
<sql id="vals">
#{account},#{password},#{userName},now(),now()
</sql>
<sql id="updateCondition">
<if test="account != null">account = #{account},</if>
<if test="password != null">password = #{password},</if>
<if test="userName != null">user_name = #{userName},</if>
update_time =now()
</sql>
<sql id="criteria">
<if test="id != null">id = #{id}</if>
<if test="account != null">and account = #{account}</if>
<if test="password != null">and password = #{password}</if>
<if test="userName != null">and user_name = #{userName}</if>
<if test="createTime != null">and create_time &gt;= #{createTime}</if>
<if test="updateTime != null">and #{updateTime} &gt;= update_time</if>
</sql>
<select id="getById" resultType="cn.wisenergy.model.app.SysUser">
select
<include refid="cols_all"/>
from
<include refid="table"/>
<where>
id=#{id}
</where>
</select>
<select id="getByAccount" resultType="cn.wisenergy.model.app.SysUser">
select
<include refid="cols_all"/>
from
<include refid="table"/>
<where>
account=#{account}
</where>
</select>
</mapper>
\ No newline at end of file
wisenergy-mapper/src/main/resources/mapper/TeamUserInfoMapper.xml
View file @ 3c66f801
......@@ -40,11 +40,11 @@
<if test="normalUserNum != null">normal_user_num =#{normalUserNum},</if>
<if test="seedlingNum != null">seedling_num =#{seedlingNum},</if>
<if test="bronzeTreeNum != null">bronze_tree_num =#{bronzeTreeNum},</if>
<if test="silverTreeNum != null">referrer_num =#{silverTreeNum},</if>
<if test="goldTreeNum != null">referrer_num =#{goldTreeNum},</if>
<if test="farmerNum != null">referrer_num =#{farmerNum},</if>
<if test="forestStartNum != null">referrer_num =#{forestStartNum},</if>
<if test="partnerNum != null">referrer_num =#{partnerNum},</if>
<if test="silverTreeNum != null">silver_tree_num =#{silverTreeNum},</if>
<if test="goldTreeNum != null">gold_tree_num =#{goldTreeNum},</if>
<if test="farmerNum != null">farmer_num =#{farmerNum},</if>
<if test="forestStartNum != null">forest_start_num =#{forestStartNum},</if>
<if test="partnerNum != null">partner_num =#{partnerNum},</if>
update_time =now()
</sql>
......@@ -53,11 +53,11 @@
<if test="normalUserNum != null">and normal_user_num =#{normalUserNum},</if>
<if test="seedlingNum != null">and seedling_num =#{seedlingNum},</if>
<if test="bronzeTreeNum != null">and bronze_tree_num =#{bronzeTreeNum},</if>
<if test="silverTreeNum != null">and referrer_num =#{silverTreeNum},</if>
<if test="goldTreeNum != null">and referrer_num =#{goldTreeNum},</if>
<if test="farmerNum != null">and referrer_num =#{farmerNum},</if>
<if test="forestStartNum != null">and referrer_num =#{forestStartNum},</if>
<if test="partnerNum != null">and referrer_num =#{partnerNum},</if>
<if test="silverTreeNum != null">and silver_tree_num =#{silverTreeNum},</if>
<if test="goldTreeNum != null">and gold_tree_num =#{goldTreeNum},</if>
<if test="farmerNum != null">and farmer_num =#{farmerNum},</if>
<if test="forestStartNum != null">and forest_start_num =#{forestStartNum},</if>
<if test="partnerNum != null">and partner_num =#{partnerNum},</if>
<if test="createTime != null">and create_time &gt;= #{createTime}</if>
<if test="updateTime != null">and #{updateTime} &gt;= update_time</if>
</sql>
......@@ -112,4 +112,38 @@
value
(<include refid="vals"/>)
</insert>
<select id="getTeamUserInfoList" resultType="cn.wisenergy.model.app.TeamUserInfo">
select
<include refid="cols_all"/>
from
<include refid="table"/>
<where>
1=1
<if test="userId != null and userId != ''">
and user_id = #{userId}
</if>
<if test="queryTime != null and queryTime != ''">
and (YEAR(create_time) = YEAR(#{queryTime})
AND MONTH(create_time) =MONTH(#{queryTime})
AND DAY(create_time)=DAY(#{queryTime}))
</if>
</where>
order by create_time desc
limit #{startNum},#{endNum}
</select>
<select id="count" resultType="java.lang.Integer">
select count(1)
from
<include refid="table"/>
<where>
<if test="userId != null and userId != ''">
user_id=#{userId}
</if>
<if test="queryTime != null and queryTime != ''">
and `create_time` = #{queryTime}
</if>
</where>
</select>
</mapper>
\ No newline at end of file
wisenergy-mapper/src/main/resources/mapper/TradeRecordMapper.xml
View file @ 3c66f801
......@@ -100,10 +100,10 @@
user_id=#{userId}
</if>
<if test="yearMonth != null">
AND(
YEAR(create_time) = YEAR(#{yearMonth})
AND MONTH(create_time) = MONTH(#{yearMonth}))
</if>
AND(
YEAR(create_time) = YEAR(#{yearMonth})
AND MONTH(create_time) = MONTH(#{yearMonth}))
</if>
</where>
</select>
......@@ -116,7 +116,7 @@
and date_format(create_time,'%Y-%m') >= date_format(now() - interval 7 month,'%Y-%m')
and (status=1 or status=3)
and user_id=#{userId}
group by user_id ,create_time desc;
group by user_id ,create_time;
</select>
<select id="getWithdrawalRecord" resultType="cn.wisenergy.model.vo.WithdrawalRecordVo">
......
wisenergy-mapper/src/main/resources/mapper/UsersMapper.xml
View file @ 3c66f801
......@@ -438,4 +438,31 @@
user_id = #{userId}
</select>
<select id="getUserList" resultType="cn.wisenergy.model.app.User">
select
<include refid="cols_all"/>
from
<include refid="table"/>
<where>
1=1
<if test="userId != null and userId != ''">
and user_id = #{userId}
</if>
<if test="queryTime != null and queryTime != ''">
and (YEAR(create_time) = YEAR(#{queryTime})
AND MONTH(create_time) =MONTH(#{queryTime})
AND DAY(create_time)=DAY(#{queryTime}))
</if>
</where>
order by create_time desc
limit #{startNum},#{endNum}
</select>
<select id="countUser" resultType="java.lang.Integer">
select count(1)
from
user_info
</select>
</mapper>
wisenergy-mapper/wisenergy-mapper.iml
View file @ 3c66f801
<?xml version="1.0" encoding="UTF-8"?>
<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" version="4">
<component name="FacetManager">
<facet type="Spring" name="Spring">
<configuration />
......@@ -10,4 +10,177 @@
</configuration>
</facet>
</component>
<component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8">
<output url="file://$MODULE_DIR$/target/classes" />
<output-test url="file://$MODULE_DIR$/target/test-classes" />
<content url="file://$MODULE_DIR$">
<sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
<excludeFolder url="file://$MODULE_DIR$/target" />
</content>
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="module" module-name="wisenergy-model" />
<orderEntry type="module" module-name="wisenergy-common" />
<orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-web:2.4.3" level="project" />
<orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter:2.4.3" level="project" />
<orderEntry type="library" name="Maven: org.springframework.boot:spring-boot:2.4.3" level="project" />
<orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-logging:2.4.3" level="project" />
<orderEntry type="library" name="Maven: ch.qos.logback:logback-classic:1.2.3" level="project" />
<orderEntry type="library" name="Maven: ch.qos.logback:logback-core:1.2.3" level="project" />
<orderEntry type="library" name="Maven: org.apache.logging.log4j:log4j-to-slf4j:2.13.3" level="project" />
<orderEntry type="library" name="Maven: org.apache.logging.log4j:log4j-api:2.13.3" level="project" />
<orderEntry type="library" name="Maven: org.slf4j:jul-to-slf4j:1.7.30" level="project" />
<orderEntry type="library" name="Maven: jakarta.annotation:jakarta.annotation-api:1.3.5" level="project" />
<orderEntry type="library" name="Maven: org.springframework:spring-core:5.3.4" level="project" />
<orderEntry type="library" name="Maven: org.springframework:spring-jcl:5.3.4" level="project" />
<orderEntry type="library" name="Maven: org.yaml:snakeyaml:1.27" level="project" />
<orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-json:2.4.3" level="project" />
<orderEntry type="library" name="Maven: com.fasterxml.jackson.datatype:jackson-datatype-jdk8:2.11.4" level="project" />
<orderEntry type="library" name="Maven: com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.11.4" level="project" />
<orderEntry type="library" name="Maven: com.fasterxml.jackson.module:jackson-module-parameter-names:2.11.4" level="project" />
<orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-tomcat:2.4.3" level="project" />
<orderEntry type="library" name="Maven: org.apache.tomcat.embed:tomcat-embed-core:9.0.43" level="project" />
<orderEntry type="library" name="Maven: org.apache.tomcat.embed:tomcat-embed-websocket:9.0.43" level="project" />
<orderEntry type="library" name="Maven: org.springframework:spring-web:5.3.4" level="project" />
<orderEntry type="library" name="Maven: org.springframework:spring-beans:5.3.4" level="project" />
<orderEntry type="library" name="Maven: org.springframework:spring-webmvc:5.3.4" level="project" />
<orderEntry type="library" name="Maven: org.springframework:spring-context:5.3.4" level="project" />
<orderEntry type="library" name="Maven: org.springframework:spring-expression:5.3.4" level="project" />
<orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-undertow:2.4.3" level="project" />
<orderEntry type="library" name="Maven: io.undertow:undertow-core:2.2.4.Final" level="project" />
<orderEntry type="library" name="Maven: org.jboss.logging:jboss-logging:3.4.1.Final" level="project" />
<orderEntry type="library" name="Maven: org.jboss.xnio:xnio-api:3.8.0.Final" level="project" />
<orderEntry type="library" name="Maven: org.wildfly.common:wildfly-common:1.5.2.Final" level="project" />
<orderEntry type="library" name="Maven: org.wildfly.client:wildfly-client-config:1.0.1.Final" level="project" />
<orderEntry type="library" scope="RUNTIME" name="Maven: org.jboss.xnio:xnio-nio:3.8.0.Final" level="project" />
<orderEntry type="library" name="Maven: org.jboss.threads:jboss-threads:3.1.0.Final" level="project" />
<orderEntry type="library" name="Maven: io.undertow:undertow-servlet:2.2.4.Final" level="project" />
<orderEntry type="library" name="Maven: org.jboss.spec.javax.annotation:jboss-annotations-api_1.3_spec:2.0.1.Final" level="project" />
<orderEntry type="library" name="Maven: io.undertow:undertow-websockets-jsr:2.2.4.Final" level="project" />
<orderEntry type="library" name="Maven: org.jboss.spec.javax.websocket:jboss-websocket-api_1.1_spec:2.0.0.Final" level="project" />
<orderEntry type="library" name="Maven: jakarta.servlet:jakarta.servlet-api:4.0.4" level="project" />
<orderEntry type="library" name="Maven: org.glassfish:jakarta.el:3.0.3" level="project" />
<orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-aop:2.4.3" level="project" />
<orderEntry type="library" name="Maven: org.springframework:spring-aop:5.3.4" level="project" />
<orderEntry type="library" name="Maven: org.aspectj:aspectjweaver:1.9.6" level="project" />
<orderEntry type="library" name="Maven: org.mybatis.spring.boot:mybatis-spring-boot-starter:2.1.4" level="project" />
<orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-jdbc:2.4.3" level="project" />
<orderEntry type="library" name="Maven: com.zaxxer:HikariCP:3.4.5" level="project" />
<orderEntry type="library" name="Maven: org.springframework:spring-jdbc:5.3.4" level="project" />
<orderEntry type="library" name="Maven: org.mybatis.spring.boot:mybatis-spring-boot-autoconfigure:2.1.4" level="project" />
<orderEntry type="library" name="Maven: org.mybatis:mybatis:3.5.6" level="project" />
<orderEntry type="library" name="Maven: org.mybatis:mybatis-spring:2.0.6" level="project" />
<orderEntry type="library" name="Maven: com.github.pagehelper:pagehelper-spring-boot-starter:1.3.0" level="project" />
<orderEntry type="library" name="Maven: com.github.pagehelper:pagehelper-spring-boot-autoconfigure:1.3.0" level="project" />
<orderEntry type="library" name="Maven: com.github.pagehelper:pagehelper:5.2.0" level="project" />
<orderEntry type="library" name="Maven: com.github.jsqlparser:jsqlparser:3.2" level="project" />
<orderEntry type="library" name="Maven: mysql:mysql-connector-java:8.0.23" level="project" />
<orderEntry type="library" name="Maven: com.baomidou:mybatis-plus-boot-starter:3.3.2" level="project" />
<orderEntry type="library" name="Maven: com.baomidou:mybatis-plus:3.3.2" level="project" />
<orderEntry type="library" name="Maven: com.baomidou:mybatis-plus-extension:3.3.2" level="project" />
<orderEntry type="library" name="Maven: com.baomidou:mybatis-plus-core:3.3.2" level="project" />
<orderEntry type="library" name="Maven: com.baomidou:mybatis-plus-annotation:3.3.2" level="project" />
<orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-autoconfigure:2.4.3" level="project" />
<orderEntry type="library" name="Maven: com.alibaba:druid-spring-boot-starter:1.2.5" level="project" />
<orderEntry type="library" name="Maven: com.alibaba:druid:1.2.5" level="project" />
<orderEntry type="library" name="Maven: org.slf4j:slf4j-api:1.7.30" level="project" />
<orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-data-redis:2.4.3" level="project" />
<orderEntry type="library" name="Maven: org.springframework.data:spring-data-redis:2.4.5" level="project" />
<orderEntry type="library" name="Maven: org.springframework.data:spring-data-keyvalue:2.4.5" level="project" />
<orderEntry type="library" name="Maven: org.springframework.data:spring-data-commons:2.4.5" level="project" />
<orderEntry type="library" name="Maven: org.springframework:spring-tx:5.3.4" level="project" />
<orderEntry type="library" name="Maven: org.springframework:spring-oxm:5.3.4" level="project" />
<orderEntry type="library" name="Maven: org.springframework:spring-context-support:5.3.4" level="project" />
<orderEntry type="library" name="Maven: io.lettuce:lettuce-core:6.0.2.RELEASE" level="project" />
<orderEntry type="library" name="Maven: io.netty:netty-common:4.1.59.Final" level="project" />
<orderEntry type="library" name="Maven: io.netty:netty-handler:4.1.59.Final" level="project" />
<orderEntry type="library" name="Maven: io.netty:netty-resolver:4.1.59.Final" level="project" />
<orderEntry type="library" name="Maven: io.netty:netty-buffer:4.1.59.Final" level="project" />
<orderEntry type="library" name="Maven: io.netty:netty-codec:4.1.59.Final" level="project" />
<orderEntry type="library" name="Maven: io.netty:netty-transport:4.1.59.Final" level="project" />
<orderEntry type="library" name="Maven: io.projectreactor:reactor-core:3.4.3" level="project" />
<orderEntry type="library" name="Maven: org.reactivestreams:reactive-streams:1.0.3" level="project" />
<orderEntry type="library" name="Maven: org.bouncycastle:bcprov-jdk15on:1.54" level="project" />
<orderEntry type="library" name="Maven: io.springfox:springfox-swagger2:2.9.2" level="project" />
<orderEntry type="library" name="Maven: io.springfox:springfox-spi:2.9.2" level="project" />
<orderEntry type="library" name="Maven: io.springfox:springfox-core:2.9.2" level="project" />
<orderEntry type="library" name="Maven: net.bytebuddy:byte-buddy:1.10.20" level="project" />
<orderEntry type="library" name="Maven: io.springfox:springfox-schema:2.9.2" level="project" />
<orderEntry type="library" name="Maven: io.springfox:springfox-swagger-common:2.9.2" level="project" />
<orderEntry type="library" name="Maven: io.springfox:springfox-spring-web:2.9.2" level="project" />
<orderEntry type="library" name="Maven: com.fasterxml:classmate:1.5.1" level="project" />
<orderEntry type="library" name="Maven: org.springframework.plugin:spring-plugin-core:1.2.0.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.springframework.plugin:spring-plugin-metadata:1.2.0.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.mapstruct:mapstruct:1.2.0.Final" level="project" />
<orderEntry type="library" name="Maven: io.springfox:springfox-swagger-ui:2.9.2" level="project" />
<orderEntry type="library" name="Maven: io.swagger:swagger-annotations:1.6.2" level="project" />
<orderEntry type="library" name="Maven: io.swagger:swagger-models:1.6.2" level="project" />
<orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-annotations:2.11.4" level="project" />
<orderEntry type="library" name="Maven: io.jsonwebtoken:jjwt:0.9.1" level="project" />
<orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-databind:2.11.4" level="project" />
<orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-core:2.11.4" level="project" />
<orderEntry type="library" name="Maven: joda-time:joda-time:2.10.8" level="project" />
<orderEntry type="library" name="Maven: org.apache.shiro:shiro-core:1.7.1" level="project" />
<orderEntry type="library" name="Maven: org.apache.shiro:shiro-lang:1.7.1" level="project" />
<orderEntry type="library" name="Maven: org.apache.shiro:shiro-cache:1.7.1" level="project" />
<orderEntry type="library" name="Maven: org.apache.shiro:shiro-crypto-hash:1.7.1" level="project" />
<orderEntry type="library" name="Maven: org.apache.shiro:shiro-crypto-core:1.7.1" level="project" />
<orderEntry type="library" name="Maven: org.apache.shiro:shiro-crypto-cipher:1.7.1" level="project" />
<orderEntry type="library" name="Maven: org.apache.shiro:shiro-config-core:1.7.1" level="project" />
<orderEntry type="library" name="Maven: org.apache.shiro:shiro-config-ogdl:1.7.1" level="project" />
<orderEntry type="library" name="Maven: commons-beanutils:commons-beanutils:1.9.4" level="project" />
<orderEntry type="library" name="Maven: commons-collections:commons-collections:3.2.2" level="project" />
<orderEntry type="library" name="Maven: org.apache.shiro:shiro-event:1.7.1" level="project" />
<orderEntry type="library" name="Maven: org.apache.shiro:shiro-spring:1.7.1" level="project" />
<orderEntry type="library" name="Maven: org.apache.shiro:shiro-web:1.7.1" level="project" />
<orderEntry type="library" name="Maven: org.owasp.encoder:encoder:1.2.2" level="project" />
<orderEntry type="library" name="Maven: org.apache.poi:poi:3.9" level="project" />
<orderEntry type="library" name="Maven: commons-codec:commons-codec:1.15" level="project" />
<orderEntry type="library" name="Maven: org.apache.poi:poi-ooxml:3.9" level="project" />
<orderEntry type="library" name="Maven: dom4j:dom4j:1.6.1" level="project" />
<orderEntry type="library" name="Maven: xml-apis:xml-apis:1.0.b2" level="project" />
<orderEntry type="library" name="Maven: org.apache.poi:poi-ooxml-schemas:3.9" level="project" />
<orderEntry type="library" name="Maven: org.apache.xmlbeans:xmlbeans:2.3.0" level="project" />
<orderEntry type="library" name="Maven: stax:stax-api:1.0.1" level="project" />
<orderEntry type="library" name="Maven: cn.hutool:hutool-all:4.6.17" level="project" />
<orderEntry type="library" name="Maven: com.alibaba:fastjson:1.2.75" level="project" />
<orderEntry type="library" name="Maven: com.aliyun:aliyun-java-sdk-core:4.5.3" level="project" />
<orderEntry type="library" name="Maven: com.google.code.gson:gson:2.8.6" level="project" />
<orderEntry type="library" name="Maven: org.apache.httpcomponents:httpclient:4.5.12" level="project" />
<orderEntry type="library" name="Maven: org.apache.httpcomponents:httpcore:4.4.13" level="project" />
<orderEntry type="library" name="Maven: commons-logging:commons-logging:1.2" level="project" />
<orderEntry type="library" name="Maven: javax.xml.bind:jaxb-api:2.3.1" level="project" />
<orderEntry type="library" name="Maven: javax.activation:javax.activation-api:1.2.0" level="project" />
<orderEntry type="library" name="Maven: org.jacoco:org.jacoco.agent:runtime:0.8.5" level="project" />
<orderEntry type="library" name="Maven: org.ini4j:ini4j:0.5.4" level="project" />
<orderEntry type="library" name="Maven: io.opentracing:opentracing-api:0.33.0" level="project" />
<orderEntry type="library" name="Maven: io.opentracing:opentracing-util:0.33.0" level="project" />
<orderEntry type="library" name="Maven: io.opentracing:opentracing-noop:0.33.0" level="project" />
<orderEntry type="library" name="Maven: org.apache.commons:commons-lang3:3.11" level="project" />
<orderEntry type="library" name="Maven: commons-lang:commons-lang:2.6" level="project" />
<orderEntry type="library" name="Maven: commons-io:commons-io:2.8.0" level="project" />
<orderEntry type="library" name="Maven: com.google.guava:guava:30.1-jre" level="project" />
<orderEntry type="library" name="Maven: com.google.guava:failureaccess:1.0.1" level="project" />
<orderEntry type="library" name="Maven: com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava" level="project" />
<orderEntry type="library" name="Maven: com.google.code.findbugs:jsr305:3.0.2" level="project" />
<orderEntry type="library" name="Maven: org.checkerframework:checker-qual:3.5.0" level="project" />
<orderEntry type="library" name="Maven: com.google.errorprone:error_prone_annotations:2.3.4" level="project" />
<orderEntry type="library" name="Maven: com.google.j2objc:j2objc-annotations:1.3" level="project" />
<orderEntry type="library" name="Maven: org.bytedeco:javacv:1.4.3" level="project" />
<orderEntry type="library" name="Maven: org.bytedeco:javacpp:1.4.3" level="project" />
<orderEntry type="library" name="Maven: org.bytedeco.javacpp-presets:opencv:3.4.3-1.4.3" level="project" />
<orderEntry type="library" name="Maven: org.bytedeco.javacpp-presets:ffmpeg:4.0.2-1.4.3" level="project" />
<orderEntry type="library" name="Maven: org.bytedeco.javacpp-presets:flycapture:2.11.3.121-1.4.3" level="project" />
<orderEntry type="library" name="Maven: org.bytedeco.javacpp-presets:libdc1394:2.2.5-1.4.3" level="project" />
<orderEntry type="library" name="Maven: org.bytedeco.javacpp-presets:libfreenect:0.5.3-1.4.3" level="project" />
<orderEntry type="library" name="Maven: org.bytedeco.javacpp-presets:libfreenect2:0.2.0-1.4.3" level="project" />
<orderEntry type="library" name="Maven: org.bytedeco.javacpp-presets:librealsense:1.12.1-1.4.3" level="project" />
<orderEntry type="library" name="Maven: org.bytedeco.javacpp-presets:videoinput:0.200-1.4.3" level="project" />
<orderEntry type="library" name="Maven: org.bytedeco.javacpp-presets:artoolkitplus:2.3.1-1.4.3" level="project" />
<orderEntry type="library" name="Maven: org.bytedeco.javacpp-presets:flandmark:1.07-1.4.3" level="project" />
<orderEntry type="library" name="Maven: org.bytedeco.javacpp-presets:leptonica:1.76.0-1.4.3" level="project" />
<orderEntry type="library" name="Maven: org.bytedeco.javacpp-presets:tesseract:4.0.0-rc2-1.4.3" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Maven: org.projectlombok:lombok:1.18.18" level="project" />
</component>
</module>
\ No newline at end of file
wisenergy-model/src/main/java/cn/wisenergy/model/app/AccountInfo.java
View file @ 3c66f801
......@@ -31,9 +31,9 @@ public class AccountInfo implements Serializable {
private String userId;
/**
* 用户等级
* 用户等级 0：普通用户 1：幼苗 2: 青铜树 3：白银树 4：黄金树 5：农场主 6：森林之星 7：西田森合伙人
*/
@ApiModelProperty(name = "userLevel", value = "用户等级")
@ApiModelProperty(name = "userLevel", value = "用户等级 0：普通用户 1：幼苗 2: 青铜树 3：白银树 4：黄金树 5：农场主 6：森林之星 7：西田森合伙人")
private Integer userLevel;
/**
......
wisenergy-model/src/main/java/cn/wisenergy/model/app/MemberPercent.java
View file @ 3c66f801
......@@ -38,18 +38,18 @@ public class MemberPercent implements Serializable {
/**
* 等级对应的返佣比例
*/
@ApiModelProperty(name = "", value = "")
@ApiModelProperty(name = "percent", value = "等级对应的返佣比例")
private BigDecimal percent;
/**
* 创建时间
*/
@ApiModelProperty(name = "", value = "")
@ApiModelProperty(name = "createTime", value = "创建时间")
private Date createTime;
/**
* 更新时间
*/
@ApiModelProperty(name = "", value = "")
@ApiModelProperty(name = "updateTime", value = "更新时间")
private Date updateTime;
}
wisenergy-model/src/main/java/cn/wisenergy/model/app/SysUser.java 0 → 100644
View file @ 3c66f801
package cn.wisenergy.model.app;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.util.Date;
/**
* @author 86187
* @ Description: 后台用户实体类
* @ Author : 86187
* @ Date : 2021/3/25 11:21
*/
@Data
@ApiModel(value = "SysUsers")
public class SysUser {
/**
* 主键id
*/
@ApiModelProperty(value = "主键id", name = "id")
private Integer id;
/**
* 账户
*/
@ApiModelProperty(value = "账户", name = "account")
private String account;
/**
* 密码
*/
@ApiModelProperty(value = "密码", name = "password")
private String password;
/**
* 账户名称
*/
@ApiModelProperty(value = "账户名称", name = "userName")
private String userName;
/**
* 创建时间
*/
@ApiModelProperty(value = "创建时间", name = "createTime")
private Date createTime;
/**
* 更新时间
*/
@ApiModelProperty(value = "更新时间", name = "updateTime")
private Date updateTime;
}
wisenergy-model/src/main/java/cn/wisenergy/model/app/User.java
View file @ 3c66f801
package cn.wisenergy.model.app;
import com.baomidou.mybatisplus.annotation.TableName;
import com.baomidou.mybatisplus.extension.activerecord.Model;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
......@@ -17,7 +16,7 @@ import java.util.Date;
* @ CreateDate : 2020/11/8 19:59
*/
@Data
@ApiModel(value = "User")
@ApiModel(value = "UserInfo")
@TableName("user_info")
public class User implements Serializable{
private static final long serialVersionUID = 2525339404301884673L;
......@@ -113,127 +112,5 @@ public class User implements Serializable{
@ApiModelProperty(name = "frozen", value = "账户冻结字段")
private Integer frozen;
public Integer getFrozen() {
return frozen;
}
public void setFrozen(Integer frozen) {
this.frozen = frozen;
}
public static long getSerialVersionUID() {
return serialVersionUID;
}
public Integer getId() {
return id;
}
public void setId(Integer id) {
this.id = id;
}
public String getUserId() {
return userId;
}
public void setUserId(String userId) {
this.userId = userId;
}
public String getPassword() {
return password;
}
public void setPassword(String password) {
this.password = password;
}
public String getHeadImage() {
return headImage;
}
public void setHeadImage(String headImage) {
this.headImage = headImage;
}
public int getUserLevel() {
return userLevel;
}
public void setUserLevel(int userLevel) {
this.userLevel = userLevel;
}
public BigDecimal getCrossBorderLine() {
return crossBorderLine;
}
public void setCrossBorderLine(BigDecimal crossBorderLine) {
this.crossBorderLine = crossBorderLine;
}
public String getIdCardNumber() {
return idCardNumber;
}
public void setIdCardNumber(String idCardNumber) {
this.idCardNumber = idCardNumber;
}
public String getFansNickname() {
return fansNickname;
}
public void setFansNickname(String fansNickname) {
this.fansNickname = fansNickname;
}
public String getFansId() {
return fansId;
}
public void setFansId(String fansId) {
this.fansId = fansId;
}
public String getInviteCode() {
return inviteCode;
}
public void setInviteCode(String inviteCode) {
this.inviteCode = inviteCode;
}
public String getBeInvitedCode() {
return beInvitedCode;
}
public void setBeInvitedCode(String beInvitedCode) {
this.beInvitedCode = beInvitedCode;
}
public String getCustomerServiceId() {
return customerServiceId;
}
public void setCustomerServiceId(String customerServiceId) {
this.customerServiceId = customerServiceId;
}
public Date getCreateTime() {
return createTime;
}
public void setCreateTime(Date createTime) {
this.createTime = createTime;
}
public Date getUpdateTime() {
return updateTime;
}
public void setUpdateTime(Date updateTime) {
this.updateTime = updateTime;
}
}
wisenergy-model/src/main/java/cn/wisenergy/model/app/zxUserDto.java deleted 100644 → 0
View file @ 0050c7ff
package cn.wisenergy.model.app;
import com.baomidou.mybatisplus.annotation.TableField;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.util.List;
/**
* Created by m1991 on 2021/3/10 20:29
*/
@Data
public class zxUserDto {
/**
* 手机号作为用户账号
*/
@TableField(exist = false)
@ApiModelProperty(name = "user_id", value = "用户id")
private String userId;
/*
* 用户头像
*/
@TableField(exist = false)
@ApiModelProperty(name = "headImage", value = "用户头像")
private String headImage;
/**
* 资讯主键id
*/
@TableField(exist = false)
@ApiModelProperty(name = "zx_id", value = "资讯主键id")
private Integer zxid;
/**
* 视频存放地址
*/
@TableField(exist = false)
@ApiModelProperty(name = "zx_url", value = "视频/图片存放地址")
private String zxUrl;
/**
* 用户本人邀请码
*/
@TableField(exist = false)
@ApiModelProperty(name = "invite_code", value = "用户本人邀请码")
private String inviteCode;
/**
* 获赞数
*/
@TableField(exist = false)
@ApiModelProperty(name = "zx_likes", value = "获赞数")
private Integer zxLikes;
@ApiModelProperty(name = "liked_status", value = "点赞状态")
private Integer likedStatus;
/**
* 资讯文字输入字段
*/
@TableField(exist = false)
@ApiModelProperty(name = "zx_field", value = "资讯文字输入字段")
private String zxField;
/**
* 资讯数据创建时间
*/
@TableField(exist = false)
@ApiModelProperty(name = "zx_date", value = "资讯数据创建时间")
private Long zxDate;
@TableField(exist = false)
private List<String> askImgList;
}
wisenergy-model/src/main/java/cn/wisenergy/model/dto/AccountInfoQuery.java 0 → 100644
View file @ 3c66f801
package cn.wisenergy.model.dto;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
/**
* @author 86187
*/
@Data
@ApiModel("AccountInfoQuery")
public class AccountInfoQuery {
/**
* 页码
*/
@ApiModelProperty(value = "页码", name = "pageNo")
private Integer pageNo;
/**
* 页条数
*/
@ApiModelProperty(value = "页条数", name = "pageSize")
private Integer pageSize;
private Integer startNum;
private Integer endNum;
}
wisenergy-model/src/main/java/cn/wisenergy/model/dto/CultivatingPrizeDto.java 0 → 100644
View file @ 3c66f801
package cn.wisenergy.model.dto;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
/**
* Created by m1991 on 2021/3/26 11:13
*/
@Data
@ApiModel("CultivatingPrizeDto")
public class CultivatingPrizeDto {
/**
* 用户id
*/
@ApiModelProperty(value = "主键id", name = "id")
private String id;
/**
* 页码
*/
@ApiModelProperty(value = "页码", name = "pageNo")
private Integer pageNo;
/**
* 页条数
*/
@ApiModelProperty(value = "页条数", name = "pageSize")
private Integer pageSize;
private Integer startNum;
private Integer endNum;
}
wisenergy-model/src/main/java/cn/wisenergy/model/dto/CultivatingPrizeInfoDto.java 0 → 100644
View file @ 3c66f801
package cn.wisenergy.model.dto;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
/**
* Created by m1991 on 2021/3/26 10:13
*/
@Data
@ApiModel("CultivatingPrizeInfoDto")
public class CultivatingPrizeInfoDto {
/**
* 用户id
*/
@ApiModelProperty(value = "用户id", name = "userId")
private String userId;
/**
* 查询时间 格式(yyyy-MM-dd)
*/
@ApiModelProperty(value = "查询时间 格式(yyyy-MM-dd)", name = "queryTime")
private String queryTime;
/**
* 页码
*/
@ApiModelProperty(value = "页码", name = "pageNo")
private Integer pageNo;
/**
* 页条数
*/
@ApiModelProperty(value = "页条数", name = "pageSize")
private Integer pageSize;
private Integer startNum;
private Integer endNum;
}
wisenergy-model/src/main/java/cn/wisenergy/model/dto/MemberPercentQuery.java 0 → 100644
View file @ 3c66f801
package cn.wisenergy.model.dto;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
/**
* @author 86187
*/
@Data
@ApiModel("MemberPercentQuery")
public class MemberPercentQuery {
/**
* 页码
*/
@ApiModelProperty(value = "页码", name = "pageNo")
private Integer pageNo;
/**
* 页条数
*/
@ApiModelProperty(value = "页条数", name = "pageSize")
private Integer pageSize;
private Integer startNum;
private Integer endNum;
}
wisenergy-model/src/main/java/cn/wisenergy/model/dto/MonthAwardQuery.java 0 → 100644
View file @ 3c66f801
package cn.wisenergy.model.dto;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
/**
* 月度奖励列表查询条件Dto
* @author 86187
*/
@Data
@ApiModel("MonthAwardQuery")
public class MonthAwardQuery {
/**
* 查询时间 格式(yyyy-MM)
*/
@ApiModelProperty(value = "查询时间 格式(yyyy-MM)", name = "queryTime")
private String queryTime;
/**
* 页码
*/
@ApiModelProperty(value = "页码", name = "pageNo")
private Integer pageNo;
/**
* 页条数
*/
@ApiModelProperty(value = "页条数", name = "pageSize")
private Integer pageSize;
private Integer startNum;
private Integer endNum;
}
wisenergy-model/src/main/java/cn/wisenergy/model/dto/ProgressPrizeQuery.java 0 → 100644
View file @ 3c66f801
package cn.wisenergy.model.dto;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
/**
*@ Description: 每月进步奖查询参数
*@ Author : 86187
*@ Date : 2021/3/25 10:50
* @author 86187
*/
@Data
@ApiModel("ProgressPrizeQuery")
public class ProgressPrizeQuery {
/**
* 查询时间 格式(yyyy-MM)
*/
@ApiModelProperty(value = "查询时间 格式(yyyy-MM)", name = "queryTime")
private String queryTime;
/**
* 页码
*/
@ApiModelProperty(value = "页码", name = "pageNo")
private Integer pageNo;
/**
* 页条数
*/
@ApiModelProperty(value = "页条数", name = "pageSize")
private Integer pageSize;
private Integer startNum;
private Integer endNum;
}
wisenergy-model/src/main/java/cn/wisenergy/model/dto/RecommendUserDto.java 0 → 100644
View file @ 3c66f801
package cn.wisenergy.model.dto;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
/**
* Created by m1991 on 2021/3/25 18:32
*/
@Data
@ApiModel("RecommendUserDto")
public class RecommendUserDto extends TeamQueryDto {
/**
* 用户id
*/
@ApiModelProperty(value = "用户id", name = "userId")
private String userId;
/**
* 查询时间 格式(yyyy-MM-dd)
*/
@ApiModelProperty(value = "查询时间 格式(yyyy-MM-dd)", name = "queryTime")
private String queryTime;
/**
* 页码
*/
@ApiModelProperty(value = "页码", name = "pageNo")
private Integer pageNo;
/**
* 页条数
*/
@ApiModelProperty(value = "页条数", name = "pageSize")
private Integer pageSize;
private Integer startNum;
private Integer endNum;
}
wisenergy-model/src/main/java/cn/wisenergy/model/dto/ShopZxUserDto.java 0 → 100644
View file @ 3c66f801
package cn.wisenergy.model.dto;
import com.baomidou.mybatisplus.annotation.TableField;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.util.List;
/**
* Created by m1991 on 2021/3/10 20:29
*/
@Data
@ApiModel("ShopZxUserDto")
public class ShopZxUserDto {
/**
* 用户id
*/
@ApiModelProperty(value = "用户id", name = "userId")
private String userId;
/**
* 页码
*/
@ApiModelProperty(value = "页码", name = "pageNo")
private Integer pageNo;
/**
* 页条数
*/
@ApiModelProperty(value = "页条数", name = "pageSize")
private Integer pageSize;
private Integer startNum;
private Integer endNum;
}
wisenergy-model/src/main/java/cn/wisenergy/model/dto/SysLoginDto.java 0 → 100644
View file @ 3c66f801
package cn.wisenergy.model.dto;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
/**
* @author 86187
*/
@Data
@ApiModel("SysLoginDto")
public class SysLoginDto {
/**
* 账户
*/
@ApiModelProperty(value = "账户", name = "account")
private String account;
/**
* 密码
*/
@ApiModelProperty(value = "密码", name = "password")
private String password;
}
wisenergy-model/src/main/java/cn/wisenergy/model/dto/TeamUserInfoDto.java 0 → 100644
View file @ 3c66f801
package cn.wisenergy.model.dto;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
/**
* Created by m1991 on 2021/3/26 9:34
*/
@Data
@ApiModel("TeamUserInfoDto")
public class TeamUserInfoDto extends TeamQueryDto {
/**
* 用户id
*/
@ApiModelProperty(value = "用户id", name = "userId")
private String userId;
/**
* 查询时间 格式(yyyy-MM-dd)
*/
@ApiModelProperty(value = "查询时间 格式(yyyy-MM-dd)", name = "queryTime")
private String queryTime;
/**
* 页码
*/
@ApiModelProperty(value = "页码", name = "pageNo")
private Integer pageNo;
/**
* 页条数
*/
@ApiModelProperty(value = "页条数", name = "pageSize")
private Integer pageSize;
private Integer startNum;
private Integer endNum;
}
wisenergy-model/src/main/java/cn/wisenergy/model/dto/UserDto.java 0 → 100644
View file @ 3c66f801
package cn.wisenergy.model.dto;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
/**
* Created by m1991 on 2021/3/25 11:16
*/
@Data
@ApiModel("UserDto")
public class UserDto {
/**
* 用户id
*/
@ApiModelProperty(value = "用户id", name = "userId")
private String userId;
/**
* 查询时间 格式(yyyy-MM-dd)
*/
@ApiModelProperty(value = "查询时间 格式(yyyy-MM-dd)", name = "queryTime")
private String queryTime;
/**
* 页码
*/
@ApiModelProperty(value = "页码", name = "pageNo")
private Integer pageNo;
/**
* 页条数
*/
@ApiModelProperty(value = "页条数", name = "pageSize")
private Integer pageSize;
private Integer startNum;
private Integer endNum;
}
wisenergy-model/src/main/java/cn/wisenergy/model/app/UsersDto.java → wisenergy-model/src/main/java/cn/wisenergy/model/dto/UsersDto.java
View file @ 3c66f801
package cn.wisenergy.model.app;
package cn.wisenergy.model.dto;
import cn.wisenergy.model.app.User;
import lombok.Data;
import java.io.Serializable;
......
wisenergy-model/src/main/java/cn/wisenergy/model/vo/CultivatingPrizeInfoVo.java 0 → 100644
View file @ 3c66f801
package cn.wisenergy.model.vo;
import cn.wisenergy.model.dto.CultivatingPrizeInfoDto;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.util.Date;
/**
* Created by m1991 on 2021/3/26 10:14
*/
@ApiModel("CultivatingPrizeInfoVo")
@Data
public class CultivatingPrizeInfoVo extends CultivatingPrizeInfoDto {
/**
* 主键id
*/
@ApiModelProperty(name = "id", value = "主键id")
private int id;
/**
* 用户id
*/
@ApiModelProperty(name = "userId", value = "用户id")
private String userId;
/**
* 幼苗状态培育奖记录 0：表示上级用户没有获得过当前等级的培育奖
* 1： 表示上级用户已经获得过当前等级的培育奖
*/
@ApiModelProperty(name = "seedling", value = "幼苗等级培育奖记录")
private int seedling;
/**
* 青铜树等级培育奖记录0：表示上级用户没有获得过当前等级的培育奖
* 1： 表示上级用户已经获得过当前等级的培育奖
*/
@ApiModelProperty(name = "bronze_tree", value = "青铜树等级培育奖记录")
private int bronzeTree;
/**
* 白银树等级培育奖记录0：表示上级用户没有获得过当前等级的培育奖
* 1： 表示上级用户已经获得过当前等级的培育奖
*/
@ApiModelProperty(name = "silver_tree", value = "白银树等级培育奖记录")
private int silverTree;
/**
* 黄金树等级培育奖记录0：表示上级用户没有获得过当前等级的培育奖
* 1： 表示上级用户已经获得过当前等级的培育奖
*/
@ApiModelProperty(name = "gold_tree", value = "黄金树等级培育奖记录")
private int goldTree;
/**
* 农场主等级培育奖记录0：表示上级用户没有获得过当前等级的培育奖
* 1： 表示上级用户已经获得过当前等级的培育奖
*/
@ApiModelProperty(name = "forest_start", value = "农场主等级培育奖记录")
private int farmer;
/**
* 森林之星等级培育奖记录0：表示上级用户没有获得过当前等级的培育奖
* 1： 表示上级用户已经获得过当前等级的培育奖
*/
@ApiModelProperty(name = "forest_start", value = "森林之星等级培育奖记录")
private int forestStart;
/**
* 西田森合伙人等级培育奖记录0：表示上级用户没有获得过当前等级的培育奖
* 1： 表示上级用户已经获得过当前等级的培育奖
*/
@ApiModelProperty(name = "partner", value = "西田森合伙人等级培育奖记录")
private int partner;
/**
* 创建时间
*/
@ApiModelProperty(name = "createTime", value = "创建时间")
private Date createTime;
/**
* 修改时间
*/
@ApiModelProperty(name = "updateTime", value = "修改时间")
private Date updateTime;
}
wisenergy-model/src/main/java/cn/wisenergy/model/vo/CultivatingPrizeVo.java 0 → 100644
View file @ 3c66f801
package cn.wisenergy.model.vo;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.util.Date;
/**
* Created by m1991 on 2021/3/26 12:34
*/
@Data
public class CultivatingPrizeVo {
/**
* 主键id
*/
@ApiModelProperty(value = "主键id", name = "id")
private Integer id;
/**
* 用户id
*/
@ApiModelProperty(value = "用户id", name = "userId")
private String userId;
/**
* 年月
*/
@ApiModelProperty(value = "年月", name = "yearMonth")
private String yearMonth;
/**
* 本月增长率
*/
@ApiModelProperty(value = "本月增长率", name = "growthRate")
private Double growthRate;
/**
* 进步奖奖金
*/
@ApiModelProperty(value = "进步奖奖金", name = "awardMoney")
private Double awardMoney;
/**
* 创建时间
*/
@ApiModelProperty(value = "创建时间", name = "createTime")
private Date createTime;
/**
* 更新时间
*/
@ApiModelProperty(value = "更新时间", name = "updateTime")
private Date updateTime;
}
wisenergy-model/src/main/java/cn/wisenergy/model/vo/RecommendUserVo.java 0 → 100644
View file @ 3c66f801
package cn.wisenergy.model.vo;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.math.BigDecimal;
import java.util.Date;
/**
* Created by m1991 on 2021/3/25 18:36
*/
@ApiModel("RecommendUserVo")
@Data
public class RecommendUserVo {
/**
* 直推用户主键id
*/
@ApiModelProperty(name = "id", value = "直推用户主键id")
private Integer id;
/**
* 用户id
*/
@ApiModelProperty(name = "user_id", value = "用户id")
private String userId;
/**
* 普通用户数量
*/
@ApiModelProperty(name = "normal_user_num", value = "普通用户数量")
private Integer normalUserNum;
/**
* 幼苗数量
*/
@ApiModelProperty(name = "seedling_num", value = "幼苗数量")
private Integer seedlingNum;
/**
* 青铜树数量
*/
@ApiModelProperty(name = " bronze_tree_num", value = "青铜树数量")
private Integer bronzeTreeNum;
/**
* 白银树数量
*/
@ApiModelProperty(name = "silver_tree_num", value = "白银树数量")
private Integer silverTreeNum;
/**
* 黄金树数量
*/
@ApiModelProperty(name = "gold_tree_num", value = "黄金树数量")
private Integer goldTreeNum;
/**
* 农场主数量
*/
@ApiModelProperty(name = "farmer_num", value = "农场主数量")
private Integer farmerNum;
/**
* 森林之星数量
*/
@ApiModelProperty(name = "forest_start_num", value = "森林之星数量")
private Integer forestStartNum;
/**
* 西田森合伙人数量
*/
@ApiModelProperty(name = "partner_num", value = "西田森合伙人数量")
private Integer partnerNum;
/**
* 创建时间
*/
@ApiModelProperty(name = "create_time", value = "创建时间")
private Date createTime;
/**
* 更新时间
*/
@ApiModelProperty(name = "update_time", value = "更新时间")
private Date updateTime;
/**
* 用户当月消费金额
*/
@ApiModelProperty(name = "monthy_count", value = "用户当月消费金额")
private BigDecimal monthyCount;
/**
* 用户当月消费金额
*/
@ApiModelProperty(name = "history_count", value = "用户累计消费金额")
private BigDecimal historyCount;
}
wisenergy-model/src/main/java/cn/wisenergy/model/vo/SetMemberPercentVo.java 0 → 100644
View file @ 3c66f801
package cn.wisenergy.model.vo;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
/**
* @author 86187
* @ Description:
* @ Author : 86187
* @ Date : 2021/3/26 10:30
*/
@Data
@ApiModel("SetMemberPercentVo")
public class SetMemberPercentVo {
/**
* 比列
*/
@ApiModelProperty(name = "percent", value = "比列")
private Double percent;
/**
* 用户等级 0：普通用户 1：幼苗 2: 青铜树 3：白银树 4：黄金树 5：农场主 6：森林之星 7：西田森合伙人
*/
@ApiModelProperty(name = "userLevel", value = "用户等级 0：普通用户 1：幼苗 2: 青铜树 3：白银树 4：黄金树 5：农场主 6：森林之星 7：西田森合伙人")
private Integer userLevel;
/**
* 会员等级百分比类型：1：返佣 2：月度肥料 3：月度最大进步奖 4：运营中心补贴
*/
@ApiModelProperty(name = "type", value = "会员等级百分比类型：1：返佣 2：月度肥料 3：月度最大进步奖 4：运营中心补贴")
private Integer type;
}
wisenergy-model/src/main/java/cn/wisenergy/model/app/zxUserVo.java → wisenergy-model/src/main/java/cn/wisenergy/model/vo/ShopZxUserVo.java
View file @ 3c66f801
package cn.wisenergy.model.app;
package cn.wisenergy.model.vo;
import com.baomidou.mybatisplus.annotation.TableField;
import io.swagger.annotations.ApiModelProperty;
......@@ -11,7 +11,7 @@ import java.util.List;
* Created by m1991 on 2021/3/22 11:06
*/
@Data
public class zxUserVo {
public class ShopZxUserVo {
/**
* 手机号作为用户账号
*/
......@@ -61,7 +61,11 @@ public class zxUserVo {
@ApiModelProperty(name = "zx_date", value = "资讯数据创建时间")
private Long zxDate;
/**
* 资讯数据创建时间
*/
@TableField(exist = false)
@ApiModelProperty(name = "AskImgList", value = "资讯图片List集合")
private List AskImgList;
}
wisenergy-model/src/main/java/cn/wisenergy/model/vo/TeamUserInfoVo.java 0 → 100644
View file @ 3c66f801
package cn.wisenergy.model.vo;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.util.Date;
/**
* Created by m1991 on 2021/3/26 9:35
*/
@ApiModel("TeamUserInfoVo")
@Data
public class TeamUserInfoVo {
/**
* 团队用户主键id
*/
@ApiModelProperty(name = "id", value = "团队用户主键id")
private Integer id;
/**
* 用户id
*/
@ApiModelProperty(name = "userId", value = "用户id")
private String userId;
/**
* 普通用户数量
*/
@ApiModelProperty(name = "normal_user_num", value = "普通用户数量")
private Integer normalUserNum;
/**
* 幼苗数量
*/
@ApiModelProperty(name = "seedling_num", value = "幼苗数量")
private Integer seedlingNum;
/**
* 青铜树数量
*/
@ApiModelProperty(name = " bronze_tree_num", value = "青铜树数量")
private Integer bronzeTreeNum;
/**
* 白银树数量
*/
@ApiModelProperty(name = "silver_tree_num", value = "白银树数量")
private Integer silverTreeNum;
/**
* 黄金树数量
*/
@ApiModelProperty(name = "gold_tree_num", value = "黄金树数量")
private Integer goldTreeNum;
/**
* 农场主数量
*/
@ApiModelProperty(name = "farmer_num", value = "农场主数量")
private Integer farmerNum;
/**
* 森林之星数量
*/
@ApiModelProperty(name = "forest_start_num", value = "森林之星数量")
private Integer forestStartNum;
/**
* 西田森合伙人数量
*/
@ApiModelProperty(name = "partner_num", value = "西田森合伙人数量")
private Integer partnerNum;
/**
* 创建时间
*/
@ApiModelProperty(name = "createTime", value = "创建时间")
private Date createTime;
/**
* 更新时间
*/
@ApiModelProperty(name = "updateTime", value = "更新时间")
private Date updateTime;
}
wisenergy-model/src/main/java/cn/wisenergy/model/vo/UserVo.java 0 → 100644
View file @ 3c66f801
package cn.wisenergy.model.vo;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.math.BigDecimal;
import java.util.Date;
/**
* Created by m1991 on 2021/3/26 11:26
*/
@Data
@ApiModel("UserVo")
public class UserVo {
/**
* 主键id
*/
@ApiModelProperty(name = "id", value = "用户主键id")
private Integer id;
/**
* 手机号作为用户账号
*/
@ApiModelProperty(name = "user_id", value = "用户id")
private String userId;
/**
* 密码
*/
@ApiModelProperty(name = "password", value = "用户密码")
private String password;
/**
* 用户头像
*/
@ApiModelProperty(name = "用户头像", value = "headImage")
private String headImage;
/**
* 用户会员等级
*/
@ApiModelProperty(name = "user_level", value = "用户会员等级")
private int userLevel;
/**
* 跨境额度
*/
@ApiModelProperty(name = "cross_border_line", value = "跨境额度")
private BigDecimal crossBorderLine;
/**
* 身份证号码
*/
@ApiModelProperty(name = "id_card_number", value = "身份证号码")
private String idCardNumber;
/**
* 粉丝昵称
*/
@ApiModelProperty(name = "fans_nickname", value = "粉丝昵称")
private String fansNickname;
/**
* 有赞粉丝id，有赞自动生成
*/
@ApiModelProperty(name = "fans_id", value = "有赞粉丝id，有赞自动生成")
private String fansId;
/**
* 用户本人邀请码
*/
@ApiModelProperty(name = "invite_code", value = "用户本人邀请码")
private String inviteCode;
/**
* 推荐人邀请码
*/
@ApiModelProperty(name = "be_invited_code", value = "推荐人邀请码")
private String beInvitedCode;
/**
* 专属客服id
*/
@ApiModelProperty(name = "customerServiceId", value ="专属客服id" )
private String customerServiceId;
/**
* 创建时间
*/
@ApiModelProperty(name = "createTime", value = "创建时间")
private Date createTime;
/**
* 修改时间
*/
@ApiModelProperty(name = "updateTime", value = "修改时间")
private Date updateTime;
/**
* 账户冻结字段 0正常 1冻结
*/
@ApiModelProperty(name = "frozen", value = "账户冻结字段")
private Integer frozen;
}
wisenergy-model/src/main/java/cn/wisenergy/model/vo/WithdrawAuditVo.java 0 → 100644
View file @ 3c66f801
package cn.wisenergy.model.vo;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
/**
* @author 86187
* @ Description: 提现审核Vo
* @ Author : 86187
* @ Date : 2021/3/29 9:56
*/
@ApiModel("WithdrawAuditVo")
@Data
public class WithdrawAuditVo {
/**
* 提现记录主键id
*/
@ApiModelProperty(value = "提现记录主键id", name = "id")
private Integer id;
}
wisenergy-model/wisenergy-model.iml
View file @ 3c66f801
......@@ -10,4 +10,175 @@
</configuration>
</facet>
</component>
<component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8">
<output url="file://$MODULE_DIR$/target/classes" />
<output-test url="file://$MODULE_DIR$/target/test-classes" />
<content url="file://$MODULE_DIR$">
<sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
<excludeFolder url="file://$MODULE_DIR$/target" />
</content>
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="module" module-name="wisenergy-common" />
<orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-web:2.4.3" level="project" />
<orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter:2.4.3" level="project" />
<orderEntry type="library" name="Maven: org.springframework.boot:spring-boot:2.4.3" level="project" />
<orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-logging:2.4.3" level="project" />
<orderEntry type="library" name="Maven: ch.qos.logback:logback-classic:1.2.3" level="project" />
<orderEntry type="library" name="Maven: ch.qos.logback:logback-core:1.2.3" level="project" />
<orderEntry type="library" name="Maven: org.apache.logging.log4j:log4j-to-slf4j:2.13.3" level="project" />
<orderEntry type="library" name="Maven: org.apache.logging.log4j:log4j-api:2.13.3" level="project" />
<orderEntry type="library" name="Maven: org.slf4j:jul-to-slf4j:1.7.30" level="project" />
<orderEntry type="library" name="Maven: jakarta.annotation:jakarta.annotation-api:1.3.5" level="project" />
<orderEntry type="library" name="Maven: org.springframework:spring-core:5.3.4" level="project" />
<orderEntry type="library" name="Maven: org.springframework:spring-jcl:5.3.4" level="project" />
<orderEntry type="library" name="Maven: org.yaml:snakeyaml:1.27" level="project" />
<orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-json:2.4.3" level="project" />
<orderEntry type="library" name="Maven: com.fasterxml.jackson.datatype:jackson-datatype-jdk8:2.11.4" level="project" />
<orderEntry type="library" name="Maven: com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.11.4" level="project" />
<orderEntry type="library" name="Maven: com.fasterxml.jackson.module:jackson-module-parameter-names:2.11.4" level="project" />
<orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-tomcat:2.4.3" level="project" />
<orderEntry type="library" name="Maven: org.apache.tomcat.embed:tomcat-embed-core:9.0.43" level="project" />
<orderEntry type="library" name="Maven: org.apache.tomcat.embed:tomcat-embed-websocket:9.0.43" level="project" />
<orderEntry type="library" name="Maven: org.springframework:spring-web:5.3.4" level="project" />
<orderEntry type="library" name="Maven: org.springframework:spring-beans:5.3.4" level="project" />
<orderEntry type="library" name="Maven: org.springframework:spring-webmvc:5.3.4" level="project" />
<orderEntry type="library" name="Maven: org.springframework:spring-context:5.3.4" level="project" />
<orderEntry type="library" name="Maven: org.springframework:spring-expression:5.3.4" level="project" />
<orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-undertow:2.4.3" level="project" />
<orderEntry type="library" name="Maven: io.undertow:undertow-core:2.2.4.Final" level="project" />
<orderEntry type="library" name="Maven: org.jboss.logging:jboss-logging:3.4.1.Final" level="project" />
<orderEntry type="library" name="Maven: org.jboss.xnio:xnio-api:3.8.0.Final" level="project" />
<orderEntry type="library" name="Maven: org.wildfly.common:wildfly-common:1.5.2.Final" level="project" />
<orderEntry type="library" name="Maven: org.wildfly.client:wildfly-client-config:1.0.1.Final" level="project" />
<orderEntry type="library" scope="RUNTIME" name="Maven: org.jboss.xnio:xnio-nio:3.8.0.Final" level="project" />
<orderEntry type="library" name="Maven: org.jboss.threads:jboss-threads:3.1.0.Final" level="project" />
<orderEntry type="library" name="Maven: io.undertow:undertow-servlet:2.2.4.Final" level="project" />
<orderEntry type="library" name="Maven: org.jboss.spec.javax.annotation:jboss-annotations-api_1.3_spec:2.0.1.Final" level="project" />
<orderEntry type="library" name="Maven: io.undertow:undertow-websockets-jsr:2.2.4.Final" level="project" />
<orderEntry type="library" name="Maven: org.jboss.spec.javax.websocket:jboss-websocket-api_1.1_spec:2.0.0.Final" level="project" />
<orderEntry type="library" name="Maven: jakarta.servlet:jakarta.servlet-api:4.0.4" level="project" />
<orderEntry type="library" name="Maven: org.glassfish:jakarta.el:3.0.3" level="project" />
<orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-aop:2.4.3" level="project" />
<orderEntry type="library" name="Maven: org.springframework:spring-aop:5.3.4" level="project" />
<orderEntry type="library" name="Maven: org.aspectj:aspectjweaver:1.9.6" level="project" />
<orderEntry type="library" name="Maven: org.mybatis.spring.boot:mybatis-spring-boot-starter:2.1.4" level="project" />
<orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-jdbc:2.4.3" level="project" />
<orderEntry type="library" name="Maven: com.zaxxer:HikariCP:3.4.5" level="project" />
<orderEntry type="library" name="Maven: org.springframework:spring-jdbc:5.3.4" level="project" />
<orderEntry type="library" name="Maven: org.mybatis.spring.boot:mybatis-spring-boot-autoconfigure:2.1.4" level="project" />
<orderEntry type="library" name="Maven: org.mybatis:mybatis:3.5.6" level="project" />
<orderEntry type="library" name="Maven: org.mybatis:mybatis-spring:2.0.6" level="project" />
<orderEntry type="library" name="Maven: com.github.pagehelper:pagehelper-spring-boot-starter:1.3.0" level="project" />
<orderEntry type="library" name="Maven: com.github.pagehelper:pagehelper-spring-boot-autoconfigure:1.3.0" level="project" />
<orderEntry type="library" name="Maven: com.github.pagehelper:pagehelper:5.2.0" level="project" />
<orderEntry type="library" name="Maven: com.github.jsqlparser:jsqlparser:3.2" level="project" />
<orderEntry type="library" name="Maven: mysql:mysql-connector-java:8.0.23" level="project" />
<orderEntry type="library" name="Maven: com.baomidou:mybatis-plus-boot-starter:3.3.2" level="project" />
<orderEntry type="library" name="Maven: com.baomidou:mybatis-plus:3.3.2" level="project" />
<orderEntry type="library" name="Maven: com.baomidou:mybatis-plus-extension:3.3.2" level="project" />
<orderEntry type="library" name="Maven: com.baomidou:mybatis-plus-core:3.3.2" level="project" />
<orderEntry type="library" name="Maven: com.baomidou:mybatis-plus-annotation:3.3.2" level="project" />
<orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-autoconfigure:2.4.3" level="project" />
<orderEntry type="library" name="Maven: com.alibaba:druid-spring-boot-starter:1.2.5" level="project" />
<orderEntry type="library" name="Maven: com.alibaba:druid:1.2.5" level="project" />
<orderEntry type="library" name="Maven: org.slf4j:slf4j-api:1.7.30" level="project" />
<orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-data-redis:2.4.3" level="project" />
<orderEntry type="library" name="Maven: org.springframework.data:spring-data-redis:2.4.5" level="project" />
<orderEntry type="library" name="Maven: org.springframework.data:spring-data-keyvalue:2.4.5" level="project" />
<orderEntry type="library" name="Maven: org.springframework.data:spring-data-commons:2.4.5" level="project" />
<orderEntry type="library" name="Maven: org.springframework:spring-tx:5.3.4" level="project" />
<orderEntry type="library" name="Maven: org.springframework:spring-oxm:5.3.4" level="project" />
<orderEntry type="library" name="Maven: org.springframework:spring-context-support:5.3.4" level="project" />
<orderEntry type="library" name="Maven: io.lettuce:lettuce-core:6.0.2.RELEASE" level="project" />
<orderEntry type="library" name="Maven: io.netty:netty-common:4.1.59.Final" level="project" />
<orderEntry type="library" name="Maven: io.netty:netty-handler:4.1.59.Final" level="project" />
<orderEntry type="library" name="Maven: io.netty:netty-resolver:4.1.59.Final" level="project" />
<orderEntry type="library" name="Maven: io.netty:netty-buffer:4.1.59.Final" level="project" />
<orderEntry type="library" name="Maven: io.netty:netty-codec:4.1.59.Final" level="project" />
<orderEntry type="library" name="Maven: io.netty:netty-transport:4.1.59.Final" level="project" />
<orderEntry type="library" name="Maven: io.projectreactor:reactor-core:3.4.3" level="project" />
<orderEntry type="library" name="Maven: org.reactivestreams:reactive-streams:1.0.3" level="project" />
<orderEntry type="library" name="Maven: org.bouncycastle:bcprov-jdk15on:1.54" level="project" />
<orderEntry type="library" name="Maven: io.springfox:springfox-swagger2:2.9.2" level="project" />
<orderEntry type="library" name="Maven: io.springfox:springfox-spi:2.9.2" level="project" />
<orderEntry type="library" name="Maven: io.springfox:springfox-core:2.9.2" level="project" />
<orderEntry type="library" name="Maven: net.bytebuddy:byte-buddy:1.10.20" level="project" />
<orderEntry type="library" name="Maven: io.springfox:springfox-schema:2.9.2" level="project" />
<orderEntry type="library" name="Maven: io.springfox:springfox-swagger-common:2.9.2" level="project" />
<orderEntry type="library" name="Maven: io.springfox:springfox-spring-web:2.9.2" level="project" />
<orderEntry type="library" name="Maven: com.fasterxml:classmate:1.5.1" level="project" />
<orderEntry type="library" name="Maven: org.springframework.plugin:spring-plugin-core:1.2.0.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.springframework.plugin:spring-plugin-metadata:1.2.0.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.mapstruct:mapstruct:1.2.0.Final" level="project" />
<orderEntry type="library" name="Maven: io.springfox:springfox-swagger-ui:2.9.2" level="project" />
<orderEntry type="library" name="Maven: io.swagger:swagger-annotations:1.6.2" level="project" />
<orderEntry type="library" name="Maven: io.swagger:swagger-models:1.6.2" level="project" />
<orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-annotations:2.11.4" level="project" />
<orderEntry type="library" name="Maven: io.jsonwebtoken:jjwt:0.9.1" level="project" />
<orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-databind:2.11.4" level="project" />
<orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-core:2.11.4" level="project" />
<orderEntry type="library" name="Maven: joda-time:joda-time:2.10.8" level="project" />
<orderEntry type="library" name="Maven: org.apache.shiro:shiro-core:1.7.1" level="project" />
<orderEntry type="library" name="Maven: org.apache.shiro:shiro-lang:1.7.1" level="project" />
<orderEntry type="library" name="Maven: org.apache.shiro:shiro-cache:1.7.1" level="project" />
<orderEntry type="library" name="Maven: org.apache.shiro:shiro-crypto-hash:1.7.1" level="project" />
<orderEntry type="library" name="Maven: org.apache.shiro:shiro-crypto-core:1.7.1" level="project" />
<orderEntry type="library" name="Maven: org.apache.shiro:shiro-crypto-cipher:1.7.1" level="project" />
<orderEntry type="library" name="Maven: org.apache.shiro:shiro-config-core:1.7.1" level="project" />
<orderEntry type="library" name="Maven: org.apache.shiro:shiro-config-ogdl:1.7.1" level="project" />
<orderEntry type="library" name="Maven: commons-beanutils:commons-beanutils:1.9.4" level="project" />
<orderEntry type="library" name="Maven: commons-collections:commons-collections:3.2.2" level="project" />
<orderEntry type="library" name="Maven: org.apache.shiro:shiro-event:1.7.1" level="project" />
<orderEntry type="library" name="Maven: org.apache.shiro:shiro-spring:1.7.1" level="project" />
<orderEntry type="library" name="Maven: org.apache.shiro:shiro-web:1.7.1" level="project" />
<orderEntry type="library" name="Maven: org.owasp.encoder:encoder:1.2.2" level="project" />
<orderEntry type="library" name="Maven: org.apache.poi:poi:3.9" level="project" />
<orderEntry type="library" name="Maven: commons-codec:commons-codec:1.15" level="project" />
<orderEntry type="library" name="Maven: org.apache.poi:poi-ooxml:3.9" level="project" />
<orderEntry type="library" name="Maven: dom4j:dom4j:1.6.1" level="project" />
<orderEntry type="library" name="Maven: xml-apis:xml-apis:1.0.b2" level="project" />
<orderEntry type="library" name="Maven: org.apache.poi:poi-ooxml-schemas:3.9" level="project" />
<orderEntry type="library" name="Maven: org.apache.xmlbeans:xmlbeans:2.3.0" level="project" />
<orderEntry type="library" name="Maven: stax:stax-api:1.0.1" level="project" />
<orderEntry type="library" name="Maven: cn.hutool:hutool-all:4.6.17" level="project" />
<orderEntry type="library" name="Maven: com.alibaba:fastjson:1.2.75" level="project" />
<orderEntry type="library" name="Maven: com.aliyun:aliyun-java-sdk-core:4.5.3" level="project" />
<orderEntry type="library" name="Maven: com.google.code.gson:gson:2.8.6" level="project" />
<orderEntry type="library" name="Maven: org.apache.httpcomponents:httpclient:4.5.12" level="project" />
<orderEntry type="library" name="Maven: org.apache.httpcomponents:httpcore:4.4.13" level="project" />
<orderEntry type="library" name="Maven: commons-logging:commons-logging:1.2" level="project" />
<orderEntry type="library" name="Maven: javax.xml.bind:jaxb-api:2.3.1" level="project" />
<orderEntry type="library" name="Maven: javax.activation:javax.activation-api:1.2.0" level="project" />
<orderEntry type="library" name="Maven: org.jacoco:org.jacoco.agent:runtime:0.8.5" level="project" />
<orderEntry type="library" name="Maven: org.ini4j:ini4j:0.5.4" level="project" />
<orderEntry type="library" name="Maven: io.opentracing:opentracing-api:0.33.0" level="project" />
<orderEntry type="library" name="Maven: io.opentracing:opentracing-util:0.33.0" level="project" />
<orderEntry type="library" name="Maven: io.opentracing:opentracing-noop:0.33.0" level="project" />
<orderEntry type="library" name="Maven: org.apache.commons:commons-lang3:3.11" level="project" />
<orderEntry type="library" name="Maven: commons-lang:commons-lang:2.6" level="project" />
<orderEntry type="library" name="Maven: commons-io:commons-io:2.8.0" level="project" />
<orderEntry type="library" name="Maven: com.google.guava:guava:30.1-jre" level="project" />
<orderEntry type="library" name="Maven: com.google.guava:failureaccess:1.0.1" level="project" />
<orderEntry type="library" name="Maven: com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava" level="project" />
<orderEntry type="library" name="Maven: com.google.code.findbugs:jsr305:3.0.2" level="project" />
<orderEntry type="library" name="Maven: org.checkerframework:checker-qual:3.5.0" level="project" />
<orderEntry type="library" name="Maven: com.google.errorprone:error_prone_annotations:2.3.4" level="project" />
<orderEntry type="library" name="Maven: com.google.j2objc:j2objc-annotations:1.3" level="project" />
<orderEntry type="library" name="Maven: org.bytedeco:javacv:1.4.3" level="project" />
<orderEntry type="library" name="Maven: org.bytedeco:javacpp:1.4.3" level="project" />
<orderEntry type="library" name="Maven: org.bytedeco.javacpp-presets:opencv:3.4.3-1.4.3" level="project" />
<orderEntry type="library" name="Maven: org.bytedeco.javacpp-presets:ffmpeg:4.0.2-1.4.3" level="project" />
<orderEntry type="library" name="Maven: org.bytedeco.javacpp-presets:flycapture:2.11.3.121-1.4.3" level="project" />
<orderEntry type="library" name="Maven: org.bytedeco.javacpp-presets:libdc1394:2.2.5-1.4.3" level="project" />
<orderEntry type="library" name="Maven: org.bytedeco.javacpp-presets:libfreenect:0.5.3-1.4.3" level="project" />
<orderEntry type="library" name="Maven: org.bytedeco.javacpp-presets:libfreenect2:0.2.0-1.4.3" level="project" />
<orderEntry type="library" name="Maven: org.bytedeco.javacpp-presets:librealsense:1.12.1-1.4.3" level="project" />
<orderEntry type="library" name="Maven: org.bytedeco.javacpp-presets:videoinput:0.200-1.4.3" level="project" />
<orderEntry type="library" name="Maven: org.bytedeco.javacpp-presets:artoolkitplus:2.3.1-1.4.3" level="project" />
<orderEntry type="library" name="Maven: org.bytedeco.javacpp-presets:flandmark:1.07-1.4.3" level="project" />
<orderEntry type="library" name="Maven: org.bytedeco.javacpp-presets:leptonica:1.76.0-1.4.3" level="project" />
<orderEntry type="library" name="Maven: org.bytedeco.javacpp-presets:tesseract:4.0.0-rc2-1.4.3" level="project" />
<orderEntry type="library" name="Maven: org.projectlombok:lombok:1.18.18" level="project" />
</component>
</module>
\ No newline at end of file
wisenergy-parent.iml
View file @ 3c66f801
<?xml version="1.0" encoding="UTF-8"?>
<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4" />
\ No newline at end of file
<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" version="4">
<component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8">
<output url="file://$MODULE_DIR$/target/classes" />
<output-test url="file://$MODULE_DIR$/target/test-classes" />
<content url="file://$MODULE_DIR$">
<excludeFolder url="file://$MODULE_DIR$/target" />
</content>
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
</component>
</module>
\ No newline at end of file
wisenergy-service/src/main/java/cn/wisenergy/service/Manager/AccountManager.java
View file @ 3c66f801
......@@ -77,6 +77,8 @@ public class AccountManager {
orderInfo.setRebateStatus(RebateStatusEnum.ALREADY_REBATE.getCode());
orderMapper.updateById(orderInfo);
String time = DateUtil.convertDateToStr(new Date(), "yyyy-MM-dd hh:mm:ss");
log.info("订单" + orderInfo.getTid() + "在" + time + "时返佣：" + bigDecimal);
//3、更新账户可用金额
accountMapper.edit(accountInfo);
......@@ -100,6 +102,7 @@ public class AccountManager {
if (count == 0) {
return false;
}
log.info("月度肥料新增用户" + teamPerformance.getUserId() + "团队绩效：" + teamPerformance.getMonthTeamPerformance());
}
}
......@@ -110,6 +113,7 @@ public class AccountManager {
if (count == 0) {
return false;
}
log.info("月度肥料更新用户" + teamPerformance.getUserId() + "团队绩效为：" + teamPerformance.getMonthTeamPerformance());
}
}
return true;
......@@ -181,6 +185,7 @@ public class AccountManager {
List<ProgressPrize> deleteList = new ArrayList<>(prizes);
for (ProgressPrize updatePrize : updateList) {
int count = progressPrizeMapper.edit(updatePrize);
log.info("更新最大进步奖用户" + updatePrize.getUserId() + "奖金为：" + updatePrize.getAwardMoney());
if (count == 0) {
return false;
}
......@@ -188,6 +193,7 @@ public class AccountManager {
for (ProgressPrize addPrize : addList) {
int count = progressPrizeMapper.add(addPrize);
log.info("新增最大进步奖用户" + addPrize.getUserId() + "奖金：" + addPrize.getAwardMoney());
if (count == 0) {
return false;
}
......@@ -204,6 +210,7 @@ public class AccountManager {
//3、添加账户获得的收益
for (AccountInfo accountInfo : accountInfoList) {
accountMapper.edit(accountInfo);
log.info("最大进步奖更新用户" + accountInfo.getUserId() + "月收益：" + accountInfo.getEarningsMonth());
//添加交易流水记录
TradeRecord tradeRecord = new TradeRecord();
......@@ -240,6 +247,40 @@ public class AccountManager {
if (count == 0) {
return false;
}
log.info("月度肥料更新用户" + accountInfo.getUserId() + "月收益" + accountInfo.getEarningsMonth());
}
}
//新增交易流水记录
if (!CollectionUtils.isEmpty(recordList)) {
for (TradeRecord tradeRecord : recordList) {
int count = tradeRecordMapper.add(tradeRecord);
if (count == 0) {
return false;
}
}
}
return true;
}
/**
* 运营中心更新账户信息和保存交易流水记录
*
* @param accountInfoList 账户列表
* @param recordList 交易流水信息
*/
@Transactional(rollbackFor = Exception.class)
public Boolean runCenterUpdateAccountAddRecord(List<AccountInfo> accountInfoList, List<TradeRecord> recordList) {
//更新月收益
if (!CollectionUtils.isEmpty(accountInfoList)) {
for (AccountInfo accountInfo : accountInfoList) {
int count = accountMapper.edit(accountInfo);
if (count == 0) {
return false;
}
log.info("运营中心更新用户" + accountInfo.getUserId() + "月收益" + accountInfo.getEarningsMonth());
}
}
......@@ -263,7 +304,7 @@ public class AccountManager {
*/
@Transactional(rollbackFor = Exception.class)
public Boolean updateAccountAddRecordAddPrize(List<AccountInfo> accountInfoList, List<TradeRecord> recordList,
List<ProgressPrize> addPrizeList,List<ProgressPrize> updatePrizeList) {
List<ProgressPrize> addPrizeList, List<ProgressPrize> updatePrizeList) {
//更新月收益
if (!CollectionUtils.isEmpty(accountInfoList)) {
......@@ -272,6 +313,7 @@ public class AccountManager {
if (count == 0) {
return false;
}
log.info("最大进步奖更新用户" + accountInfo.getUserId() + "月收益" + accountInfo.getEarningsMonth());
}
}
......@@ -292,6 +334,7 @@ public class AccountManager {
if (count == 0) {
return false;
}
log.info("用户" + progressPrize.getUserId() + "新增最大进步奖奖金：" + progressPrize.getAwardMoney());
}
}
......@@ -302,6 +345,7 @@ public class AccountManager {
if (count == 0) {
return false;
}
log.info("用户" + progressPrize.getUserId() + "更新最大进步奖奖金为：" + progressPrize.getAwardMoney());
}
}
return true;
......@@ -325,6 +369,7 @@ public class AccountManager {
if (count == 0) {
return false;
}
log.info("月定时任务月度肥料更新用户" + accountInfo.getUserId() + "月收益：" + accountInfo.getEarningsMonth());
}
}
......@@ -338,7 +383,7 @@ public class AccountManager {
}
}
//判断是否存在月度肥料奖金信息
//判断是否存在月度肥料剩余奖金信息
if (null == monthManure) {
//新增上月剩余月度肥料奖金
int count = monthManureMapper.add(manure);
......
wisenergy-service/src/main/java/cn/wisenergy/service/Manager/BankManger.java 0 → 100644
View file @ 3c66f801
package cn.wisenergy.service.Manager;
import cn.wisenergy.mapper.AccountMapper;
import cn.wisenergy.mapper.BankInfoMapper;
import cn.wisenergy.mapper.TradeRecordMapper;
import cn.wisenergy.model.app.AccountInfo;
import cn.wisenergy.model.app.TradeRecord;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
import org.springframework.transaction.annotation.Transactional;
/**
* @author 86187
* @ Description: 银行卡管理类
* @ Author : 86187
* @ Date : 2021/3/26 19:38
*/
@Component
@Slf4j
public class BankManger {
@Autowired
private TradeRecordMapper recordMapper;
@Autowired
private AccountMapper accountMapper;
/**
* 更新账户信息和保存交易流水记录
*
* @param accountInfo 账户信息
* @param record 交易流水信息
*/
@Transactional(rollbackFor = Exception.class)
public Boolean updateAccountAddRecord(AccountInfo accountInfo, TradeRecord record) {
//更新账户信息
if (null != accountInfo) {
int count = accountMapper.edit(accountInfo);
if (count == 0) {
return false;
}
}
//新增交易流水记录
if (null != record) {
int count = recordMapper.add(record);
return count != 0;
}
return true;
}
/**
* 更新账户信息和提现记录状态
*
* @param accountInfo 账户信息
* @param record 交易流水信息
*/
@Transactional(rollbackFor = Exception.class)
public Boolean updateAccountAndRecord(AccountInfo accountInfo, TradeRecord record) {
//更新账户信息
if (null != accountInfo) {
int count = accountMapper.edit(accountInfo);
if (count == 0) {
return false;
}
}
//新增交易流水记录
if (null != record) {
int count = recordMapper.add(record);
return count != 0;
}
return true;
}
}
wisenergy-service/src/main/java/cn/wisenergy/service/app/AccountService.java
View file @ 3c66f801
......@@ -3,21 +3,15 @@ package cn.wisenergy.service.app;
import cn.wisenergy.common.utils.R;
import cn.wisenergy.model.app.AccountInfo;
import cn.wisenergy.model.app.User;
import cn.wisenergy.model.dto.AccountInfoQuery;
import com.github.pagehelper.PageInfo;
import java.util.List;
/**
* @author 86187
*/
public interface AccountService {
/**
* 订单返佣-日任务
* @return true or false
*/
R<Boolean> orderRebate();
/**
* 获取账户信息
*
......@@ -27,24 +21,9 @@ public interface AccountService {
R<AccountInfo> getByUserId(String userId);
/**
* 收益和业绩统计（月度肥料 -日）
* @return true or false
*/
R<Boolean> performanceCount();
/**
* 获取用户的商机信息
*
* @param userId 用户id
* @return 用户商机列表
*/
List<User> getByList(String userId);
/**
* 进步奖收益统计（最大进步奖） -日任务
*
* @return true or false
* 获取账户列表
* @param query 查询条件
* @return 账户列表
*/
R<Boolean> progressPrizeCount();
R<PageInfo<AccountInfo>> getList(AccountInfoQuery query);
}
wisenergy-service/src/main/java/cn/wisenergy/service/app/BankService.java
View file @ 3c66f801
......@@ -4,6 +4,7 @@ import cn.wisenergy.common.utils.R;
import cn.wisenergy.model.app.BankInfo;
import cn.wisenergy.model.dto.WithdrawBankDto;
import cn.wisenergy.model.vo.TaxRateVo;
import cn.wisenergy.model.vo.WithdrawAuditVo;
import java.util.List;
......@@ -67,4 +68,12 @@ public interface BankService {
*/
R<TaxRateVo> getTaxRate(Double money);
/**
* 提现审核
*
* @param auditVo 提现记录id
* @return true or false
*/
R<Boolean> withdrawAudit(WithdrawAuditVo auditVo);
}
wisenergy-service/src/main/java/cn/wisenergy/service/app/CultivatingPrizeInfoService.java 0 → 100644
View file @ 3c66f801
package cn.wisenergy.service.app;
import cn.wisenergy.common.utils.R;
import cn.wisenergy.model.dto.CultivatingPrizeInfoDto;
import cn.wisenergy.model.vo.CultivatingPrizeInfoVo;
import com.github.pagehelper.PageInfo;
/**
* Created by m1991 on 2021/3/26 10:22
*/
public interface CultivatingPrizeInfoService {
/**
* 分页查询所有信息
*
* @param cultivatingPrizeInfoDto 查询参数
* @return 列表
*/
R<PageInfo<CultivatingPrizeInfoVo>> getCultivatingPrizeInfoList(CultivatingPrizeInfoDto cultivatingPrizeInfoDto);
}
wisenergy-service/src/main/java/cn/wisenergy/service/app/CultivatingPrizeService.java 0 → 100644
View file @ 3c66f801
package cn.wisenergy.service.app;
import cn.wisenergy.common.utils.R;
import cn.wisenergy.model.app.CultivatingPrize;
import cn.wisenergy.model.dto.CultivatingPrizeDto;
import com.github.pagehelper.PageInfo;
import java.util.List;
/**
* Created by m1991 on 2021/3/26 11:00
*/
public interface CultivatingPrizeService {
/**
* 分页查询所有用户信息
*
* @return 列表
*/
R<List<CultivatingPrize>> getCultivatingPrizeList();
}
wisenergy-service/src/main/java/cn/wisenergy/service/app/DayTaskService.java 0 → 100644
View file @ 3c66f801
package cn.wisenergy.service.app;
import cn.wisenergy.common.utils.R;
import cn.wisenergy.model.app.User;
import java.util.List;
/**
*@ Description: 日定时任务
*@ Author : 86187
*@ Date : 2021/3/25 15:09
* @author 86187
*/
public interface DayTaskService {
/**
* 订单返佣-日任务
* @return true or false
*/
R<Boolean> orderRebate();
/**
* 收益和业绩统计（月度肥料 -日）
* @return true or false
*/
R<Boolean> performanceCount();
/**
* 获取用户的上级信息
*
* @param userId 用户id
* @return 用户商机列表
*/
List<User> getByList(String userId);
/**
* 进步奖收益统计（最大进步奖） -日任务
*
* @return true or false
*/
R<Boolean> progressPrizeCount();
}
wisenergy-service/src/main/java/cn/wisenergy/service/app/LoginService.java
View file @ 3c66f801
package cn.wisenergy.service.app;
import cn.wisenergy.common.utils.R;
import cn.wisenergy.model.vo.UserLoginVo;
import cn.wisenergy.model.vo.UserRegisterVo;
/**
......
wisenergy-service/src/main/java/cn/wisenergy/service/app/MemberPercentService.java 0 → 100644
View file @ 3c66f801
package cn.wisenergy.service.app;
import cn.wisenergy.common.utils.R;
import cn.wisenergy.model.app.MemberPercent;
import cn.wisenergy.model.dto.MemberPercentQuery;
import cn.wisenergy.model.vo.SetMemberPercentVo;
import com.github.pagehelper.PageInfo;
/**
* @author 86187
*/
public interface MemberPercentService {
/**
* 获取会员等级优惠比列列表
*
* @param query 条件
* @return 优惠比列列表
*/
R<PageInfo<MemberPercent>> getList(MemberPercentQuery query);
/**
* 更据等级和类型，设置优惠比列
*
* @param percentVo 参数
* @return true or false
*/
R<Boolean> setMemberPercent(SetMemberPercentVo percentVo);
}
wisenergy-service/src/main/java/cn/wisenergy/service/app/MonthAwardService.java
View file @ 3c66f801
package cn.wisenergy.service.app;
import cn.wisenergy.common.utils.R;
import cn.wisenergy.model.app.MonthAward;
import cn.wisenergy.model.dto.MonthAwardQuery;
import cn.wisenergy.model.vo.MonthAwardVo;
import com.github.pagehelper.PageInfo;
/**
* @author 86187
......@@ -16,4 +19,11 @@ public interface MonthAwardService {
* @return 月度奖金
*/
R<MonthAwardVo> queryMonthAward(String userId);
/**
* 获取月度奖励列表
* @param monthAwardQuery 查询参数
* @return 月度奖励列表
*/
R<PageInfo<MonthAward>> getList(MonthAwardQuery monthAwardQuery);
}
wisenergy-service/src/main/java/cn/wisenergy/service/app/MonthTaskService.java
View file @ 3c66f801
......@@ -36,4 +36,11 @@ public interface MonthTaskService {
* @return true or false
*/
R<Boolean> runCenterSubsidy();
/**
* 月度奖金统计- 数据写入月度奖金实体类
*
* @return true or false
*/
R<Boolean> monthAwardCount();
}
wisenergy-service/src/main/java/cn/wisenergy/service/app/ProgressPrizeService.java
View file @ 3c66f801
package cn.wisenergy.service.app;
import cn.wisenergy.common.utils.R;
import cn.wisenergy.model.app.ProgressPrize;
import cn.wisenergy.model.dto.ProgressPrizeQuery;
import cn.wisenergy.model.vo.PrizeShowVo;
import cn.wisenergy.model.vo.ProgressPrizeVo;
import com.github.pagehelper.PageInfo;
import java.util.List;
......@@ -20,4 +23,11 @@ public interface ProgressPrizeService {
* @return 进步奖列表
*/
R<PrizeShowVo> getProgressPrizes();
/**
* 获取最大进步奖列表
* @param query 查询参数
* @return 最大进步奖列表
*/
R<PageInfo<ProgressPrize>> getList(ProgressPrizeQuery query);
}
wisenergy-service/src/main/java/cn/wisenergy/service/app/RecommendUserService.java
View file @ 3c66f801
......@@ -2,8 +2,10 @@ package cn.wisenergy.service.app;
import cn.wisenergy.common.utils.R;
import cn.wisenergy.model.app.RecommendUser;
import cn.wisenergy.model.app.User;
import cn.wisenergy.model.dto.RecommendUserDto;
import cn.wisenergy.model.vo.RecommendUserVo;
import cn.wisenergy.model.vo.UserAndRecommendVo;
import com.github.pagehelper.PageInfo;
import java.util.List;
......@@ -12,4 +14,12 @@ public interface RecommendUserService {
RecommendUser getMyRecommed(String userId);
List<UserAndRecommendVo> getMyRecommendInfo(String userId, Integer userLevel);
/**
* 分页查询所有用户信息
*
* @param recommendUserDto 查询参数
* @return 列表
*/
R<PageInfo<RecommendUserVo>> getRecommendUserList(RecommendUserDto recommendUserDto);
}
wisenergy-service/src/main/java/cn/wisenergy/service/app/TeamUserInfoService.java
View file @ 3c66f801
package cn.wisenergy.service.app;
import cn.wisenergy.common.utils.R;
import cn.wisenergy.model.app.TeamUserInfo;
import cn.wisenergy.model.dto.TeamUserInfoDto;
import cn.wisenergy.model.vo.TeamUserInfoVo;
import com.github.pagehelper.PageInfo;
public interface TeamUserInfoService {
......@@ -11,4 +15,12 @@ public interface TeamUserInfoService {
* @return 用户团队总人数
*/
int getTeamUserCount(String userId);
/**
* 分页查询所有用户信息
*
* @param teamUserInfoDto 查询参数
* @return 列表
*/
R<PageInfo<TeamUserInfoVo>> getTeamUserInfoList(TeamUserInfoDto teamUserInfoDto);
}
wisenergy-service/src/main/java/cn/wisenergy/service/app/TradeRecordService.java
View file @ 3c66f801
......@@ -11,13 +11,6 @@ import java.util.List;
* @author 86187
*/
public interface TradeRecordService {
/**
* 月度奖金统计- 数据写入月度奖金实体类
*
* @return true or false
*/
R<Boolean> monthAwardCount();
/**
* 交易流水列表查询
*
......
wisenergy-service/src/main/java/cn/wisenergy/service/app/UploadService.java
View file @ 3c66f801
package cn.wisenergy.service.app;
import cn.wisenergy.model.app.shopZx;
import cn.wisenergy.model.app.zxUserVo;
import cn.wisenergy.common.utils.R;
import cn.wisenergy.model.dto.ShopZxUserDto;
import cn.wisenergy.model.vo.ShopZxUserVo;
import com.github.pagehelper.PageInfo;
import org.springframework.core.io.Resource;
import org.springframework.web.multipart.MultipartFile;
import javax.servlet.http.HttpServletRequest;
import java.util.List;
import java.util.Map;
/**
......@@ -55,11 +56,10 @@ public interface UploadService {
/**
* TODO 资讯单表分页全部信息展示
* @param pageNum
* @param pageSize
* @param shopZxUserDto
* @return
*/
List<zxUserVo> selectAll(Integer pageNum, Integer pageSize);
R<PageInfo<ShopZxUserVo>> getShopZxUserList(ShopZxUserDto shopZxUserDto);
/**
* TODO 资讯点赞
......
wisenergy-service/src/main/java/cn/wisenergy/service/app/UserLevelService.java
View file @ 3c66f801
......@@ -9,8 +9,4 @@ public interface UserLevelService {
*/
void userLevelUpgrade(String userId);
/**
* 用户升级定时任务
*/
void userLevelUp();
}
wisenergy-service/src/main/java/cn/wisenergy/service/app/UserLevelTaskService.java 0 → 100644
View file @ 3c66f801
package cn.wisenergy.service.app;
public interface UserLevelTaskService {
/**
* 用户升级定时任务
*/
void userLevelUp();
/**
* 用户升级月定时任务
*/
void monthUserLevelUp();
}
wisenergy-service/src/main/java/cn/wisenergy/service/app/UserService.java
View file @ 3c66f801
......@@ -2,9 +2,12 @@ package cn.wisenergy.service.app;
import cn.wisenergy.common.utils.R;
import cn.wisenergy.model.app.User;
import cn.wisenergy.model.app.UsersDto;
import cn.wisenergy.model.dto.UsersDto;
import cn.wisenergy.model.dto.TeamQueryDto;
import cn.wisenergy.model.vo.AerialDeliveryVo;
import cn.wisenergy.model.vo.UserRegisterVo;
import com.github.pagehelper.PageInfo;
import java.util.Map;
......@@ -96,4 +99,12 @@ public interface UserService {
*/
R<Boolean> fillInInviteCode(String userId, String inviteCode);
/**
* 分页查询所有用户信息
*
* @param queryDto 查询参数
* @return 列表
*/
R<PageInfo<User>> getUserList(TeamQueryDto queryDto);
}
wisenergy-service/src/main/java/cn/wisenergy/service/app/impl/AccountServiceImpl.java
View file @ 3c66f801
package cn.wisenergy.service.app.impl;
import cn.wisenergy.common.constant.CommonAttributes;
import cn.wisenergy.common.utils.DateUtil;
import cn.wisenergy.common.utils.R;
import cn.wisenergy.mapper.*;
import cn.wisenergy.model.app.*;
import cn.wisenergy.model.dto.AccountInfoQuery;
import cn.wisenergy.model.dto.MemberPercentQuery;
import cn.wisenergy.model.enums.*;
import cn.wisenergy.model.vo.TeamPerformanceSortVo;
import cn.wisenergy.service.Manager.PublicManager;
import cn.wisenergy.service.app.AccountService;
import cn.wisenergy.service.Manager.AccountManager;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.github.pagehelper.PageInfo;
import com.xxl.job.core.handler.annotation.XxlJob;
import lombok.extern.slf4j.Slf4j;
......@@ -32,526 +36,58 @@ import java.util.*;
@Service
public class AccountServiceImpl extends ServiceImpl<AccountMapper, AccountInfo> implements AccountService {
@Autowired
private UsersMapper usersMapper;
@Autowired
private AccountMapper accountMapper;
@Autowired
private MemberPercentMapper memberPercentMapper;
@Autowired
private AccountManager accountManager;
@Autowired
private PublicManager publicManager;
@Autowired
private TradeRecordMapper tradeRecordMapper;
@Autowired
private TeamPerformanceMapper teamPerformanceMapper;
@Autowired
private ProgressPrizeMapper progressPrizeMapper;
@Autowired
private OrderMapper orderMapper;
@Autowired
private MonthManureMapper monthManureMapper;
@Autowired
private LastAccountMapper lastAccountMapper;
private static final String PATTERN = "yyyy-MM";
private static final Integer TWENTY = 20;
@XxlJob(value = "orderRebateDayTask")
@Override
public R<Boolean> orderRebate() {
log.info("订单返佣接口定时-日任务");
// //获取返佣订单
List<OrderInfo> list = orderMapper.getListBySuccessTime(new Date());
log.info("shop-mall[]AccountServiceImpl[]orderRebate[]input.param.list:{}", list.size());
if (CollectionUtils.isEmpty(list)) {
return R.ok(0, true);
}
//1、遍历订单，订单状态是未返佣，完成时间小于当前时间 --返佣
for (OrderInfo orderInfo : list) {
long successTime = orderInfo.getSuccessTime().getTime();
long time = System.currentTimeMillis();
if (RebateStatusEnum.NO_REBATE.getCode().equals(orderInfo.getRebateStatus()) && successTime <= time) {
//获取用户信息
User user = usersMapper.getByUserId(orderInfo.getUserId());
if (null == user || user.getUserLevel() == 0) {
continue;
}
//获取账户信息
AccountInfo accountInfo = accountMapper.getByUserId(user.getUserId());
if (null == accountInfo) {
continue;
}
//获取返佣比例
MemberPercent memberpercent = memberPercentMapper.getByLevelAndType(user.getUserLevel(),
MemberPercentEnum.REBATE.getCode());
if (null == memberpercent) {
continue;
}
//修改订单状态为已返佣，账户可用金额增加
accountManager.updateOrderAddMoney(orderInfo, accountInfo, memberpercent);
}
}
return R.ok(0, true);
}
@Override
public R<AccountInfo> getByUserId(String userId) {
AccountInfo accountInfo = accountMapper.getByUserId(userId);
return R.ok(accountInfo);
}
@XxlJob(value = "monthManureDayTask")
@Override
public R<Boolean> performanceCount() {
//获取本月订单
log.info("月度肥料定时-日任务开启");
List<OrderInfo> list = orderMapper.getByCreateTime(new Date());
log.info("shop-mall[]AccountServiceImpl[]performanceCount[]input.param.list:{}", list.size());
if (CollectionUtils.isEmpty(list)) {
return R.ok(0, true);
}
Date date = new Date();
String yearMonth = DateUtil.convertDateToStr(date, PATTERN);
//计算当月所有订单成交额
BigDecimal totalMoney = new BigDecimal(0);
//统计出出每个用户当月订单成交额 key:userId value:用户当月订单成交额
Map<String, Double> map = new HashMap<>();
for (OrderInfo orderInfo : list) {
String userId = orderInfo.getUserId();
double payMoney = orderInfo.getPayment().doubleValue();
//key 存在 累加订单金额 到 value
if (map.containsKey(userId)) {
double money = payMoney + map.get(orderInfo.getUserId());
map.put(orderInfo.getUserId(), money);
} else {
//key 不存在，加入集合
map.put(userId, payMoney);
}
totalMoney = totalMoney.add(orderInfo.getPayment());
}
//累计用户和上级用户-团队业绩
Map<String, Double> tempMap = new HashMap<>();
for (Map.Entry<String, Double> entity : map.entrySet()) {
String userId = entity.getKey();
//1)、统计当前用户月度业绩
double userCount = entity.getValue();
if (tempMap.containsKey(entity.getKey())) {
double teamMoney = userCount + tempMap.get(entity.getKey());
tempMap.put(entity.getKey(), teamMoney);
} else {
//key 不存在，加入集合 当前用户团队绩效
tempMap.put(entity.getKey(), userCount);
}
//2)、获取当前用户的上级用户列表
List<User> userList = getByList(userId);
if (CollectionUtils.isEmpty(userList)) {
continue;
}
for (User userInfo : userList) {
//3)、统计当前用户的上级用户团队绩效
//key 存在 当前用户团队绩效 + 上级用户团队绩效
if (tempMap.containsKey(userInfo.getUserId())) {
double teamMoney = userCount + tempMap.get(userInfo.getUserId());
tempMap.put(userInfo.getUserId(), teamMoney);
} else {
//key 不存在，加入集合 当前用户团队绩效
tempMap.put(userInfo.getUserId(), userCount);
}
}
}
//3、获取用户当月绩效信息 新增 or 更新
List<TeamPerformance> addList = new ArrayList<>();
List<TeamPerformance> updateList = new ArrayList<>();
for (Map.Entry<String, Double> entity : tempMap.entrySet()) {
//获取团队业绩信息
TeamPerformance teamPerformance = teamPerformanceMapper.getByUserIdAndTime(entity.getKey(), yearMonth);
if (null == teamPerformance) {
//获取用户信息
User user = usersMapper.getByUserId(entity.getKey());
//添加用户团队业绩信息
TeamPerformance performance = new TeamPerformance();
performance.setUserId(user.getUserId());
performance.setMonthTeamPerformance(BigDecimal.valueOf(entity.getValue()));
performance.setUserLevel(user.getUserLevel());
performance.setYearMonth(yearMonth);
addList.add(performance);
} else {
teamPerformance.setMonthTeamPerformance(BigDecimal.valueOf(entity.getValue()));
updateList.add(teamPerformance);
}
}
//4、更新账户月度绩效
boolean updateBool = accountManager.updateAccountPerformanceMonth(addList, updateList);
if (!updateBool) {
return R.ok(1, false);
}
//5、获取所有用户,如果会员等级是黄金以上，计算月度收益
List<User> userList = usersMapper.getAllGoldUser();
if (CollectionUtils.isEmpty(userList)) {
return R.ok(0, true);
}
boolean bool = monthlyIncome(totalMoney, userList);
if (!bool) {
return R.ok(1, false);
}
log.info("月度肥料定时-日任务执行成功");
return R.ok(0, true);
public R<PageInfo<AccountInfo>> getList(AccountInfoQuery query) {
log.info("shop-mall[]AccountServiceImpl[]getList[]input.param.query:" + query);
if (null == query) {
return R.error("入参不能为空!");
}
pageHandle(query);
Map<String,Object> map=new HashMap<>();
int total = accountMapper.count();
map.put("startNum", query.getStartNum());
map.put("endNum", query.getEndNum());
List<AccountInfo> list = accountMapper.getList(map);
PageInfo<AccountInfo> info = new PageInfo<>();
info.setPageSize(query.getPageSize());
info.setPageNum(query.getPageNo());
info.setTotal(total);
info.setList(list);
return R.ok(info);
}
/**
* 获取用户的上级列表
* 分页处理方法
*
* @param userId 用户id
* @return 用户的上级列表
* @param schemeVo 参数
*/
@Override
public List<User> getByList(String userId) {
List<User> list = new ArrayList<>();
User user = usersMapper.getByUserId(userId);
getUser(list, userId);
//去除本身
list.remove(user);
return list;
}
@XxlJob(value = "growthAwardDayTask")
@Override
public R<Boolean> progressPrizeCount() {
log.info("shop-mall[]AccountServiceImpl[]performanceCount[]input.method");
log.info("本月最大进步奖日定时任务开启");
Date date = new Date();
String yearMonth = DateUtil.convertDateToStr(date, PATTERN);
//1、判断当前月是否是业绩开始的第一个月
List<TeamPerformance> teamPerformances = teamPerformanceMapper.getByBeforeTime(yearMonth);
//获取当月所有人业绩总额
Double totalMoney = teamPerformanceMapper.countByTime(yearMonth);
double number = Math.floor(totalMoney / 3980 / 12);
//2、集合为空 是业绩开始的第一个月
if (CollectionUtils.isEmpty(teamPerformances)) {
if (number != 0) {
//获取月业绩前20用户
List<TeamPerformance> list = teamPerformanceMapper.userTwenty(yearMonth);
if (CollectionUtils.isEmpty(list)) {
return R.ok(0, true);
}
//获取20名进步最大的月业绩和
Double twentyTotal = teamPerformanceMapper.countTwenty(yearMonth);
List<AccountInfo> accountInfoList = new ArrayList<>();
List<TradeRecord> tradeRecordList = new ArrayList<>();
List<ProgressPrize> addPrizeList = new ArrayList<>();
List<ProgressPrize> updatePrizeList = new ArrayList<>();
for (TeamPerformance user : list) {
//获取最大进步奖 百分比
MemberPercent memberPercent = memberPercentMapper.getByLevelAndType(user.getUserLevel(),
MemberPercentEnum.MONTH_BEST_AWARD.getCode());
//计算收益
double userTeamPerformance = user.getMonthTeamPerformance().doubleValue();
double percent = memberPercent.getPercent().doubleValue();
double income = Math.floor(number * 3980 * percent * userTeamPerformance / twentyTotal);
//获取账户信息
AccountInfo accountInfo = accountMapper.getByUserId(user.getUserId());
//用户月收益 =其他收益+最大进步奖收益
BigDecimal earningsMonth = accountInfo.getEarningsMonth().add(BigDecimal.valueOf(income));
accountInfo.setEarningsMonth(earningsMonth);
//用户总收益 =其他总收益 + 最大进步奖收益
BigDecimal earningsTotal = accountInfo.getEarningsTotal().add(BigDecimal.valueOf(income));
accountInfo.setEarningsTotal(earningsTotal);
accountInfoList.add(accountInfo);
//添加最大进步奖信息 不存在：新增 存在，修改
BigDecimal awardMoney = new BigDecimal(income).setScale(2, RoundingMode.HALF_UP);
ProgressPrize progressPrize = progressPrizeMapper.getByUserIdYearMonth(user.getUserId(), yearMonth);
if (null == progressPrize) {
ProgressPrize prize = new ProgressPrize();
prize.setAwardMoney(awardMoney.doubleValue());
prize.setUserId(user.getUserId());
prize.setGrowthRate(0.0);
prize.setYearMonth(yearMonth);
addPrizeList.add(prize);
} else {
progressPrize.setYearMonth(yearMonth);
progressPrize.setAwardMoney(awardMoney.doubleValue());
updatePrizeList.add(progressPrize);
}
//添加交易流水记录
TradeRecord tradeRecord = new TradeRecord();
tradeRecord.setUserId(user.getUserId());
tradeRecord.setTradeType(TradeRecordEnum.PROGRESS_PRIZE.getCode());
tradeRecord.setTradeNo(null);
tradeRecord.setStatus(TradeStatusEnum.NO_SETTLE_ACCOUNTS.getCode());
tradeRecord.setMoney(BigDecimal.valueOf(income));
tradeRecordList.add(tradeRecord);
}
//更新账户信息，添加交易流水记录
boolean bool = accountManager.updateAccountAddRecordAddPrize(accountInfoList, tradeRecordList,
addPrizeList, updatePrizeList);
if (!bool) {
return R.ok(1, false);
}
}
log.info("本月最大进步奖日定时任务执行成功");
return R.ok(0, true);
}
//3、集合不为空 不是业绩开始的第一个月
//获取用户列表
List<User> userList = usersMapper.findAllNotZeroUser();
if (CollectionUtils.isEmpty(userList)) {
return R.ok(0, true);
}
//4计算每个用户本月的业绩增长率 如果集合大于20 ，取前二十名，小于，取全部
List<TeamPerformanceSortVo> listVo = progressPrizeStatistics(userList);
if (listVo.size() >= TWENTY) {
listVo.subList(0, TWENTY);
}
//5、计算前20的总业绩
double total = listVo.stream().mapToDouble(TeamPerformanceSortVo::getMonthPerformance).sum();
boolean bool = totalPerformanceIncome(listVo, number, total);
if (!bool) {
return R.ok(1, false);
}
log.info("本月最大进步奖日定时任务执行成功");
return R.ok(0, true);
}
public void getUser(List<User> list, String userId) {
User user = usersMapper.getByUserId(userId);
list.add(user);
if (null != user && !StringUtils.isBlank(user.getBeInvitedCode())) {
User userInfo = usersMapper.getByBeInvitedCode(user.getBeInvitedCode());
if (null != userInfo) {
if (userInfo.getBeInvitedCode().equals(userInfo.getInviteCode())) {
return;
}
getUser(list, userInfo.getUserId());
}
}
}
/**
* 如果会员等级是黄金以上，计算月度收益
*
* @param totalMoney 月金额总额
* @param userList 用户列表
* @return true or false
*/
private boolean monthlyIncome(BigDecimal totalMoney, List<User> userList) {
double total = totalMoney.doubleValue();
Date date = new Date();
String yearMonth = DateUtil.convertDateToStr(date, PATTERN);
//当月所有人订单成交总金额/3980/12 向下整
double moneyMonth = Math.floor(total / 3980 / 12);
List<AccountInfo> accountInfoList = new ArrayList<>();
List<TradeRecord> tradeRecordList = new ArrayList<>();
//获取上月未分配完的奖金
double lastMonthAward;
Date last = DateUtil.getLastMonth(new Date());
String yearMonthTime = DateUtil.convertDateToStr(last, PATTERN);
MonthManure monthManure = monthManureMapper.queryByTime(yearMonthTime);
if (null == monthManure) {
lastMonthAward = 0.00;
} else {
lastMonthAward = monthManure.getManureAward();
}
for (User user : userList) {
if (moneyMonth != 0) {
//获取等级优惠百分比
MemberPercent memberPercent = memberPercentMapper.getByLevelAndType(user.getUserLevel(), 2);
if (null != memberPercent) {
//获取本月团队总金额
TeamPerformance teamPerformance = teamPerformanceMapper.getByUserIdAndTime(user.getUserId(), yearMonth);
//获取该等级团队总金额
Double teamTotal = teamPerformanceMapper.countTeamMoney(user.getUserLevel(), yearMonth);
if (null != teamPerformance && null != teamTotal) {
double month = teamPerformance.getMonthTeamPerformance().doubleValue();
double percent = memberPercent.getPercent().doubleValue();
//计算收益
double teamMoney = (moneyMonth + lastMonthAward) * 3980 * percent * month;
DecimalFormat df = new DecimalFormat("######0.00");
double income = Double.parseDouble(df.format(teamMoney / teamTotal));
//获取账户信息
AccountInfo accountInfo = accountMapper.getByUserId(user.getUserId());
BigDecimal bigDecimal = new BigDecimal(income).setScale(2,RoundingMode.HALF_UP);
//获取用户本月收益=可提现金额+ 本月肥料收益
BigDecimal performanceMonth = accountInfo.getExtractMoney().add(bigDecimal);
accountInfo.setEarningsMonth(performanceMonth);
//获取用户上月总收益
LastMonthAccount lastMonthAccount = lastAccountMapper.getByUserIdAndTime(user.getUserId(), yearMonthTime);
BigDecimal lastTotalMonth;
if (null == lastMonthAccount || null == lastMonthAccount.getEarningsTotal()) {
lastTotalMonth = new BigDecimal("0.00");
} else {
lastTotalMonth = lastMonthAccount.getEarningsTotal();
}
//用户总收益=上月总收益+本月收益
BigDecimal performanceTotal = lastTotalMonth.add(performanceMonth);
accountInfo.setEarningsTotal(performanceTotal);
accountInfoList.add(accountInfo);
//5、添加交易流水记录
TradeRecord tradeRecord = new TradeRecord();
tradeRecord.setUserId(user.getUserId());
tradeRecord.setTradeType(TradeRecordEnum.MONTHLY_FERTILIZER.getCode());
tradeRecord.setTradeNo(null);
tradeRecord.setStatus(TradeStatusEnum.NO_SETTLE_ACCOUNTS.getCode());
tradeRecordList.add(tradeRecord);
}
}
}
}
//更新账户信息，新增交易流水记录
return accountManager.updateAccountAddRecord(accountInfoList, tradeRecordList);
}
/**
* 统计每个用户本月业绩增长率
*
* @param userList 用户列表
* @return 每个用户本月业绩增长率
*/
private List<TeamPerformanceSortVo> progressPrizeStatistics(List<User> userList) {
Date date = new Date();
String yearMonth = DateUtil.convertDateToStr(date, PATTERN);
//遍历 计算业绩增长率
List<TeamPerformanceSortVo> listVo = new ArrayList<>();
for (User user : userList) {
TeamPerformanceSortVo teamVo = new TeamPerformanceSortVo();
double growthRate;
//获取当月业绩
TeamPerformance teamPerformance = teamPerformanceMapper.getByUserIdAndTime(user.getUserId(), yearMonth);
//获取上月业绩
Calendar cal = Calendar.getInstance();
cal.setTime(new Date());
cal.add(Calendar.MONTH, -1);
Date lastDate = cal.getTime();
String lastMonthTime = DateUtil.convertDateToStr(lastDate, PATTERN);
TeamPerformance lastMonth = teamPerformanceMapper.getByUserIdAndTime(user.getUserId(), lastMonthTime);
if (null == teamPerformance || null == lastMonth) {
growthRate = 0.00;
} else {
double month = teamPerformance.getMonthTeamPerformance().doubleValue();
double last = lastMonth.getMonthTeamPerformance().doubleValue();
if (last >= month) {
growthRate = 0.00;
} else {
growthRate = (month - last) / month;
}
}
teamVo.setGrowthRate(growthRate);
double monthPerformance;
assert teamPerformance != null;
if (null == teamPerformance.getMonthTeamPerformance()) {
monthPerformance = 0.00;
} else {
monthPerformance = teamPerformance.getMonthTeamPerformance().doubleValue();
}
teamVo.setMonthPerformance(monthPerformance);
teamVo.setUserId(user.getUserId());
teamVo.setTeamPerformance(teamPerformance);
listVo.add(teamVo);
}
//对集合进行排序
listVo.sort(Comparator.comparing(TeamPerformanceSortVo::getGrowthRate).reversed());
return listVo;
}
/**
* 统计用户最大进步奖收益
*
* @param listVo 用户增长率列表
* @param number 个人业绩
* @param total 总业绩
*/
private boolean totalPerformanceIncome(List<TeamPerformanceSortVo> listVo, double number, double total) {
//要更新的账户列表
List<AccountInfo> updateAccountList = new ArrayList<>();
BigDecimal sum = new BigDecimal(0);
for (int i = 0; i < listVo.size(); i++) {
String userId = listVo.get(i).getTeamPerformance().getUserId();
Integer userLevel = listVo.get(i).getTeamPerformance().getUserLevel();
//获取最大进步奖 百分比
MemberPercent memberPercent = memberPercentMapper.getByLevelAndType(userLevel, 3);
//计算收益
double userTeamPerformance = listVo.get(i).getTeamPerformance().getMonthTeamPerformance().doubleValue();
double percent = memberPercent.getPercent().doubleValue();
double income = number * 3980 * percent * userTeamPerformance / total;
//获取账户信息
AccountInfo accountInfo = accountMapper.getByUserId(userId);
BigDecimal bigDecimal;
if (i == listVo.size() - 1) {
bigDecimal = new BigDecimal(total).subtract(sum);
} else {
bigDecimal = accountInfo.getEarningsMonth().add(new BigDecimal(income));
sum = sum.add(new BigDecimal(income));
}
accountInfo.setEarningsMonth(bigDecimal);
updateAccountList.add(accountInfo);
}
//判断本月是否有最大进步奖数据 无，新增 有，修改或删除
Date date = new Date();
String yearMonth = DateUtil.convertDateToStr(date, PATTERN);
List<ProgressPrize> prizes = progressPrizeMapper.getByYearMonth(yearMonth);
//修改或保存最大进步奖信息
// flag 1： 日定时任务 2：月定时任务
int flag = 1;
return accountManager.updateOrSavePrize(listVo, updateAccountList, prizes, flag);
private void pageHandle(AccountInfoQuery schemeVo) {
Integer pageNum = schemeVo.getPageNo();
Integer pageSize = schemeVo.getPageSize();
if (null == pageSize || pageSize == 0) {
pageSize = 10;
}
if (null == pageNum || pageNum == 0) {
pageNum = 1;
}
Integer endNum = pageSize;
Integer startNum = (pageNum - CommonAttributes.NUM_ONE) * pageSize;
schemeVo.setEndNum(endNum);
schemeVo.setStartNum(startNum);
schemeVo.setPageNo(pageNum);
schemeVo.setPageSize(pageSize);
}
}
wisenergy-service/src/main/java/cn/wisenergy/service/app/impl/AerialDeliveryUserServiceImpl.java
View file @ 3c66f801
......@@ -7,10 +7,7 @@ import cn.wisenergy.model.app.RecommendUser;
import cn.wisenergy.model.app.TeamUserInfo;
import cn.wisenergy.model.app.User;
import cn.wisenergy.service.app.AerialDeliveryUserService;
import com.xxl.job.core.handler.annotation.XxlJob;
import lombok.extern.slf4j.Slf4j;
import org.bouncycastle.pqc.crypto.newhope.NHOtherInfoGenerator;
import org.bytedeco.javacpp.presets.opencv_core;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
......@@ -85,19 +82,142 @@ public class AerialDeliveryUserServiceImpl implements AerialDeliveryUserService
//3、上级用户的直推表数据维护
recommendInfoDataPreserve(userId,userInvitedId);
//4、用户的团队表数据维护
Map<String, Integer> teamDataMap = teamUserInfoByAerialDelivery(userInvitedId, userId);
//Map<String, Integer> teamDataMap = teamUserInfoByAerialDelivery(userInvitedId, userId);
//4.1获取当前团队中最上级的用户对象
User highUser = highUser(userId);
if (null != highUser){
//4.2 最上级用户id
String highUserId = highUser.getUserId();
//4.1整体团队数据维护
teamData(teamDataMap, highUserId);
}
// User highUser = highUser(userId);
// if (null != highUser){
// //4.2 最上级用户id
// String highUserId = highUser.getUserId();
// //4.1整体团队数据维护
// teamData(teamDataMap, highUserId);
// }
//4、用户团队数据维护
teamDataPreserve(userId,userInvitedId);
//5、查看当前用户是否要进行升级
userLevelService.userLevelUpgrade(userInvitedId);
}
/**
* 团队数据维护
* @param userId
* @param userInvitedId
*/
private void teamDataPreserve(String userId, String userInvitedId) {
User userByUserId = usersMapper.getUserByUserId(userId);
//用户等级
int userLevel = userByUserId.getUserLevel();
//当前用户的团队各人数等级
TeamUserInfo userTeamUserInfoMapperByUserId = teamUserInfoMapper.getByUserId(userId);
if (null != userTeamUserInfoMapperByUserId ){
Integer normalUserNum = userTeamUserInfoMapperByUserId.getNormalUserNum();
Integer seedlingNum = userTeamUserInfoMapperByUserId.getSeedlingNum();
Integer bronzeTreeNum = userTeamUserInfoMapperByUserId.getBronzeTreeNum();
Integer silverTreeNum = userTeamUserInfoMapperByUserId.getSilverTreeNum();
Integer goldTreeNum = userTeamUserInfoMapperByUserId.getGoldTreeNum();
Integer farmerNum = userTeamUserInfoMapperByUserId.getFarmerNum();
Integer forestStartNum = userTeamUserInfoMapperByUserId.getForestStartNum();
Integer partnerNum = userTeamUserInfoMapperByUserId.getPartnerNum();
//推荐人的用户的团队各等级人数
TeamUserInfo inviteTeamUserInfoMapperByUserId = teamUserInfoMapper.getByUserId(userInvitedId);
if (null != inviteTeamUserInfoMapperByUserId){
if (0 == userLevel){
inviteTeamUserInfoMapperByUserId.setNormalUserNum(inviteTeamUserInfoMapperByUserId.getNormalUserNum() + normalUserNum + 1 );
inviteTeamUserInfoMapperByUserId.setSeedlingNum(inviteTeamUserInfoMapperByUserId.getSeedlingNum() + seedlingNum );
inviteTeamUserInfoMapperByUserId.setBronzeTreeNum(inviteTeamUserInfoMapperByUserId.getBronzeTreeNum() + bronzeTreeNum );
inviteTeamUserInfoMapperByUserId.setSilverTreeNum(inviteTeamUserInfoMapperByUserId.getSilverTreeNum() + silverTreeNum );
inviteTeamUserInfoMapperByUserId.setGoldTreeNum(inviteTeamUserInfoMapperByUserId.getGoldTreeNum() + goldTreeNum );
inviteTeamUserInfoMapperByUserId.setFarmerNum(inviteTeamUserInfoMapperByUserId.getFarmerNum() + farmerNum );
inviteTeamUserInfoMapperByUserId.setForestStartNum(inviteTeamUserInfoMapperByUserId.getForestStartNum() + forestStartNum );
inviteTeamUserInfoMapperByUserId.setPartnerNum(inviteTeamUserInfoMapperByUserId.getPartnerNum() + partnerNum );
}else if (1 == userLevel){
inviteTeamUserInfoMapperByUserId.setNormalUserNum(inviteTeamUserInfoMapperByUserId.getNormalUserNum() + normalUserNum );
inviteTeamUserInfoMapperByUserId.setSeedlingNum(inviteTeamUserInfoMapperByUserId.getSeedlingNum() + seedlingNum + 1 );
inviteTeamUserInfoMapperByUserId.setBronzeTreeNum(inviteTeamUserInfoMapperByUserId.getBronzeTreeNum() + bronzeTreeNum );
inviteTeamUserInfoMapperByUserId.setSilverTreeNum(inviteTeamUserInfoMapperByUserId.getSilverTreeNum() + silverTreeNum );
inviteTeamUserInfoMapperByUserId.setGoldTreeNum(inviteTeamUserInfoMapperByUserId.getGoldTreeNum() + goldTreeNum );
inviteTeamUserInfoMapperByUserId.setFarmerNum(inviteTeamUserInfoMapperByUserId.getFarmerNum() + farmerNum );
inviteTeamUserInfoMapperByUserId.setForestStartNum(inviteTeamUserInfoMapperByUserId.getForestStartNum() + forestStartNum );
inviteTeamUserInfoMapperByUserId.setPartnerNum(inviteTeamUserInfoMapperByUserId.getPartnerNum() + partnerNum );
}else if (2 == userLevel){
inviteTeamUserInfoMapperByUserId.setNormalUserNum(inviteTeamUserInfoMapperByUserId.getNormalUserNum() + normalUserNum );
inviteTeamUserInfoMapperByUserId.setSeedlingNum(inviteTeamUserInfoMapperByUserId.getSeedlingNum() + seedlingNum );
inviteTeamUserInfoMapperByUserId.setBronzeTreeNum(inviteTeamUserInfoMapperByUserId.getBronzeTreeNum() + bronzeTreeNum + 1 );
inviteTeamUserInfoMapperByUserId.setSilverTreeNum(inviteTeamUserInfoMapperByUserId.getSilverTreeNum() + silverTreeNum );
inviteTeamUserInfoMapperByUserId.setGoldTreeNum(inviteTeamUserInfoMapperByUserId.getGoldTreeNum() + goldTreeNum );
inviteTeamUserInfoMapperByUserId.setFarmerNum(inviteTeamUserInfoMapperByUserId.getFarmerNum() + farmerNum );
inviteTeamUserInfoMapperByUserId.setForestStartNum(inviteTeamUserInfoMapperByUserId.getForestStartNum() + forestStartNum );
inviteTeamUserInfoMapperByUserId.setPartnerNum(inviteTeamUserInfoMapperByUserId.getPartnerNum() + partnerNum );
}else if (3 == userLevel){
inviteTeamUserInfoMapperByUserId.setNormalUserNum(inviteTeamUserInfoMapperByUserId.getNormalUserNum() + normalUserNum );
inviteTeamUserInfoMapperByUserId.setSeedlingNum(inviteTeamUserInfoMapperByUserId.getSeedlingNum() + seedlingNum );
inviteTeamUserInfoMapperByUserId.setBronzeTreeNum(inviteTeamUserInfoMapperByUserId.getBronzeTreeNum() + bronzeTreeNum );
inviteTeamUserInfoMapperByUserId.setSilverTreeNum(inviteTeamUserInfoMapperByUserId.getSilverTreeNum() + silverTreeNum + 1 );
inviteTeamUserInfoMapperByUserId.setGoldTreeNum(inviteTeamUserInfoMapperByUserId.getGoldTreeNum() + goldTreeNum );
inviteTeamUserInfoMapperByUserId.setFarmerNum(inviteTeamUserInfoMapperByUserId.getFarmerNum() + farmerNum );
inviteTeamUserInfoMapperByUserId.setForestStartNum(inviteTeamUserInfoMapperByUserId.getForestStartNum() + forestStartNum );
inviteTeamUserInfoMapperByUserId.setPartnerNum(inviteTeamUserInfoMapperByUserId.getPartnerNum() + partnerNum );
}else if (4 == userLevel){
inviteTeamUserInfoMapperByUserId.setNormalUserNum(inviteTeamUserInfoMapperByUserId.getNormalUserNum() + normalUserNum );
inviteTeamUserInfoMapperByUserId.setSeedlingNum(inviteTeamUserInfoMapperByUserId.getSeedlingNum() + seedlingNum );
inviteTeamUserInfoMapperByUserId.setBronzeTreeNum(inviteTeamUserInfoMapperByUserId.getBronzeTreeNum() + bronzeTreeNum );
inviteTeamUserInfoMapperByUserId.setSilverTreeNum(inviteTeamUserInfoMapperByUserId.getSilverTreeNum() + silverTreeNum );
inviteTeamUserInfoMapperByUserId.setGoldTreeNum(inviteTeamUserInfoMapperByUserId.getGoldTreeNum() + goldTreeNum + 1 );
inviteTeamUserInfoMapperByUserId.setFarmerNum(inviteTeamUserInfoMapperByUserId.getFarmerNum() + farmerNum );
inviteTeamUserInfoMapperByUserId.setForestStartNum(inviteTeamUserInfoMapperByUserId.getForestStartNum() + forestStartNum );
inviteTeamUserInfoMapperByUserId.setPartnerNum(inviteTeamUserInfoMapperByUserId.getPartnerNum() + partnerNum );
}else if (5 == userLevel){
inviteTeamUserInfoMapperByUserId.setNormalUserNum(inviteTeamUserInfoMapperByUserId.getNormalUserNum() + normalUserNum );
inviteTeamUserInfoMapperByUserId.setSeedlingNum(inviteTeamUserInfoMapperByUserId.getSeedlingNum() + seedlingNum );
inviteTeamUserInfoMapperByUserId.setBronzeTreeNum(inviteTeamUserInfoMapperByUserId.getBronzeTreeNum() + bronzeTreeNum );
inviteTeamUserInfoMapperByUserId.setSilverTreeNum(inviteTeamUserInfoMapperByUserId.getSilverTreeNum() + silverTreeNum );
inviteTeamUserInfoMapperByUserId.setGoldTreeNum(inviteTeamUserInfoMapperByUserId.getGoldTreeNum() + goldTreeNum );
inviteTeamUserInfoMapperByUserId.setFarmerNum(inviteTeamUserInfoMapperByUserId.getFarmerNum() + farmerNum + 1 );
inviteTeamUserInfoMapperByUserId.setForestStartNum(inviteTeamUserInfoMapperByUserId.getForestStartNum() + forestStartNum );
inviteTeamUserInfoMapperByUserId.setPartnerNum(inviteTeamUserInfoMapperByUserId.getPartnerNum() + partnerNum );
}else if (6 == userLevel){
inviteTeamUserInfoMapperByUserId.setNormalUserNum(inviteTeamUserInfoMapperByUserId.getNormalUserNum() + normalUserNum );
inviteTeamUserInfoMapperByUserId.setSeedlingNum(inviteTeamUserInfoMapperByUserId.getSeedlingNum() + seedlingNum );
inviteTeamUserInfoMapperByUserId.setBronzeTreeNum(inviteTeamUserInfoMapperByUserId.getBronzeTreeNum() + bronzeTreeNum );
inviteTeamUserInfoMapperByUserId.setSilverTreeNum(inviteTeamUserInfoMapperByUserId.getSilverTreeNum() + silverTreeNum );
inviteTeamUserInfoMapperByUserId.setGoldTreeNum(inviteTeamUserInfoMapperByUserId.getGoldTreeNum() + goldTreeNum );
inviteTeamUserInfoMapperByUserId.setFarmerNum(inviteTeamUserInfoMapperByUserId.getFarmerNum() + farmerNum );
inviteTeamUserInfoMapperByUserId.setForestStartNum(inviteTeamUserInfoMapperByUserId.getForestStartNum() + forestStartNum + 1 );
inviteTeamUserInfoMapperByUserId.setPartnerNum(inviteTeamUserInfoMapperByUserId.getPartnerNum() + partnerNum );
}else if (7 == userLevel){
inviteTeamUserInfoMapperByUserId.setNormalUserNum(inviteTeamUserInfoMapperByUserId.getNormalUserNum() + normalUserNum );
inviteTeamUserInfoMapperByUserId.setSeedlingNum(inviteTeamUserInfoMapperByUserId.getSeedlingNum() + seedlingNum );
inviteTeamUserInfoMapperByUserId.setBronzeTreeNum(inviteTeamUserInfoMapperByUserId.getBronzeTreeNum() + bronzeTreeNum );
inviteTeamUserInfoMapperByUserId.setSilverTreeNum(inviteTeamUserInfoMapperByUserId.getSilverTreeNum() + silverTreeNum );
inviteTeamUserInfoMapperByUserId.setGoldTreeNum(inviteTeamUserInfoMapperByUserId.getGoldTreeNum() + goldTreeNum );
inviteTeamUserInfoMapperByUserId.setFarmerNum(inviteTeamUserInfoMapperByUserId.getFarmerNum() + farmerNum );
inviteTeamUserInfoMapperByUserId.setForestStartNum(inviteTeamUserInfoMapperByUserId.getForestStartNum() + forestStartNum );
inviteTeamUserInfoMapperByUserId.setPartnerNum(inviteTeamUserInfoMapperByUserId.getPartnerNum() + partnerNum + 1);
}
teamUserInfoMapper.updateById(inviteTeamUserInfoMapperByUserId);
//推荐人的推荐人id
User invitedUserByUserId = usersMapper.getUserByUserId(userInvitedId);
if (null != invitedUserByUserId){
String beInvitedCode = invitedUserByUserId.getBeInvitedCode();
User user = usersMapper.getuserByBeInvitedCode(beInvitedCode);
if (null != user){
String upUserId = user.getUserId();
teamDataPreserve(userId,upUserId);
}
}
}
}
}
/**
* 直推数据维护
* @param userId 当前用户id
......
wisenergy-service/src/main/java/cn/wisenergy/service/app/impl/BankServiceImpl.java
View file @ 3c66f801
......@@ -8,6 +8,8 @@ import cn.wisenergy.model.enums.FrozenStatus;
import cn.wisenergy.model.enums.TradeRecordEnum;
import cn.wisenergy.model.enums.TradeStatusEnum;
import cn.wisenergy.model.vo.TaxRateVo;
import cn.wisenergy.model.vo.WithdrawAuditVo;
import cn.wisenergy.service.Manager.BankManger;
import cn.wisenergy.service.app.BankService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import lombok.extern.slf4j.Slf4j;
......@@ -15,6 +17,7 @@ import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.math.BigDecimal;
import java.util.ArrayList;
import java.util.List;
......@@ -49,6 +52,12 @@ public class BankServiceImpl extends ServiceImpl<BankInfoMapper, BankInfo> imple
@Autowired
private VariableMapper variableMapper;
@Autowired
private BankManger bankManger;
@Autowired
private TradeRecordMapper tradeRecordMapper;
private static final String TAX_RATE_KEY = "TAX_RATE_CODE";
......@@ -181,15 +190,31 @@ public class BankServiceImpl extends ServiceImpl<BankInfoMapper, BankInfo> imple
return R.error(1, "验证码已过期!", false);
}
//3、添加提现交易流水记录
//3、更新可提现金额和
BigDecimal money = BigDecimal.valueOf(dto.getMoney());
BigDecimal extractMoney = accountInfo.getExtractMoney().subtract(money);
accountInfo.setExtractMoney(extractMoney);
BigDecimal frozenMoney = accountInfo.getFrozenMoney().add(money);
accountInfo.setFrozenMoney(frozenMoney);
BigDecimal earningsMonth = accountInfo.getEarningsMonth().subtract(money);
accountInfo.setEarningsMonth(earningsMonth);
BigDecimal earningsTotal = accountInfo.getEarningsTotal().subtract(money);
accountInfo.setEarningsTotal(earningsTotal);
//4、添加提现交易流水记录
TradeRecord tradeRecord = new TradeRecord();
tradeRecord.setUserId(accountInfo.getUserId());
tradeRecord.setTradeType(TradeRecordEnum.WITHDRAW_DEPOSIT.getCode());
tradeRecord.setTradeNo(null);
tradeRecord.setStatus(TradeStatusEnum.BANK_TRANSFER_ACCOUNTS.getCode());
int count = recordMapper.add(tradeRecord);
if (count == 0) {
return R.error("保存交易流水失败!");
tradeRecord.setMoney(money);
Boolean bool = bankManger.updateAccountAddRecord(accountInfo, tradeRecord);
if (!bool) {
return R.ok(1, false);
}
return R.ok(0, true);
}
......@@ -237,4 +262,31 @@ public class BankServiceImpl extends ServiceImpl<BankInfoMapper, BankInfo> imple
taxRateVo.setTaxDesc("提现时系统自动扣除2%个人所得税，剩余税费由平台替缴。");
return R.ok(taxRateVo);
}
@Override
public R<Boolean> withdrawAudit(WithdrawAuditVo auditVo) {
log.info("shop-mall[]BankServiceImpl[]withdrawAudit[]input.param.auditVo:" + auditVo);
if (null == auditVo || null == auditVo.getId()) {
return R.error("入参为空!");
}
//1、根据提现记录id,获取提现信息
TradeRecord tradeRecord = tradeRecordMapper.selectById(auditVo.getId());
if (null == tradeRecord) {
return R.error("提现记录不正确，请联系管理员!");
}
//2、获取账户信息
AccountInfo accountInfo = accountMapper.getByUserId(tradeRecord.getUserId());
if (null == accountInfo) {
return R.error("提现账户信息不存在!");
}
//更新提现状态为 提现成功，更新账户冻结金额
boolean bool = bankManger.updateAccountAndRecord(accountInfo, tradeRecord);
if (!bool) {
return R.ok(1, false);
}
return R.ok(0, true);
}
}
wisenergy-service/src/main/java/cn/wisenergy/service/app/impl/CultivatingPrizeInfoServiceImpl.java 0 → 100644
View file @ 3c66f801
package cn.wisenergy.service.app.impl;
import cn.wisenergy.common.constant.CommonAttributes;
import cn.wisenergy.common.utils.DateUtil;
import cn.wisenergy.common.utils.R;
import cn.wisenergy.mapper.CultivatingPrizeInfoMapper;
import cn.wisenergy.model.app.CultivatingPrizeInfo;
import cn.wisenergy.model.dto.CultivatingPrizeInfoDto;
import cn.wisenergy.model.vo.CultivatingPrizeInfoVo;
import cn.wisenergy.service.app.CultivatingPrizeInfoService;
import com.github.pagehelper.PageInfo;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.util.Date;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
/**
* Created by m1991 on 2021/3/26 10:22
*/
@Service
@Slf4j
public class CultivatingPrizeInfoServiceImpl implements CultivatingPrizeInfoService {
@Autowired
public CultivatingPrizeInfoMapper cultivatingPrizeInfoMapper;
@Override
public R<PageInfo<CultivatingPrizeInfoVo>> getCultivatingPrizeInfoList(CultivatingPrizeInfoDto cultivatingPrizeInfoDto) {
log.info("shop-mall[]CultivatingPrizeInfoServiceImpl[]getCultivatingPrizeInfoList[]input.param.query:" + cultivatingPrizeInfoDto);
if (null == cultivatingPrizeInfoDto) {
return R.error("入参不能为空!");
}
pageHandle(cultivatingPrizeInfoDto);
Map<String, Object> map = new HashMap<>(8);
if (!StringUtils.isBlank(cultivatingPrizeInfoDto.getUserId())) {
map.put("userId", cultivatingPrizeInfoDto.getUserId());
}
if (!StringUtils.isBlank(cultivatingPrizeInfoDto.getQueryTime())) {
Date date = DateUtil.convertStrToDate(cultivatingPrizeInfoDto.getQueryTime(), "yyyy-MM-dd");
String queryTime = cultivatingPrizeInfoDto.getQueryTime();
map.put("queryTime", queryTime);
}
map.put("startNum", cultivatingPrizeInfoDto.getStartNum());
map.put("endNum", cultivatingPrizeInfoDto.getEndNum());
int total = cultivatingPrizeInfoMapper.count(map);
List<CultivatingPrizeInfoVo> list = cultivatingPrizeInfoMapper.getCultivatingPrizeInfoList(map);
PageInfo<CultivatingPrizeInfoVo> info = new PageInfo<>();
info.setPageSize(cultivatingPrizeInfoDto.getPageSize());
info.setPageNum(cultivatingPrizeInfoDto.getPageNo());
info.setList(list);
info.setTotal(total);
return R.ok(info);
}
/**
* 分页处理方法
*
* @param schemeVo 参数
*/
private void pageHandle(CultivatingPrizeInfoDto schemeVo) {
Integer pageNum = schemeVo.getPageNo();
Integer pageSize = schemeVo.getPageSize();
if (null == pageSize || pageSize == 0) {
pageSize = 10;
}
if (null == pageNum || pageNum == 0) {
pageNum = 1;
}
Integer endNum = pageSize;
Integer startNum = (pageNum - CommonAttributes.NUM_ONE) * pageSize;
schemeVo.setEndNum(endNum);
schemeVo.setStartNum(startNum);
schemeVo.setPageNo(pageNum);
schemeVo.setPageSize(pageSize);
}
}
wisenergy-service/src/main/java/cn/wisenergy/service/app/impl/CultivatingPrizeServiceImpl.java 0 → 100644
View file @ 3c66f801
package cn.wisenergy.service.app.impl;
import cn.wisenergy.common.utils.R;
import cn.wisenergy.mapper.CultivatingPrizeMapper;
import cn.wisenergy.model.app.CultivatingPrize;
import cn.wisenergy.model.vo.CultivatingPrizeVo;
import cn.wisenergy.service.app.CultivatingPrizeService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.util.List;
/**
* Created by m1991 on 2021/3/26 11:06
*/
@Service
@Slf4j
public class CultivatingPrizeServiceImpl implements CultivatingPrizeService {
@Autowired
public CultivatingPrizeMapper cultivatingPrizeMapper;
@Override
public R<List<CultivatingPrize>> getCultivatingPrizeList() {
log.info("shop-mall[]CultivatingPrizeServiceImpl[]getCultivatingPrizeList[]input.param.query:" );
List<CultivatingPrize> cultivatingPrizeList = cultivatingPrizeMapper.getCultivatingPrizeList();
return R.ok(cultivatingPrizeList);
}
}
wisenergy-service/src/main/java/cn/wisenergy/service/app/impl/CustomerServiceServiceImpl.java
View file @ 3c66f801
......@@ -7,19 +7,17 @@ import cn.wisenergy.model.app.CustomerService;
import cn.wisenergy.model.app.User;
import cn.wisenergy.service.app.CustomerServiceService;
import lombok.extern.slf4j.Slf4j;
import org.aspectj.weaver.ast.Var;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Service;
import org.springframework.web.multipart.MultipartFile;
import org.yaml.snakeyaml.events.Event;
import javax.servlet.http.HttpServletRequest;
import java.io.File;
import java.io.IOException;
import java.util.Date;
import java.util.HashMap;
import java.util.Map;
@Service
@Slf4j
......
wisenergy-service/src/main/java/cn/wisenergy/service/app/impl/DayTaskServiceImpl.java 0 → 100644
View file @ 3c66f801
package cn.wisenergy.service.app.impl;
import cn.wisenergy.common.utils.DateUtil;
import cn.wisenergy.common.utils.R;
import cn.wisenergy.mapper.*;
import cn.wisenergy.model.app.*;
import cn.wisenergy.model.enums.MemberPercentEnum;
import cn.wisenergy.model.enums.RebateStatusEnum;
import cn.wisenergy.model.enums.TradeRecordEnum;
import cn.wisenergy.model.enums.TradeStatusEnum;
import cn.wisenergy.model.vo.TeamPerformanceSortVo;
import cn.wisenergy.service.Manager.AccountManager;
import cn.wisenergy.service.Manager.PublicManager;
import cn.wisenergy.service.app.DayTaskService;
import com.xxl.job.core.handler.annotation.XxlJob;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.util.CollectionUtils;
import java.math.BigDecimal;
import java.math.RoundingMode;
import java.text.DecimalFormat;
import java.util.*;
/**
* @author 86187
*/
@Service
@Slf4j
public class DayTaskServiceImpl implements DayTaskService {
@Autowired
private UsersMapper usersMapper;
@Autowired
private AccountMapper accountMapper;
@Autowired
private MemberPercentMapper memberPercentMapper;
@Autowired
private AccountManager accountManager;
@Autowired
private PublicManager publicManager;
@Autowired
private TradeRecordMapper tradeRecordMapper;
@Autowired
private TeamPerformanceMapper teamPerformanceMapper;
@Autowired
private ProgressPrizeMapper progressPrizeMapper;
@Autowired
private OrderMapper orderMapper;
@Autowired
private MonthManureMapper monthManureMapper;
@Autowired
private LastAccountMapper lastAccountMapper;
private static final String PATTERN = "yyyy-MM";
private static final Integer TWENTY = 20;
@XxlJob(value = "orderRebateDayTask")
@Override
public R<Boolean> orderRebate() {
log.info("订单返佣接口定时-日任务");
// //获取返佣订单
List<OrderInfo> list = orderMapper.getListBySuccessTime(new Date());
log.info("shop-mall[]AccountServiceImpl[]orderRebate[]input.param.list:{}", list.size());
if (CollectionUtils.isEmpty(list)) {
return R.ok(0, true);
}
//1、遍历订单，订单状态是未返佣，完成时间小于当前时间 --返佣
for (OrderInfo orderInfo : list) {
long successTime = orderInfo.getSuccessTime().getTime();
long time = System.currentTimeMillis();
if (RebateStatusEnum.NO_REBATE.getCode().equals(orderInfo.getRebateStatus()) && successTime <= time) {
//获取用户信息
User user = usersMapper.getByUserId(orderInfo.getUserId());
if (null == user || user.getUserLevel() == 0) {
continue;
}
//获取账户信息
AccountInfo accountInfo = accountMapper.getByUserId(user.getUserId());
if (null == accountInfo) {
continue;
}
//获取返佣比例
MemberPercent memberpercent = memberPercentMapper.getByLevelAndType(user.getUserLevel(),
MemberPercentEnum.REBATE.getCode());
if (null == memberpercent) {
continue;
}
//修改订单状态为已返佣，账户可用金额增加
accountManager.updateOrderAddMoney(orderInfo, accountInfo, memberpercent);
}
}
return R.ok(0, true);
}
@XxlJob(value = "monthManureDayTask")
@Override
public R<Boolean> performanceCount() {
//获取本月订单
log.info("月度肥料定时-日任务开启");
List<OrderInfo> list = orderMapper.getByCreateTime(new Date());
log.info("shop-mall[]AccountServiceImpl[]performanceCount[]input.param.list:{}", list.size());
if (CollectionUtils.isEmpty(list)) {
return R.ok(0, true);
}
Date date = new Date();
String yearMonth = DateUtil.convertDateToStr(date, PATTERN);
//计算当月所有订单成交额
BigDecimal totalMoney = new BigDecimal(0);
//统计出出每个用户当月订单成交额 key:userId value:用户当月订单成交额
Map<String, Double> map = new HashMap<>();
for (OrderInfo orderInfo : list) {
String userId = orderInfo.getUserId();
double payMoney = orderInfo.getPayment().doubleValue();
//key 存在 累加订单金额 到 value
if (map.containsKey(userId)) {
double money = payMoney + map.get(orderInfo.getUserId());
map.put(orderInfo.getUserId(), money);
} else {
//key 不存在，加入集合
map.put(userId, payMoney);
}
totalMoney = totalMoney.add(orderInfo.getPayment());
}
//累计用户和上级用户-团队业绩
Map<String, Double> tempMap = new HashMap<>();
for (Map.Entry<String, Double> entity : map.entrySet()) {
String userId = entity.getKey();
//1)、统计当前用户月度业绩
double userCount = entity.getValue();
if (tempMap.containsKey(entity.getKey())) {
double teamMoney = userCount + tempMap.get(entity.getKey());
tempMap.put(entity.getKey(), teamMoney);
} else {
//key 不存在，加入集合 当前用户团队绩效
tempMap.put(entity.getKey(), userCount);
}
//2)、获取当前用户的上级用户列表
List<User> userList = getByList(userId);
if (CollectionUtils.isEmpty(userList)) {
continue;
}
for (User user : userList) {
//3)、统计当前用户的上级用户团队绩效
//key 存在 当前用户团队绩效 + 上级用户团队绩效
if (tempMap.containsKey(user.getUserId())) {
double teamMoney = userCount + tempMap.get(user.getUserId());
tempMap.put(user.getUserId(), teamMoney);
} else {
//key 不存在，加入集合 当前用户团队绩效
tempMap.put(user.getUserId(), userCount);
}
}
}
//3、获取用户当月绩效信息 新增 or 更新
List<TeamPerformance> addList = new ArrayList<>();
List<TeamPerformance> updateList = new ArrayList<>();
for (Map.Entry<String, Double> entity : tempMap.entrySet()) {
//获取团队业绩信息
TeamPerformance teamPerformance = teamPerformanceMapper.getByUserIdAndTime(entity.getKey(), yearMonth);
if (null == teamPerformance) {
//获取用户信息
User user = usersMapper.getByUserId(entity.getKey());
//添加用户团队业绩信息
TeamPerformance performance = new TeamPerformance();
performance.setUserId(user.getUserId());
performance.setMonthTeamPerformance(BigDecimal.valueOf(entity.getValue()));
performance.setUserLevel(user.getUserLevel());
performance.setYearMonth(yearMonth);
addList.add(performance);
} else {
teamPerformance.setMonthTeamPerformance(BigDecimal.valueOf(entity.getValue()));
updateList.add(teamPerformance);
}
}
//4、更新账户月度绩效
boolean updateBool = accountManager.updateAccountPerformanceMonth(addList, updateList);
if (!updateBool) {
return R.ok(1, false);
}
//5、获取所有用户,如果会员等级是黄金以上，计算月度收益
List<User> userList = usersMapper.getAllGoldUser();
if (CollectionUtils.isEmpty(userList)) {
return R.ok(0, true);
}
boolean bool = monthlyIncome(totalMoney, userList);
if (!bool) {
return R.ok(1, false);
}
log.info("月度肥料定时-日任务执行成功");
return R.ok(0, true);
}
@XxlJob(value = "growthAwardDayTask")
@Override
public R<Boolean> progressPrizeCount() {
log.info("shop-mall[]AccountServiceImpl[]performanceCount[]input.method");
log.info("本月最大进步奖日定时任务开启");
Date date = new Date();
String yearMonth = DateUtil.convertDateToStr(date, PATTERN);
//1、判断当前月是否是业绩开始的第一个月
List<TeamPerformance> teamPerformances = teamPerformanceMapper.getByBeforeTime(yearMonth);
//获取当月所有人业绩总额
Double totalMoney = teamPerformanceMapper.countByTime(yearMonth);
double number = Math.floor(totalMoney / 3980 / 12);
//2、集合为空 是业绩开始的第一个月
if (CollectionUtils.isEmpty(teamPerformances)) {
if (number != 0) {
//获取月业绩前20用户
List<TeamPerformance> list = teamPerformanceMapper.userTwenty(yearMonth);
if (CollectionUtils.isEmpty(list)) {
return R.ok(0, true);
}
//获取20名进步最大的月业绩和
Double twentyTotal = teamPerformanceMapper.countTwenty(yearMonth);
List<AccountInfo> accountInfoList = new ArrayList<>();
List<TradeRecord> tradeRecordList = new ArrayList<>();
List<ProgressPrize> addPrizeList = new ArrayList<>();
List<ProgressPrize> updatePrizeList = new ArrayList<>();
for (TeamPerformance user : list) {
//获取最大进步奖 百分比
MemberPercent memberPercent = memberPercentMapper.getByLevelAndType(user.getUserLevel(),
MemberPercentEnum.MONTH_BEST_AWARD.getCode());
//计算收益
double userTeamPerformance = user.getMonthTeamPerformance().doubleValue();
double percent = memberPercent.getPercent().doubleValue();
double income = Math.floor(number * 3980 * percent * userTeamPerformance / twentyTotal);
//获取账户信息
AccountInfo accountInfo = accountMapper.getByUserId(user.getUserId());
//用户月收益 =其他收益+最大进步奖收益
BigDecimal earningsMonth = accountInfo.getEarningsMonth().add(BigDecimal.valueOf(income));
accountInfo.setEarningsMonth(earningsMonth);
//用户总收益 =其他总收益 + 最大进步奖收益
BigDecimal earningsTotal = accountInfo.getEarningsTotal().add(BigDecimal.valueOf(income));
accountInfo.setEarningsTotal(earningsTotal);
accountInfoList.add(accountInfo);
//添加最大进步奖信息 不存在：新增 存在，修改
BigDecimal awardMoney = new BigDecimal(income).setScale(2, RoundingMode.HALF_UP);
ProgressPrize progressPrize = progressPrizeMapper.getByUserIdYearMonth(user.getUserId(), yearMonth);
if (null == progressPrize) {
ProgressPrize prize = new ProgressPrize();
prize.setAwardMoney(awardMoney.doubleValue());
prize.setUserId(user.getUserId());
prize.setGrowthRate(0.0);
prize.setYearMonth(yearMonth);
addPrizeList.add(prize);
} else {
progressPrize.setYearMonth(yearMonth);
progressPrize.setAwardMoney(awardMoney.doubleValue());
updatePrizeList.add(progressPrize);
}
//添加交易流水记录
TradeRecord tradeRecord = new TradeRecord();
tradeRecord.setUserId(user.getUserId());
tradeRecord.setTradeType(TradeRecordEnum.PROGRESS_PRIZE.getCode());
tradeRecord.setTradeNo(null);
tradeRecord.setStatus(TradeStatusEnum.NO_SETTLE_ACCOUNTS.getCode());
tradeRecord.setMoney(BigDecimal.valueOf(income));
tradeRecordList.add(tradeRecord);
}
//更新账户信息，添加交易流水记录
boolean bool = accountManager.updateAccountAddRecordAddPrize(accountInfoList, tradeRecordList,
addPrizeList, updatePrizeList);
if (!bool) {
return R.ok(1, false);
}
}
log.info("本月最大进步奖日定时任务执行成功");
return R.ok(0, true);
}
//3、集合不为空 不是业绩开始的第一个月
//获取用户列表
List<User> userList = usersMapper.findAllNotZeroUser();
if (CollectionUtils.isEmpty(userList)) {
return R.ok(0, true);
}
//4计算每个用户本月的业绩增长率 如果集合大于20 ，取前二十名，小于，取全部
List<TeamPerformanceSortVo> listVo = progressPrizeStatistics(userList);
if (listVo.size() >= TWENTY) {
listVo.subList(0, TWENTY);
}
//5、计算前20的总业绩
double total = listVo.stream().mapToDouble(TeamPerformanceSortVo::getMonthPerformance).sum();
boolean bool = totalPerformanceIncome(listVo, number, total);
if (!bool) {
return R.ok(1, false);
}
log.info("本月最大进步奖日定时任务执行成功");
return R.ok(0, true);
}
/**
* 获取用户的上级列表
*
* @param userId 用户id
* @return 用户的上级列表
*/
@Override
public List<User> getByList(String userId) {
List<User> list = new ArrayList<>();
User user = usersMapper.getByUserId(userId);
getUser(list, userId);
//去除本身
list.remove(user);
return list;
}
public void getUser(List<User> list, String userId) {
User user = usersMapper.getByUserId(userId);
list.add(user);
if (null != user && !StringUtils.isBlank(user.getBeInvitedCode())) {
user = usersMapper.getByBeInvitedCode(user.getBeInvitedCode());
if (null != user) {
if (user.getBeInvitedCode().equals(user.getInviteCode())) {
return;
}
getUser(list, user.getUserId());
}
}
}
/**
* 统计每个用户本月业绩增长率
*
* @param userList 用户列表
* @return 每个用户本月业绩增长率
*/
private List<TeamPerformanceSortVo> progressPrizeStatistics(List<User> userList) {
Date date = new Date();
String yearMonth = DateUtil.convertDateToStr(date, PATTERN);
//遍历 计算业绩增长率
List<TeamPerformanceSortVo> listVo = new ArrayList<>();
for (User user : userList) {
TeamPerformanceSortVo teamVo = new TeamPerformanceSortVo();
double growthRate;
//获取当月业绩
TeamPerformance teamPerformance = teamPerformanceMapper.getByUserIdAndTime(user.getUserId(), yearMonth);
//获取上月业绩
Calendar cal = Calendar.getInstance();
cal.setTime(new Date());
cal.add(Calendar.MONTH, -1);
Date lastDate = cal.getTime();
String lastMonthTime = DateUtil.convertDateToStr(lastDate, PATTERN);
TeamPerformance lastMonth = teamPerformanceMapper.getByUserIdAndTime(user.getUserId(), lastMonthTime);
if (null == teamPerformance || null == lastMonth) {
growthRate = 0.00;
} else {
double month = teamPerformance.getMonthTeamPerformance().doubleValue();
double last = lastMonth.getMonthTeamPerformance().doubleValue();
if (last >= month) {
growthRate = 0.00;
} else {
growthRate = (month - last) / month;
}
}
teamVo.setGrowthRate(growthRate);
double monthPerformance;
assert teamPerformance != null;
if (null == teamPerformance.getMonthTeamPerformance()) {
monthPerformance = 0.00;
} else {
monthPerformance = teamPerformance.getMonthTeamPerformance().doubleValue();
}
teamVo.setMonthPerformance(monthPerformance);
teamVo.setUserId(user.getUserId());
teamVo.setTeamPerformance(teamPerformance);
listVo.add(teamVo);
}
//对集合进行排序
listVo.sort(Comparator.comparing(TeamPerformanceSortVo::getGrowthRate).reversed());
return listVo;
}
/**
* 如果会员等级是黄金以上，计算月度收益
*
* @param totalMoney 月金额总额
* @param userList 用户列表
* @return true or false
*/
private boolean monthlyIncome(BigDecimal totalMoney, List<User> userList) {
double total = totalMoney.doubleValue();
Date date = new Date();
String yearMonth = DateUtil.convertDateToStr(date, PATTERN);
//当月所有人订单成交总金额/3980/12 向下整
double moneyMonth = Math.floor(total / 3980 / 12);
List<AccountInfo> accountInfoList = new ArrayList<>();
List<TradeRecord> tradeRecordList = new ArrayList<>();
//获取上月未分配完的奖金
double lastMonthAward;
Date last = DateUtil.getLastMonth(new Date());
String yearMonthTime = DateUtil.convertDateToStr(last, PATTERN);
MonthManure monthManure = monthManureMapper.queryByTime(yearMonthTime);
if (null == monthManure) {
lastMonthAward = 0.00;
} else {
lastMonthAward = monthManure.getManureAward();
}
for (User user : userList) {
if (moneyMonth != 0) {
//获取等级优惠百分比
MemberPercent memberPercent = memberPercentMapper.getByLevelAndType(user.getUserLevel(), 2);
if (null != memberPercent) {
//获取本月团队总金额
TeamPerformance teamPerformance = teamPerformanceMapper.getByUserIdAndTime(user.getUserId(), yearMonth);
//获取该等级团队总金额
Double teamTotal = teamPerformanceMapper.countTeamMoney(user.getUserLevel(), yearMonth);
if (null != teamPerformance && null != teamTotal) {
double month = teamPerformance.getMonthTeamPerformance().doubleValue();
double percent = memberPercent.getPercent().doubleValue();
//计算收益
double teamMoney = (moneyMonth + lastMonthAward) * 3980 * percent * month;
DecimalFormat df = new DecimalFormat("######0.00");
double income = Double.parseDouble(df.format(teamMoney / teamTotal));
//获取账户信息
AccountInfo accountInfo = accountMapper.getByUserId(user.getUserId());
BigDecimal bigDecimal = new BigDecimal(income).setScale(2, RoundingMode.HALF_UP);
//获取用户本月收益=可提现金额+ 本月肥料收益
BigDecimal performanceMonth = accountInfo.getExtractMoney().add(bigDecimal);
accountInfo.setEarningsMonth(performanceMonth);
//获取用户上月总收益
LastMonthAccount lastMonthAccount = lastAccountMapper.getByUserIdAndTime(user.getUserId(), yearMonthTime);
BigDecimal lastTotalMonth;
if (null == lastMonthAccount || null == lastMonthAccount.getEarningsTotal()) {
lastTotalMonth = new BigDecimal("0.00");
} else {
lastTotalMonth = lastMonthAccount.getEarningsTotal();
}
//用户总收益=上月总收益+本月收益
BigDecimal performanceTotal = lastTotalMonth.add(performanceMonth);
accountInfo.setEarningsTotal(performanceTotal);
accountInfoList.add(accountInfo);
//5、添加交易流水记录
TradeRecord tradeRecord = new TradeRecord();
tradeRecord.setUserId(user.getUserId());
tradeRecord.setTradeType(TradeRecordEnum.MONTHLY_FERTILIZER.getCode());
tradeRecord.setTradeNo(null);
tradeRecord.setStatus(TradeStatusEnum.NO_SETTLE_ACCOUNTS.getCode());
tradeRecordList.add(tradeRecord);
}
}
}
}
//更新账户信息，新增交易流水记录
return accountManager.updateAccountAddRecord(accountInfoList, tradeRecordList);
}
/**
* 统计用户最大进步奖收益
*
* @param listVo 用户增长率列表
* @param number 个人业绩
* @param total 总业绩
*/
private boolean totalPerformanceIncome(List<TeamPerformanceSortVo> listVo, double number, double total) {
//要更新的账户列表
List<AccountInfo> updateAccountList = new ArrayList<>();
BigDecimal sum = new BigDecimal(0);
for (int i = 0; i < listVo.size(); i++) {
String userId = listVo.get(i).getTeamPerformance().getUserId();
Integer userLevel = listVo.get(i).getTeamPerformance().getUserLevel();
//获取最大进步奖 百分比
MemberPercent memberPercent = memberPercentMapper.getByLevelAndType(userLevel, 3);
//计算收益
double userTeamPerformance = listVo.get(i).getTeamPerformance().getMonthTeamPerformance().doubleValue();
double percent = memberPercent.getPercent().doubleValue();
double income = number * 3980 * percent * userTeamPerformance / total;
//获取账户信息
AccountInfo accountInfo = accountMapper.getByUserId(userId);
BigDecimal bigDecimal;
if (i == listVo.size() - 1) {
bigDecimal = new BigDecimal(total).subtract(sum);
} else {
bigDecimal = accountInfo.getEarningsMonth().add(new BigDecimal(income));
sum = sum.add(new BigDecimal(income));
}
accountInfo.setEarningsMonth(bigDecimal);
updateAccountList.add(accountInfo);
}
//判断本月是否有最大进步奖数据 无，新增 有，修改或删除
Date date = new Date();
String yearMonth = DateUtil.convertDateToStr(date, PATTERN);
List<ProgressPrize> prizes = progressPrizeMapper.getByYearMonth(yearMonth);
//修改或保存最大进步奖信息
// flag 1： 日定时任务 2：月定时任务
int flag = 1;
return accountManager.updateOrSavePrize(listVo, updateAccountList, prizes, flag);
}
}
wisenergy-service/src/main/java/cn/wisenergy/service/app/impl/MemberPercentServiceImpl.java 0 → 100644
View file @ 3c66f801
package cn.wisenergy.service.app.impl;
import cn.wisenergy.common.constant.CommonAttributes;
import cn.wisenergy.common.utils.R;
import cn.wisenergy.mapper.MemberPercentMapper;
import cn.wisenergy.model.app.MemberPercent;
import cn.wisenergy.model.app.TradeRecord;
import cn.wisenergy.model.dto.MemberPercentQuery;
import cn.wisenergy.model.dto.TradeRecordQuery;
import cn.wisenergy.model.vo.SetMemberPercentVo;
import cn.wisenergy.service.app.MemberPercentService;
import com.github.pagehelper.PageInfo;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.math.BigDecimal;
import java.math.RoundingMode;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
/**
* @author 86187
*/
@Service
@Slf4j
public class MemberPercentServiceImpl implements MemberPercentService {
@Autowired
private MemberPercentMapper memberPercentMapper;
@Override
public R<PageInfo<MemberPercent>> getList(MemberPercentQuery query) {
log.info("sho[-mall[]MemberPercentServiceImpl[]getList[]input.param.query:" + query);
if (null == query) {
return R.error("入参不能为空!");
}
pageHandle(query);
Map<String, Object> map = new HashMap<>();
int total = memberPercentMapper.count();
map.put("startNum", query.getStartNum());
map.put("endNum", query.getEndNum());
List<MemberPercent> list = memberPercentMapper.getList(map);
PageInfo<MemberPercent> info = new PageInfo<>();
info.setPageSize(query.getPageSize());
info.setPageNum(query.getPageNo());
info.setTotal(total);
info.setList(list);
return R.ok(info);
}
@Override
public R<Boolean> setMemberPercent(SetMemberPercentVo percentVo) {
log.info("sho[-mall[]MemberPercentServiceImpl[]setMemberPercent[]input.param.percentVo:" + percentVo);
if (null == percentVo || null == percentVo.getPercent() ||
null == percentVo.getType() || null == percentVo.getUserLevel()) {
return R.error("入参不能为空!");
}
//1、更据等级和类型，获取会员等级优惠 存在更新，不存 在新增
MemberPercent memberPercent = memberPercentMapper.getByLevelAndType(percentVo.getUserLevel(), percentVo.getType());
MemberPercent member = new MemberPercent();
BigDecimal bigDecimal = BigDecimal.valueOf(percentVo.getPercent()).setScale(2, RoundingMode.HALF_UP);
if (null == memberPercent) {
member.setType(percentVo.getType());
member.setPercent(bigDecimal);
member.setUserLevel(percentVo.getUserLevel());
int count = memberPercentMapper.add(member);
if (count == 0) {
return R.ok(1, false);
}
return R.ok(0, true);
}
//存在则更新
memberPercent.setPercent(bigDecimal);
int count = memberPercentMapper.edit(memberPercent);
if (count == 0) {
return R.ok(1, false);
}
return R.ok(0, true);
}
/**
* 分页处理方法
*
* @param schemeVo 参数
*/
private void pageHandle(MemberPercentQuery schemeVo) {
Integer pageNum = schemeVo.getPageNo();
Integer pageSize = schemeVo.getPageSize();
if (null == pageSize || pageSize == 0) {
pageSize = 10;
}
if (null == pageNum || pageNum == 0) {
pageNum = 1;
}
Integer endNum = pageSize;
Integer startNum = (pageNum - CommonAttributes.NUM_ONE) * pageSize;
schemeVo.setEndNum(endNum);
schemeVo.setStartNum(startNum);
schemeVo.setPageNo(pageNum);
schemeVo.setPageSize(pageSize);
}
}
wisenergy-service/src/main/java/cn/wisenergy/service/app/impl/MonthAwardServiceImpl.java
View file @ 3c66f801
package cn.wisenergy.service.app.impl;
import cn.wisenergy.common.constant.CommonAttributes;
import cn.wisenergy.common.utils.DateUtil;
import cn.wisenergy.common.utils.R;
import cn.wisenergy.mapper.MonthAwardMapper;
import cn.wisenergy.mapper.TradeRecordMapper;
import cn.wisenergy.model.app.MonthAward;
import cn.wisenergy.model.app.TradeRecord;
import cn.wisenergy.model.dto.MonthAwardQuery;
import cn.wisenergy.model.dto.TradeRecordQuery;
import cn.wisenergy.model.vo.MonthAwardVo;
import cn.wisenergy.service.app.MonthAwardService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.github.pagehelper.PageInfo;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.util.Date;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
/**
* @author 86187
......@@ -60,4 +68,52 @@ public class MonthAwardServiceImpl extends ServiceImpl<MonthAwardMapper, MonthAw
}
return R.ok(monthAwardVo);
}
@Override
public R<PageInfo<MonthAward>> getList(MonthAwardQuery query) {
log.info("shop-mall[]MonthAwardServiceImpl[]getList[]input.param.query:" + query);
if (null == query) {
return R.error("入参为空!");
}
pageHandle(query);
Map<String, Object> map = new HashMap<>(8);
if (!StringUtils.isBlank(query.getQueryTime())) {
map.put("queryTime", query.getQueryTime());
}
int total = baseMapper.count(map);
map.put("startNum", query.getStartNum());
map.put("endNum", query.getEndNum());
List<MonthAward> list = baseMapper.getList(map);
PageInfo<MonthAward> info = new PageInfo<>();
info.setPageSize(query.getPageSize());
info.setPageNum(query.getPageNo());
info.setTotal(total);
info.setList(list);
return R.ok(info);
}
/**
* 分页处理方法
*
* @param schemeVo 参数
*/
private void pageHandle(MonthAwardQuery schemeVo) {
Integer pageNum = schemeVo.getPageNo();
Integer pageSize = schemeVo.getPageSize();
if (null == pageSize || pageSize == 0) {
pageSize = 10;
}
if (null == pageNum || pageNum == 0) {
pageNum = 1;
}
Integer endNum = pageSize;
Integer startNum = (pageNum - CommonAttributes.NUM_ONE) * pageSize;
schemeVo.setEndNum(endNum);
schemeVo.setStartNum(startNum);
schemeVo.setPageNo(pageNum);
schemeVo.setPageSize(pageSize);
}
}
wisenergy-service/src/main/java/cn/wisenergy/service/app/impl/MonthTaskServiceImpl.java
View file @ 3c66f801
......@@ -3,6 +3,7 @@ package cn.wisenergy.service.app.impl;
import cn.wisenergy.common.utils.DateUtil;
import cn.wisenergy.common.utils.R;
import cn.wisenergy.mapper.*;
import cn.wisenergy.model.app.*;
import cn.wisenergy.model.enums.MemberPercentEnum;
import cn.wisenergy.model.enums.TradeRecordEnum;
......@@ -11,7 +12,7 @@ import cn.wisenergy.model.enums.UserLevelEnum;
import cn.wisenergy.model.vo.TeamPerformanceSortVo;
import cn.wisenergy.service.Manager.AccountManager;
import cn.wisenergy.service.Manager.PublicManager;
import cn.wisenergy.service.app.AccountService;
import cn.wisenergy.service.app.DayTaskService;
import cn.wisenergy.service.app.MonthTaskService;
import com.xxl.job.core.handler.annotation.XxlJob;
import lombok.extern.slf4j.Slf4j;
......@@ -58,11 +59,14 @@ public class MonthTaskServiceImpl implements MonthTaskService {
private ProgressPrizeMapper progressPrizeMapper;
@Autowired
private AccountService accountService;
private DayTaskService dayTaskService;
@Autowired
private MonthManureMapper monthManureMapper;
@Autowired
private MonthAwardMapper monthAwardMapper;
@Autowired
private OrderMapper orderMapper;
......@@ -124,20 +128,20 @@ public class MonthTaskServiceImpl implements MonthTaskService {
}
//2)、获取当前用户的上级用户列表
List<User> userList = accountService.getByList(userId);
List<User> userList = dayTaskService.getByList(userId);
if (CollectionUtils.isEmpty(userList)) {
continue;
}
for (User userInfo : userList) {
for (User User : userList) {
//3)、统计当前用户的上级用户团队绩效
//key 存在 当前用户团队绩效 + 上级用户团队绩效
if (tempMap.containsKey(userInfo.getUserId())) {
double teamMoney = userCount + tempMap.get(userInfo.getUserId());
tempMap.put(userInfo.getUserId(), teamMoney);
if (tempMap.containsKey(User.getUserId())) {
double teamMoney = userCount + tempMap.get(User.getUserId());
tempMap.put(User.getUserId(), teamMoney);
} else {
//key 不存在，加入集合 当前用户团队绩效
tempMap.put(userInfo.getUserId(), userCount);
tempMap.put(User.getUserId(), userCount);
}
}
}
......@@ -323,6 +327,7 @@ public class MonthTaskServiceImpl implements MonthTaskService {
lastAccountMapper.deleteTable("month_account_image");
}
@XxlJob(value = "runCenterSubsidyMonthTask")
@Override
public R<Boolean> runCenterSubsidy() {
log.info("shop-mall[]MonthTaskServiceImpl[]runCenterSubsidy[]input.method");
......@@ -382,13 +387,107 @@ public class MonthTaskServiceImpl implements MonthTaskService {
}
//修改账户信息和保存交易记录
boolean bool = accountManager.updateAccountAddRecord(accountInfoList, tradeRecordList);
boolean bool = accountManager.runCenterUpdateAccountAddRecord(accountInfoList, tradeRecordList);
if (!bool) {
return R.ok(1, false);
}
return R.ok(0, true);
}
@XxlJob(value = "monthAwardCountTask")
@Override
public R<Boolean> monthAwardCount() {
MonthAward result = new MonthAward();
//1、获取本月新增奖金
Double monthGrow = tradeRecordMapper.queryMonthGrow(new Date());
result.setMonthIncreased(monthGrow);
//2、获取历史奖金金额
Double awardTotal = tradeRecordMapper.queryAllAward(new Date());
result.setAwardTotal(awardTotal);
//3、本月累计奖金 =本月新增奖金+上月剩余月度肥料奖金
//获取上月剩余月度肥料奖金
Double monthAwardTotal;
Date date = DateUtil.getLastMonth(new Date());
String yearMonth = DateUtil.convertDateToStr(date, "yyyy-MM");
MonthManure monthManure = monthManureMapper.queryByTime(yearMonth);
if (null == monthManure) {
monthAwardTotal = monthGrow;
} else {
monthAwardTotal = monthGrow + monthManure.getManureAward();
}
result.setMonthAwardTotal(monthAwardTotal);
//4、较上月增长奖金 本月累计奖金-上月累计奖金
//本月
String currentMonth = DateUtil.convertDateToStr(new Date(), "yyyy-MM");
Date lastDate = DateUtil.getLastMonth(new Date());
String lastMonth = DateUtil.convertDateToStr(lastDate, "yyyy-MM");
Double growthAward;
//获取上月 累计奖金
MonthAward monthAward = monthAwardMapper.getByTime(lastMonth);
if (null == monthAward) {
growthAward = monthAwardTotal;
} else {
growthAward = monthAwardTotal - monthAward.getMonthAwardTotal();
}
result.setGrowthAward(growthAward);
//5、获取黄金树本月奖金
Double goldAward = tradeRecordMapper.queryByUserLevel(UserLevelEnum.GOLD_TREE.getCode(), new Date());
if (null == goldAward) {
result.setGoldAward(0.00);
} else {
result.setGoldAward(goldAward);
}
//6、获取农场主本月奖金
Double farmerAward = tradeRecordMapper.queryByUserLevel(UserLevelEnum.FARMER.getCode(), new Date());
if (null == farmerAward) {
result.setFarmerAward(0.00);
} else {
result.setFarmerAward(farmerAward);
}
//7、森林之星月奖金
Double startAward = tradeRecordMapper.queryByUserLevel(UserLevelEnum.FOREST_START.getCode(), new Date());
if (null == startAward) {
result.setForestStartAward(0.00);
} else {
result.setForestStartAward(startAward);
}
//8、森田合伙人月奖金
Double partnerAward = tradeRecordMapper.queryByUserLevel(UserLevelEnum.PARTNER.getCode(), new Date());
if (null == partnerAward) {
result.setPartnerAward(0.00);
} else {
result.setPartnerAward(partnerAward);
}
//9、 判断是否有本月奖金这条数据，没有，新增，有更新值
MonthAward currentMonthAward = monthAwardMapper.getByTime(currentMonth);
if (null == currentMonthAward) {
int count = monthAwardMapper.add(result);
log.info(result.getYearMonth() + "插入一条月度奖励数据!");
if (count == 0) {
return R.ok(1, false);
}
} else {
result.setId(currentMonthAward.getId());
int count = monthAwardMapper.edit(result);
log.info("更新" + result.getYearMonth() + "月度奖励数据!");
if (count == 0) {
return R.ok(1, false);
}
}
return R.ok(0, true);
}
/**
* 如果会员等级是黄金以上，计算月度收益
......
wisenergy-service/src/main/java/cn/wisenergy/service/app/impl/ProgressPrizeServiceImpl.java
View file @ 3c66f801
package cn.wisenergy.service.app.impl;
import cn.wisenergy.common.constant.CommonAttributes;
import cn.wisenergy.common.utils.DateUtil;
import cn.wisenergy.common.utils.R;
import cn.wisenergy.mapper.ProgressPrizeMapper;
import cn.wisenergy.model.app.ProgressPrize;
import cn.wisenergy.model.app.TeamPerformance;
import cn.wisenergy.model.dto.ProgressPrizeQuery;
import cn.wisenergy.model.dto.TeamQueryDto;
import cn.wisenergy.model.vo.PrizeShowVo;
import cn.wisenergy.model.vo.ProgressPrizeVo;
import cn.wisenergy.service.app.ProgressPrizeService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.github.pagehelper.PageInfo;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils;
import org.springframework.stereotype.Service;
import org.springframework.util.CollectionUtils;
import java.util.Date;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
/**
* @author 86187
......@@ -42,4 +50,54 @@ public class ProgressPrizeServiceImpl extends ServiceImpl<ProgressPrizeMapper, P
prizeShowVo.setPrizeVos(list);
return R.ok(prizeShowVo);
}
@Override
public R<PageInfo<ProgressPrize>> getList(ProgressPrizeQuery query) {
log.info("shop-mall[]ProgressPrizeServiceImpl[]getList[]input.param.query:" + query);
if (null == query) {
return R.error("入参不能为空!");
}
pageHandle(query);
Map<String, Object> map = new HashMap<>(8);
map.put("queryTime", query.getQueryTime());
if (!StringUtils.isBlank(query.getQueryTime())) {
Date date = DateUtil.convertStrToDate(query.getQueryTime(), "yyyy-MM-dd");
map.put("queryTime", date);
}
int total = baseMapper.count(map);
map.put("startNum", query.getStartNum());
map.put("endNum", query.getEndNum());
List<ProgressPrize> list = baseMapper.getList(map);
PageInfo<ProgressPrize> info = new PageInfo<>();
info.setPageSize(query.getPageSize());
info.setPageNum(query.getPageNo());
info.setTotal(total);
info.setList(list);
return R.ok(info);
}
/**
* 分页处理方法
*
* @param schemeVo 参数
*/
private void pageHandle(ProgressPrizeQuery schemeVo) {
Integer pageNum = schemeVo.getPageNo();
Integer pageSize = schemeVo.getPageSize();
if (null == pageSize || pageSize == 0) {
pageSize = 10;
}
if (null == pageNum || pageNum == 0) {
pageNum = 1;
}
Integer endNum = pageSize;
Integer startNum = (pageNum - CommonAttributes.NUM_ONE) * pageSize;
schemeVo.setEndNum(endNum);
schemeVo.setStartNum(startNum);
schemeVo.setPageNo(pageNum);
schemeVo.setPageSize(pageSize);
}
}
wisenergy-service/src/main/java/cn/wisenergy/service/app/impl/RecommendUserServiceImpl.java
View file @ 3c66f801
package cn.wisenergy.service.app.impl;
import cn.wisenergy.common.constant.CommonAttributes;
import cn.wisenergy.common.utils.DateUtil;
import cn.wisenergy.common.utils.R;
import cn.wisenergy.mapper.RecommendUserMapper;
import cn.wisenergy.mapper.UsersMapper;
import cn.wisenergy.model.app.RecommendUser;
import cn.wisenergy.model.app.User;
import cn.wisenergy.model.dto.RecommendUserDto;
import cn.wisenergy.model.dto.TeamQueryDto;
import cn.wisenergy.model.vo.RecommendUserVo;
import cn.wisenergy.model.vo.UserAndRecommendVo;
import cn.wisenergy.service.app.RecommendUserService;
import com.github.pagehelper.PageInfo;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.*;
@Service
@Slf4j
......@@ -63,4 +67,61 @@ public class RecommendUserServiceImpl implements RecommendUserService {
return userAndRecommendVos;
}
@Override
public R<PageInfo<RecommendUserVo>> getRecommendUserList(RecommendUserDto recommendUserDto) {
log.info("shop-mall[]RecommendUserServiceImpl[]getRecommendUserList[]input.param.query:" + recommendUserDto);
if (null == recommendUserDto) {
return R.error("入参不能为空!");
}
pageHandle(recommendUserDto);
Map<String, Object> map = new HashMap<>(8);
if (!StringUtils.isBlank(recommendUserDto.getUserId())) {
map.put("userId", recommendUserDto.getUserId());
}
if (!StringUtils.isBlank(recommendUserDto.getQueryTime())) {
Date date = DateUtil.convertStrToDate(recommendUserDto.getQueryTime(), "yyyy-MM-dd");
String queryTime = recommendUserDto.getQueryTime();
map.put("queryTime", queryTime);
}
int total = recommendUserMapper.count(map);
map.put("startNum", recommendUserDto.getStartNum());
map.put("endNum", recommendUserDto.getEndNum());
List<RecommendUserVo> list = recommendUserMapper.getRecommendUserList(map);
PageInfo<RecommendUserVo> info = new PageInfo<>();
info.setPageSize(recommendUserDto.getPageSize());
info.setPageNum(recommendUserDto.getPageNo());
info.setList(list);
info.setTotal(total);
return R.ok(info);
}
/**
* 分页处理方法
*
* @param schemeVo 参数
*/
private void pageHandle(RecommendUserDto schemeVo) {
Integer pageNum = schemeVo.getPageNo();
Integer pageSize = schemeVo.getPageSize();
if (null == pageSize || pageSize == 0) {
pageSize = 10;
}
if (null == pageNum || pageNum == 0) {
pageNum = 1;
}
Integer endNum = pageSize;
Integer startNum = (pageNum - CommonAttributes.NUM_ONE) * pageSize;
schemeVo.setEndNum(endNum);
schemeVo.setStartNum(startNum);
schemeVo.setPageNo(pageNum);
schemeVo.setPageSize(pageSize);
}
}
wisenergy-service/src/main/java/cn/wisenergy/service/app/impl/TeamUserInfoServiceImpl.java
View file @ 3c66f801
package cn.wisenergy.service.app.impl;
import cn.wisenergy.common.constant.CommonAttributes;
import cn.wisenergy.common.utils.DateUtil;
import cn.wisenergy.common.utils.R;
import cn.wisenergy.mapper.TeamUserInfoMapper;
import cn.wisenergy.model.app.TeamUserInfo;
import cn.wisenergy.model.dto.TeamUserInfoDto;
import cn.wisenergy.model.vo.TeamUserInfoVo;
import cn.wisenergy.service.app.TeamUserInfoService;
import com.github.pagehelper.PageInfo;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.util.Date;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@Service
@Slf4j
public class TeamUserInfoServiceImpl implements TeamUserInfoService {
......@@ -36,4 +48,60 @@ public class TeamUserInfoServiceImpl implements TeamUserInfoService {
int teamUserCount = teamUserInfoMapper.getTeamUserCount(userId);
return teamUserCount;
}
@Override
public R<PageInfo<TeamUserInfoVo>> getTeamUserInfoList(TeamUserInfoDto teamUserInfoDto) {
log.info("shop-mall[]TeamUserInfoServiceImpl[]getTeamUserInfoList[]input.param.query:" + teamUserInfoDto);
if (null == teamUserInfoDto) {
return R.error("入参不能为空!");
}
pageHandle(teamUserInfoDto);
Map<String, Object> map = new HashMap<>(8);
if (!StringUtils.isBlank(teamUserInfoDto.getUserId())) {
map.put("userId", teamUserInfoDto.getUserId());
}
if (!StringUtils.isBlank(teamUserInfoDto.getQueryTime())) {
Date date = DateUtil.convertStrToDate(teamUserInfoDto.getQueryTime(), "yyyy-MM-dd");
String queryTime = teamUserInfoDto.getQueryTime();
map.put("queryTime", queryTime);
}
int total = teamUserInfoMapper.count(map);
map.put("startNum", teamUserInfoDto.getStartNum());
map.put("endNum", teamUserInfoDto.getEndNum());
List<TeamUserInfoVo> list = teamUserInfoMapper.getTeamUserInfoList(map);
PageInfo<TeamUserInfoVo> info = new PageInfo<>();
info.setPageSize(teamUserInfoDto.getPageSize());
info.setPageNum(teamUserInfoDto.getPageNo());
info.setList(list);
info.setTotal(total);
return R.ok(info);
}
/**
* 分页处理方法
*
* @param schemeVo 参数
*/
private void pageHandle(TeamUserInfoDto schemeVo) {
Integer pageNum = schemeVo.getPageNo();
Integer pageSize = schemeVo.getPageSize();
if (null == pageSize || pageSize == 0) {
pageSize = 10;
}
if (null == pageNum || pageNum == 0) {
pageNum = 1;
}
Integer endNum = pageSize;
Integer startNum = (pageNum - CommonAttributes.NUM_ONE) * pageSize;
schemeVo.setEndNum(endNum);
schemeVo.setStartNum(startNum);
schemeVo.setPageNo(pageNum);
schemeVo.setPageSize(pageSize);
}
}
wisenergy-service/src/main/java/cn/wisenergy/service/app/impl/TradeRecordServiceImpl.java
View file @ 3c66f801
......@@ -14,6 +14,7 @@ import cn.wisenergy.model.enums.UserLevelEnum;
import cn.wisenergy.service.app.TradeRecordService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.github.pagehelper.PageInfo;
import com.xxl.job.core.handler.annotation.XxlJob;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
......@@ -38,97 +39,6 @@ public class TradeRecordServiceImpl extends ServiceImpl<TradeRecordMapper, Trade
@Autowired
private TradeRecordMapper tradeRecordMapper;
@Override
public R<Boolean> monthAwardCount() {
MonthAward result = new MonthAward();
//1、获取本月新增奖金
Double monthGrow = baseMapper.queryMonthGrow(new Date());
result.setMonthIncreased(monthGrow);
//2、获取历史奖金金额
Double awardTotal = baseMapper.queryAllAward(new Date());
result.setAwardTotal(awardTotal);
//3、本月累计奖金 =本月新增奖金+上月剩余月度肥料奖金
//获取上月剩余月度肥料奖金
Double monthAwardTotal;
Date date = DateUtil.getLastMonth(new Date());
String yearMonth = DateUtil.convertDateToStr(date, "yyyy-MM");
MonthManure monthManure = monthManureMapper.queryByTime(yearMonth);
if (null == monthManure) {
monthAwardTotal = monthGrow;
} else {
monthAwardTotal = monthGrow + monthManure.getManureAward();
}
result.setMonthAwardTotal(monthAwardTotal);
//4、较上月增长奖金 本月累计奖金-上月累计奖金
//本月
String currentMonth=DateUtil.convertDateToStr(new Date(),"yyyy-MM");
Date lastDate=DateUtil.getLastMonth(new Date());
String lastMonth=DateUtil.convertDateToStr(lastDate,"yyyy-MM");
Double growthAward;
//获取上月 累计奖金
MonthAward monthAward = monthAwardMapper.getByTime(lastMonth);
if (null == monthAward) {
growthAward = monthAwardTotal;
} else {
growthAward = monthAwardTotal - monthAward.getMonthAwardTotal();
}
result.setGrowthAward(growthAward);
//5、获取黄金树本月奖金
Double goldAward = baseMapper.queryByUserLevel(UserLevelEnum.GOLD_TREE.getCode(), new Date());
if (null == goldAward) {
result.setGoldAward(0.00);
} else {
result.setGoldAward(goldAward);
}
//6、获取农场主本月奖金
Double farmerAward = baseMapper.queryByUserLevel(UserLevelEnum.FARMER.getCode(), new Date());
if (null == farmerAward) {
result.setFarmerAward(0.00);
} else {
result.setFarmerAward(farmerAward);
}
//7、森林之星月奖金
Double startAward = baseMapper.queryByUserLevel(UserLevelEnum.FOREST_START.getCode(), new Date());
if (null == startAward) {
result.setForestStartAward(0.00);
} else {
result.setForestStartAward(startAward);
}
//8、森田合伙人月奖金
Double partnerAward = baseMapper.queryByUserLevel(UserLevelEnum.PARTNER.getCode(), new Date());
if (null == partnerAward) {
result.setPartnerAward(0.00);
} else {
result.setPartnerAward(partnerAward);
}
//9、 判断是否有本月奖金这条数据，没有，新增，有更新值
MonthAward currentMonthAward = monthAwardMapper.getByTime(currentMonth);
if (null == currentMonthAward) {
int count = monthAwardMapper.add(result);
if (count == 0) {
return R.ok(1, false);
}
} else {
result.setId(currentMonthAward.getId());
int count = monthAwardMapper.edit(result);
if (count == 0) {
return R.ok(1, false);
}
}
return R.ok(0, true);
}
@Override
public R<PageInfo<TradeRecord>> queryList(TradeRecordQuery query) {
log.info("shop-mall[]TradeRecordServiceImpl[]queryList[]input.param.query:" + query);
......
wisenergy-service/src/main/java/cn/wisenergy/service/app/impl/UploadServiceImpl.java
View file @ 3c66f801
......@@ -2,12 +2,16 @@ package cn.wisenergy.service.app.impl;
import cn.hutool.core.img.Img;
import cn.wisenergy.common.constant.CommonAttributes;
import cn.wisenergy.common.expection.BaseException;
import cn.wisenergy.common.utils.*;
import cn.wisenergy.mapper.UsersMapper;
import cn.wisenergy.mapper.userLikesMapper;
import cn.wisenergy.model.app.*;
import cn.wisenergy.model.dto.ShopZxUserDto;
import cn.wisenergy.model.vo.ShopZxUserVo;
import com.github.pagehelper.PageInfo;
import org.springframework.core.io.Resource;
import org.springframework.core.io.UrlResource;
import org.springframework.stereotype.Service;
......@@ -329,9 +333,9 @@ public class UploadServiceImpl implements UploadService {
public Map selectPage(Integer pageNum, Integer pageSize, String inviteCode) {
Map map = new HashMap();
pageNum = pageNum - 1;
List<zxUserDto> shopZxList = shopZxMapper.selectPage(pageNum, pageSize);
List<ShopZxUserVo> shopZxList = shopZxMapper.selectPage(pageNum, pageSize);
for (zxUserDto shopZx : shopZxList) {
for (ShopZxUserVo shopZx : shopZxList) {
String[] zxUrl = shopZx.getZxUrl().split(",");
ArrayList list = new ArrayList();
if (null != zxUrl) {
......@@ -371,11 +375,59 @@ public class UploadServiceImpl implements UploadService {
}
@Override
public List<zxUserVo> selectAll(Integer pageNum, Integer pageSize) {
public R<PageInfo<ShopZxUserVo>> getShopZxUserList(ShopZxUserDto shopZxUserDto) {
log.info("shop-mall[]TeamUserInfoServiceImpl[]getTeamUserInfoList[]input.param.query:" + shopZxUserDto);
if (null == shopZxUserDto) {
return R.error("入参不能为空!");
}
pageHandle(shopZxUserDto);
Map<String, Object> map = new HashMap<>(8);
if (!org.apache.commons.lang3.StringUtils.isBlank(shopZxUserDto.getUserId())) {
map.put("userId", shopZxUserDto.getUserId());
}
return shopZxMapper.selectAll(pageNum, pageSize);
int total = shopZxMapper.count(map);
map.put("startNum", shopZxUserDto.getStartNum());
map.put("endNum", shopZxUserDto.getEndNum());
List<ShopZxUserVo> list = shopZxMapper.getShopZxList(map);
PageInfo<ShopZxUserVo> info = new PageInfo<>();
info.setPageSize(shopZxUserDto.getPageSize());
info.setPageNum(shopZxUserDto.getPageNo());
info.setList(list);
info.setTotal(total);
return R.ok(info);
}
/**
* 分页处理方法
*
* @param schemeVo 参数
*/
private void pageHandle(ShopZxUserDto schemeVo) {
Integer pageNum = schemeVo.getPageNo();
Integer pageSize = schemeVo.getPageSize();
if (null == pageSize || pageSize == 0) {
pageSize = 10;
}
if (null == pageNum || pageNum == 0) {
pageNum = 1;
}
Integer endNum = pageSize;
Integer startNum = (pageNum - CommonAttributes.NUM_ONE) * pageSize;
schemeVo.setEndNum(endNum);
schemeVo.setStartNum(startNum);
schemeVo.setPageNo(pageNum);
schemeVo.setPageSize(pageSize);
}
/**
* 资讯点赞实现
*
......
wisenergy-service/src/main/java/cn/wisenergy/service/app/impl/UserLevelServiceImpl.java
View file @ 3c66f801
......@@ -6,7 +6,6 @@ import cn.wisenergy.model.enums.TradeRecordEnum;
import cn.wisenergy.service.app.AerialDeliveryUserService;
import cn.wisenergy.service.app.UserLevelService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.xxl.job.core.handler.annotation.XxlJob;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
......@@ -59,23 +58,6 @@ public class UserLevelServiceImpl extends ServiceImpl<UsersMapper, User> impleme
private static final String sysInviteCode1 = "1";
private static final String sysInviteCode2 = "88888888";
//获取订单
@XxlJob(value = "userLevelUpjobhandler")
@Override
public void userLevelUp() {
//1.获取数据库订单数据
log.info("------------------------用户升级开始----------------------------------");
List<OrderInfo> ordersByLevelStatus = orderMapper.getByLevelStatus(0);
for (OrderInfo orderInfo : ordersByLevelStatus) {
String userId = orderInfo.getUserId();
userLevelUpgrade(userId);
//当前订单升级状态置为1
orderInfo.setLevelStatus(1);
orderMapper.updateById(orderInfo);
}
log.info("-------------------------用户升级结束--------------------------------------");
}
@Override
@Transactional
public void userLevelUpgrade(String userId) {
......@@ -135,8 +117,8 @@ public class UserLevelServiceImpl extends ServiceImpl<UsersMapper, User> impleme
inviteRecommendUser.setSeedlingNum(inviteRecommendUser.getSeedlingNum() + 1);
recommendUserMapper.updateById(inviteRecommendUser);
//团队用户表数据维护
// teamUserInfoNormalToSeed(inviteUserId);
aerialDeliveryUserService.teamDataNotRecommend(userId,inviteUserId);
teamUserInfoNormalToSeed(inviteUserId);
// aerialDeliveryUserService.teamDataNotRecommend(userId,inviteUserId);
//上级用户获得幼苗等级的培育奖
int level = 1;
cultivatingPrizeToInvitedUser(userId, inviteUserId, level);
......@@ -169,8 +151,8 @@ public class UserLevelServiceImpl extends ServiceImpl<UsersMapper, User> impleme
inviteRecommendUser.setBronzeTreeNum(inviteRecommendUser.getBronzeTreeNum() + 1);
recommendUserMapper.updateById(inviteRecommendUser);
//团队用户表数据维护
// teamUserInfoSeedToBronze(inviteUserId);
aerialDeliveryUserService.teamDataNotRecommend(userId,inviteUserId);
teamUserInfoSeedToBronze(inviteUserId);
// aerialDeliveryUserService.teamDataNotRecommend(userId,inviteUserId);
//上级用户获得幼苗等级的培育奖
int level = 2;
cultivatingPrizeToInvitedUser(userId, inviteUserId, level);
......@@ -201,8 +183,8 @@ public class UserLevelServiceImpl extends ServiceImpl<UsersMapper, User> impleme
inviteRecommendUser.setSilverTreeNum(inviteRecommendUser.getSilverTreeNum() + 1);
recommendUserMapper.updateById(inviteRecommendUser);
//团队用户表数据维护
// teamUserInfoBronzeToSilver(inviteUserId);
aerialDeliveryUserService.teamDataNotRecommend(userId,inviteUserId);
teamUserInfoBronzeToSilver(inviteUserId);
// aerialDeliveryUserService.teamDataNotRecommend(userId,inviteUserId);
//上级用户获得幼苗等级的培育奖
int level = 3;
cultivatingPrizeToInvitedUser(userId, inviteUserId, level);
......@@ -272,8 +254,8 @@ public class UserLevelServiceImpl extends ServiceImpl<UsersMapper, User> impleme
inviteRecommendUser.setGoldTreeNum(inviteRecommendUser.getFarmerNum() + 1);
recommendUserMapper.updateById(inviteRecommendUser);
//团队用户表数据维护
// teamUserInfoGoldTreeToFarmer(inviteUserId);
aerialDeliveryUserService.teamDataNotRecommend(userId,inviteUserId);
teamUserInfoGoldTreeToFarmer(inviteUserId);
// aerialDeliveryUserService.teamDataNotRecommend(userId,inviteUserId);
//上级用户获得幼苗等级的培育奖
int level = 5;
cultivatingPrizeToInvitedUser(userId, inviteUserId, level);
......@@ -308,8 +290,8 @@ public class UserLevelServiceImpl extends ServiceImpl<UsersMapper, User> impleme
inviteRecommendUser.setForestStartNum(inviteRecommendUser.getForestStartNum() + 1);
recommendUserMapper.updateById(inviteRecommendUser);
//团队用户表数据维护
// teamUserInfoFarmerToForestStart(inviteUserId);
aerialDeliveryUserService.teamDataNotRecommend(userId,inviteUserId);
teamUserInfoFarmerToForestStart(inviteUserId);
// aerialDeliveryUserService.teamDataNotRecommend(userId,inviteUserId);
//上级用户获得幼苗等级的培育奖
int level = 6;
cultivatingPrizeToInvitedUser(userId, inviteUserId, level);
......@@ -345,8 +327,8 @@ public class UserLevelServiceImpl extends ServiceImpl<UsersMapper, User> impleme
inviteRecommendUser.setPartnerNum(inviteRecommendUser.getPartnerNum() + 1);
recommendUserMapper.updateById(inviteRecommendUser);
//团队用户表数据维护
// teamUserInfoForestStartToPartner(inviteUserId);
aerialDeliveryUserService.teamDataNotRecommend(userId,inviteUserId);
teamUserInfoForestStartToPartner(inviteUserId);
// aerialDeliveryUserService.teamDataNotRecommend(userId,inviteUserId);
//上级用户获得幼苗等级的培育奖
int level = 7;
cultivatingPrizeToInvitedUser(userId, inviteUserId, level);
......
wisenergy-service/src/main/java/cn/wisenergy/service/app/impl/UserLevelTaskServiceImpl.java 0 → 100644
View file @ 3c66f801
package cn.wisenergy.service.app.impl;
import cn.wisenergy.mapper.OrderMapper;
import cn.wisenergy.model.app.OrderInfo;
import cn.wisenergy.service.app.UserLevelService;
import cn.wisenergy.service.app.UserLevelTaskService;
import com.xxl.job.core.handler.annotation.XxlJob;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.util.List;
@Service
@Slf4j
public class UserLevelTaskServiceImpl implements UserLevelTaskService {
@Autowired
private OrderMapper orderMapper;
@Autowired
private UserLevelService userLevelService;
//获取订单
@XxlJob(value = "userLevelUpjobhandler")
@Override
public void userLevelUp() {
//1.获取数据库订单数据
log.info("------------------------日定时任务+5分钟执行一次+用户升级开始----------------------------------");
List<OrderInfo> ordersByLevelStatus = orderMapper.getByLevelStatus(0);
for (OrderInfo orderInfo : ordersByLevelStatus) {
String userId = orderInfo.getUserId();
userLevelService.userLevelUpgrade(userId);
//当前订单升级状态置为1
orderInfo.setLevelStatus(1);
orderMapper.updateById(orderInfo);
}
log.info("-------------------------日定时任务+5分钟执行一次+用户升级结束--------------------------------------");
}
@XxlJob("monthUserLevelUpjobhandler")
@Override
public void monthUserLevelUp(){
//1.获取数据库订单数据
log.info("------------------------月定时任务：====用户升级开始----------------------------------");
List<OrderInfo> ordersByLevelStatus = orderMapper.getByMonthOrderStatus(0);
for (OrderInfo orderInfo : ordersByLevelStatus) {
String userId = orderInfo.getUserId();
userLevelService.userLevelUpgrade(userId);
//当前订单升级状态置为1
orderInfo.setLevelStatus(1);
orderMapper.updateById(orderInfo);
}
log.info("-------------------------月定时任务：====用户升级结束--------------------------------------");
}
}
wisenergy-service/src/main/java/cn/wisenergy/service/app/impl/UserServiceImpl.java
View file @ 3c66f801
package cn.wisenergy.service.app.impl;
import cn.wisenergy.common.constant.CommonAttributes;
import cn.wisenergy.common.utils.*;
import cn.wisenergy.mapper.*;
import cn.wisenergy.model.app.*;
import cn.wisenergy.model.app.UsersDto;
import cn.wisenergy.model.dto.UsersDto;
import cn.wisenergy.model.dto.TeamQueryDto;
import cn.wisenergy.model.vo.AerialDeliveryVo;
import cn.wisenergy.model.vo.UserPoolVo;
import cn.wisenergy.service.Manager.RegistUserMoudleInitManager;
import cn.wisenergy.service.app.AerialDeliveryUserService;
import cn.wisenergy.service.app.UserLevelService;
import cn.wisenergy.service.app.UserService;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.xxl.job.core.handler.annotation.XxlJob;
import lombok.Data;
import com.github.pagehelper.PageInfo;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils;
import org.aspectj.weaver.ast.Var;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.CollectionUtils;
import java.math.BigDecimal;
import java.text.SimpleDateFormat;
import java.util.*;
/**
......@@ -148,6 +144,7 @@ public class UserServiceImpl extends ServiceImpl<UsersMapper, User> implements U
//邀请人的被邀请码
String byqm = user.getBeInvitedCode();
//通过被邀请码，比对本人邀请码查询本人id
String idb = String.valueOf(usersMapper.beInvitedCode1(beInvitedCode));
......@@ -217,17 +214,17 @@ public class UserServiceImpl extends ServiceImpl<UsersMapper, User> implements U
if (null == userIdByIntive) {
R.error(1, "用户推荐人邀请码不存在，请填写正确的邀请码");
} else {
// //上级用户的直推信息 普通用户数量+1
// RecommendUser recommendUserMapperByUserId = recommendUserMapper.getByUserId(userIdByIntive);
// Integer normalUserNum = recommendUserMapperByUserId.getNormalUserNum();
// recommendUserMapperByUserId.setNormalUserNum(normalUserNum + 1);
// recommendUserMapper.updateById(recommendUserMapperByUserId);
//上级用户的直推信息 普通用户数量+1
RecommendUser recommendUserMapperByUserId = recommendUserMapper.getByUserId(userIdByIntive);
Integer normalUserNum = recommendUserMapperByUserId.getNormalUserNum();
recommendUserMapperByUserId.setNormalUserNum(normalUserNum + 1);
recommendUserMapper.updateById(recommendUserMapperByUserId);
//通过用户的userid和推荐人邀请码 设置当前用户的上级直推数据和当前用户所在团队的团队数据
aerialDeliveryUserService.userSetBeinviteCode(userId,beInvitedCode);
// aerialDeliveryUserService.userSetBeinviteCode(userId,beInvitedCode);
}
//递归向上修改团队用户信息表
// teamUserInfo(beInvitedCode);
teamUserInfo(beInvitedCode);
Map map = new HashMap();
R.ok("注册成功！", 0);
map.put("code", 0);
......@@ -373,4 +370,66 @@ public class UserServiceImpl extends ServiceImpl<UsersMapper, User> implements U
}
return succ;
}
/**
* 用户分页查询
*
* @param queryDto 查询参数
* @return
*/
@Override
public R<PageInfo<User>> getUserList(TeamQueryDto queryDto) {
log.info("shop-mall[]UserServiceImpl[]getList[]input.param.query:" + queryDto);
if (null == queryDto) {
return R.error("入参不能为空!");
}
pageHandle(queryDto);
Map<String, Object> map = new HashMap<>(8);
if (!StringUtils.isBlank(queryDto.getUserId())) {
map.put("userId", queryDto.getUserId());
}
if (!StringUtils.isBlank(queryDto.getQueryTime())) {
Date date = DateUtil.convertStrToDate(queryDto.getQueryTime(), "yyyy-MM-dd hh:mm:ss");
map.put("queryTime", date);
}
int total = usersMapper.countUser(map);
map.put("startNum", queryDto.getStartNum());
map.put("endNum", queryDto.getEndNum());
List<User> list = usersMapper.getUserList(map);
PageInfo<User> info = new PageInfo<>();
info.setPageSize(queryDto.getPageSize());
info.setPageNum(queryDto.getPageNo());
info.setList(list);
info.setTotal(total);
return R.ok(info);
}
/**
* 分页处理方法
*
* @param schemeVo 参数
*/
private void pageHandle(TeamQueryDto schemeVo) {
Integer pageNum = schemeVo.getPageNo();
Integer pageSize = schemeVo.getPageSize();
if (null == pageSize || pageSize == 0) {
pageSize = 10;
}
if (null == pageNum || pageNum == 0) {
pageNum = 1;
}
Integer endNum = pageSize;
Integer startNum = (pageNum - CommonAttributes.NUM_ONE) * pageSize;
schemeVo.setEndNum(endNum);
schemeVo.setStartNum(startNum);
schemeVo.setPageNo(pageNum);
schemeVo.setPageSize(pageSize);
}
}
wisenergy-web-admin/pom.xml
View file @ 3c66f801
......@@ -64,6 +64,12 @@
<artifactId>thumbnailator</artifactId>
<version>0.4.8</version>
</dependency>
<!--获取服务器硬件信息-->
<dependency>
<groupId>org.fusesource</groupId>
<artifactId>sigar</artifactId>
<version>1.6.4</version>
</dependency>
</dependencies>
<!-- MAVEN构建 -->
......
wisenergy-web-admin/src/main/java/cn/wisenergy/web/admin/controller/app/AccountController.java
View file @ 3c66f801
......@@ -2,9 +2,10 @@ package cn.wisenergy.web.admin.controller.app;
import cn.wisenergy.common.utils.R;
import cn.wisenergy.model.app.AccountInfo;
import cn.wisenergy.model.app.User;
import cn.wisenergy.model.dto.AccountInfoQuery;
import cn.wisenergy.service.app.AccountService;
import cn.wisenergy.web.common.BaseController;
import com.github.pagehelper.PageInfo;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiOperation;
......@@ -14,8 +15,6 @@ import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import java.util.List;
/**
* @author 86187
*/
......@@ -34,30 +33,11 @@ public class AccountController extends BaseController {
return accountService.getByUserId(userId);
}
@ApiOperation(value = "获取账户列表信息", notes = "获取账户列表信息", httpMethod = "GET")
@ApiImplicitParam(name = "userId", value = "用户id", dataType = "String")
@GetMapping("/getByList")
public List<User> getByList(String userId) {
return accountService.getByList(userId);
}
@ApiOperation(value = "订单佣金", notes = "订单佣金", httpMethod = "GET")
@GetMapping("/orderRebate")
public R<Boolean> orderRebate() {
return accountService.orderRebate();
@ApiOperation(value = "获取账户分页列表", notes = "获取账户分页列表", httpMethod = "GET")
@ApiImplicitParam(name = "query", value = "查询条件", dataType = "AccountInfoQuery")
@GetMapping("/getList")
public R<PageInfo<AccountInfo>> getList(AccountInfoQuery query) {
return accountService.getList(query);
}
@ApiOperation(value = "月度肥料", notes = "月度肥料", httpMethod = "GET")
@GetMapping("/monthManure")
public R<Boolean> monthManure() {
return accountService.performanceCount();
}
@ApiOperation(value = "最大进步奖", notes = "最大进步奖", httpMethod = "GET")
@GetMapping("/growAward")
public R<Boolean> growAward() {
return accountService.progressPrizeCount();
}
}
wisenergy-web-admin/src/main/java/cn/wisenergy/web/admin/controller/app/BankController.java
View file @ 3c66f801
......@@ -4,6 +4,7 @@ import cn.wisenergy.common.utils.R;
import cn.wisenergy.model.app.BankInfo;
import cn.wisenergy.model.dto.WithdrawBankDto;
import cn.wisenergy.model.vo.TaxRateVo;
import cn.wisenergy.model.vo.WithdrawAuditVo;
import cn.wisenergy.service.app.BankService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
......@@ -98,4 +99,12 @@ public class BankController {
log.info("shop-mall[]BankController[]getTaxRate[]input.method");
return bankService.getTaxRate(money);
}
@ApiOperation(value = "审核提现", notes = "审核提现", httpMethod = "POST")
@ApiImplicitParam(name = "auditVo", value = "参数", dataType = "WithdrawAuditVo")
@PostMapping("/audit")
public R<Boolean> audit(@RequestBody WithdrawAuditVo auditVo) {
log.info("shop-mall[]BankController[]getTaxRate[]input.method");
return bankService.withdrawAudit(auditVo);
}
}
wisenergy-web-admin/src/main/java/cn/wisenergy/web/admin/controller/app/DayTaskController.java 0 → 100644
View file @ 3c66f801
package cn.wisenergy.web.admin.controller.app;
import cn.wisenergy.common.utils.R;
import cn.wisenergy.service.app.DayTaskService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
/**
* @author 86187
*/
@Api(tags = "日定时任务管理")
@RestController
@RequestMapping("/day")
@Slf4j
public class DayTaskController {
@Autowired
private DayTaskService dayTaskService;
@ApiOperation(value = "订单佣金", notes = "订单佣金", httpMethod = "GET")
@GetMapping("/orderRebate")
public R<Boolean> orderRebate() {
return dayTaskService.orderRebate();
}
@ApiOperation(value = "月度肥料", notes = "月度肥料", httpMethod = "GET")
@GetMapping("/monthManure")
public R<Boolean> monthManure() {
return dayTaskService.performanceCount();
}
@ApiOperation(value = "最大进步奖", notes = "最大进步奖", httpMethod = "GET")
@GetMapping("/growAward")
public R<Boolean> growAward() {
return dayTaskService.progressPrizeCount();
}
}
wisenergy-web-admin/src/main/java/cn/wisenergy/web/admin/controller/app/LoginController.java
View file @ 3c66f801
......@@ -7,7 +7,7 @@ import cn.wisenergy.common.enums.ResultEnum;
import cn.wisenergy.common.utils.*;
import cn.wisenergy.mapper.UsersMapper;
import cn.wisenergy.model.app.User;
import cn.wisenergy.model.app.UsersDto;
import cn.wisenergy.model.dto.UsersDto;
import cn.wisenergy.model.vo.UserLoginVo;
import cn.wisenergy.model.vo.UserRegisterVo;
import cn.wisenergy.service.app.LoginService;
......
wisenergy-web-admin/src/main/java/cn/wisenergy/web/admin/controller/app/MemberController.java 0 → 100644
View file @ 3c66f801
package cn.wisenergy.web.admin.controller.app;
import cn.wisenergy.common.utils.R;
import cn.wisenergy.model.app.MemberPercent;
import cn.wisenergy.model.dto.MemberPercentQuery;
import cn.wisenergy.service.app.MemberPercentService;
import com.github.pagehelper.PageInfo;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
/**
* @author 86187
*/
@Api(tags = "会员优惠比列-后台管理")
@RestController
@RequestMapping("/member")
@Slf4j
public class MemberController {
@Autowired
private MemberPercentService memberPercentService;
@ApiOperation(value = "获取会员优惠比列列表", notes = "获取会员优惠比列列表", httpMethod = "GET")
@ApiImplicitParam(name = "query", value = "查询参数", dataType = "MemberPercentQuery")
@GetMapping("/getList")
public R<PageInfo<MemberPercent>> getList(MemberPercentQuery query) {
log.info("shop-mall[]MemberController[]getList[]input.param.query:" + query);
if (null == query) {
return R.error("入参为空!");
}
return memberPercentService.getList(query);
}
}
wisenergy-web-admin/src/main/java/cn/wisenergy/web/admin/controller/app/MonthAwardController.java
View file @ 3c66f801
package cn.wisenergy.web.admin.controller.app;
import cn.wisenergy.common.utils.R;
import cn.wisenergy.model.app.MonthAward;
import cn.wisenergy.model.dto.MonthAwardQuery;
import cn.wisenergy.model.vo.MonthAwardVo;
import cn.wisenergy.service.app.MonthAwardService;
import com.github.pagehelper.PageInfo;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiOperation;
......@@ -37,4 +40,16 @@ public class MonthAwardController {
}
return monthAwardService.queryMonthAward(userId);
}
@ApiOperation(value = "获取月度奖金列表", notes = "获取月度奖金列表", httpMethod = "GET")
@ApiImplicitParam(name = "query", value = "查询参数", dataType = "MonthAwardQuery")
@GetMapping("/getList")
public R<PageInfo<MonthAward>> getList(MonthAwardQuery query) {
log.info("shop-mall[]MonthAwardController[]monthAwardQuery[]input.param.query:" + query);
if (null == query) {
return R.error("入参为空!");
}
return monthAwardService.getList(query);
}
}
wisenergy-web-admin/src/main/java/cn/wisenergy/web/admin/controller/app/MonthTaskController.java
View file @ 3c66f801
......@@ -7,6 +7,7 @@ import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
......@@ -47,4 +48,10 @@ public class MonthTaskController {
return monthTaskService.runCenterSubsidy();
}
@ApiOperation(value = "统计月度奖金", notes = "统计月度奖金", httpMethod = "POST")
@PostMapping("/monthAwardCount")
public R<Boolean> monthAwardCount() {
log.info("shop-mall[]TradeRecordController[]monthAwardCount[]input.method");
return monthTaskService.monthAwardCount();
}
}
wisenergy-web-admin/src/main/java/cn/wisenergy/web/admin/controller/app/PrizeController.java 0 → 100644
View file @ 3c66f801
package cn.wisenergy.web.admin.controller.app;
import cn.wisenergy.common.utils.R;
import cn.wisenergy.model.app.MonthAward;
import cn.wisenergy.model.app.ProgressPrize;
import cn.wisenergy.model.dto.MonthAwardQuery;
import cn.wisenergy.model.dto.ProgressPrizeQuery;
import cn.wisenergy.service.app.ProgressPrizeService;
import com.github.pagehelper.PageInfo;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
/**
* @author 86187
*/
@Api(tags = "后台管理--进步奖")
@RestController
@RequestMapping("/prize")
@Slf4j
public class PrizeController {
@Autowired
private ProgressPrizeService prizeService;
@ApiOperation(value = "获取最大进步奖列表", notes = "获取最大进步奖列表", httpMethod = "GET")
@ApiImplicitParam(name = "query", value = "查询参数", dataType = "ProgressPrizeQuery")
@GetMapping("/getList")
public R<PageInfo<ProgressPrize>> getList(ProgressPrizeQuery query) {
log.info("shop-mall[]MonthAwardController[]getList[]input.param.query:" + query);
if (null == query) {
return R.error("入参为空!");
}
return prizeService.getList(query);
}
}
wisenergy-web-admin/src/main/java/cn/wisenergy/web/admin/controller/app/SettingController.java 0 → 100644
View file @ 3c66f801
package cn.wisenergy.web.admin.controller.app;
import cn.wisenergy.common.utils.R;
import cn.wisenergy.model.vo.SetMemberPercentVo;
import cn.wisenergy.service.app.MemberPercentService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
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 86187
*/
@Api(tags = "后台管理 -- 应用设置")
@RestController
@RequestMapping("/set")
@Slf4j
public class SettingController {
@Autowired
private MemberPercentService memberPercentService;
@ApiOperation(value = "参数设置", notes = "参数设置", httpMethod = "POST")
@ApiImplicitParam(name = "percentVo", value = "参数信息", dataType = "SetMemberPercentVo")
@PostMapping("/param")
public R<Boolean> param(@RequestBody SetMemberPercentVo percentVo) {
log.info("shop-mall[]SettingController[]param[]input.param.percentVo:" + percentVo);
if (null == percentVo || null == percentVo.getPercent() ||
null == percentVo.getType() || null == percentVo.getUserLevel()) {
return R.error("入参为空!");
}
return memberPercentService.setMemberPercent(percentVo);
}
}
wisenergy-web-admin/src/main/java/cn/wisenergy/web/admin/controller/app/SysUserController.java 0 → 100644
View file @ 3c66f801
package cn.wisenergy.web.admin.controller.app;
import cn.wisenergy.common.utils.R;
import cn.wisenergy.mapper.SysUserMapper;
import cn.wisenergy.model.app.SysUser;
import cn.wisenergy.model.dto.SysLoginDto;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
/**
* @author 86187
*/
@Api(tags = "后台管理--用户登录")
@RestController
@RequestMapping("/sys")
@Slf4j
public class SysUserController {
@Autowired
private SysUserMapper sysUserMapper;
@ApiOperation(value = "登录", notes = "登录", httpMethod = "POST")
@ApiImplicitParam(name = "query", value = "登录信息", dataType = "SysLoginDto")
@PostMapping("/login")
public R<Boolean> login(@RequestBody SysLoginDto query) {
log.info("shop-mall[]SysUserController[]login[]input.param.query:" + query);
if (null == query || StringUtils.isBlank(query.getAccount()) || StringUtils.isBlank(query.getPassword())) {
return R.error("入参为空!");
}
//获取账户信息
SysUser sysUser = sysUserMapper.getByAccount(query.getAccount());
if (null == sysUser) {
return R.error("用户信息不存在!");
}
//判断账户密码是否正确
if (!query.getPassword().equals(sysUser.getPassword())) {
return R.error("密码输入错误，请从新输入!");
}
return R.ok(0, true);
}
}
wisenergy-web-admin/src/main/java/cn/wisenergy/web/admin/controller/app/TestController.java
View file @ 3c66f801
......@@ -5,6 +5,7 @@ import cn.wisenergy.common.utils.*;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
import org.hyperic.sigar.*;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.ResponseBody;
......@@ -106,6 +107,7 @@ public class TestController {
// String a= ShareCodeUtil.idToCode(1,0+1);
}
@ApiOperation(value = "测试短信服务，发送手机号", notes = "测试短信服务，发送手机号", httpMethod = "POST", produces = "application/json; charset=UTF-8")
......@@ -115,4 +117,221 @@ public class TestController {
// System.out.println(useronfig.getUserName()+"---"+useronfig.getSex());
return smsUtils.sendMessage("19919990669","SMS_212170059","2111")? ResultUtils.returnSuccess():ResultUtils.returnFail();
}
@RequestMapping("/test")
public void test() {
try {
log.info("-----------------开始-----------------");
log.info("-----------------cpu信息-----------------");
// cpu信息
cpu();
log.info("-----------------内存信息-----------------");
// 内存信息
memory();
log.info("-----------------操作系统信息-----------------");
// 操作系统信息
os();
log.info("-----------------用户信息-----------------");
// 用户信息
who();
log.info("-----------------文件系统信息-----------------");
// 文件系统信息
file();
log.info("-----------------网络信息-----------------");
// 网络信息
net();
log.info("-----------------以太网信息-----------------");
// 以太网信息
ethernet();
log.info("-----------------结束-----------------");
} catch (Exception e1) {
e1.printStackTrace();
}
}
private static void memory() throws SigarException {
Sigar sigar = new Sigar();
Mem mem = sigar.getMem();
// 内存总量
log.info("内存总量: " + mem.getTotal() / 1024L + "K av");
// 当前内存使用量
log.info("当前内存使用量: " + mem.getUsed() / 1024L + "K used");
// 当前内存剩余量
log.info("当前内存剩余量: " + mem.getFree() / 1024L + "K free");
Swap swap = sigar.getSwap();
// 交换区总量
log.info("交换区总量: " + swap.getTotal() / 1024L + "K av");
// 当前交换区使用量
log.info("当前交换区使用量: " + swap.getUsed() / 1024L + "K used");
// 当前交换区剩余量
log.info("当前交换区剩余量: " + swap.getFree() / 1024L + "K free");
}
private static void cpu() throws SigarException {
Sigar sigar = new Sigar();
CpuInfo infos[] = sigar.getCpuInfoList();
CpuPerc cpuList[] = null;
cpuList = sigar.getCpuPercList();
for (int i = 0; i < infos.length; i++) {// 不管是单块CPU还是多CPU都适用
CpuInfo info = infos[i];
log.info("第" + (i + 1) + "块CPU信息");
log.info("CPU的总量MHz: " + info.getMhz());// CPU的总量MHz
log.info("CPU生产商: " + info.getVendor());// 获得CPU的卖主，如：Intel
log.info("CPU类别: " + info.getModel());// 获得CPU的类别，如：Celeron
log.info("CPU缓存数量: " + info.getCacheSize());// 缓冲存储器数量
printCpuPerc(cpuList[i]);
}
}
private static void printCpuPerc(CpuPerc cpu) {
log.info("CPU用户使用率: " + CpuPerc.format(cpu.getUser()));// 用户使用率
log.info("CPU系统使用率: " + CpuPerc.format(cpu.getSys()));// 系统使用率
log.info("CPU当前等待率: " + CpuPerc.format(cpu.getWait()));// 当前等待率
log.info("CPU当前错误率: " + CpuPerc.format(cpu.getNice()));//
log.info("CPU当前空闲率: " + CpuPerc.format(cpu.getIdle()));// 当前空闲率
log.info("CPU总的使用率: " + CpuPerc.format(cpu.getCombined()));// 总的使用率
}
private static void os() {
OperatingSystem OS = OperatingSystem.getInstance();
// 操作系统内核类型如： 386、486、586等x86
log.info("操作系统: " + OS.getArch());
log.info("操作系统CpuEndian(): " + OS.getCpuEndian());//
log.info("操作系统DataModel(): " + OS.getDataModel());//
// 系统描述
log.info("操作系统的描述: " + OS.getDescription());
// 操作系统类型
// log.info("OS.getName(): " + OS.getName());
// log.info("OS.getPatchLevel(): " + OS.getPatchLevel());//
// 操作系统的卖主
log.info("操作系统的卖主: " + OS.getVendor());
// 卖主名称
log.info("操作系统的卖主名: " + OS.getVendorCodeName());
// 操作系统名称
log.info("操作系统名称: " + OS.getVendorName());
// 操作系统卖主类型
log.info("操作系统卖主类型: " + OS.getVendorVersion());
// 操作系统的版本号
log.info("操作系统的版本号: " + OS.getVersion());
}
private static void who() throws SigarException {
Sigar sigar = new Sigar();
Who who[] = sigar.getWhoList();
if (who != null && who.length > 0) {
for (int i = 0; i < who.length; i++) {
// log.info("当前系统进程表中的用户名" + String.valueOf(i));
Who _who = who[i];
log.info("用户控制台: " + _who.getDevice());
log.info("用户host: " + _who.getHost());
// log.info("getTime(): " + _who.getTime());
// 当前系统进程表中的用户名
log.info("当前系统进程表中的用户名: " + _who.getUser());
}
}
}
private static void file() throws Exception {
Sigar sigar = new Sigar();
FileSystem fslist[] = sigar.getFileSystemList();
for (int i = 0; i < fslist.length; i++) {
log.info("分区的盘符名称" + i);
FileSystem fs = fslist[i];
// 分区的盘符名称
log.info("盘符名称: " + fs.getDevName());
// 分区的盘符名称
log.info("盘符路径: " + fs.getDirName());
log.info("盘符标志: " + fs.getFlags());//
// 文件系统类型，比如 FAT32、NTFS
log.info("盘符类型: " + fs.getSysTypeName());
// 文件系统类型名，比如本地硬盘、光驱、网络文件系统等
log.info("盘符类型名: " + fs.getTypeName());
// 文件系统类型
log.info("盘符文件系统类型: " + fs.getType());
FileSystemUsage usage = null;
usage = sigar.getFileSystemUsage(fs.getDirName());
switch (fs.getType()) {
case 0: // TYPE_UNKNOWN ：未知
break;
case 1: // TYPE_NONE
break;
case 2: // TYPE_LOCAL_DISK : 本地硬盘
// 文件系统总大小
log.info(fs.getDevName() + "总大小: " + usage.getTotal() + "KB");
// 文件系统剩余大小
log.info(fs.getDevName() + "剩余大小: " + usage.getFree() + "KB");
// 文件系统可用大小
log.info(fs.getDevName() + "可用大小: " + usage.getAvail() + "KB");
// 文件系统已经使用量
log.info(fs.getDevName() + "已经使用量: " + usage.getUsed() + "KB");
double usePercent = usage.getUsePercent() * 100D;
// 文件系统资源的利用率
log.info(fs.getDevName() + "资源的利用率: " + usePercent + "%");
break;
case 3:// TYPE_NETWORK ：网络
break;
case 4:// TYPE_RAM_DISK ：闪存
break;
case 5:// TYPE_CDROM ：光驱
break;
case 6:// TYPE_SWAP ：页面交换
break;
}
log.info(fs.getDevName() + "读出： " + usage.getDiskReads());
log.info(fs.getDevName() + "写入： " + usage.getDiskWrites());
}
return;
}
private static void net() throws Exception {
Sigar sigar = new Sigar();
String ifNames[] = sigar.getNetInterfaceList();
for (int i = 0; i < ifNames.length; i++) {
String name = ifNames[i];
NetInterfaceConfig ifconfig = sigar.getNetInterfaceConfig(name);
log.info("网络设备名: " + name);// 网络设备名
log.info("IP地址: " + ifconfig.getAddress());// IP地址
log.info("子网掩码: " + ifconfig.getNetmask());// 子网掩码
if ((ifconfig.getFlags() & 1L) <= 0L) {
log.info("!IFF_UP...skipping getNetInterfaceStat");
continue;
}
NetInterfaceStat ifstat = sigar.getNetInterfaceStat(name);
log.info(name + "接收的总包裹数:" + ifstat.getRxPackets());// 接收的总包裹数
log.info(name + "发送的总包裹数:" + ifstat.getTxPackets());// 发送的总包裹数
log.info(name + "接收到的总字节数:" + ifstat.getRxBytes());// 接收到的总字节数
log.info(name + "发送的总字节数:" + ifstat.getTxBytes());// 发送的总字节数
log.info(name + "接收到的错误包数:" + ifstat.getRxErrors());// 接收到的错误包数
log.info(name + "发送数据包时的错误数:" + ifstat.getTxErrors());// 发送数据包时的错误数
log.info(name + "接收时丢弃的包数:" + ifstat.getRxDropped());// 接收时丢弃的包数
log.info(name + "发送时丢弃的包数:" + ifstat.getTxDropped());// 发送时丢弃的包数
}
}
private static void ethernet() throws SigarException {
Sigar sigar = null;
sigar = new Sigar();
String[] ifaces = sigar.getNetInterfaceList();
for (int i = 0; i < ifaces.length; i++) {
NetInterfaceConfig cfg = sigar.getNetInterfaceConfig(ifaces[i]);
if (NetFlags.LOOPBACK_ADDRESS.equals(cfg.getAddress()) || (cfg.getFlags() & NetFlags.IFF_LOOPBACK) != 0
|| NetFlags.NULL_HWADDR.equals(cfg.getHwaddr())) {
continue;
}
log.info(cfg.getName() + "IP地址:" + cfg.getAddress());// IP地址
log.info(cfg.getName() + "网关广播地址:" + cfg.getBroadcast());// 网关广播地址
log.info(cfg.getName() + "网卡MAC地址:" + cfg.getHwaddr());// 网卡MAC地址
log.info(cfg.getName() + "子网掩码:" + cfg.getNetmask());// 子网掩码
log.info(cfg.getName() + "网卡描述信息:" + cfg.getDescription());// 网卡描述信息
log.info(cfg.getName() + "网卡类型" + cfg.getType());//
}
}
}
wisenergy-web-admin/src/main/java/cn/wisenergy/web/admin/controller/app/TestController1.java 0 → 100644
View file @ 3c66f801
//package cn.wisenergy.web.admin.controller.app;
//
//import org.hyperic.sigar.*;
//import org.springframework.web.bind.annotation.RequestMapping;
//import org.springframework.web.bind.annotation.RestController;
//
//import lombok.extern.slf4j.Slf4j;
//
//@RestController
//@Slf4j
//public class TestController1 {
//
// @RequestMapping("/test")
// public void test() {
// try {
// log.info("-----------------开始-----------------");
// log.info("-----------------cpu信息-----------------");
// // cpu信息
// cpu();
// log.info("-----------------内存信息-----------------");
//
// // 内存信息
// memory();
// log.info("-----------------操作系统信息-----------------");
//
// // 操作系统信息
// os();
// log.info("-----------------用户信息-----------------");
//
// // 用户信息
// who();
// log.info("-----------------文件系统信息-----------------");
//
// // 文件系统信息
// file();
// log.info("-----------------网络信息-----------------");
//
// // 网络信息
// net();
// log.info("-----------------以太网信息-----------------");
// // 以太网信息
// ethernet();
// log.info("-----------------结束-----------------");
//
// } catch (Exception e1) {
// e1.printStackTrace();
// }
// }
//
// private static void memory() throws SigarException {
// Sigar sigar = new Sigar();
// Mem mem = sigar.getMem();
// // 内存总量
// log.info("内存总量: " + mem.getTotal() / 1024L + "K av");
// // 当前内存使用量
// log.info("当前内存使用量: " + mem.getUsed() / 1024L + "K used");
// // 当前内存剩余量
// log.info("当前内存剩余量: " + mem.getFree() / 1024L + "K free");
// Swap swap = sigar.getSwap();
// // 交换区总量
// log.info("交换区总量: " + swap.getTotal() / 1024L + "K av");
// // 当前交换区使用量
// log.info("当前交换区使用量: " + swap.getUsed() / 1024L + "K used");
// // 当前交换区剩余量
// log.info("当前交换区剩余量: " + swap.getFree() / 1024L + "K free");
// }
//
// private static void cpu() throws SigarException {
// Sigar sigar = new Sigar();
// CpuInfo infos[] = sigar.getCpuInfoList();
// CpuPerc cpuList[] = null;
// cpuList = sigar.getCpuPercList();
// for (int i = 0; i < infos.length; i++) {// 不管是单块CPU还是多CPU都适用
// CpuInfo info = infos[i];
// log.info("第" + (i + 1) + "块CPU信息");
// log.info("CPU的总量MHz: " + info.getMhz());// CPU的总量MHz
// log.info("CPU生产商: " + info.getVendor());// 获得CPU的卖主，如：Intel
// log.info("CPU类别: " + info.getModel());// 获得CPU的类别，如：Celeron
// log.info("CPU缓存数量: " + info.getCacheSize());// 缓冲存储器数量
// printCpuPerc(cpuList[i]);
// }
// }
//
// private static void printCpuPerc(CpuPerc cpu) {
// log.info("CPU用户使用率: " + CpuPerc.format(cpu.getUser()));// 用户使用率
// log.info("CPU系统使用率: " + CpuPerc.format(cpu.getSys()));// 系统使用率
// log.info("CPU当前等待率: " + CpuPerc.format(cpu.getWait()));// 当前等待率
// log.info("CPU当前错误率: " + CpuPerc.format(cpu.getNice()));//
// log.info("CPU当前空闲率: " + CpuPerc.format(cpu.getIdle()));// 当前空闲率
// log.info("CPU总的使用率: " + CpuPerc.format(cpu.getCombined()));// 总的使用率
// }
//
// private static void os() {
// OperatingSystem OS = OperatingSystem.getInstance();
// // 操作系统内核类型如： 386、486、586等x86
// log.info("操作系统: " + OS.getArch());
// log.info("操作系统CpuEndian(): " + OS.getCpuEndian());//
// log.info("操作系统DataModel(): " + OS.getDataModel());//
// // 系统描述
// log.info("操作系统的描述: " + OS.getDescription());
// // 操作系统类型
// // log.info("OS.getName(): " + OS.getName());
// // log.info("OS.getPatchLevel(): " + OS.getPatchLevel());//
// // 操作系统的卖主
// log.info("操作系统的卖主: " + OS.getVendor());
// // 卖主名称
// log.info("操作系统的卖主名: " + OS.getVendorCodeName());
// // 操作系统名称
// log.info("操作系统名称: " + OS.getVendorName());
// // 操作系统卖主类型
// log.info("操作系统卖主类型: " + OS.getVendorVersion());
// // 操作系统的版本号
// log.info("操作系统的版本号: " + OS.getVersion());
// }
//
// private static void who() throws SigarException {
// Sigar sigar = new Sigar();
// Who who[] = sigar.getWhoList();
// if (who != null && who.length > 0) {
// for (int i = 0; i < who.length; i++) {
// // log.info("当前系统进程表中的用户名" + String.valueOf(i));
// Who _who = who[i];
// log.info("用户控制台: " + _who.getDevice());
// log.info("用户host: " + _who.getHost());
// // log.info("getTime(): " + _who.getTime());
// // 当前系统进程表中的用户名
// log.info("当前系统进程表中的用户名: " + _who.getUser());
// }
// }
// }
//
// private static void file() throws Exception {
// Sigar sigar = new Sigar();
// FileSystem fslist[] = sigar.getFileSystemList();
// for (int i = 0; i < fslist.length; i++) {
// log.info("分区的盘符名称" + i);
// FileSystem fs = fslist[i];
// // 分区的盘符名称
// log.info("盘符名称: " + fs.getDevName());
// // 分区的盘符名称
// log.info("盘符路径: " + fs.getDirName());
// log.info("盘符标志: " + fs.getFlags());//
// // 文件系统类型，比如 FAT32、NTFS
// log.info("盘符类型: " + fs.getSysTypeName());
// // 文件系统类型名，比如本地硬盘、光驱、网络文件系统等
// log.info("盘符类型名: " + fs.getTypeName());
// // 文件系统类型
// log.info("盘符文件系统类型: " + fs.getType());
// FileSystemUsage usage = null;
// usage = sigar.getFileSystemUsage(fs.getDirName());
// switch (fs.getType()) {
// case 0: // TYPE_UNKNOWN ：未知
// break;
// case 1: // TYPE_NONE
// break;
// case 2: // TYPE_LOCAL_DISK : 本地硬盘
// // 文件系统总大小
// log.info(fs.getDevName() + "总大小: " + usage.getTotal() + "KB");
// // 文件系统剩余大小
// log.info(fs.getDevName() + "剩余大小: " + usage.getFree() + "KB");
// // 文件系统可用大小
// log.info(fs.getDevName() + "可用大小: " + usage.getAvail() + "KB");
// // 文件系统已经使用量
// log.info(fs.getDevName() + "已经使用量: " + usage.getUsed() + "KB");
// double usePercent = usage.getUsePercent() * 100D;
// // 文件系统资源的利用率
// log.info(fs.getDevName() + "资源的利用率: " + usePercent + "%");
// break;
// case 3:// TYPE_NETWORK ：网络
// break;
// case 4:// TYPE_RAM_DISK ：闪存
// break;
// case 5:// TYPE_CDROM ：光驱
// break;
// case 6:// TYPE_SWAP ：页面交换
// break;
// }
// log.info(fs.getDevName() + "读出： " + usage.getDiskReads());
// log.info(fs.getDevName() + "写入： " + usage.getDiskWrites());
// }
// return;
// }
//
// private static void net() throws Exception {
// Sigar sigar = new Sigar();
// String ifNames[] = sigar.getNetInterfaceList();
// for (int i = 0; i < ifNames.length; i++) {
// String name = ifNames[i];
// NetInterfaceConfig ifconfig = sigar.getNetInterfaceConfig(name);
// log.info("网络设备名: " + name);// 网络设备名
// log.info("IP地址: " + ifconfig.getAddress());// IP地址
// log.info("子网掩码: " + ifconfig.getNetmask());// 子网掩码
// if ((ifconfig.getFlags() & 1L) <= 0L) {
// log.info("!IFF_UP...skipping getNetInterfaceStat");
// continue;
// }
// NetInterfaceStat ifstat = sigar.getNetInterfaceStat(name);
// log.info(name + "接收的总包裹数:" + ifstat.getRxPackets());// 接收的总包裹数
// log.info(name + "发送的总包裹数:" + ifstat.getTxPackets());// 发送的总包裹数
// log.info(name + "接收到的总字节数:" + ifstat.getRxBytes());// 接收到的总字节数
// log.info(name + "发送的总字节数:" + ifstat.getTxBytes());// 发送的总字节数
// log.info(name + "接收到的错误包数:" + ifstat.getRxErrors());// 接收到的错误包数
// log.info(name + "发送数据包时的错误数:" + ifstat.getTxErrors());// 发送数据包时的错误数
// log.info(name + "接收时丢弃的包数:" + ifstat.getRxDropped());// 接收时丢弃的包数
// log.info(name + "发送时丢弃的包数:" + ifstat.getTxDropped());// 发送时丢弃的包数
// }
// }
//
// private static void ethernet() throws SigarException {
// Sigar sigar = null;
// sigar = new Sigar();
// String[] ifaces = sigar.getNetInterfaceList();
// for (int i = 0; i < ifaces.length; i++) {
// NetInterfaceConfig cfg = sigar.getNetInterfaceConfig(ifaces[i]);
// if (NetFlags.LOOPBACK_ADDRESS.equals(cfg.getAddress()) || (cfg.getFlags() & NetFlags.IFF_LOOPBACK) != 0
// || NetFlags.NULL_HWADDR.equals(cfg.getHwaddr())) {
// continue;
// }
// log.info(cfg.getName() + "IP地址:" + cfg.getAddress());// IP地址
// log.info(cfg.getName() + "网关广播地址:" + cfg.getBroadcast());// 网关广播地址
// log.info(cfg.getName() + "网卡MAC地址:" + cfg.getHwaddr());// 网卡MAC地址
// log.info(cfg.getName() + "子网掩码:" + cfg.getNetmask());// 子网掩码
// log.info(cfg.getName() + "网卡描述信息:" + cfg.getDescription());// 网卡描述信息
// log.info(cfg.getName() + "网卡类型" + cfg.getType());//
// }
// }
//}
wisenergy-web-admin/src/main/java/cn/wisenergy/web/admin/controller/app/TradeRecordController.java
View file @ 3c66f801
......@@ -33,12 +33,4 @@ public class TradeRecordController {
log.info("shop-mall[]TradeRecordController[]queryList[]input.param.query:" + query);
return tradeRecordService.queryList(query);
}
@ApiOperation(value = "统计月度奖金", notes = "统计月度奖金", httpMethod = "POST")
@PostMapping("/monthAwardCount")
public R<Boolean> monthAwardCount() {
log.info("shop-mall[]TradeRecordController[]monthAwardCount[]input.method");
return tradeRecordService.monthAwardCount();
}
}
wisenergy-web-admin/src/main/java/cn/wisenergy/web/admin/controller/app/UploadController.java
View file @ 3c66f801
package cn.wisenergy.web.admin.controller.app;
import cn.wisenergy.model.app.shopZx;
import cn.wisenergy.model.app.zxUserVo;
import cn.wisenergy.common.utils.R;
import cn.wisenergy.model.dto.ShopZxUserDto;
import cn.wisenergy.model.vo.CultivatingPrizeVo;
import cn.wisenergy.model.vo.ShopZxUserVo;
import cn.wisenergy.service.app.UploadService;
import com.github.pagehelper.PageInfo;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
......@@ -119,7 +122,7 @@ public class UploadController {
*/
@ApiOperation(value = "用户发布资讯信息点赞接口", notes = "点赞接口", httpMethod = "POST", produces = "application/json; charset=UTF-8")
@ApiImplicitParams({
@ApiImplicitParam(name = "zxid", value = "资讯ID", required = true,dataType = "integer"),
@ApiImplicitParam(name = "zxid", value = "资讯ID", required = true, dataType = "int"),
@ApiImplicitParam(name = "inviteCode", value = "用户本人邀请码（发布人）", required = true, dataType = "String")})
@RequestMapping(method = RequestMethod.POST, value = "/thumbUp")
public Map like(int zxid,String inviteCode){
......@@ -130,7 +133,7 @@ public class UploadController {
* TODO 审核接口
*/
@ApiOperation(value = "用户发布资讯信息审核接口", notes = "审核接口",produces = "application/json; charset=UTF-8")
@ApiImplicitParam(name = "zxid", value = "资讯ID", required = true,dataType = "integer")
@ApiImplicitParam(name = "zxid", value = "资讯ID", required = true, dataType = "int")
@RequestMapping(method = RequestMethod.POST, value = "/toExamine")
public Map ToExamine(int zxid){
......@@ -140,12 +143,10 @@ public class UploadController {
/**
* TODO 查询资讯单表全部数据的API
*/
@ApiOperation(value = "查询资讯单表全部数据的API", notes = "单表全部数据的API")
@ApiImplicitParams({
@ApiImplicitParam(name = "pageNum", value = "从几开始", required = true,dataType = "int"),
@ApiImplicitParam(name = "pageSize", value = "一页展示数量", required = true, dataType = "int")})
@RequestMapping(method = RequestMethod.GET, value = "/shopzxAll")
public List<zxUserVo> shopzxAll(Integer pageNum, Integer pageSize){
return uploadService.selectAll(pageNum,pageSize);
@ApiOperation(value = "后台-资讯列表", notes = "资讯列表", httpMethod = "GET")
@ApiImplicitParam(name = "query", value = "查询参数", dataType = "CultivatingPrizeDto")
@GetMapping("/queryShopZxList")
public R<PageInfo<ShopZxUserVo>> queryShopZxList(ShopZxUserDto shopZxUserDto){
return uploadService.getShopZxUserList(shopZxUserDto);
}
}
\ No newline at end of file
wisenergy-web-admin/src/main/java/cn/wisenergy/web/admin/controller/app/UserController.java
View file @ 3c66f801
......@@ -3,18 +3,14 @@ package cn.wisenergy.web.admin.controller.app;
import cn.wisenergy.common.constant.RedisConsts;
import cn.wisenergy.common.utils.R;
import cn.wisenergy.common.utils.RedisUtils;
import cn.wisenergy.model.app.RecommendUser;
import cn.wisenergy.model.app.TeamUserInfo;
import cn.wisenergy.model.app.User;
import cn.wisenergy.model.vo.AerialDeliveryVo;
import cn.wisenergy.model.vo.UserAndRecommendVo;
import cn.wisenergy.service.app.RecommendUserService;
import cn.wisenergy.service.app.TeamUserInfoService;
import cn.wisenergy.service.app.UserForestStatusService;
import cn.wisenergy.service.app.UserService;
import cn.wisenergy.model.app.*;
import cn.wisenergy.model.dto.*;
import cn.wisenergy.model.vo.*;
import cn.wisenergy.service.app.*;
import cn.wisenergy.web.common.BaseController;
import cn.wisenergy.web.config.JwtConfig;
import cn.wisenergy.web.shiro.JwtUtil;
import com.github.pagehelper.PageInfo;
import io.swagger.annotations.*;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils;
......@@ -39,6 +35,13 @@ public class UserController extends BaseController {
@Autowired
private UserService userService;
@Autowired
private CultivatingPrizeService cultivatingPrizeService;
@Autowired
private CultivatingPrizeInfoService cultivatingPrizeInfoService;
@Autowired
private UserForestStatusService userForestStatusService;
......@@ -170,4 +173,42 @@ public class UserController extends BaseController {
return userService.fillInInviteCode(userId, inviteCode);
}
@ApiOperation(value = "后台-用户列表", notes = "用户列表", httpMethod = "GET")
@ApiImplicitParam(name = "query", value = "查询参数", dataType = "TeamQueryDto")
@GetMapping("/queryUserList")
public R<PageInfo<User>> queryUserList(TeamQueryDto queryDto) {
log.info("shop-mall[]UserController[]queryUserList[]input.param.query:" + queryDto);
return userService.getUserList(queryDto);
}
@ApiOperation(value = "后台-直推用户列表", notes = "直推用户列表", httpMethod = "GET")
@ApiImplicitParam(name = "query", value = "查询参数", dataType = "RecommendUserDto")
@GetMapping("/queryRecommendUserList")
public R<PageInfo<RecommendUserVo>> queryRecommendUserList(RecommendUserDto recommendUserDto) {
log.info("shop-mall[]UserController[]queryRecommendUserList[]input.param.query:" + recommendUserDto);
return recommendUserService.getRecommendUserList(recommendUserDto);
}
@ApiOperation(value = "后台-团队用户列表", notes = "团队用户列表", httpMethod = "GET")
@ApiImplicitParam(name = "query", value = "查询参数", dataType = "TeamUserInfoDto")
@GetMapping("/queryTeamUserInfoList")
public R<PageInfo<TeamUserInfoVo>> queryTeamUserInfoList(TeamUserInfoDto teamUserInfoDto) {
log.info("shop-mall[]UserController[]queryTeamUserInfoList[]input.param.query:" + teamUserInfoDto);
return teamUserInfoService.getTeamUserInfoList(teamUserInfoDto);
}
@ApiOperation(value = "后台-培育奖记录表", notes = "培育奖记录表", httpMethod = "GET")
@ApiImplicitParam(name = "query", value = "查询参数", dataType = "CultivatingPrizeInfoDto")
@GetMapping("/queryCultivatingInfo")
public R<PageInfo<CultivatingPrizeInfoVo>> queryCultivatingPrizeInfoList(CultivatingPrizeInfoDto cultivatingPrizeInfoDto) {
log.info("shop-mall[]UserController[]queryCultivatingPrizeInfoList[]input.param.query:" + cultivatingPrizeInfoDto);
return cultivatingPrizeInfoService.getCultivatingPrizeInfoList(cultivatingPrizeInfoDto);
}
@ApiOperation(value = "后台-培育奖表列表", notes = "培育奖表列表", httpMethod = "GET")
@GetMapping("/queryCultivatingPrizeInfoList")
public R<List<CultivatingPrize>> queryCultivatingPrizeList() {
log.info("shop-mall[]UserController[]queryCultivatingPrizeList[]input.param.query:");
return cultivatingPrizeService.getCultivatingPrizeList();
}
}
wisenergy-web-admin/src/main/java/cn/wisenergy/web/common/BaseController.java
View file @ 3c66f801
package cn.wisenergy.web.common;
import cn.wisenergy.model.app.User;
import cn.wisenergy.service.app.UserService;
import cn.wisenergy.web.shiro.JwtUtil;
......
wisenergy-web-admin/src/main/java/cn/wisenergy/web/config/ShiroConfig.java
View file @ 3c66f801
......@@ -72,12 +72,14 @@ public class ShiroConfig {
filterChainDefinitionMap.put("/api/sms/verifyCode", "anon");
filterChainDefinitionMap.put("/api/sms/**", "anon");
filterChainDefinitionMap.put("/upload_flowChart/**", "anon");//图片地址
filterChainDefinitionMap.put("/webSocket/**", "anon");//socket
filterChainDefinitionMap.put("/message/**", "anon");//消息推送接口
filterChainDefinitionMap.put("/userlevel/test","anon");
filterChainDefinitionMap.put("/userlevel/test", "anon");
//后台设置
filterChainDefinitionMap.put("/set/**", "anon");
filterChainDefinitionMap.put("/customerService/uploadWeChatImg", "anon");
filterChainDefinitionMap.put("/customerService/service", "anon");
filterChainDefinitionMap.put("/**", "oauth2"); // 其他路径均需要身份认证，一般位于最下面，优先级最低
// 其他路径均需要身份认证，一般位于最下面，优先级最低
filterChainDefinitionMap.put("/**", "oauth2");
// 设置拦截器
shiroFilterFactoryBean.setFilterChainDefinitionMap(filterChainDefinitionMap);
......
wisenergy-web-admin/src/main/java/cn/wisenergy/web/config/SigarConfig.java 0 → 100644
View file @ 3c66f801
package cn.wisenergy.web.config;
import lombok.extern.slf4j.Slf4j;
import org.hyperic.jni.ArchNotSupportedException;
import org.hyperic.sigar.Sigar;
import org.hyperic.sigar.SigarLoader;
import org.springframework.context.annotation.Configuration;
import org.springframework.core.io.DefaultResourceLoader;
import org.springframework.core.io.Resource;
import org.springframework.core.io.ResourceLoader;
import java.io.*;
/**
* Created by m1991 on 2021/3/23 16:50
*/
@Slf4j
@Configuration
public class SigarConfig {
static {
try {
initSigar();
} catch (IOException e) {
e.printStackTrace();
}
}
/**
* 初始化sigar的配置文件
*/
public static void initSigar() throws IOException {
SigarLoader loader = new SigarLoader(Sigar.class);
String lib = null;
try {
lib = loader.getLibraryName();
log.info("init sigar so文件====================="+lib);
} catch (ArchNotSupportedException var7) {
log.error("initSigar() error:{}",var7.getMessage());
}
ResourceLoader resourceLoader = new DefaultResourceLoader();
Resource resource = resourceLoader.getResource("classpath:/sigar.so/" + lib);
if (resource.exists()) {
InputStream is = resource.getInputStream();
File tempDir = new File("./log");
if (!tempDir.exists()){
tempDir.mkdirs();
}
BufferedOutputStream os = new BufferedOutputStream(new FileOutputStream(new File(tempDir, lib), false));
int lentgh = 0;
while ((lentgh = is.read()) != -1){
os.write(lentgh);
}
is.close();
os.close();
System.setProperty("org.hyperic.sigar.path", tempDir.getCanonicalPath());
}
}
}
\ No newline at end of file
wisenergy-web-admin/src/main/java/cn/wisenergy/web/shiro/JwtUtil.java
View file @ 3c66f801
package cn.wisenergy.web.shiro;
import cn.wisenergy.common.enums.RespCodeEnum;
import cn.wisenergy.model.app.User;
import cn.wisenergy.web.config.JwtConfig;
import com.alibaba.fastjson.JSON;
......
wisenergy-web-admin/src/main/resources/logback-spring.xml
View file @ 3c66f801
......@@ -71,6 +71,30 @@
<!-- 项目日志 -->
<logger name="cn.wisenergy"/>
<!-- 定时任务日志配置-->
<!-- <property name="task_log_address" value="/opt"/>-->
<appender name="order_task_logs" class="ch.qos.logback.core.rolling.RollingFileAppender">
<rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
<fileNamePattern>${LOG_DIR}/${project.artifactId}/order_task-log.%d{yyyy-MM-dd}.log</fileNamePattern>
</rollingPolicy>
<encoder class="ch.qos.logback.core.encoder.LayoutWrappingEncoder">
<layout class="ch.qos.logback.classic.PatternLayout">
<pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{50} - %msg%n</pattern>
</layout>
</encoder>
<!--日志文件最大的大小 -->
<triggeringPolicy class="ch.qos.logback.core.rolling.SizeBasedTriggeringPolicy">
<MaxFileSize>10MB</MaxFileSize>
</triggeringPolicy>
</appender>
<logger name="cn.wisenergy.service.app.impl.OrderServiceImpl">
<appender-ref ref="order_task_logs"/>
</logger>
<!-- 日志根 -->
<root level="${LOG_LEVEL}">
<appender-ref ref="stdout"/>
......
wisenergy-web-admin/wisenergy-web-admin.iml
View file @ 3c66f801
......@@ -10,4 +10,216 @@
</configuration>
</facet>
</component>
<component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8">
<output url="file://$MODULE_DIR$/target/classes" />
<output-test url="file://$MODULE_DIR$/target/test-classes" />
<content url="file://$MODULE_DIR$">
<sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
<excludeFolder url="file://$MODULE_DIR$/target" />
</content>
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-web:2.4.3" level="project" />
<orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter:2.4.3" level="project" />
<orderEntry type="library" name="Maven: org.springframework.boot:spring-boot:2.4.3" level="project" />
<orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-autoconfigure:2.4.3" level="project" />
<orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-logging:2.4.3" level="project" />
<orderEntry type="library" name="Maven: org.apache.logging.log4j:log4j-to-slf4j:2.13.3" level="project" />
<orderEntry type="library" name="Maven: org.apache.logging.log4j:log4j-api:2.13.3" level="project" />
<orderEntry type="library" name="Maven: org.slf4j:jul-to-slf4j:1.7.30" level="project" />
<orderEntry type="library" name="Maven: jakarta.annotation:jakarta.annotation-api:1.3.5" level="project" />
<orderEntry type="library" name="Maven: org.springframework:spring-core:5.3.4" level="project" />
<orderEntry type="library" name="Maven: org.springframework:spring-jcl:5.3.4" level="project" />
<orderEntry type="library" name="Maven: org.yaml:snakeyaml:1.27" level="project" />
<orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-json:2.4.3" level="project" />
<orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-databind:2.11.4" level="project" />
<orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-annotations:2.11.4" level="project" />
<orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-core:2.11.4" level="project" />
<orderEntry type="library" name="Maven: com.fasterxml.jackson.datatype:jackson-datatype-jdk8:2.11.4" level="project" />
<orderEntry type="library" name="Maven: com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.11.4" level="project" />
<orderEntry type="library" name="Maven: com.fasterxml.jackson.module:jackson-module-parameter-names:2.11.4" level="project" />
<orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-tomcat:2.4.3" level="project" />
<orderEntry type="library" name="Maven: org.apache.tomcat.embed:tomcat-embed-core:9.0.43" level="project" />
<orderEntry type="library" name="Maven: org.glassfish:jakarta.el:3.0.3" level="project" />
<orderEntry type="library" name="Maven: org.apache.tomcat.embed:tomcat-embed-websocket:9.0.43" level="project" />
<orderEntry type="library" name="Maven: org.springframework:spring-web:5.3.4" level="project" />
<orderEntry type="library" name="Maven: org.springframework:spring-beans:5.3.4" level="project" />
<orderEntry type="library" name="Maven: org.springframework:spring-webmvc:5.3.4" level="project" />
<orderEntry type="library" name="Maven: org.springframework:spring-aop:5.3.4" level="project" />
<orderEntry type="library" name="Maven: org.springframework:spring-context:5.3.4" level="project" />
<orderEntry type="library" name="Maven: org.springframework:spring-expression:5.3.4" level="project" />
<orderEntry type="module" module-name="wisenergy-service" />
<orderEntry type="module" module-name="wisenergy-mapper" />
<orderEntry type="module" module-name="wisenergy-model" />
<orderEntry type="module" module-name="wisenergy-common" />
<orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-undertow:2.4.3" level="project" />
<orderEntry type="library" name="Maven: io.undertow:undertow-core:2.2.4.Final" level="project" />
<orderEntry type="library" name="Maven: org.jboss.logging:jboss-logging:3.4.1.Final" level="project" />
<orderEntry type="library" name="Maven: org.jboss.xnio:xnio-api:3.8.0.Final" level="project" />
<orderEntry type="library" name="Maven: org.wildfly.common:wildfly-common:1.5.2.Final" level="project" />
<orderEntry type="library" name="Maven: org.wildfly.client:wildfly-client-config:1.0.1.Final" level="project" />
<orderEntry type="library" scope="RUNTIME" name="Maven: org.jboss.xnio:xnio-nio:3.8.0.Final" level="project" />
<orderEntry type="library" name="Maven: org.jboss.threads:jboss-threads:3.1.0.Final" level="project" />
<orderEntry type="library" name="Maven: io.undertow:undertow-servlet:2.2.4.Final" level="project" />
<orderEntry type="library" name="Maven: org.jboss.spec.javax.annotation:jboss-annotations-api_1.3_spec:2.0.1.Final" level="project" />
<orderEntry type="library" name="Maven: io.undertow:undertow-websockets-jsr:2.2.4.Final" level="project" />
<orderEntry type="library" name="Maven: org.jboss.spec.javax.websocket:jboss-websocket-api_1.1_spec:2.0.0.Final" level="project" />
<orderEntry type="library" name="Maven: jakarta.servlet:jakarta.servlet-api:4.0.4" level="project" />
<orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-aop:2.4.3" level="project" />
<orderEntry type="library" name="Maven: org.aspectj:aspectjweaver:1.9.6" level="project" />
<orderEntry type="library" name="Maven: org.mybatis.spring.boot:mybatis-spring-boot-starter:2.1.4" level="project" />
<orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-jdbc:2.4.3" level="project" />
<orderEntry type="library" name="Maven: com.zaxxer:HikariCP:3.4.5" level="project" />
<orderEntry type="library" name="Maven: org.springframework:spring-jdbc:5.3.4" level="project" />
<orderEntry type="library" name="Maven: org.mybatis.spring.boot:mybatis-spring-boot-autoconfigure:2.1.4" level="project" />
<orderEntry type="library" name="Maven: org.mybatis:mybatis:3.5.6" level="project" />
<orderEntry type="library" name="Maven: org.mybatis:mybatis-spring:2.0.6" level="project" />
<orderEntry type="library" name="Maven: com.github.pagehelper:pagehelper-spring-boot-starter:1.3.0" level="project" />
<orderEntry type="library" name="Maven: com.github.pagehelper:pagehelper-spring-boot-autoconfigure:1.3.0" level="project" />
<orderEntry type="library" name="Maven: com.github.pagehelper:pagehelper:5.2.0" level="project" />
<orderEntry type="library" name="Maven: com.github.jsqlparser:jsqlparser:3.2" level="project" />
<orderEntry type="library" name="Maven: mysql:mysql-connector-java:8.0.23" level="project" />
<orderEntry type="library" name="Maven: com.baomidou:mybatis-plus-boot-starter:3.3.2" level="project" />
<orderEntry type="library" name="Maven: com.baomidou:mybatis-plus:3.3.2" level="project" />
<orderEntry type="library" name="Maven: com.baomidou:mybatis-plus-extension:3.3.2" level="project" />
<orderEntry type="library" name="Maven: com.baomidou:mybatis-plus-core:3.3.2" level="project" />
<orderEntry type="library" name="Maven: com.baomidou:mybatis-plus-annotation:3.3.2" level="project" />
<orderEntry type="library" name="Maven: com.alibaba:druid-spring-boot-starter:1.2.5" level="project" />
<orderEntry type="library" name="Maven: com.alibaba:druid:1.2.5" level="project" />
<orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-data-redis:2.4.3" level="project" />
<orderEntry type="library" name="Maven: org.springframework.data:spring-data-redis:2.4.5" level="project" />
<orderEntry type="library" name="Maven: org.springframework.data:spring-data-keyvalue:2.4.5" level="project" />
<orderEntry type="library" name="Maven: org.springframework.data:spring-data-commons:2.4.5" level="project" />
<orderEntry type="library" name="Maven: org.springframework:spring-tx:5.3.4" level="project" />
<orderEntry type="library" name="Maven: org.springframework:spring-oxm:5.3.4" level="project" />
<orderEntry type="library" name="Maven: org.springframework:spring-context-support:5.3.4" level="project" />
<orderEntry type="library" name="Maven: io.lettuce:lettuce-core:6.0.2.RELEASE" level="project" />
<orderEntry type="library" name="Maven: io.netty:netty-common:4.1.59.Final" level="project" />
<orderEntry type="library" name="Maven: io.netty:netty-handler:4.1.59.Final" level="project" />
<orderEntry type="library" name="Maven: io.netty:netty-resolver:4.1.59.Final" level="project" />
<orderEntry type="library" name="Maven: io.netty:netty-buffer:4.1.59.Final" level="project" />
<orderEntry type="library" name="Maven: io.netty:netty-codec:4.1.59.Final" level="project" />
<orderEntry type="library" name="Maven: io.netty:netty-transport:4.1.59.Final" level="project" />
<orderEntry type="library" name="Maven: io.projectreactor:reactor-core:3.4.3" level="project" />
<orderEntry type="library" name="Maven: org.reactivestreams:reactive-streams:1.0.3" level="project" />
<orderEntry type="library" name="Maven: io.springfox:springfox-swagger2:2.9.2" level="project" />
<orderEntry type="library" name="Maven: io.springfox:springfox-spi:2.9.2" level="project" />
<orderEntry type="library" name="Maven: io.springfox:springfox-core:2.9.2" level="project" />
<orderEntry type="library" name="Maven: net.bytebuddy:byte-buddy:1.10.20" level="project" />
<orderEntry type="library" name="Maven: io.springfox:springfox-schema:2.9.2" level="project" />
<orderEntry type="library" name="Maven: io.springfox:springfox-swagger-common:2.9.2" level="project" />
<orderEntry type="library" name="Maven: io.springfox:springfox-spring-web:2.9.2" level="project" />
<orderEntry type="library" name="Maven: com.fasterxml:classmate:1.5.1" level="project" />
<orderEntry type="library" name="Maven: org.springframework.plugin:spring-plugin-core:1.2.0.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.springframework.plugin:spring-plugin-metadata:1.2.0.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.mapstruct:mapstruct:1.2.0.Final" level="project" />
<orderEntry type="library" name="Maven: io.springfox:springfox-swagger-ui:2.9.2" level="project" />
<orderEntry type="library" name="Maven: io.swagger:swagger-annotations:1.6.2" level="project" />
<orderEntry type="library" name="Maven: io.swagger:swagger-models:1.6.2" level="project" />
<orderEntry type="library" name="Maven: io.jsonwebtoken:jjwt:0.9.1" level="project" />
<orderEntry type="library" name="Maven: joda-time:joda-time:2.10.8" level="project" />
<orderEntry type="library" name="Maven: org.apache.poi:poi:3.9" level="project" />
<orderEntry type="library" name="Maven: org.apache.poi:poi-ooxml:3.9" level="project" />
<orderEntry type="library" name="Maven: dom4j:dom4j:1.6.1" level="project" />
<orderEntry type="library" name="Maven: xml-apis:xml-apis:1.0.b2" level="project" />
<orderEntry type="library" name="Maven: org.apache.poi:poi-ooxml-schemas:3.9" level="project" />
<orderEntry type="library" name="Maven: org.apache.xmlbeans:xmlbeans:2.3.0" level="project" />
<orderEntry type="library" name="Maven: stax:stax-api:1.0.1" level="project" />
<orderEntry type="library" name="Maven: commons-lang:commons-lang:2.6" level="project" />
<orderEntry type="library" name="Maven: com.google.guava:guava:30.1-jre" level="project" />
<orderEntry type="library" name="Maven: com.google.guava:failureaccess:1.0.1" level="project" />
<orderEntry type="library" name="Maven: com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava" level="project" />
<orderEntry type="library" name="Maven: com.google.code.findbugs:jsr305:3.0.2" level="project" />
<orderEntry type="library" name="Maven: org.checkerframework:checker-qual:3.5.0" level="project" />
<orderEntry type="library" name="Maven: com.google.errorprone:error_prone_annotations:2.3.4" level="project" />
<orderEntry type="library" name="Maven: com.google.j2objc:j2objc-annotations:1.3" level="project" />
<orderEntry type="library" name="Maven: com.hikvision.ga:artemis-http-client:1.1.3" level="project" />
<orderEntry type="library" name="Maven: org.apache.commons:commons-lang3:3.1" level="project" />
<orderEntry type="library" name="Maven: ch.qos.logback:logback-core:1.2.3" level="project" />
<orderEntry type="library" name="Maven: ch.qos.logback:logback-classic:1.2.3" level="project" />
<orderEntry type="library" name="Maven: org.jetbrains:annotations:20.1.0" level="project" />
<orderEntry type="library" name="Maven: com.alipay.sdk:alipay-sdk-java:4.11.66.ALL" level="project" />
<orderEntry type="library" name="Maven: com.alibaba:fastjson:1.2.75" level="project" />
<orderEntry type="library" name="Maven: org.bouncycastle:bcprov-jdk15on:1.62" level="project" />
<orderEntry type="library" name="Maven: com.squareup.okhttp3:okhttp:3.14.9" level="project" />
<orderEntry type="library" name="Maven: com.squareup.okio:okio:1.17.2" level="project" />
<orderEntry type="library" name="Maven: com.github.wechatpay-apiv3:wechatpay-apache-httpclient:0.2.1" level="project" />
<orderEntry type="library" scope="RUNTIME" name="Maven: org.apache.httpcomponents:httpmime:4.5.13" level="project" />
<orderEntry type="library" name="Maven: com.itextpdf:itextpdf:5.5.13" level="project" />
<orderEntry type="library" name="Maven: com.itextpdf:itext-asian:5.2.0" level="project" />
<orderEntry type="library" name="Maven: com.youzan.cloud:open-sdk-core:1.0.7-RELEASE" level="project" />
<orderEntry type="library" name="Maven: com.youzan.cloud:open-sdk-gen:1.0.7.78771202102051104-RELEASE" level="project" />
<orderEntry type="library" name="Maven: com.youzan.cloud:open-sdk-api:1.0.7-RELEASE" level="project" />
<orderEntry type="library" name="Maven: com.youzan.cloud:open-sdk-common:1.0.7-RELEASE" level="project" />
<orderEntry type="library" name="Maven: com.xuxueli:xxl-job-core:2.3.0" level="project" />
<orderEntry type="library" name="Maven: io.netty:netty-all:4.1.59.Final" level="project" />
<orderEntry type="library" name="Maven: org.codehaus.groovy:groovy:2.5.14" level="project" />
<orderEntry type="library" name="Maven: org.bytedeco:javacv:1.4.3" level="project" />
<orderEntry type="library" name="Maven: org.bytedeco:javacpp:1.4.3" level="project" />
<orderEntry type="library" name="Maven: org.bytedeco.javacpp-presets:opencv:3.4.3-1.4.3" level="project" />
<orderEntry type="library" name="Maven: org.bytedeco.javacpp-presets:ffmpeg:4.0.2-1.4.3" level="project" />
<orderEntry type="library" name="Maven: org.bytedeco.javacpp-presets:flycapture:2.11.3.121-1.4.3" level="project" />
<orderEntry type="library" name="Maven: org.bytedeco.javacpp-presets:libdc1394:2.2.5-1.4.3" level="project" />
<orderEntry type="library" name="Maven: org.bytedeco.javacpp-presets:libfreenect:0.5.3-1.4.3" level="project" />
<orderEntry type="library" name="Maven: org.bytedeco.javacpp-presets:libfreenect2:0.2.0-1.4.3" level="project" />
<orderEntry type="library" name="Maven: org.bytedeco.javacpp-presets:librealsense:1.12.1-1.4.3" level="project" />
<orderEntry type="library" name="Maven: org.bytedeco.javacpp-presets:videoinput:0.200-1.4.3" level="project" />
<orderEntry type="library" name="Maven: org.bytedeco.javacpp-presets:artoolkitplus:2.3.1-1.4.3" level="project" />
<orderEntry type="library" name="Maven: org.bytedeco.javacpp-presets:flandmark:1.07-1.4.3" level="project" />
<orderEntry type="library" name="Maven: org.bytedeco.javacpp-presets:leptonica:1.76.0-1.4.3" level="project" />
<orderEntry type="library" name="Maven: org.bytedeco.javacpp-presets:tesseract:4.0.0-rc2-1.4.3" level="project" />
<orderEntry type="library" name="Maven: org.bytedeco.javacpp-presets:ffmpeg-platform:4.0.2-1.4.3" level="project" />
<orderEntry type="library" name="Maven: org.bytedeco.javacpp-presets:ffmpeg:android-arm:4.0.2-1.4.3" level="project" />
<orderEntry type="library" name="Maven: org.bytedeco.javacpp-presets:ffmpeg:android-arm64:4.0.2-1.4.3" level="project" />
<orderEntry type="library" name="Maven: org.bytedeco.javacpp-presets:ffmpeg:android-x86:4.0.2-1.4.3" level="project" />
<orderEntry type="library" name="Maven: org.bytedeco.javacpp-presets:ffmpeg:android-x86_64:4.0.2-1.4.3" level="project" />
<orderEntry type="library" name="Maven: org.bytedeco.javacpp-presets:ffmpeg:linux-x86:4.0.2-1.4.3" level="project" />
<orderEntry type="library" name="Maven: org.bytedeco.javacpp-presets:ffmpeg:linux-x86_64:4.0.2-1.4.3" level="project" />
<orderEntry type="library" name="Maven: org.bytedeco.javacpp-presets:ffmpeg:linux-armhf:4.0.2-1.4.3" level="project" />
<orderEntry type="library" name="Maven: org.bytedeco.javacpp-presets:ffmpeg:linux-ppc64le:4.0.2-1.4.3" level="project" />
<orderEntry type="library" name="Maven: org.bytedeco.javacpp-presets:ffmpeg:macosx-x86_64:4.0.2-1.4.3" level="project" />
<orderEntry type="library" name="Maven: org.bytedeco.javacpp-presets:ffmpeg:windows-x86:4.0.2-1.4.3" level="project" />
<orderEntry type="library" name="Maven: org.bytedeco.javacpp-presets:ffmpeg:windows-x86_64:4.0.2-1.4.3" level="project" />
<orderEntry type="library" name="Maven: org.apache.shiro:shiro-spring:1.7.1" level="project" />
<orderEntry type="library" name="Maven: org.apache.shiro:shiro-core:1.7.1" level="project" />
<orderEntry type="library" name="Maven: org.apache.shiro:shiro-lang:1.7.1" level="project" />
<orderEntry type="library" name="Maven: org.apache.shiro:shiro-cache:1.7.1" level="project" />
<orderEntry type="library" name="Maven: org.apache.shiro:shiro-crypto-hash:1.7.1" level="project" />
<orderEntry type="library" name="Maven: org.apache.shiro:shiro-crypto-core:1.7.1" level="project" />
<orderEntry type="library" name="Maven: org.apache.shiro:shiro-crypto-cipher:1.7.1" level="project" />
<orderEntry type="library" name="Maven: org.apache.shiro:shiro-config-core:1.7.1" level="project" />
<orderEntry type="library" name="Maven: org.apache.shiro:shiro-config-ogdl:1.7.1" level="project" />
<orderEntry type="library" name="Maven: commons-beanutils:commons-beanutils:1.9.4" level="project" />
<orderEntry type="library" name="Maven: commons-collections:commons-collections:3.2.2" level="project" />
<orderEntry type="library" name="Maven: org.apache.shiro:shiro-event:1.7.1" level="project" />
<orderEntry type="library" name="Maven: org.apache.shiro:shiro-web:1.7.1" level="project" />
<orderEntry type="library" name="Maven: org.owasp.encoder:encoder:1.2.2" level="project" />
<orderEntry type="library" name="Maven: com.aliyun:aliyun-java-sdk-core:4.5.3" level="project" />
<orderEntry type="library" name="Maven: com.google.code.gson:gson:2.8.6" level="project" />
<orderEntry type="library" name="Maven: org.apache.httpcomponents:httpclient:4.5.12" level="project" />
<orderEntry type="library" name="Maven: commons-codec:commons-codec:1.15" level="project" />
<orderEntry type="library" name="Maven: org.apache.httpcomponents:httpcore:4.4.13" level="project" />
<orderEntry type="library" name="Maven: commons-logging:commons-logging:1.2" level="project" />
<orderEntry type="library" name="Maven: javax.xml.bind:jaxb-api:2.3.1" level="project" />
<orderEntry type="library" name="Maven: javax.activation:javax.activation-api:1.2.0" level="project" />
<orderEntry type="library" name="Maven: org.jacoco:org.jacoco.agent:runtime:0.8.5" level="project" />
<orderEntry type="library" name="Maven: org.ini4j:ini4j:0.5.4" level="project" />
<orderEntry type="library" name="Maven: org.slf4j:slf4j-api:1.7.30" level="project" />
<orderEntry type="library" name="Maven: io.opentracing:opentracing-api:0.33.0" level="project" />
<orderEntry type="library" name="Maven: io.opentracing:opentracing-util:0.33.0" level="project" />
<orderEntry type="library" name="Maven: io.opentracing:opentracing-noop:0.33.0" level="project" />
<orderEntry type="library" name="Maven: cn.hutool:hutool-all:4.6.17" level="project" />
<orderEntry type="library" name="Maven: com.google.zxing:javase:3.4.1" level="project" />
<orderEntry type="library" name="Maven: com.google.zxing:core:3.4.1" level="project" />
<orderEntry type="library" name="Maven: com.beust:jcommander:1.78" level="project" />
<orderEntry type="library" scope="RUNTIME" name="Maven: com.github.jai-imageio:jai-imageio-core:1.4.0" level="project" />
<orderEntry type="library" name="Maven: commons-fileupload:commons-fileupload:1.4" level="project" />
<orderEntry type="library" name="Maven: commons-io:commons-io:2.8.0" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Maven: javax.servlet:javax.servlet-api:4.0.1" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Maven: org.projectlombok:lombok:1.18.18" level="project" />
<orderEntry type="library" name="Maven: net.coobird:thumbnailator:0.4.8" level="project" />
<orderEntry type="library" name="Maven: org.fusesource:sigar:1.6.4" level="project" />
<orderEntry type="library" name="Maven: log4j:log4j:1.2.15" level="project" />
</component>
</module>
\ No newline at end of file
Markdown is supported
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