新增获取购买量趋势接口

carbon-service/carbon-manager-client/carbon-manager-client.iml

@@ -1,217 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
-  <component name="FacetManager">
-    <facet type="Spring" name="Spring">
-      <configuration />
-    </facet>
-    <facet type="web" name="Web">
-      <configuration>
-        <webroots />
-        <sourceRoots>
-          <root url="file://$MODULE_DIR$/src/main/java" />
-          <root url="file://$MODULE_DIR$/src/main/resources" />
-        </sourceRoots>
-      </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" />
-      <sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
-      <excludeFolder url="file://$MODULE_DIR$/target" />
-    </content>
-    <orderEntry type="inheritedJdk" />
-    <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="module" module-name="common-core" />
-    <orderEntry type="library" name="Maven: org.springframework.cloud:spring-cloud-starter-hystrix:1.4.6.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.cloud:spring-cloud-starter-netflix-hystrix:1.4.6.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.cloud:spring-cloud-starter:1.3.5.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.cloud:spring-cloud-context:1.3.5.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.security:spring-security-rsa:1.0.3.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.cloud:spring-cloud-netflix-core:1.4.6.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.cloud:spring-cloud-starter-netflix-archaius:1.4.6.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: com.netflix.archaius:archaius-core:0.7.4" level="project" />
-    <orderEntry type="library" scope="RUNTIME" name="Maven: com.google.code.findbugs:jsr305:3.0.1" level="project" />
-    <orderEntry type="library" name="Maven: commons-configuration:commons-configuration:1.10" level="project" />
-    <orderEntry type="library" name="Maven: commons-lang:commons-lang:2.6" level="project" />
-    <orderEntry type="library" name="Maven: com.netflix.hystrix:hystrix-core:1.5.12" level="project" />
-    <orderEntry type="library" name="Maven: io.reactivex:rxjava:1.2.0" level="project" />
-    <orderEntry type="library" name="Maven: org.hdrhistogram:HdrHistogram:2.1.9" level="project" />
-    <orderEntry type="library" name="Maven: com.netflix.hystrix:hystrix-metrics-event-stream:1.5.12" level="project" />
-    <orderEntry type="library" scope="RUNTIME" name="Maven: com.netflix.hystrix:hystrix-serialization:1.5.12" level="project" />
-    <orderEntry type="library" scope="RUNTIME" name="Maven: com.fasterxml.jackson.module:jackson-module-afterburner:2.8.11" level="project" />
-    <orderEntry type="library" name="Maven: com.netflix.hystrix:hystrix-javanica:1.5.12" level="project" />
-    <orderEntry type="library" name="Maven: org.aspectj:aspectjweaver:1.8.13" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter:2.2.3.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-logging:1.5.18.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: ch.qos.logback:logback-classic:1.1.11" level="project" />
-    <orderEntry type="library" name="Maven: ch.qos.logback:logback-core:1.1.11" level="project" />
-    <orderEntry type="library" name="Maven: org.slf4j:jul-to-slf4j:1.7.25" level="project" />
-    <orderEntry type="library" name="Maven: org.slf4j:log4j-over-slf4j:1.7.25" level="project" />
-    <orderEntry type="library" name="Maven: jakarta.annotation:jakarta.annotation-api:1.3.5" level="project" />
-    <orderEntry type="library" scope="RUNTIME" name="Maven: org.yaml:snakeyaml:1.17" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-web:1.5.18.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-tomcat:1.5.18.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.tomcat.embed:tomcat-embed-core:8.5.35" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.tomcat:tomcat-annotations-api:8.5.35" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.tomcat.embed:tomcat-embed-el:8.5.35" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.tomcat.embed:tomcat-embed-websocket:8.5.35" level="project" />
-    <orderEntry type="library" name="Maven: org.hibernate:hibernate-validator:5.3.6.Final" level="project" />
-    <orderEntry type="library" name="Maven: javax.validation:validation-api:1.1.0.Final" level="project" />
-    <orderEntry type="library" name="Maven: org.jboss.logging:jboss-logging:3.3.2.Final" level="project" />
-    <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-databind:2.8.11.3" level="project" />
-    <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-core:2.8.11" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-web:4.3.21.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-webmvc:4.3.21.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-expression:4.3.21.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.cloud:spring-cloud-starter-feign:1.4.6.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.cloud:spring-cloud-starter-openfeign:1.4.6.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.cloud:spring-cloud-commons:1.3.5.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.security:spring-security-crypto:4.2.10.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: io.github.openfeign:feign-core:9.5.0" level="project" />
-    <orderEntry type="library" name="Maven: org.jvnet:animal-sniffer-annotation:1.0" level="project" />
-    <orderEntry type="library" name="Maven: io.github.openfeign:feign-slf4j:9.5.0" level="project" />
-    <orderEntry type="library" name="Maven: io.github.openfeign:feign-hystrix:9.5.0" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.cloud:spring-cloud-starter-netflix-ribbon:1.4.6.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: com.netflix.ribbon:ribbon:2.2.5" level="project" />
-    <orderEntry type="library" scope="RUNTIME" name="Maven: com.netflix.ribbon:ribbon-transport:2.2.5" level="project" />
-    <orderEntry type="library" scope="RUNTIME" name="Maven: io.reactivex:rxnetty-contexts:0.4.9" level="project" />
-    <orderEntry type="library" scope="RUNTIME" name="Maven: io.reactivex:rxnetty-servo:0.4.9" level="project" />
-    <orderEntry type="library" scope="RUNTIME" name="Maven: javax.inject:javax.inject:1" level="project" />
-    <orderEntry type="library" scope="RUNTIME" name="Maven: io.reactivex:rxnetty:0.4.9" level="project" />
-    <orderEntry type="library" name="Maven: com.netflix.ribbon:ribbon-core:2.2.5" level="project" />
-    <orderEntry type="library" name="Maven: com.netflix.ribbon:ribbon-httpclient:2.2.5" level="project" />
-    <orderEntry type="library" scope="RUNTIME" name="Maven: com.sun.jersey:jersey-client:1.19.1" level="project" />
-    <orderEntry type="library" scope="RUNTIME" name="Maven: com.sun.jersey:jersey-core:1.19.1" level="project" />
-    <orderEntry type="library" scope="RUNTIME" name="Maven: javax.ws.rs:jsr311-api:1.1.1" level="project" />
-    <orderEntry type="library" scope="RUNTIME" name="Maven: com.sun.jersey.contribs:jersey-apache-client4:1.19.1" level="project" />
-    <orderEntry type="library" scope="RUNTIME" name="Maven: com.netflix.servo:servo-core:0.10.1" level="project" />
-    <orderEntry type="library" scope="RUNTIME" name="Maven: com.netflix.servo:servo-internal:0.10.1" level="project" />
-    <orderEntry type="library" scope="RUNTIME" name="Maven: com.netflix.netflix-commons:netflix-commons-util:0.1.1" level="project" />
-    <orderEntry type="library" name="Maven: com.netflix.ribbon:ribbon-loadbalancer:2.2.5" level="project" />
-    <orderEntry type="library" scope="RUNTIME" name="Maven: com.netflix.netflix-commons:netflix-statistics:0.1.1" level="project" />
-    <orderEntry type="library" name="Maven: com.alibaba:fastjson:1.2.58" level="project" />
-    <orderEntry type="library" name="Maven: net.sf.dozer:dozer:5.5.1" level="project" />
-    <orderEntry type="library" name="Maven: commons-beanutils:commons-beanutils:1.9.3" level="project" />
-    <orderEntry type="library" name="Maven: commons-collections:commons-collections:3.2.2" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.commons:commons-lang3:3.6" level="project" />
-    <orderEntry type="library" name="Maven: org.slf4j:jcl-over-slf4j:1.7.25" level="project" />
-    <orderEntry type="library" name="Maven: io.jsonwebtoken:jjwt:0.9.0" level="project" />
-    <orderEntry type="library" name="Maven: net.sourceforge.jexcelapi:jxl:2.6.12" level="project" />
-    <orderEntry type="library" name="Maven: log4j:log4j:1.2.14" level="project" />
-    <orderEntry type="library" name="Maven: commons-net:commons-net:3.1" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-data-redis:1.5.18.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.data:spring-data-redis:1.8.17.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.data:spring-data-keyvalue:1.2.17.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.data:spring-data-commons:1.13.17.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-tx:4.3.21.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-oxm:4.3.21.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-context-support:4.3.21.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: redis.clients:jedis:2.9.0" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.commons:commons-pool2:2.4.3" level="project" />
-    <orderEntry type="library" name="Maven: com.github.binarywang:weixin-java-mp:3.1.0" level="project" />
-    <orderEntry type="library" name="Maven: com.github.binarywang:weixin-java-common:3.1.0" level="project" />
-    <orderEntry type="library" name="Maven: com.thoughtworks.xstream:xstream:1.4.10" level="project" />
-    <orderEntry type="library" name="Maven: xmlpull:xmlpull:1.1.3.1" level="project" />
-    <orderEntry type="library" name="Maven: xpp3:xpp3_min:1.1.4c" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpmime:4.5.6" level="project" />
-    <orderEntry type="library" name="Maven: commons-io:commons-io:2.5" level="project" />
-    <orderEntry type="library" name="Maven: com.github.binarywang:weixin-java-pay:3.1.0" level="project" />
-    <orderEntry type="library" name="Maven: com.github.binarywang:qrcode-utils:1.1" level="project" />
-    <orderEntry type="library" name="Maven: org.jodd:jodd-http:3.7.1" level="project" />
-    <orderEntry type="library" name="Maven: org.jodd:jodd-core:3.7.1" level="project" />
-    <orderEntry type="library" name="Maven: org.jodd:jodd-upload:3.7.1" level="project" />
-    <orderEntry type="library" name="Maven: org.bouncycastle:bcpkix-jdk15on:1.59" level="project" />
-    <orderEntry type="library" name="Maven: org.bouncycastle:bcprov-jdk15on:1.59" level="project" />
-    <orderEntry type="library" name="Maven: com.google.zxing:core:3.3.0" level="project" />
-    <orderEntry type="library" name="Maven: com.google.zxing:javase:3.3.3" level="project" />
-    <orderEntry type="library" name="Maven: com.beust:jcommander:1.72" 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: com.belerweb:pinyin4j:2.5.0" level="project" />
-    <orderEntry type="library" name="Maven: com.aliyun:aliyun-java-sdk-core:4.0.3" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpclient:4.5.6" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpcore:4.4.10" level="project" />
-    <orderEntry type="library" name="Maven: javax.xml.bind:jaxb-api:2.1" level="project" />
-    <orderEntry type="library" name="Maven: javax.xml.stream:stax-api:1.0-2" level="project" />
-    <orderEntry type="library" name="Maven: com.sun.xml.bind:jaxb-core:2.1.14" level="project" />
-    <orderEntry type="library" name="Maven: com.sun.xml.bind:jaxb-impl:2.1" level="project" />
-    <orderEntry type="library" name="Maven: javax.activation:activation:1.1.1" level="project" />
-    <orderEntry type="library" name="Maven: org.jsoup:jsoup:1.7.3" level="project" />
-    <orderEntry type="library" name="Maven: com.squareup.okhttp:okhttp:2.7.5" level="project" />
-    <orderEntry type="library" name="Maven: com.squareup.okio:okio:1.6.0" level="project" />
-    <orderEntry type="library" name="Maven: cn.hutool:hutool-captcha:5.4.7" level="project" />
-    <orderEntry type="library" name="Maven: cn.hutool:hutool-core:5.4.7" level="project" />
-    <orderEntry type="library" name="Maven: com.jcraft:jsch:0.1.54" level="project" />
-    <orderEntry type="library" name="Maven: dom4j:dom4j:1.6.1" level="project" />
-    <orderEntry type="library" name="Maven: xml-apis:xml-apis:1.4.01" level="project" />
-    <orderEntry type="library" name="Maven: com.github.pagehelper:pagehelper-spring-boot-starter:1.2.5" level="project" />
-    <orderEntry type="library" name="Maven: org.mybatis.spring.boot:mybatis-spring-boot-starter:1.3.1" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-jdbc:1.5.18.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.tomcat:tomcat-jdbc:8.5.35" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.tomcat:tomcat-juli:8.5.35" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-jdbc:4.3.21.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.mybatis.spring.boot:mybatis-spring-boot-autoconfigure:1.3.1" level="project" />
-    <orderEntry type="library" name="Maven: org.mybatis:mybatis:3.4.5" level="project" />
-    <orderEntry type="library" name="Maven: org.mybatis:mybatis-spring:1.3.1" level="project" />
-    <orderEntry type="library" name="Maven: com.github.pagehelper:pagehelper-spring-boot-autoconfigure:1.2.5" level="project" />
-    <orderEntry type="library" name="Maven: com.github.pagehelper:pagehelper:5.1.4" level="project" />
-    <orderEntry type="library" name="Maven: com.github.jsqlparser:jsqlparser:1.0" level="project" />
-    <orderEntry type="library" name="Maven: io.springfox:springfox-swagger2:2.6.1" level="project" />
-    <orderEntry type="library" name="Maven: io.swagger:swagger-annotations:1.5.10" level="project" />
-    <orderEntry type="library" name="Maven: io.swagger:swagger-models:1.5.10" level="project" />
-    <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-annotations:2.8.0" level="project" />
-    <orderEntry type="library" name="Maven: io.springfox:springfox-spi:2.6.1" level="project" />
-    <orderEntry type="library" name="Maven: io.springfox:springfox-core:2.6.1" level="project" />
-    <orderEntry type="library" name="Maven: io.springfox:springfox-schema:2.6.1" level="project" />
-    <orderEntry type="library" name="Maven: io.springfox:springfox-swagger-common:2.6.1" level="project" />
-    <orderEntry type="library" name="Maven: io.springfox:springfox-spring-web:2.6.1" level="project" />
-    <orderEntry type="library" name="Maven: com.google.guava:guava:18.0" level="project" />
-    <orderEntry type="library" name="Maven: com.fasterxml:classmate:1.3.4" level="project" />
-    <orderEntry type="library" name="Maven: org.slf4j:slf4j-api:1.7.25" 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:spring-beans:4.3.21.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-context:4.3.21.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-aop:4.3.21.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.0.0.Final" level="project" />
-    <orderEntry type="library" name="Maven: io.springfox:springfox-swagger-ui:2.6.1" level="project" />
-    <orderEntry type="library" name="Maven: org.projectlombok:lombok:1.16.18" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: org.springframework.boot:spring-boot-starter-test:1.5.18.RELEASE" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: org.springframework.boot:spring-boot-test:1.5.18.RELEASE" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: org.springframework.boot:spring-boot-test-autoconfigure:1.5.18.RELEASE" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: com.jayway.jsonpath:json-path:2.2.0" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: net.minidev:json-smart:2.2.1" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: net.minidev:accessors-smart:1.1" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: junit:junit:4.12" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: org.assertj:assertj-core:2.6.0" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: org.mockito:mockito-core:1.10.19" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: org.objenesis:objenesis:2.1" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: org.hamcrest:hamcrest-core:1.3" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: org.hamcrest:hamcrest-library:1.3" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: org.skyscreamer:jsonassert:1.4.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:4.3.21.RELEASE" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: org.springframework:spring-test:4.3.21.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-devtools:1.5.18.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot:1.5.18.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-autoconfigure:1.5.18.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: com.qiniu:qiniu-java-sdk:7.2.28" level="project" />
-    <orderEntry type="library" scope="RUNTIME" name="Maven: com.squareup.okhttp3:okhttp:3.8.1" level="project" />
-    <orderEntry type="library" name="Maven: com.google.code.gson:gson:2.8.5" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.poi:poi:3.17" level="project" />
-    <orderEntry type="library" name="Maven: commons-codec:commons-codec:1.10" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.commons:commons-collections4:4.1" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.poi:poi-ooxml:3.17" level="project" />
-    <orderEntry type="library" name="Maven: com.github.virtuald:curvesapi:1.04" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.poi:poi-ooxml-schemas:3.17" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.xmlbeans:xmlbeans:2.6.0" level="project" />
-    <orderEntry type="library" name="Maven: stax:stax-api:1.0.1" level="project" />
-    <orderEntry type="library" name="Maven: com.alibaba:easyexcel:2.2.3" level="project" />
-    <orderEntry type="library" name="Maven: cglib:cglib:3.1" level="project" />
-    <orderEntry type="library" name="Maven: org.ow2.asm:asm:4.2" level="project" />
-    <orderEntry type="library" name="Maven: org.ehcache:ehcache:3.2.3" level="project" />
-  </component>
-</module>

carbon-service/carbon-manager-client/src/main/java/com/hcloud/microserver/facade/carbon/entity/GroupNumBO.java

@@ -0,0 +1,24 @@
+package com.hcloud.microserver.facade.carbon.entity;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+
+@Data
+@ApiModel
+public class GroupNumBO implements Serializable {
+
+    private String num;
+
+    @ApiModelProperty("金钱")
+    private BigDecimal moneyNum;
+
+    @ApiModelProperty("碳汇量")
+    private BigDecimal carbonNum;
+
+    @ApiModelProperty("数量")
+    private long saleNum;
+}

carbon-service/carbon-manager-client/src/main/java/com/hcloud/microserver/facade/carbon/entity/UserBuyBO.java

@@ -0,0 +1,25 @@
+package com.hcloud.microserver.facade.carbon.entity;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+@Data
+@ApiModel
+public class UserBuyBO {
+
+    @ApiModelProperty("用户名称")
+    private String userName;
+
+    @ApiModelProperty("金钱")
+    private BigDecimal moneyNum;
+
+    @ApiModelProperty("碳汇量")
+    private BigDecimal carbonNum;
+
+    @ApiModelProperty("数量")
+    private long saleNum;
+
+}

carbon-service/carbon-manager-client/src/main/java/com/hcloud/microserver/facade/carbon/forms/DayCarbonFrom.java

@@ -1,10 +1,14 @@
 package com.hcloud.microserver.facade.carbon.forms;
 
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.io.Serializable;
 
 @Data
+@ApiModel
 public class DayCarbonFrom implements Serializable {
+    @ApiModelProperty("时间参数")
     private String dataFrom;
 }

carbon-service/carbon-manager-client/src/main/java/com/hcloud/microserver/facade/carbon/forms/GroupNumFrom.java

@@ -0,0 +1,16 @@
+package com.hcloud.microserver.facade.carbon.forms;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+@Data
+@ApiModel
+public class GroupNumFrom implements Serializable {
+    @ApiModelProperty("时间参数")
+    private Date dataFrom;
+
+}

carbon-service/carbon-manager-client/src/main/java/com/hcloud/microserver/facade/carbon/forms/UserBuyFrom.java

@@ -0,0 +1,9 @@
+package com.hcloud.microserver.facade.carbon.forms;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+@Data
+public class UserBuyFrom implements Serializable {
+}

carbon-service/carbon-manager-service/src/main/java/com/hcloud/microserver/bank/controller/WebIndexController.java

@@ -4,11 +4,17 @@ import com.hcloud.microserver.facade.carbon.entity.DayCarbonBO;
 import com.hcloud.microserver.bank.service.WebIndexService;
 import com.hcloud.microserver.commoncore.base.BaseController;
 import com.hcloud.microserver.commoncore.base.ResultVO;
+import com.hcloud.microserver.facade.carbon.entity.GroupNumBO;
+import com.hcloud.microserver.facade.carbon.entity.UserBuyBO;
 import com.hcloud.microserver.facade.carbon.forms.DayCarbonFrom;
+import com.hcloud.microserver.facade.carbon.forms.GroupNumFrom;
+import com.hcloud.microserver.facade.carbon.forms.UserBuyFrom;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import java.util.List;
+
 @RestController
 @RequestMapping("/webindex")
 public class WebIndexController extends BaseController {
@@ -22,4 +28,18 @@ public class WebIndexController extends BaseController {
         DayCarbonBO dayCarbonBO = webIndexService.dayCarbon(dayCarbonFrom);
         return success(dayCarbonBO);
     }
+
+    @ApiOperation("统计用户购碳排名")
+    @PostMapping("/userBuy")
+    public ResultVO userBuy(@RequestBody(required = false) UserBuyFrom userBuyFrom) {
+        List<UserBuyBO> dayCarbonBO = webIndexService.userBuy(userBuyFrom);
+        return success(dayCarbonBO);
+    }
+
+    @ApiOperation("统计购买趋势")
+    @PostMapping("/groupnum")
+    public ResultVO GroupNum(@RequestBody(required = false) GroupNumFrom groupNumFrom) {
+        List<GroupNumBO> dayCarbonBO = webIndexService.GroupNum(groupNumFrom);
+        return success(dayCarbonBO);
+    }
 }

carbon-service/carbon-manager-service/src/main/java/com/hcloud/microserver/bank/dao/WebIndexMapper.java

@@ -1,11 +1,23 @@
 package com.hcloud.microserver.bank.dao;
 
 import com.hcloud.microserver.facade.carbon.entity.DayCarbonBO;
+import com.hcloud.microserver.facade.carbon.entity.GroupNumBO;
+import com.hcloud.microserver.facade.carbon.entity.UserBuyBO;
 import com.hcloud.microserver.facade.carbon.forms.DayCarbonFrom;
+import com.hcloud.microserver.facade.carbon.forms.GroupNumFrom;
+import com.hcloud.microserver.facade.carbon.forms.UserBuyFrom;
+import org.apache.ibatis.annotations.MapKey;
 import org.apache.ibatis.annotations.Param;
 import org.mapstruct.Mapper;
 
+import java.util.List;
+import java.util.Map;
+
 @Mapper
 public interface WebIndexMapper {
     DayCarbonBO dayCarbon(@Param("dayCarbonFrom") DayCarbonFrom dayCarbonFrom);
+
+    List<UserBuyBO> userBuy(@Param("userBuyFrom")UserBuyFrom userBuyFrom);
+    @MapKey("num")
+    Map<String,GroupNumBO> GroupNum(@Param("groupNumFrom") GroupNumFrom groupNumFrom);
 }

carbon-service/carbon-manager-service/src/main/java/com/hcloud/microserver/bank/service/WebIndexService.java

@@ -1,9 +1,18 @@
 package com.hcloud.microserver.bank.service;
 
 import com.hcloud.microserver.facade.carbon.entity.DayCarbonBO;
+import com.hcloud.microserver.facade.carbon.entity.GroupNumBO;
+import com.hcloud.microserver.facade.carbon.entity.UserBuyBO;
 import com.hcloud.microserver.facade.carbon.forms.DayCarbonFrom;
+import com.hcloud.microserver.facade.carbon.forms.GroupNumFrom;
+import com.hcloud.microserver.facade.carbon.forms.UserBuyFrom;
+
+import java.util.List;
 
 public interface WebIndexService {
     DayCarbonBO dayCarbon(DayCarbonFrom dayCarbonFrom);
 
+    List<UserBuyBO> userBuy(UserBuyFrom userBuyFrom);
+
+    List<GroupNumBO> GroupNum(GroupNumFrom userBuyFrom);
 }

carbon-service/carbon-manager-service/src/main/java/com/hcloud/microserver/bank/service/impl/WebIndexServiceImpl.java

@@ -3,9 +3,19 @@ package com.hcloud.microserver.bank.service.impl;
 import com.hcloud.microserver.facade.carbon.entity.DayCarbonBO;
 import com.hcloud.microserver.bank.dao.WebIndexMapper;
 import com.hcloud.microserver.bank.service.WebIndexService;
+import com.hcloud.microserver.facade.carbon.entity.GroupNumBO;
+import com.hcloud.microserver.facade.carbon.entity.UserBuyBO;
 import com.hcloud.microserver.facade.carbon.forms.DayCarbonFrom;
+import com.hcloud.microserver.facade.carbon.forms.GroupNumFrom;
+import com.hcloud.microserver.facade.carbon.forms.UserBuyFrom;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.util.StringUtils;
+
+import java.math.BigDecimal;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
 
 @Service
 public class WebIndexServiceImpl implements WebIndexService {
@@ -16,4 +26,31 @@ public class WebIndexServiceImpl implements WebIndexService {
     public DayCarbonBO dayCarbon(DayCarbonFrom dayCarbonFrom) {
         return webIndexMapper.dayCarbon(dayCarbonFrom);
     }
+
+    @Override
+    public List<UserBuyBO> userBuy(UserBuyFrom userBuyFrom) {
+        return webIndexMapper.userBuy(userBuyFrom);
+    }
+
+    @Override
+    public List<GroupNumBO> GroupNum(GroupNumFrom userBuyFrom) {
+        Map<String, GroupNumBO> groupNumBOS = webIndexMapper.GroupNum(userBuyFrom);
+        List<GroupNumBO> list = new ArrayList<>();
+        for (int i = 1; i <= 12; i++) {
+
+            GroupNumBO groupNumBOnew = new GroupNumBO();
+            BigDecimal bigDecimal = new BigDecimal(0);
+            String num = i + "";
+            groupNumBOnew.setNum(num);
+            groupNumBOnew.setCarbonNum(bigDecimal);
+            groupNumBOnew.setMoneyNum(bigDecimal);
+            GroupNumBO groupNumBO = groupNumBOS.get(num);
+            if (!StringUtils.isEmpty(groupNumBO)) {
+                list.add(groupNumBO);
+            } else {
+                list.add(groupNumBOnew);
+            }
+        }
+        return list;
+    }
 }

carbon-service/carbon-manager-service/src/main/resources/mappers/WebIndexService.xml

@@ -33,4 +33,62 @@
         </choose>
         LIMIT 1
     </select>
+    <select id="userBuy" resultType="com.hcloud.microserver.facade.carbon.entity.UserBuyBO">
+        SELECT
+            *
+        FROM
+            (
+                SELECT
+                    IFNULL(
+                        a.customer_name,
+                        '昵称不存在'
+                    ) AS userName,
+                    SUM(b.order_amount) AS moneyNum,
+                    SUM(b.order_carbon_amount) AS carbonNum,
+                    SUM(c.sale_num) AS saleNum
+                FROM
+                    t_customer_info a
+                JOIN t_goods_order_info b ON a.guid = b.fk_customer_guid
+                JOIN t_goods_order_detail c ON b.guid = c.fk_order_guid
+                WHERE
+                    b.order_status = 2
+                GROUP BY
+                    b.fk_customer_guid
+            ) tmp
+        ORDER BY
+            tmp.moneyNum DESC
+    </select>
+    <select id="GroupNum" resultType="com.hcloud.microserver.facade.carbon.entity.GroupNumBO">
+        SELECT
+        tmp.*, REPLACE (
+        ltrim(REPLACE(tmp.enum, '0', ' ')),
+        ' ',
+        '0'
+        ) AS num
+        FROM
+        (
+        SELECT
+        DATE_FORMAT(b.create_time, '%m') AS enum,
+        b.create_time AS createTime,
+        SUM(b.order_amount) AS moneyNum,
+        SUM(b.order_carbon_amount) AS carbonNum,
+        SUM(c.sale_num) AS saleNum
+        FROM
+        t_goods_order_info b
+        JOIN t_goods_order_detail c ON b.guid = c.fk_order_guid
+        WHERE
+        b.order_status = 2
+        <choose>
+            <when test="groupNumFrom.dataFrom !=null and groupNumFrom.dataFrom !=''">
+                AND DATE_FORMAT(b.create_time, '%Y') = DATE_FORMAT(#{groupNumFrom.dataFrom}, '%Y')
+            </when>
+            <otherwise>
+                AND DATE_FORMAT(b.create_time, '%Y') = DATE_FORMAT(NOW(), '%Y')
+            </otherwise>
+        </choose>
+        GROUP BY
+        DATE_FORMAT(b.create_time, '%Y-%m')
+        ) tmp
+
+    </select>
 </mapper>