整合银行清分和若依权限系统

carbon-admin/carbon-admin-service/src/main/java/com/hcloud/microserver/bank/config/GlobalCorsConfig.java

@@ -1,29 +1,35 @@
 package com.hcloud.microserver.bank.config;
 
 
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.web.cors.CorsConfiguration;
+import org.springframework.web.cors.UrlBasedCorsConfigurationSource;
+import org.springframework.web.filter.CorsFilter;
+
 /**
  * 全局跨域相关配置
  * Created by macro on 2019/7/27.
  */
-//@Configuration
+@Configuration
 public class GlobalCorsConfig {
 
     /**
      * 允许跨域调用的过滤器
      */
-//    @Bean
-//    public CorsFilter corsFilter() {
-//        CorsConfiguration config = new CorsConfiguration();
-//        //允许所有域名进行跨域调用
-//        config.addAllowedOrigin("*");
-//        //允许跨越发送cookie
-//        config.setAllowCredentials(true);
-//        //放行全部原始头信息
-//        config.addAllowedHeader("*");
-//        //允许所有请求方法跨域调用
-//        config.addAllowedMethod("*");
-//        UrlBasedCorsConfigurationSource source = new UrlBasedCorsConfigurationSource();
-//        source.registerCorsConfiguration("/**", config);
-//        return new CorsFilter(source);
-//    }
+    @Bean
+    public CorsFilter corsFilter() {
+        CorsConfiguration config = new CorsConfiguration();
+        //允许所有域名进行跨域调用
+        config.addAllowedOrigin("*");
+        //允许跨越发送cookie
+        config.setAllowCredentials(true);
+        //放行全部原始头信息
+        config.addAllowedHeader("*");
+        //允许所有请求方法跨域调用
+        config.addAllowedMethod("*");
+        UrlBasedCorsConfigurationSource source = new UrlBasedCorsConfigurationSource();
+        source.registerCorsConfiguration("/**", config);
+        return new CorsFilter(source);
+    }
 }

carbon-admin/carbon-admin-service/src/main/resources/bootstrap.yml

@@ -10,6 +10,8 @@ spring:
     active: prod
   application:
     name: carbon-admin
+  main:
+    allow-bean-definition-overriding: true
   cloud:
     nacos:
       discovery:

carbon-back/carbon-back-common/pom.xml

@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <artifactId>carbon-back</artifactId>
+        <groupId>com.hcloud.microserver</groupId>
+        <version>0.0.1-SNAPSHOT</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>carbon-back-common</artifactId>
+    <groupId>com.hcloud.microserver</groupId>
+    <version>0.0.1-SNAPSHOT</version>
+    <name>carbon-back-common</name>
+    <packaging>jar</packaging>
+
+    <dependencies>
+        <dependency>
+            <groupId>com.github.pagehelper</groupId>
+            <artifactId>pagehelper-spring-boot-starter</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.cloud</groupId>
+            <artifactId>spring-cloud-starter-openfeign</artifactId>
+        </dependency>
+    </dependencies>
+
+
+</project>

carbon-back/carbon-back-common/src/main/java/com/hcloud/microserver/facade/carbon/entity/BaseDictionary.java

@@ -0,0 +1,131 @@
+package com.hcloud.microserver.facade.carbon.entity;
+
+import lombok.ToString;
+
+import java.io.Serializable;
+import java.util.Date;
+
+@ToString
+public class BaseDictionary implements Serializable {
+
+    private static final long serialVersionUID = -9045464053839476883L;
+    private String guid;
+
+    private String fkOrgGuid;
+
+    private String fkTypeGuid;
+
+    private String dicname;
+
+    private String diccode;
+
+    private Integer isForbiden;
+
+    private Integer orderby;
+
+    private String remark;
+
+    private Integer state;
+
+    private Date createTime;
+
+    private Date modifiedTime;
+
+    private String typeName;
+
+    public String getGuid() {
+        return guid;
+    }
+
+    public void setGuid(String guid) {
+        this.guid = guid == null ? null : guid.trim();
+    }
+
+    public String getFkOrgGuid() {
+        return fkOrgGuid;
+    }
+
+    public void setFkOrgGuid(String fkOrgGuid) {
+        this.fkOrgGuid = fkOrgGuid == null ? null : fkOrgGuid.trim();
+    }
+
+    public String getFkTypeGuid() {
+        return fkTypeGuid;
+    }
+
+    public void setFkTypeGuid(String fkTypeGuid) {
+        this.fkTypeGuid = fkTypeGuid == null ? null : fkTypeGuid.trim();
+    }
+
+    public String getDicname() {
+        return dicname;
+    }
+
+    public void setDicname(String dicname) {
+        this.dicname = dicname == null ? null : dicname.trim();
+    }
+
+    public String getDiccode() {
+        return diccode;
+    }
+
+    public void setDiccode(String diccode) {
+        this.diccode = diccode == null ? null : diccode.trim();
+    }
+
+    public Integer getIsForbiden() {
+        return isForbiden;
+    }
+
+    public void setIsForbiden(Integer isForbiden) {
+        this.isForbiden = isForbiden;
+    }
+
+    public Integer getOrderby() {
+        return orderby;
+    }
+
+    public void setOrderby(Integer orderby) {
+        this.orderby = orderby;
+    }
+
+    public String getRemark() {
+        return remark;
+    }
+
+    public void setRemark(String remark) {
+        this.remark = remark == null ? null : remark.trim();
+    }
+
+    public Integer getState() {
+        return state;
+    }
+
+    public void setState(Integer state) {
+        this.state = state;
+    }
+
+    public Date getCreateTime() {
+        return createTime;
+    }
+
+    public void setCreateTime(Date createTime) {
+        this.createTime = createTime;
+    }
+
+    public Date getModifiedTime() {
+        return modifiedTime;
+    }
+
+    public void setModifiedTime(Date modifiedTime) {
+        this.modifiedTime = modifiedTime;
+    }
+
+    public String getTypeName() {
+        return typeName;
+    }
+
+    public void setTypeName(String typeName) {
+        this.typeName = typeName;
+    }
+}

carbon-back/carbon-back-common/src/main/java/com/hcloud/microserver/facade/carbon/entity/BaseDictionaryType.java

@@ -0,0 +1,85 @@
+package com.hcloud.microserver.facade.carbon.entity;
+
+import java.util.Date;
+
+public class BaseDictionaryType {
+    private String guid;
+
+    private String fkOrgGuid;
+
+    private String parentTypeId;
+
+    private String typeCode;
+
+    private String typeName;
+
+    private Integer state;
+
+    private Date createTime;
+
+    private Date modifiedTime;
+
+    public String getGuid() {
+        return guid;
+    }
+
+    public void setGuid(String guid) {
+        this.guid = guid == null ? null : guid.trim();
+    }
+
+    public String getFkOrgGuid() {
+        return fkOrgGuid;
+    }
+
+    public void setFkOrgGuid(String fkOrgGuid) {
+        this.fkOrgGuid = fkOrgGuid == null ? null : fkOrgGuid.trim();
+    }
+
+    public String getParentTypeId() {
+        return parentTypeId;
+    }
+
+    public void setParentTypeId(String parentTypeId) {
+        this.parentTypeId = parentTypeId == null ? null : parentTypeId.trim();
+    }
+
+    public String getTypeCode() {
+        return typeCode;
+    }
+
+    public void setTypeCode(String typeCode) {
+        this.typeCode = typeCode == null ? null : typeCode.trim();
+    }
+
+    public String getTypeName() {
+        return typeName;
+    }
+
+    public void setTypeName(String typeName) {
+        this.typeName = typeName == null ? null : typeName.trim();
+    }
+
+    public Integer getState() {
+        return state;
+    }
+
+    public void setState(Integer state) {
+        this.state = state;
+    }
+
+    public Date getCreateTime() {
+        return createTime;
+    }
+
+    public void setCreateTime(Date createTime) {
+        this.createTime = createTime;
+    }
+
+    public Date getModifiedTime() {
+        return modifiedTime;
+    }
+
+    public void setModifiedTime(Date modifiedTime) {
+        this.modifiedTime = modifiedTime;
+    }
+}

carbon-back/carbon-back-common/src/main/java/com/hcloud/microserver/facade/carbon/entity/BasePosition.java

@@ -0,0 +1,24 @@
+package com.hcloud.microserver.facade.carbon.entity;
+
+import lombok.Data;
+
+@Data
+public class BasePosition {
+    private Integer id;
+
+    private String upCode;
+
+    private String name;
+
+    private Integer level;
+
+    private String pinyin;
+
+    private String acronym;
+
+    private String code;
+
+    private String areaCode;
+
+    private String zip;
+}

carbon-back/carbon-back-common/src/main/java/com/hcloud/microserver/facade/carbon/entity/CarbonCalculateRule.java

@@ -0,0 +1,125 @@
+package com.hcloud.microserver.facade.carbon.entity;
+
+import java.util.Date;
+
+public class CarbonCalculateRule {
+    private String guid;
+
+    private String fkProductTypeId;
+
+    private String ruleName;
+
+    private String paramA;
+
+    private String paramB;
+
+    private String paramC;
+
+    private String paramD;
+
+    private String paramE;
+
+    private String paramR;
+
+    private Integer state;
+
+    private Date createTime;
+
+    private Date modifiedTime;
+
+    public String getGuid() {
+        return guid;
+    }
+
+    public void setGuid(String guid) {
+        this.guid = guid == null ? null : guid.trim();
+    }
+
+    public String getFkProductTypeId() {
+        return fkProductTypeId;
+    }
+
+    public void setFkProductTypeId(String fkProductTypeId) {
+        this.fkProductTypeId = fkProductTypeId == null ? null : fkProductTypeId.trim();
+    }
+
+    public String getRuleName() {
+        return ruleName;
+    }
+
+    public void setRuleName(String ruleName) {
+        this.ruleName = ruleName == null ? null : ruleName.trim();
+    }
+
+    public String getParamA() {
+        return paramA;
+    }
+
+    public void setParamA(String paramA) {
+        this.paramA = paramA == null ? null : paramA.trim();
+    }
+
+    public String getParamB() {
+        return paramB;
+    }
+
+    public void setParamB(String paramB) {
+        this.paramB = paramB == null ? null : paramB.trim();
+    }
+
+    public String getParamC() {
+        return paramC;
+    }
+
+    public void setParamC(String paramC) {
+        this.paramC = paramC == null ? null : paramC.trim();
+    }
+
+    public String getParamD() {
+        return paramD;
+    }
+
+    public void setParamD(String paramD) {
+        this.paramD = paramD == null ? null : paramD.trim();
+    }
+
+    public String getParamE() {
+        return paramE;
+    }
+
+    public void setParamE(String paramE) {
+        this.paramE = paramE == null ? null : paramE.trim();
+    }
+
+    public String getParamR() {
+        return paramR;
+    }
+
+    public void setParamR(String paramR) {
+        this.paramR = paramR == null ? null : paramR.trim();
+    }
+
+    public Integer getState() {
+        return state;
+    }
+
+    public void setState(Integer state) {
+        this.state = state;
+    }
+
+    public Date getCreateTime() {
+        return createTime;
+    }
+
+    public void setCreateTime(Date createTime) {
+        this.createTime = createTime;
+    }
+
+    public Date getModifiedTime() {
+        return modifiedTime;
+    }
+
+    public void setModifiedTime(Date modifiedTime) {
+        this.modifiedTime = modifiedTime;
+    }
+}

carbon-back/carbon-back-common/src/main/java/com/hcloud/microserver/facade/carbon/entity/CarbonPlatformStatiticsNum.java

@@ -0,0 +1,56 @@
+package com.hcloud.microserver.facade.carbon.entity;
+
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.util.List;
+
+@Data
+@ApiModel(value = "碳汇平台统计",description = "碳汇平台的用户量统计")
+public class CarbonPlatformStatiticsNum {
+    @ApiModelProperty("企业总数")
+    private BigDecimal compNum;
+
+    @ApiModelProperty("用户总数")
+    private BigDecimal customerNum;
+
+    @ApiModelProperty("企业用户占总用户的占比")
+    private BigDecimal compCustomerPercentage;
+
+    @ApiModelProperty("不是企业用户占总用户的占比")
+    private BigDecimal NoCompCustomerPercentage;
+
+    @ApiModelProperty("平台用户访问量")
+    private BigDecimal views;
+
+    @ApiModelProperty("产品总量")
+    private BigDecimal productNum;
+
+    @ApiModelProperty("产品各类别占量")
+    private List<CarbonStatisticsProduct> productList;
+
+    @ApiModelProperty("交易订单量")
+    private BigDecimal orderNum;
+
+
+    @ApiModelProperty("农户数量")
+    private BigDecimal farmerTotalNum;
+
+    @ApiModelProperty("集体数量")
+    private BigDecimal collectiveTotalNum;
+
+    @ApiModelProperty("各集体农户占比")
+    private List<CarbonStatisticsFarmer> farmerList;
+
+    @ApiModelProperty("总销售量")
+    private BigDecimal carbonTotalBuy;
+
+
+
+
+
+
+}

carbon-back/carbon-back-common/src/main/java/com/hcloud/microserver/facade/carbon/entity/CarbonStatisticsBuyTrend.java

@@ -0,0 +1,34 @@
+package com.hcloud.microserver.facade.carbon.entity;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+@ApiModel(value = "CarbonStatisticsBuyTrend",description = "统计购买趋势")
+@Data
+public class CarbonStatisticsBuyTrend {
+
+    @ApiModelProperty("时间")
+    private String time;
+
+    @ApiModelProperty("碳汇量")
+    private BigDecimal carbonAmount;
+
+    @ApiModelProperty("最小碳汇量")
+    private BigDecimal minCarbonAmount;
+
+    @ApiModelProperty("最大碳汇量")
+    private BigDecimal maxCarbonAmount;
+
+    @ApiModelProperty("总价格")
+    private BigDecimal totalMoney;
+
+    @ApiModelProperty("最小价格")
+    private BigDecimal minMoney;
+
+    @ApiModelProperty("最大价格")
+    private BigDecimal maxMoney;
+
+}

carbon-back/carbon-back-common/src/main/java/com/hcloud/microserver/facade/carbon/entity/CarbonStatisticsFarmer.java

@@ -0,0 +1,17 @@
+package com.hcloud.microserver.facade.carbon.entity;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@ApiModel(value = "CarbonStatisticsFarmer",description = "平台农户占量")
+@Data
+public class CarbonStatisticsFarmer {
+
+    @ApiModelProperty("集体名称")
+    private String collectiveName;
+
+    @ApiModelProperty("集体农户数量")
+    private String farmerNum;
+
+}

carbon-back/carbon-back-common/src/main/java/com/hcloud/microserver/facade/carbon/entity/CarbonStatisticsProduct.java

@@ -0,0 +1,20 @@
+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(value = "CarbonStatisticsProduct",description = "产品类别统计")
+public class CarbonStatisticsProduct {
+
+    @ApiModelProperty("类别名称")
+    private String productTypeName;
+    @ApiModelProperty("数量")
+    private BigDecimal num;
+
+    @ApiModelProperty("占比")
+    private BigDecimal ratio;
+
+}

carbon-back/carbon-back-common/src/main/java/com/hcloud/microserver/facade/carbon/entity/CollectiveFarmer.java

@@ -0,0 +1,213 @@
+package com.hcloud.microserver.facade.carbon.entity;
+
+import lombok.ToString;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Date;
+import java.util.List;
+
+@ToString
+public class CollectiveFarmer implements Serializable {
+
+    private static final long serialVersionUID = -5328351127753129451L;
+    private String guid;
+
+    private String fkPovertyAreaId;
+
+    private String collectiveCode;
+
+    private String collectiveName;
+
+    private Integer collectivePersonNum;
+
+    private String orgUnit;
+
+    private String remark;
+
+    private String collectiveImages;
+
+    private String bankName;
+
+    private String bankCardNo;
+
+    private Integer isEnable;
+
+    private Integer state;
+
+    private String createUser;
+
+    private Date createTime;
+
+    private String modifiedUser;
+
+    private Date modifiedTime;
+
+    private BigDecimal recieveMoney;
+
+    private BigDecimal actualMoney;
+
+    private String phone;
+
+    private List<FarmerInfo> farmerInfos;
+
+    public String getGuid() {
+        return guid;
+    }
+
+    public void setGuid(String guid) {
+        this.guid = guid == null ? null : guid.trim();
+    }
+
+    public String getFkPovertyAreaId() {
+        return fkPovertyAreaId;
+    }
+
+    public void setFkPovertyAreaId(String fkPovertyAreaId) {
+        this.fkPovertyAreaId = fkPovertyAreaId == null ? null : fkPovertyAreaId.trim();
+    }
+
+    public String getCollectiveCode() {
+        return collectiveCode;
+    }
+
+    public void setCollectiveCode(String collectiveCode) {
+        this.collectiveCode = collectiveCode == null ? null : collectiveCode.trim();
+    }
+
+    public String getCollectiveName() {
+        return collectiveName;
+    }
+
+    public void setCollectiveName(String collectiveName) {
+        this.collectiveName = collectiveName == null ? null : collectiveName.trim();
+    }
+
+    public Integer getCollectivePersonNum() {
+        return collectivePersonNum;
+    }
+
+    public void setCollectivePersonNum(Integer collectivePersonNum) {
+        this.collectivePersonNum = collectivePersonNum;
+    }
+
+    public String getOrgUnit() {
+        return orgUnit;
+    }
+
+    public void setOrgUnit(String orgUnit) {
+        this.orgUnit = orgUnit == null ? null : orgUnit.trim();
+    }
+
+    public String getRemark() {
+        return remark;
+    }
+
+    public void setRemark(String remark) {
+        this.remark = remark == null ? null : remark.trim();
+    }
+
+    public String getCollectiveImages() {
+        return collectiveImages;
+    }
+
+    public void setCollectiveImages(String collectiveImages) {
+        this.collectiveImages = collectiveImages == null ? null : collectiveImages.trim();
+    }
+
+    public String getBankName() {
+        return bankName;
+    }
+
+    public void setBankName(String bankName) {
+        this.bankName = bankName == null ? null : bankName.trim();
+    }
+
+    public String getBankCardNo() {
+        return bankCardNo;
+    }
+
+    public void setBankCardNo(String bankCardNo) {
+        this.bankCardNo = bankCardNo == null ? null : bankCardNo.trim();
+    }
+
+    public Integer getIsEnable() {
+        return isEnable;
+    }
+
+    public void setIsEnable(Integer isEnable) {
+        this.isEnable = isEnable;
+    }
+
+    public Integer getState() {
+        return state;
+    }
+
+    public void setState(Integer state) {
+        this.state = state;
+    }
+
+    public String getCreateUser() {
+        return createUser;
+    }
+
+    public void setCreateUser(String createUser) {
+        this.createUser = createUser == null ? null : createUser.trim();
+    }
+
+    public Date getCreateTime() {
+        return createTime;
+    }
+
+    public void setCreateTime(Date createTime) {
+        this.createTime = createTime;
+    }
+
+    public String getModifiedUser() {
+        return modifiedUser;
+    }
+
+    public void setModifiedUser(String modifiedUser) {
+        this.modifiedUser = modifiedUser == null ? null : modifiedUser.trim();
+    }
+
+    public Date getModifiedTime() {
+        return modifiedTime;
+    }
+
+    public void setModifiedTime(Date modifiedTime) {
+        this.modifiedTime = modifiedTime;
+    }
+
+    public BigDecimal getRecieveMoney() {
+        return recieveMoney;
+    }
+
+    public void setRecieveMoney(BigDecimal recieveMoney) {
+        this.recieveMoney = recieveMoney;
+    }
+
+    public BigDecimal getActualMoney() {
+        return actualMoney;
+    }
+
+    public void setActualMoney(BigDecimal actualMoney) {
+        this.actualMoney = actualMoney;
+    }
+
+    public String getPhone() {
+        return phone;
+    }
+
+    public void setPhone(String phone) {
+        this.phone = phone;
+    }
+
+    public List<FarmerInfo> getFarmerInfos() {
+        return farmerInfos;
+    }
+
+    public void setFarmerInfos(List<FarmerInfo> farmerInfos) {
+        this.farmerInfos = farmerInfos;
+    }
+}

carbon-back/carbon-back-common/src/main/java/com/hcloud/microserver/facade/carbon/entity/CollectiveProductBelong.java

@@ -0,0 +1,20 @@
+package com.hcloud.microserver.facade.carbon.entity;
+
+import lombok.ToString;
+
+import java.io.Serializable;
+
+@ToString
+public class CollectiveProductBelong extends ProductBelong implements Serializable {
+
+    private static final long serialVersionUID = 4861049796598851983L;
+    private CollectiveFarmer collectiveFarmer;
+
+    public CollectiveFarmer getCollectiveFarmer() {
+        return collectiveFarmer;
+    }
+
+    public void setCollectiveFarmer(CollectiveFarmer collectiveFarmer) {
+        this.collectiveFarmer = collectiveFarmer;
+    }
+}

carbon-back/carbon-back-common/src/main/java/com/hcloud/microserver/facade/carbon/entity/CustomerChannel.java

@@ -0,0 +1,76 @@
+package com.hcloud.microserver.facade.carbon.entity;
+
+/**
+ * @author xiezt
+ */
+public class CustomerChannel {
+    private String guid;
+
+    private String fkCustomerId;
+
+    private Integer channelType;
+
+    private String channelName;
+
+    private String channelKeywordOne;
+
+    private String channelKeywordTwo;
+
+    private String channelKeywordThree;
+
+    public String getGuid() {
+        return guid;
+    }
+
+    public void setGuid(String guid) {
+        this.guid = guid == null ? null : guid.trim();
+    }
+
+    public String getFkCustomerId() {
+        return fkCustomerId;
+    }
+
+    public void setFkCustomerId(String fkCustomerId) {
+        this.fkCustomerId = fkCustomerId == null ? null : fkCustomerId.trim();
+    }
+
+    public String getChannelName() {
+        return channelName;
+    }
+
+    public void setChannelName(String channelName) {
+        this.channelName = channelName == null ? null : channelName.trim();
+    }
+
+    public String getChannelKeywordOne() {
+        return channelKeywordOne;
+    }
+
+    public void setChannelKeywordOne(String channelKeywordOne) {
+        this.channelKeywordOne = channelKeywordOne == null ? null : channelKeywordOne.trim();
+    }
+
+    public String getChannelKeywordTwo() {
+        return channelKeywordTwo;
+    }
+
+    public void setChannelKeywordTwo(String channelKeywordTwo) {
+        this.channelKeywordTwo = channelKeywordTwo == null ? null : channelKeywordTwo.trim();
+    }
+
+    public String getChannelKeywordThree() {
+        return channelKeywordThree;
+    }
+
+    public void setChannelKeywordThree(String channelKeywordThree) {
+        this.channelKeywordThree = channelKeywordThree == null ? null : channelKeywordThree.trim();
+    }
+
+    public Integer getChannelType() {
+        return channelType;
+    }
+
+    public void setChannelType(Integer channelType) {
+        this.channelType = channelType;
+    }
+}

carbon-back/carbon-back-common/src/main/java/com/hcloud/microserver/facade/carbon/entity/CustomerCompanyInfo.java

@@ -0,0 +1,134 @@
+package com.hcloud.microserver.facade.carbon.entity;
+
+import lombok.ToString;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * @author xiezt
+ */
+@ToString
+public class CustomerCompanyInfo implements Serializable {
+    private static final long serialVersionUID = -8242664522405565533L;
+
+    private String guid;
+
+    private String fkCustomerId;
+
+    private String companyName;
+
+    private String orgCode;
+
+    private String principals;
+
+    private String phone;
+
+    private String email;
+
+    private String companyAddress;
+
+    private String companyImages;
+
+    private Integer state;
+
+    private Date createTime;
+
+    private Date modifiedTime;
+
+    public String getGuid() {
+        return guid;
+    }
+
+    public void setGuid(String guid) {
+        this.guid = guid == null ? null : guid.trim();
+    }
+
+    public String getFkCustomerId() {
+        return fkCustomerId;
+    }
+
+    public void setFkCustomerId(String fkCustomerId) {
+        this.fkCustomerId = fkCustomerId == null ? null : fkCustomerId.trim();
+    }
+
+    public String getCompanyName() {
+        return companyName;
+    }
+
+    public void setCompanyName(String companyName) {
+        this.companyName = companyName == null ? null : companyName.trim();
+    }
+
+    public String getOrgCode() {
+        return orgCode;
+    }
+
+    public void setOrgCode(String orgCode) {
+        this.orgCode = orgCode == null ? null : orgCode.trim();
+    }
+
+    public String getPrincipals() {
+        return principals;
+    }
+
+    public void setPrincipals(String principals) {
+        this.principals = principals == null ? null : principals.trim();
+    }
+
+    public String getPhone() {
+        return phone;
+    }
+
+    public void setPhone(String phone) {
+        this.phone = phone == null ? null : phone.trim();
+    }
+
+    public String getEmail() {
+        return email;
+    }
+
+    public void setEmail(String email) {
+        this.email = email == null ? null : email.trim();
+    }
+
+    public String getCompanyAddress() {
+        return companyAddress;
+    }
+
+    public void setCompanyAddress(String companyAddress) {
+        this.companyAddress = companyAddress == null ? null : companyAddress.trim();
+    }
+
+    public String getCompanyImages() {
+        return companyImages;
+    }
+
+    public void setCompanyImages(String companyImages) {
+        this.companyImages = companyImages == null ? null : companyImages.trim();
+    }
+
+    public Integer getState() {
+        return state;
+    }
+
+    public void setState(Integer state) {
+        this.state = state;
+    }
+
+    public Date getCreateTime() {
+        return createTime;
+    }
+
+    public void setCreateTime(Date createTime) {
+        this.createTime = createTime;
+    }
+
+    public Date getModifiedTime() {
+        return modifiedTime;
+    }
+
+    public void setModifiedTime(Date modifiedTime) {
+        this.modifiedTime = modifiedTime;
+    }
+}

carbon-back/carbon-back-common/src/main/java/com/hcloud/microserver/facade/carbon/entity/CustomerCompanyType.java

@@ -0,0 +1,87 @@
+package com.hcloud.microserver.facade.carbon.entity;
+
+import javax.validation.constraints.NotEmpty;
+import java.util.Date;
+
+public class CustomerCompanyType {
+    private String guid;
+
+    private String parentId;
+
+    @NotEmpty(message = "企业类型不能为空")
+    private String typeName;
+
+    private String typeVal;
+
+    private Integer state;
+
+    private Date modifiedTime;
+
+    private String methodology;
+
+    private String typeDesc;
+
+    public String getGuid() {
+        return guid;
+    }
+
+    public void setGuid(String guid) {
+        this.guid = guid == null ? null : guid.trim();
+    }
+
+    public String getParentId() {
+        return parentId;
+    }
+
+    public void setParentId(String parentId) {
+        this.parentId = parentId == null ? null : parentId.trim();
+    }
+
+    public String getTypeName() {
+        return typeName;
+    }
+
+    public void setTypeName(String typeName) {
+        this.typeName = typeName == null ? null : typeName.trim();
+    }
+
+    public String getTypeVal() {
+        return typeVal;
+    }
+
+    public void setTypeVal(String typeVal) {
+        this.typeVal = typeVal == null ? null : typeVal.trim();
+    }
+
+    public Integer getState() {
+        return state;
+    }
+
+    public void setState(Integer state) {
+        this.state = state;
+    }
+
+    public Date getModifiedTime() {
+        return modifiedTime;
+    }
+
+    public void setModifiedTime(Date modifiedTime) {
+        this.modifiedTime = modifiedTime;
+    }
+
+    public String getMethodology() {
+        return methodology;
+    }
+
+    public void setMethodology(String methodology) {
+        this.methodology = methodology == null ? null : methodology.trim();
+    }
+
+    public String getTypeDesc() {
+        return typeDesc;
+    }
+
+    public void setTypeDesc(String typeDesc) {
+        this.typeDesc = typeDesc == null ? null : typeDesc.trim();
+    }
+}

carbon-back/carbon-back-common/src/main/java/com/hcloud/microserver/facade/carbon/entity/CustomerInfo.java

@@ -0,0 +1,218 @@
+package com.hcloud.microserver.facade.carbon.entity;
+
+import java.util.Date;
+
+/**
+ * @author xiezt
+ */
+public class CustomerInfo {
+    private String guid;
+
+    private String account;
+
+    private String passwd;
+
+    private Integer customerType;
+
+    private String customerName;
+
+    private String nickName;
+
+    private String pid;
+
+    private String phone;
+
+    private Integer sex;
+
+    private Integer score;
+
+    private String wxId;
+
+    private String unionId;
+
+    private String headImage;
+
+    private Integer isCompany;
+
+    private Integer isValidate;
+
+    private Integer isEnable;
+
+    private Integer state;
+
+    private String createUser;
+
+    private Date createTime;
+
+    private String modifiedUser;
+
+    private Date modifiedTime;
+
+    public String getGuid() {
+        return guid;
+    }
+
+    public void setGuid(String guid) {
+        this.guid = guid == null ? null : guid.trim();
+    }
+
+    public String getAccount() {
+        return account;
+    }
+
+    public void setAccount(String account) {
+        this.account = account == null ? null : account.trim();
+    }
+
+    public String getPasswd() {
+        return passwd;
+    }
+
+    public void setPasswd(String passwd) {
+        this.passwd = passwd == null ? null : passwd.trim();
+    }
+
+    public Integer getCustomerType() {
+        return customerType;
+    }
+
+    public void setCustomerType(Integer customerType) {
+        this.customerType = customerType;
+    }
+
+    public String getCustomerName() {
+        return customerName;
+    }
+
+    public void setCustomerName(String customerName) {
+        this.customerName = customerName == null ? null : customerName.trim();
+    }
+
+    public String getNickName() {
+        return nickName;
+    }
+
+    public void setNickName(String nickName) {
+        this.nickName = nickName == null ? null : nickName.trim();
+    }
+
+    public String getPid() {
+        return pid;
+    }
+
+    public void setPid(String pid) {
+        this.pid = pid == null ? null : pid.trim();
+    }
+
+    public String getPhone() {
+        return phone;
+    }
+
+    public void setPhone(String phone) {
+        this.phone = phone == null ? null : phone.trim();
+    }
+
+    public Integer getSex() {
+        return sex;
+    }
+
+    public void setSex(Integer sex) {
+        this.sex = sex;
+    }
+
+    public Integer getScore() {
+        return score;
+    }
+
+    public void setScore(Integer score) {
+        this.score = score;
+    }
+
+    public String getWxId() {
+        return wxId;
+    }
+
+    public void setWxId(String wxId) {
+        this.wxId = wxId == null ? null : wxId.trim();
+    }
+
+    public String getUnionId() {
+        return unionId;
+    }
+
+    public void setUnionId(String unionId) {
+        this.unionId = unionId == null ? null : unionId.trim();
+    }
+
+    public Integer getIsCompany() {
+        return isCompany;
+    }
+
+    public void setIsCompany(Integer isCompany) {
+        this.isCompany = isCompany;
+    }
+
+    public Integer getIsValidate() {
+        return isValidate;
+    }
+
+    public void setIsValidate(Integer isValidate) {
+        this.isValidate = isValidate;
+    }
+
+    public Integer getIsEnable() {
+        return isEnable;
+    }
+
+    public void setIsEnable(Integer isEnable) {
+        this.isEnable = isEnable;
+    }
+
+    public Integer getState() {
+        return state;
+    }
+
+    public void setState(Integer state) {
+        this.state = state;
+    }
+
+    public String getCreateUser() {
+        return createUser;
+    }
+
+    public void setCreateUser(String createUser) {
+        this.createUser = createUser == null ? null : createUser.trim();
+    }
+
+    public Date getCreateTime() {
+        return createTime;
+    }
+
+    public void setCreateTime(Date createTime) {
+        this.createTime = createTime;
+    }
+
+    public String getModifiedUser() {
+        return modifiedUser;
+    }
+
+    public void setModifiedUser(String modifiedUser) {
+        this.modifiedUser = modifiedUser == null ? null : modifiedUser.trim();
+    }
+
+    public Date getModifiedTime() {
+        return modifiedTime;
+    }
+
+    public void setModifiedTime(Date modifiedTime) {
+        this.modifiedTime = modifiedTime;
+    }
+
+    public String getHeadImage() {
+        return headImage;
+    }
+
+    public void setHeadImage(String headImage) {
+        this.headImage = headImage == null ? null : headImage.trim();
+    }
+}

carbon-back/carbon-back-common/src/main/java/com/hcloud/microserver/facade/carbon/entity/DayCarbonBO.java

@@ -0,0 +1,17 @@
+package com.hcloud.microserver.facade.carbon.entity;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+
+@Data
+@ApiModel
+public class DayCarbonBO implements Serializable {
+    @ApiModelProperty("碳汇量")
+    private long carbonNum;
+
+    @ApiModelProperty("订单数量")
+    private long orderNum;
+}

carbon-back/carbon-back-common/src/main/java/com/hcloud/microserver/facade/carbon/entity/FarmerInfo.java

@@ -0,0 +1,282 @@
+package com.hcloud.microserver.facade.carbon.entity;
+
+import lombok.ToString;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Date;
+
+@ToString
+public class FarmerInfo implements Serializable {
+
+    private static final long serialVersionUID = 764011447211904341L;
+    private String guid;
+
+    private String fkPovertyAreaId;
+
+    private String fkCollectiveId;
+
+    private String farmerCode;
+
+    private String farmerName;
+
+    private Integer familyNum;
+
+    private Integer sex;
+
+    private String pid;
+
+    private String nation;
+
+    private String education;
+
+    private String phone;
+
+    private String bankCardNo;
+
+    private BigDecimal incomeVal;
+
+    private String farmerType;
+
+    private String farmerRemark;
+
+    private String farmerImages;
+
+    private String villageOrg;
+
+    private Integer isEnable;
+
+    private Integer state;
+
+    private String createUser;
+
+    private Date createTime;
+
+    private String modifiedUser;
+
+    private Date modifiedTime;
+
+    private String bankClearingMsg;
+
+    private BigDecimal recieveMoney;
+
+    private BigDecimal actualMoney;
+
+    private PovertyArea povertyArea;
+
+    public String getGuid() {
+        return guid;
+    }
+
+    public void setGuid(String guid) {
+        this.guid = guid == null ? null : guid.trim();
+    }
+
+    public String getFkPovertyAreaId() {
+        return fkPovertyAreaId;
+    }
+
+    public void setFkPovertyAreaId(String fkPovertyAreaId) {
+        this.fkPovertyAreaId = fkPovertyAreaId == null ? null : fkPovertyAreaId.trim();
+    }
+
+    public String getFkCollectiveId() {
+        return fkCollectiveId;
+    }
+
+    public void setFkCollectiveId(String fkCollectiveId) {
+        this.fkCollectiveId = fkCollectiveId == null ? null : fkCollectiveId.trim();
+    }
+
+    public String getFarmerCode() {
+        return farmerCode;
+    }
+
+    public void setFarmerCode(String farmerCode) {
+        this.farmerCode = farmerCode == null ? null : farmerCode.trim();
+    }
+
+    public String getFarmerName() {
+        return farmerName;
+    }
+
+    public void setFarmerName(String farmerName) {
+        this.farmerName = farmerName == null ? null : farmerName.trim();
+    }
+
+    public Integer getFamilyNum() {
+        return familyNum;
+    }
+
+    public void setFamilyNum(Integer familyNum) {
+        this.familyNum = familyNum;
+    }
+
+    public Integer getSex() {
+        return sex;
+    }
+
+    public void setSex(Integer sex) {
+        this.sex = sex;
+    }
+
+    public String getPid() {
+        return pid;
+    }
+
+    public void setPid(String pid) {
+        this.pid = pid == null ? null : pid.trim();
+    }
+
+    public String getNation() {
+        return nation;
+    }
+
+    public void setNation(String nation) {
+        this.nation = nation == null ? null : nation.trim();
+    }
+
+    public String getEducation() {
+        return education;
+    }
+
+    public void setEducation(String education) {
+        this.education = education == null ? null : education.trim();
+    }
+
+    public String getPhone() {
+        return phone;
+    }
+
+    public void setPhone(String phone) {
+        this.phone = phone == null ? null : phone.trim();
+    }
+
+    public String getBankCardNo() {
+        return bankCardNo;
+    }
+
+    public void setBankCardNo(String bankCardNo) {
+        this.bankCardNo = bankCardNo == null ? null : bankCardNo.trim();
+    }
+
+    public BigDecimal getIncomeVal() {
+        return incomeVal;
+    }
+
+    public void setIncomeVal(BigDecimal incomeVal) {
+        this.incomeVal = incomeVal;
+    }
+
+    public String getFarmerType() {
+        return farmerType;
+    }
+
+    public void setFarmerType(String farmerType) {
+        this.farmerType = farmerType == null ? null : farmerType.trim();
+    }
+
+    public String getFarmerRemark() {
+        return farmerRemark;
+    }
+
+    public void setFarmerRemark(String farmerRemark) {
+        this.farmerRemark = farmerRemark == null ? null : farmerRemark.trim();
+    }
+
+    public String getFarmerImages() {
+        return farmerImages;
+    }
+
+    public void setFarmerImages(String farmerImages) {
+        this.farmerImages = farmerImages == null ? null : farmerImages.trim();
+    }
+
+    public String getVillageOrg() {
+        return villageOrg;
+    }
+
+    public void setVillageOrg(String villageOrg) {
+        this.villageOrg = villageOrg == null ? null : villageOrg.trim();
+    }
+
+    public Integer getIsEnable() {
+        return isEnable;
+    }
+
+    public void setIsEnable(Integer isEnable) {
+        this.isEnable = isEnable;
+    }
+
+    public Integer getState() {
+        return state;
+    }
+
+    public void setState(Integer state) {
+        this.state = state;
+    }
+
+    public String getCreateUser() {
+        return createUser;
+    }
+
+    public void setCreateUser(String createUser) {
+        this.createUser = createUser == null ? null : createUser.trim();
+    }
+
+    public Date getCreateTime() {
+        return createTime;
+    }
+
+    public void setCreateTime(Date createTime) {
+        this.createTime = createTime;
+    }
+
+    public String getModifiedUser() {
+        return modifiedUser;
+    }
+
+    public void setModifiedUser(String modifiedUser) {
+        this.modifiedUser = modifiedUser == null ? null : modifiedUser.trim();
+    }
+
+    public Date getModifiedTime() {
+        return modifiedTime;
+    }
+
+    public void setModifiedTime(Date modifiedTime) {
+        this.modifiedTime = modifiedTime;
+    }
+
+    public String getBankClearingMsg() {
+        return bankClearingMsg;
+    }
+
+    public void setBankClearingMsg(String bankClearingMsg) {
+        this.bankClearingMsg = bankClearingMsg == null ? null : bankClearingMsg.trim();
+    }
+
+    public BigDecimal getRecieveMoney() {
+        return recieveMoney;
+    }
+
+    public void setRecieveMoney(BigDecimal recieveMoney) {
+        this.recieveMoney = recieveMoney;
+    }
+
+    public BigDecimal getActualMoney() {
+        return actualMoney;
+    }
+
+    public void setActualMoney(BigDecimal actualMoney) {
+        this.actualMoney = actualMoney;
+    }
+
+    public PovertyArea getPovertyArea() {
+        return povertyArea;
+    }
+
+    public void setPovertyArea(PovertyArea povertyArea) {
+        this.povertyArea = povertyArea;
+    }
+}

carbon-back/carbon-back-common/src/main/java/com/hcloud/microserver/facade/carbon/entity/FarmerProductBelong.java

@@ -0,0 +1,21 @@
+package com.hcloud.microserver.facade.carbon.entity;
+
+import lombok.ToString;
+
+import java.io.Serializable;
+
+@ToString
+public class FarmerProductBelong extends ProductBelong implements Serializable {
+
+    private static final long serialVersionUID = -8900020095725959361L;
+
+    private FarmerInfo farmerInfo;
+
+    public FarmerInfo getFarmerInfo() {
+        return farmerInfo;
+    }
+
+    public void setFarmerInfo(FarmerInfo farmerInfo) {
+        this.farmerInfo = farmerInfo;
+    }
+}

carbon-back/carbon-back-common/src/main/java/com/hcloud/microserver/facade/carbon/entity/GoodsCredentialInfo.java

@@ -0,0 +1,169 @@
+package com.hcloud.microserver.facade.carbon.entity;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ * @author xiezt
+ */
+public class GoodsCredentialInfo {
+    private String guid;
+
+    private String fkCustomerId;
+
+    private String fkOrderId;
+
+    private String fkOrderDetailId;
+
+    private String credentialNo;
+
+    private Date buyDate;
+
+    private BigDecimal carbonAmount;
+
+    private String productAddress;
+
+    private Integer farmerCount;
+
+    private String farmerNames;
+
+    private String creImages;
+
+    private Integer state;
+
+    private String createUser;
+
+    private Date createTime;
+
+    private CustomerInfo customerInfo;
+
+    private GoodsOrderInfo goodsOrderInfo;
+
+    public String getGuid() {
+        return guid;
+    }
+
+    public void setGuid(String guid) {
+        this.guid = guid == null ? null : guid.trim();
+    }
+
+    public String getFkOrderId() {
+        return fkOrderId;
+    }
+
+    public void setFkOrderId(String fkOrderId) {
+        this.fkOrderId = fkOrderId == null ? null : fkOrderId.trim();
+    }
+
+    public String getFkOrderDetailId() {
+        return fkOrderDetailId;
+    }
+
+    public void setFkOrderDetailId(String fkOrderDetailId) {
+        this.fkOrderDetailId = fkOrderDetailId == null ? null : fkOrderDetailId.trim();
+    }
+
+    public Date getBuyDate() {
+        return buyDate;
+    }
+
+    public void setBuyDate(Date buyDate) {
+        this.buyDate = buyDate;
+    }
+
+    public BigDecimal getCarbonAmount() {
+        return carbonAmount;
+    }
+
+    public void setCarbonAmount(BigDecimal carbonAmount) {
+        this.carbonAmount = carbonAmount;
+    }
+
+    public String getProductAddress() {
+        return productAddress;
+    }
+
+    public void setProductAddress(String productAddress) {
+        this.productAddress = productAddress == null ? null : productAddress.trim();
+    }
+
+    public Integer getFarmerCount() {
+        return farmerCount;
+    }
+
+    public void setFarmerCount(Integer farmerCount) {
+        this.farmerCount = farmerCount;
+    }
+
+    public String getFarmerNames() {
+        return farmerNames;
+    }
+
+    public void setFarmerNames(String farmerNames) {
+        this.farmerNames = farmerNames == null ? null : farmerNames.trim();
+    }
+
+    public String getCreImages() {
+        return creImages;
+    }
+
+    public void setCreImages(String creImages) {
+        this.creImages = creImages == null ? null : creImages.trim();
+    }
+
+    public Integer getState() {
+        return state;
+    }
+
+    public void setState(Integer state) {
+        this.state = state;
+    }
+
+    public String getCreateUser() {
+        return createUser;
+    }
+
+    public void setCreateUser(String createUser) {
+        this.createUser = createUser == null ? null : createUser.trim();
+    }
+
+    public Date getCreateTime() {
+        return createTime;
+    }
+
+    public void setCreateTime(Date createTime) {
+        this.createTime = createTime;
+    }
+
+    public String getCredentialNo() {
+        return credentialNo;
+    }
+
+    public void setCredentialNo(String credentialNo) {
+        this.credentialNo = credentialNo==null?null:credentialNo.trim();
+    }
+
+    public String getFkCustomerId() {
+        return fkCustomerId;
+    }
+
+    public void setFkCustomerId(String fkCustomerId) {
+        this.fkCustomerId = fkCustomerId==null ? null : fkCustomerId.trim();
+    }
+
+    public CustomerInfo getCustomerInfo() {
+        return customerInfo;
+    }
+
+    public void setCustomerInfo(CustomerInfo customerInfo) {
+        this.customerInfo = customerInfo;
+    }
+
+    public GoodsOrderInfo getGoodsOrderInfo() {
+        return goodsOrderInfo;
+    }
+
+    public void setGoodsOrderInfo(GoodsOrderInfo goodsOrderInfo) {
+        this.goodsOrderInfo = goodsOrderInfo;
+    }
+}

carbon-back/carbon-back-common/src/main/java/com/hcloud/microserver/facade/carbon/entity/GoodsDetail.java

@@ -0,0 +1,147 @@
+package com.hcloud.microserver.facade.carbon.entity;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Date;
+
+public class GoodsDetail implements Serializable {
+
+    private static final long serialVersionUID = 4150521701359158295L;
+    private String guid;
+
+    private String fkGoodsGuid;
+
+    private String fkProductGuid;
+
+    private String productName;
+
+    private String productCode;
+
+    private String saleUnit;
+
+    private BigDecimal carbonVal;
+
+    private Integer isEnable;
+
+    private Integer farmerNums;
+
+    private Integer state;
+
+    private Date createTime;
+
+    private Date modifiedTime;
+
+    public String getGuid() {
+        return guid;
+    }
+
+    public void setGuid(String guid) {
+        this.guid = guid == null ? null : guid.trim();
+    }
+
+    public String getFkGoodsGuid() {
+        return fkGoodsGuid;
+    }
+
+    public void setFkGoodsGuid(String fkGoodsGuid) {
+        this.fkGoodsGuid = fkGoodsGuid == null ? null : fkGoodsGuid.trim();
+    }
+
+    public String getFkProductGuid() {
+        return fkProductGuid;
+    }
+
+    public void setFkProductGuid(String fkProductGuid) {
+        this.fkProductGuid = fkProductGuid == null ? null : fkProductGuid.trim();
+    }
+
+    public String getProductName() {
+        return productName;
+    }
+
+    public void setProductName(String productName) {
+        this.productName = productName == null ? null : productName.trim();
+    }
+
+    public String getProductCode() {
+        return productCode;
+    }
+
+    public void setProductCode(String productCode) {
+        this.productCode = productCode == null ? null : productCode.trim();
+    }
+
+    public String getSaleUnit() {
+        return saleUnit;
+    }
+
+    public void setSaleUnit(String saleUnit) {
+        this.saleUnit = saleUnit == null ? null : saleUnit.trim();
+    }
+
+    public BigDecimal getCarbonVal() {
+        return carbonVal;
+    }
+
+    public void setCarbonVal(BigDecimal carbonVal) {
+        this.carbonVal = carbonVal;
+    }
+
+    public Integer getIsEnable() {
+        return isEnable;
+    }
+
+    public void setIsEnable(Integer isEnable) {
+        this.isEnable = isEnable;
+    }
+
+    public Integer getFarmerNums() {
+        return farmerNums;
+    }
+
+    public void setFarmerNums(Integer farmerNums) {
+        this.farmerNums = farmerNums;
+    }
+
+    public Integer getState() {
+        return state;
+    }
+
+    public void setState(Integer state) {
+        this.state = state;
+    }
+
+    public Date getCreateTime() {
+        return createTime;
+    }
+
+    public void setCreateTime(Date createTime) {
+        this.createTime = createTime;
+    }
+
+    public Date getModifiedTime() {
+        return modifiedTime;
+    }
+
+    public void setModifiedTime(Date modifiedTime) {
+        this.modifiedTime = modifiedTime;
+    }
+
+    @Override
+    public String toString() {
+        return "GoodsDetail{" +
+                "guid='" + guid + '\'' +
+                ", fkGoodsGuid='" + fkGoodsGuid + '\'' +
+                ", fkProductGuid='" + fkProductGuid + '\'' +
+                ", productName='" + productName + '\'' +
+                ", productCode='" + productCode + '\'' +
+                ", saleUnit='" + saleUnit + '\'' +
+                ", carbonVal=" + carbonVal +
+                ", isEnable=" + isEnable +
+                ", farmerNums=" + farmerNums +
+                ", state=" + state +
+                ", createTime=" + createTime +
+                ", modifiedTime=" + modifiedTime +
+                '}';
+    }
+}

carbon-back/carbon-back-common/src/main/java/com/hcloud/microserver/facade/carbon/entity/GoodsInfo.java

@@ -0,0 +1,227 @@
+package com.hcloud.microserver.facade.carbon.entity;
+
+import lombok.ToString;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ * @author JYJ
+ */
+@ToString
+public class GoodsInfo implements Serializable {
+
+    private static final long serialVersionUID = -2833811165241905425L;
+
+    private String guid;
+
+    private String goodsType;
+
+    private String goodsCode;
+
+    private String goodsName;
+
+    private BigDecimal carbonVal;
+
+    private BigDecimal price;
+
+    private String goodsDesc;
+
+    private String goodsImages;
+
+    private Date goodsSaleDate;
+
+    private Integer isSale;
+
+    private Integer state;
+
+    private String createUser;
+
+    private Date createTime;
+
+    private String modifiedUser;
+
+    private Date modifiedTime;
+
+    private String goodsUse;
+
+    // 非t_goods_info表字段,需要join其他表用于显示的字段
+    private String productTypeName;
+
+    private BigDecimal saledCarbonSkin;
+
+    private BigDecimal unsaledCarbonSkin;
+
+    private String saleTargets;
+
+    private String saleType;
+
+    public String getGuid() {
+        return guid;
+    }
+
+    public void setGuid(String guid) {
+        this.guid = guid == null ? null : guid.trim();
+    }
+
+    public String getGoodsType() {
+        return goodsType;
+    }
+
+    public void setGoodsType(String goodsType) {
+        this.goodsType = goodsType==null?null:goodsType.trim();
+    }
+
+    public String getGoodsCode() {
+        return goodsCode;
+    }
+
+    public void setGoodsCode(String goodsCode) {
+        this.goodsCode = goodsCode == null ? null : goodsCode.trim();
+    }
+
+    public String getGoodsName() {
+        return goodsName;
+    }
+
+    public void setGoodsName(String goodsName) {
+        this.goodsName = goodsName == null ? null : goodsName.trim();
+    }
+
+    public BigDecimal getCarbonVal() {
+        return carbonVal;
+    }
+
+    public void setCarbonVal(BigDecimal carbonVal) {
+        this.carbonVal = carbonVal;
+    }
+
+    public BigDecimal getPrice() {
+        return price;
+    }
+
+    public void setPrice(BigDecimal price) {
+        this.price = price;
+    }
+
+    public String getGoodsDesc() {
+        return goodsDesc;
+    }
+
+    public void setGoodsDesc(String goodsDesc) {
+        this.goodsDesc = goodsDesc == null ? null : goodsDesc.trim();
+    }
+
+    public String getGoodsImages() {
+        return goodsImages;
+    }
+
+    public void setGoodsImages(String goodsImages) {
+        this.goodsImages = goodsImages == null ? null : goodsImages.trim();
+    }
+
+    public Integer getIsSale() {
+        return isSale;
+    }
+
+    public void setIsSale(Integer isSale) {
+        this.isSale = isSale;
+    }
+
+    public Integer getState() {
+        return state;
+    }
+
+    public void setState(Integer state) {
+        this.state = state;
+    }
+
+    public String getCreateUser() {
+        return createUser;
+    }
+
+    public void setCreateUser(String createUser) {
+        this.createUser = createUser == null ? null : createUser.trim();
+    }
+
+    public Date getCreateTime() {
+        return createTime;
+    }
+
+    public void setCreateTime(Date createTime) {
+        this.createTime = createTime;
+    }
+
+    public String getModifiedUser() {
+        return modifiedUser;
+    }
+
+    public void setModifiedUser(String modifiedUser) {
+        this.modifiedUser = modifiedUser == null ? null : modifiedUser.trim();
+    }
+
+    public Date getModifiedTime() {
+        return modifiedTime;
+    }
+
+    public void setModifiedTime(Date modifiedTime) {
+        this.modifiedTime = modifiedTime;
+    }
+
+    public String getGoodsUse() {
+        return goodsUse;
+    }
+
+    public void setGoodsUse(String goodsUse) {
+        this.goodsUse = goodsUse;
+    }
+
+    public Date getGoodsSaleDate() {
+        return goodsSaleDate;
+    }
+
+    public void setGoodsSaleDate(Date goodsSaleDate) {
+        this.goodsSaleDate = goodsSaleDate;
+    }
+
+    public String getProductTypeName() {
+        return productTypeName;
+    }
+
+    public void setProductTypeName(String productTypeName) {
+        this.productTypeName = productTypeName;
+    }
+
+    public BigDecimal getSaledCarbonSkin() {
+        return saledCarbonSkin;
+    }
+
+    public void setSaledCarbonSkin(BigDecimal saledCarbonSkin) {
+        this.saledCarbonSkin = saledCarbonSkin;
+    }
+
+    public BigDecimal getUnsaledCarbonSkin() {
+        return unsaledCarbonSkin;
+    }
+
+    public void setUnsaledCarbonSkin(BigDecimal unsaledCarbonSkin) {
+        this.unsaledCarbonSkin = unsaledCarbonSkin;
+    }
+
+    public String getSaleTargets() {
+        return saleTargets;
+    }
+
+    public void setSaleTargets(String saleTargets) {
+        this.saleTargets = saleTargets;
+    }
+
+    public String getSaleType() {
+        return saleType;
+    }
+
+    public void setSaleType(String saleType) {
+        this.saleType = saleType;
+    }
+}

carbon-back/carbon-back-common/src/main/java/com/hcloud/microserver/facade/carbon/entity/GoodsOrderDetail.java

@@ -0,0 +1,120 @@
+package com.hcloud.microserver.facade.carbon.entity;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ * @author xiezt
+ */
+public class GoodsOrderDetail {
+
+    private String guid;
+
+    private String fkOrderGuid;
+
+    private String fkGoodsGuid;
+
+    private String goodsName;
+
+    private BigDecimal goodsPrice;
+
+    private BigDecimal saleNum;
+
+    private BigDecimal amount;
+
+    private Integer state;
+
+    private String createUser;
+
+    private Date createTime;
+
+    private GoodsInfo goodsInfo;
+
+    public String getGuid() {
+        return guid;
+    }
+
+    public void setGuid(String guid) {
+        this.guid = guid == null ? null : guid.trim();
+    }
+
+    public String getFkOrderGuid() {
+        return fkOrderGuid;
+    }
+
+    public void setFkOrderGuid(String fkOrderGuid) {
+        this.fkOrderGuid = fkOrderGuid == null ? null : fkOrderGuid.trim();
+    }
+
+    public String getFkGoodsGuid() {
+        return fkGoodsGuid;
+    }
+
+    public void setFkGoodsGuid(String fkGoodsGuid) {
+        this.fkGoodsGuid = fkGoodsGuid == null ? null : fkGoodsGuid.trim();
+    }
+
+    public String getGoodsName() {
+        return goodsName;
+    }
+
+    public void setGoodsName(String goodsName) {
+        this.goodsName = goodsName == null ? null : goodsName.trim();
+    }
+
+    public BigDecimal getGoodsPrice() {
+        return goodsPrice;
+    }
+
+    public void setGoodsPrice(BigDecimal goodsPrice) {
+        this.goodsPrice = goodsPrice;
+    }
+
+    public BigDecimal getSaleNum() {
+        return saleNum;
+    }
+
+    public void setSaleNum(BigDecimal saleNum) {
+        this.saleNum = saleNum;
+    }
+
+    public BigDecimal getAmount() {
+        return amount;
+    }
+
+    public void setAmount(BigDecimal amount) {
+        this.amount = amount;
+    }
+
+    public Integer getState() {
+        return state;
+    }
+
+    public void setState(Integer state) {
+        this.state = state;
+    }
+
+    public String getCreateUser() {
+        return createUser;
+    }
+
+    public void setCreateUser(String createUser) {
+        this.createUser = createUser == null ? null : createUser.trim();
+    }
+
+    public Date getCreateTime() {
+        return createTime;
+    }
+
+    public void setCreateTime(Date createTime) {
+        this.createTime = createTime;
+    }
+
+    public GoodsInfo getGoodsInfo() {
+        return goodsInfo;
+    }
+
+    public void setGoodsInfo(GoodsInfo goodsInfo) {
+        this.goodsInfo = goodsInfo;
+    }
+}

carbon-back/carbon-back-common/src/main/java/com/hcloud/microserver/facade/carbon/entity/GoodsOrderInfo.java

@@ -0,0 +1,146 @@
+package com.hcloud.microserver.facade.carbon.entity;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+public class GoodsOrderInfo {
+    private String guid;
+
+    private String fkCustomerGuid;
+
+    private String orderNo;
+
+    private String customerName;
+
+    private String customerType;
+
+    private BigDecimal orderAmount;
+
+    private BigDecimal orderCarbonAmount;
+
+    private Integer orderStatus;
+
+    private Integer state;
+
+    private String createUser;
+
+    private Date createTime;
+
+    private String modifiedUser;
+
+    private Date modifiedTime;
+
+    private String payNo;
+
+    public String getGuid() {
+        return guid;
+    }
+
+    public void setGuid(String guid) {
+        this.guid = guid == null ? null : guid.trim();
+    }
+
+    public String getFkCustomerGuid() {
+        return fkCustomerGuid;
+    }
+
+    public void setFkCustomerGuid(String fkCustomerGuid) {
+        this.fkCustomerGuid = fkCustomerGuid == null ? null : fkCustomerGuid.trim();
+    }
+
+    public String getOrderNo() {
+        return orderNo;
+    }
+
+    public void setOrderNo(String orderNo) {
+        this.orderNo = orderNo == null ? null : orderNo.trim();
+    }
+
+    public BigDecimal getOrderAmount() {
+        return orderAmount;
+    }
+
+    public void setOrderAmount(BigDecimal orderAmount) {
+        this.orderAmount = orderAmount;
+    }
+
+    public BigDecimal getOrderCarbonAmount() {
+        return orderCarbonAmount;
+    }
+
+    public void setOrderCarbonAmount(BigDecimal orderCarbonAmount) {
+        this.orderCarbonAmount = orderCarbonAmount;
+    }
+
+    public Integer getOrderStatus() {
+        return orderStatus;
+    }
+
+    public void setOrderStatus(Integer orderStatus) {
+        this.orderStatus = orderStatus;
+    }
+
+    public Integer getState() {
+        return state;
+    }
+
+    public void setState(Integer state) {
+        this.state = state;
+    }
+
+    public String getCreateUser() {
+        return createUser;
+    }
+
+    public void setCreateUser(String createUser) {
+        this.createUser = createUser == null ? null : createUser.trim();
+    }
+
+    public Date getCreateTime() {
+        return createTime;
+    }
+
+    public void setCreateTime(Date createTime) {
+        this.createTime = createTime;
+    }
+
+    public String getModifiedUser() {
+        return modifiedUser;
+    }
+
+    public void setModifiedUser(String modifiedUser) {
+        this.modifiedUser = modifiedUser == null ? null : modifiedUser.trim();
+    }
+
+    public Date getModifiedTime() {
+        return modifiedTime;
+    }
+
+    public void setModifiedTime(Date modifiedTime) {
+        this.modifiedTime = modifiedTime;
+    }
+
+    public String getCustomerName() {
+        return customerName;
+    }
+
+    public void setCustomerName(String customerName) {
+        this.customerName = customerName==null?null:customerName.trim();
+    }
+
+    public String getCustomerType() {
+        return customerType;
+    }
+
+    public void setCustomerType(String customerType) {
+        this.customerType = customerType==null?null:customerType.trim();
+    }
+
+    public String getPayNo() {
+        return payNo;
+    }
+
+    public void setPayNo(String payNo) {
+        this.payNo = payNo==null?null:payNo.trim();
+    }
+}

carbon-back/carbon-back-common/src/main/java/com/hcloud/microserver/facade/carbon/entity/GoodsPayOrder.java

@@ -0,0 +1,116 @@
+package com.hcloud.microserver.facade.carbon.entity;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+public class GoodsPayOrder {
+    private String guid;
+
+    private String fkCustomerId;
+
+    private String fkOrderId;
+
+    private String orderNo;
+
+    private String payNo;
+
+    private BigDecimal payAmount;
+
+    private Integer payChannel;
+
+    private Date payTime;
+
+    private Integer payStatus;
+
+    private Integer state;
+
+    private Date createTime;
+
+    public String getGuid() {
+        return guid;
+    }
+
+    public void setGuid(String guid) {
+        this.guid = guid == null ? null : guid.trim();
+    }
+
+    public String getFkCustomerId() {
+        return fkCustomerId;
+    }
+
+    public void setFkCustomerId(String fkCustomerId) {
+        this.fkCustomerId = fkCustomerId == null ? null : fkCustomerId.trim();
+    }
+
+    public String getFkOrderId() {
+        return fkOrderId;
+    }
+
+    public void setFkOrderId(String fkOrderId) {
+        this.fkOrderId = fkOrderId == null ? null : fkOrderId.trim();
+    }
+
+    public String getOrderNo() {
+        return orderNo;
+    }
+
+    public void setOrderNo(String orderNo) {
+        this.orderNo = orderNo == null ? null : orderNo.trim();
+    }
+
+    public String getPayNo() {
+        return payNo;
+    }
+
+    public void setPayNo(String payNo) {
+        this.payNo = payNo == null ? null : payNo.trim();
+    }
+
+    public BigDecimal getPayAmount() {
+        return payAmount;
+    }
+
+    public void setPayAmount(BigDecimal payAmount) {
+        this.payAmount = payAmount;
+    }
+
+    public Integer getPayChannel() {
+        return payChannel;
+    }
+
+    public void setPayChannel(Integer payChannel) {
+        this.payChannel = payChannel;
+    }
+
+    public Date getPayTime() {
+        return payTime;
+    }
+
+    public void setPayTime(Date payTime) {
+        this.payTime = payTime;
+    }
+
+    public Integer getPayStatus() {
+        return payStatus;
+    }
+
+    public void setPayStatus(Integer payStatus) {
+        this.payStatus = payStatus;
+    }
+
+    public Integer getState() {
+        return state;
+    }
+
+    public void setState(Integer state) {
+        this.state = state;
+    }
+
+    public Date getCreateTime() {
+        return createTime;
+    }
+
+    public void setCreateTime(Date createTime) {
+        this.createTime = createTime;
+    }
+}

carbon-back/carbon-back-common/src/main/java/com/hcloud/microserver/facade/carbon/entity/GoodsSaleInfo.java

@@ -0,0 +1,143 @@
+package com.hcloud.microserver.facade.carbon.entity;
+
+import lombok.ToString;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Date;
+
+@ToString
+public class GoodsSaleInfo implements Serializable {
+
+    private static final long serialVersionUID = 7343587609332991440L;
+
+    private String guid;
+
+    private String fkGoodsGuid;
+
+    private BigDecimal salePrice;
+
+    private BigDecimal companyPrice;
+
+    private BigDecimal memberPrice;
+
+    private BigDecimal saledCarbonSkin;
+
+    private BigDecimal unsaledCarbonSkin;
+
+    private Integer isEnable;
+
+    private Integer state;
+
+    private Date modifiedTime;
+
+    private Integer saleType;
+
+    private String saleTargets;
+
+    private String saleUnit;
+
+    public String getGuid() {
+        return guid;
+    }
+
+    public void setGuid(String guid) {
+        this.guid = guid == null ? null : guid.trim();
+    }
+
+    public String getFkGoodsGuid() {
+        return fkGoodsGuid;
+    }
+
+    public void setFkGoodsGuid(String fkGoodsGuid) {
+        this.fkGoodsGuid = fkGoodsGuid == null ? null : fkGoodsGuid.trim();
+    }
+
+    public BigDecimal getSalePrice() {
+        return salePrice;
+    }
+
+    public void setSalePrice(BigDecimal salePrice) {
+        this.salePrice = salePrice;
+    }
+
+    public BigDecimal getCompanyPrice() {
+        return companyPrice;
+    }
+
+    public void setCompanyPrice(BigDecimal companyPrice) {
+        this.companyPrice = companyPrice;
+    }
+
+    public BigDecimal getMemberPrice() {
+        return memberPrice;
+    }
+
+    public void setMemberPrice(BigDecimal memberPrice) {
+        this.memberPrice = memberPrice;
+    }
+
+    public BigDecimal getSaledCarbonSkin() {
+        return saledCarbonSkin;
+    }
+
+    public void setSaledCarbonSkin(BigDecimal saledCarbonSkin) {
+        this.saledCarbonSkin = saledCarbonSkin;
+    }
+
+    public BigDecimal getUnsaledCarbonSkin() {
+        return unsaledCarbonSkin;
+    }
+
+    public void setUnsaledCarbonSkin(BigDecimal unsaledCarbonSkin) {
+        this.unsaledCarbonSkin = unsaledCarbonSkin;
+    }
+
+    public Integer getIsEnable() {
+        return isEnable;
+    }
+
+    public void setIsEnable(Integer isEnable) {
+        this.isEnable = isEnable;
+    }
+
+    public Integer getState() {
+        return state;
+    }
+
+    public void setState(Integer state) {
+        this.state = state;
+    }
+
+    public Date getModifiedTime() {
+        return modifiedTime;
+    }
+
+    public void setModifiedTime(Date modifiedTime) {
+        this.modifiedTime = modifiedTime;
+    }
+
+    public Integer getSaleType() {
+        return saleType;
+    }
+
+    public void setSaleType(Integer saleType) {
+        this.saleType = saleType;
+    }
+
+    public String getSaleTargets() {
+        return saleTargets;
+    }
+
+    public void setSaleTargets(String saleTargets) {
+        this.saleTargets = saleTargets;
+    }
+
+    public String getSaleUnit() {
+        return saleUnit;
+    }
+
+    public void setSaleUnit(String saleUnit) {
+        this.saleUnit = saleUnit;
+    }
+}

carbon-back/carbon-back-common/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-back/carbon-back-common/src/main/java/com/hcloud/microserver/facade/carbon/entity/OrderPayApply.java

@@ -0,0 +1,106 @@
+package com.hcloud.microserver.facade.carbon.entity;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+public class OrderPayApply {
+    private String guid;
+
+    private String fkCustomerId;
+
+    private String fkOrderId;
+
+    private String applyUserName;
+
+    private BigDecimal payAmount;
+
+    private String remark;
+
+    private Integer applyStatus;
+
+    private Integer state;
+
+    private Date createTime;
+
+    private Date modifiedTime;
+
+    public String getGuid() {
+        return guid;
+    }
+
+    public void setGuid(String guid) {
+        this.guid = guid == null ? null : guid.trim();
+    }
+
+    public String getFkCustomerId() {
+        return fkCustomerId;
+    }
+
+    public void setFkCustomerId(String fkCustomerId) {
+        this.fkCustomerId = fkCustomerId == null ? null : fkCustomerId.trim();
+    }
+
+    public String getFkOrderId() {
+        return fkOrderId;
+    }
+
+    public void setFkOrderId(String fkOrderId) {
+        this.fkOrderId = fkOrderId == null ? null : fkOrderId.trim();
+    }
+
+    public String getApplyUserName() {
+        return applyUserName;
+    }
+
+    public void setApplyUserName(String applyUserName) {
+        this.applyUserName = applyUserName == null ? null : applyUserName.trim();
+    }
+
+    public BigDecimal getPayAmount() {
+        return payAmount;
+    }
+
+    public void setPayAmount(BigDecimal payAmount) {
+        this.payAmount = payAmount;
+    }
+
+    public String getRemark() {
+        return remark;
+    }
+
+    public void setRemark(String remark) {
+        this.remark = remark == null ? null : remark.trim();
+    }
+
+    public Integer getApplyStatus() {
+        return applyStatus;
+    }
+
+    public void setApplyStatus(Integer applyStatus) {
+        this.applyStatus = applyStatus;
+    }
+
+    public Integer getState() {
+        return state;
+    }
+
+    public void setState(Integer state) {
+        this.state = state;
+    }
+
+    public Date getCreateTime() {
+        return createTime;
+    }
+
+    public void setCreateTime(Date createTime) {
+        this.createTime = createTime;
+    }
+
+    public Date getModifiedTime() {
+        return modifiedTime;
+    }
+
+    public void setModifiedTime(Date modifiedTime) {
+        this.modifiedTime = modifiedTime;
+    }
+}

carbon-back/carbon-back-common/src/main/java/com/hcloud/microserver/facade/carbon/entity/OrderPayVoucher.java

@@ -0,0 +1,140 @@
+package com.hcloud.microserver.facade.carbon.entity;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ * @author xiezt
+ */
+public class OrderPayVoucher {
+
+    private String guid;
+
+    private String fkOrderId;
+
+    private String fkCustomerId;
+
+    private String fkApplyId;
+
+    private String payUserName;
+
+    private String payBank;
+
+    private String payCardNo;
+
+    private BigDecimal payAmount;
+
+    private Date payTime;
+
+    private String voucherImages;
+
+    private Integer state;
+
+    private Date createTime;
+
+    private Date modifiedTime;
+
+    public String getGuid() {
+        return guid;
+    }
+
+    public void setGuid(String guid) {
+        this.guid = guid == null ? null : guid.trim();
+    }
+
+    public String getFkOrderId() {
+        return fkOrderId;
+    }
+
+    public void setFkOrderId(String fkOrderId) {
+        this.fkOrderId = fkOrderId == null ? null : fkOrderId.trim();
+    }
+
+    public String getFkCustomerId() {
+        return fkCustomerId;
+    }
+
+    public void setFkCustomerId(String fkCustomerId) {
+        this.fkCustomerId = fkCustomerId == null ? null : fkCustomerId.trim();
+    }
+
+    public String getFkApplyId() {
+        return fkApplyId;
+    }
+
+    public void setFkApplyId(String fkApplyId) {
+        this.fkApplyId = fkApplyId == null ? null : fkApplyId.trim();
+    }
+
+    public String getPayUserName() {
+        return payUserName;
+    }
+
+    public void setPayUserName(String payUserName) {
+        this.payUserName = payUserName == null ? null : payUserName.trim();
+    }
+
+    public String getPayBank() {
+        return payBank;
+    }
+
+    public void setPayBank(String payBank) {
+        this.payBank = payBank == null ? null : payBank.trim();
+    }
+
+    public String getPayCardNo() {
+        return payCardNo;
+    }
+
+    public void setPayCardNo(String payCardNo) {
+        this.payCardNo = payCardNo == null ? null : payCardNo.trim();
+    }
+
+    public BigDecimal getPayAmount() {
+        return payAmount;
+    }
+
+    public void setPayAmount(BigDecimal payAmount) {
+        this.payAmount = payAmount;
+    }
+
+    public Date getPayTime() {
+        return payTime;
+    }
+
+    public void setPayTime(Date payTime) {
+        this.payTime = payTime;
+    }
+
+    public String getVoucherImages() {
+        return voucherImages;
+    }
+
+    public void setVoucherImages(String voucherImages) {
+        this.voucherImages = voucherImages == null ? null : voucherImages.trim();
+    }
+
+    public Integer getState() {
+        return state;
+    }
+
+    public void setState(Integer state) {
+        this.state = state;
+    }
+
+    public Date getCreateTime() {
+        return createTime;
+    }
+
+    public void setCreateTime(Date createTime) {
+        this.createTime = createTime;
+    }
+
+    public Date getModifiedTime() {
+        return modifiedTime;
+    }
+
+    public void setModifiedTime(Date modifiedTime) {
+        this.modifiedTime = modifiedTime;
+    }
+}

carbon-back/carbon-back-common/src/main/java/com/hcloud/microserver/facade/carbon/entity/PovertyArea.java

@@ -0,0 +1,45 @@
+package com.hcloud.microserver.facade.carbon.entity;
+
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * @author xiezt
+ */
+@Data
+public class PovertyArea {
+    private String guid;
+
+    private String povertyAreaName;
+
+    private String areaAddress;
+
+    private String areaDesc;
+
+    private String cityId;
+
+    private String countyId;
+
+    private String townId;
+
+    private String villageId;
+
+    private String areaImages;
+
+    private Integer isEnable;
+
+    private Integer state;
+
+    private String createUser;
+
+    private Date createTime;
+
+    private String modifiedUser;
+
+    private Date modifiedTime;
+
+    private String provinceId;
+
+    private Integer familyNum;
+}

carbon-back/carbon-back-common/src/main/java/com/hcloud/microserver/facade/carbon/entity/ProductBelong.java

@@ -0,0 +1,121 @@
+package com.hcloud.microserver.facade.carbon.entity;
+
+import lombok.ToString;
+
+import java.io.Serializable;
+import java.util.Date;
+import java.util.List;
+
+@ToString
+public class ProductBelong implements Serializable {
+    private static final long serialVersionUID = -5693556988379041946L;
+    private String guid;
+
+    private String fkProductGuid;
+
+    private String fkFarmerGuid;
+
+    private String fkCollectiveGuid;
+
+    private String farmerName;
+
+    private String farmerVillage;
+
+    private Integer farmerNum;
+
+    private Integer state;
+
+    private Date createTime;
+
+    private Date modifiedTime;
+
+    private Integer belongType;
+
+    public String getGuid() {
+        return guid;
+    }
+
+    public void setGuid(String guid) {
+        this.guid = guid == null ? null : guid.trim();
+    }
+
+    public String getFkProductGuid() {
+        return fkProductGuid;
+    }
+
+    public void setFkProductGuid(String fkProductGuid) {
+        this.fkProductGuid = fkProductGuid == null ? null : fkProductGuid.trim();
+    }
+
+    public String getFkFarmerGuid() {
+        return fkFarmerGuid;
+    }
+
+    public void setFkFarmerGuid(String fkFarmerGuid) {
+        this.fkFarmerGuid = fkFarmerGuid == null ? null : fkFarmerGuid.trim();
+    }
+
+    public String getFkCollectiveGuid() {
+        return fkCollectiveGuid;
+    }
+
+    public void setFkCollectiveGuid(String fkCollectiveGuid) {
+        this.fkCollectiveGuid = fkCollectiveGuid;
+    }
+
+    public String getFarmerName() {
+        return farmerName;
+    }
+
+    public void setFarmerName(String farmerName) {
+        this.farmerName = farmerName == null ? null : farmerName.trim();
+    }
+
+    public String getFarmerVillage() {
+        return farmerVillage;
+    }
+
+    public void setFarmerVillage(String farmerVillage) {
+        this.farmerVillage = farmerVillage == null ? null : farmerVillage.trim();
+    }
+
+    public Integer getFarmerNum() {
+        return farmerNum;
+    }
+
+    public void setFarmerNum(Integer farmerNum) {
+        this.farmerNum = farmerNum;
+    }
+
+    public Integer getState() {
+        return state;
+    }
+
+    public void setState(Integer state) {
+        this.state = state;
+    }
+
+    public Date getCreateTime() {
+        return createTime;
+    }
+
+    public void setCreateTime(Date createTime) {
+        this.createTime = createTime;
+    }
+
+    public Date getModifiedTime() {
+        return modifiedTime;
+    }
+
+    public void setModifiedTime(Date modifiedTime) {
+        this.modifiedTime = modifiedTime;
+    }
+
+    public Integer getBelongType() {
+        return belongType;
+    }
+
+    public void setBelongType(Integer belongType) {
+        this.belongType = belongType;
+    }
+}

carbon-back/carbon-back-common/src/main/java/com/hcloud/microserver/facade/carbon/entity/ProductExpansion.java

@@ -0,0 +1,101 @@
+package com.hcloud.microserver.facade.carbon.entity;
+
+import java.io.Serializable;
+import java.util.Date;
+
+public class ProductExpansion implements Serializable {
+    private static final long serialVersionUID = -8280719751518169272L;
+    private String guid;
+
+    private String fkProductGuid;
+
+    private String fkProductTypeGuid;
+
+    private String expansionItem;
+
+    private String expansionVal;
+
+    private Integer state;
+
+    private Date createTime;
+
+    private Date modifiedTime;
+
+    public String getGuid() {
+        return guid;
+    }
+
+    public void setGuid(String guid) {
+        this.guid = guid == null ? null : guid.trim();
+    }
+
+    public String getFkProductGuid() {
+        return fkProductGuid;
+    }
+
+    public void setFkProductGuid(String fkProductGuid) {
+        this.fkProductGuid = fkProductGuid == null ? null : fkProductGuid.trim();
+    }
+
+    public String getExpansionItem() {
+        return expansionItem;
+    }
+
+    public void setExpansionItem(String expansionItem) {
+        this.expansionItem = expansionItem == null ? null : expansionItem.trim();
+    }
+
+    public String getExpansionVal() {
+        return expansionVal;
+    }
+
+    public void setExpansionVal(String expansionVal) {
+        this.expansionVal = expansionVal == null ? null : expansionVal.trim();
+    }
+
+    public Integer getState() {
+        return state;
+    }
+
+    public void setState(Integer state) {
+        this.state = state;
+    }
+
+    public Date getCreateTime() {
+        return createTime;
+    }
+
+    public void setCreateTime(Date createTime) {
+        this.createTime = createTime;
+    }
+
+    public Date getModifiedTime() {
+        return modifiedTime;
+    }
+
+    public void setModifiedTime(Date modifiedTime) {
+        this.modifiedTime = modifiedTime;
+    }
+
+    public String getFkProductTypeGuid() {
+        return fkProductTypeGuid;
+    }
+
+    public void setFkProductTypeGuid(String fkProductTypeGuid) {
+        this.fkProductTypeGuid = fkProductTypeGuid;
+    }
+
+    @Override
+    public String toString() {
+        return "ProductExpansion{" +
+                "guid='" + guid + '\'' +
+                ", fkProductGuid='" + fkProductGuid + '\'' +
+                ", fkProductTypeGuid='" + fkProductTypeGuid + '\'' +
+                ", expansionItem='" + expansionItem + '\'' +
+                ", expansionVal='" + expansionVal + '\'' +
+                ", state=" + state +
+                ", createTime=" + createTime +
+                ", modifiedTime=" + modifiedTime +
+                '}';
+    }
+}

carbon-back/carbon-back-common/src/main/java/com/hcloud/microserver/facade/carbon/entity/ProductInfo.java

@@ -0,0 +1,233 @@
+package com.hcloud.microserver.facade.carbon.entity;
+
+import lombok.ToString;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Date;
+import java.util.List;
+
+@ToString
+public class ProductInfo implements Serializable {
+
+    private static final long serialVersionUID = -4385146356458594027L;
+    private String guid;
+
+    private String fkProductType;
+
+    private String fkCarbonRule;
+
+    private String fkPovertyArea;
+
+    private String productName;
+
+    private String productCode;
+
+    private Date carbonGenerateDate;
+
+    private Integer productValidateNum;
+
+    private Date carbonRefreshTime;
+
+    private BigDecimal carbonSink;
+
+    private String productImgs;
+
+    private Integer isEnable;
+
+    private String remark;
+
+    private Integer state;
+
+    private String createUser;
+
+    private Date createTime;
+
+    private String modifiedUser;
+
+    private Date modifiedTime;
+
+    private List<ProductExpansion> productExpansions;
+
+    private List<ProductBelong> productBelongs;
+
+    private ProductType productType;
+
+    private PovertyArea povertyArea;
+
+    public String getGuid() {
+        return guid;
+    }
+
+    public void setGuid(String guid) {
+        this.guid = guid;
+    }
+
+    public String getFkProductType() {
+        return fkProductType;
+    }
+
+    public void setFkProductType(String fkProductType) {
+        this.fkProductType = fkProductType;
+    }
+
+    public String getFkCarbonRule() {
+        return fkCarbonRule;
+    }
+
+    public void setFkCarbonRule(String fkCarbonRule) {
+        this.fkCarbonRule = fkCarbonRule;
+    }
+
+    public String getFkPovertyArea() {
+        return fkPovertyArea;
+    }
+
+    public void setFkPovertyArea(String fkPovertyArea) {
+        this.fkPovertyArea = fkPovertyArea;
+    }
+
+    public String getProductName() {
+        return productName;
+    }
+
+    public void setProductName(String productName) {
+        this.productName = productName;
+    }
+
+    public String getProductCode() {
+        return productCode;
+    }
+
+    public void setProductCode(String productCode) {
+        this.productCode = productCode;
+    }
+
+    public Date getCarbonGenerateDate() {
+        return carbonGenerateDate;
+    }
+
+    public void setCarbonGenerateDate(Date carbonGenerateDate) {
+        this.carbonGenerateDate = carbonGenerateDate;
+    }
+
+    public Integer getProductValidateNum() {
+        return productValidateNum;
+    }
+
+    public void setProductValidateNum(Integer productValidateNum) {
+        this.productValidateNum = productValidateNum;
+    }
+
+    public Date getCarbonRefreshTime() {
+        return carbonRefreshTime;
+    }
+
+    public void setCarbonRefreshTime(Date carbonRefreshTime) {
+        this.carbonRefreshTime = carbonRefreshTime;
+    }
+
+    public BigDecimal getCarbonSink() {
+        return carbonSink;
+    }
+
+    public void setCarbonSink(BigDecimal carbonSink) {
+        this.carbonSink = carbonSink;
+    }
+
+    public String getProductImgs() {
+        return productImgs;
+    }
+
+    public void setProductImgs(String productImgs) {
+        this.productImgs = productImgs;
+    }
+
+    public Integer getIsEnable() {
+        return isEnable;
+    }
+
+    public void setIsEnable(Integer isEnable) {
+        this.isEnable = isEnable;
+    }
+
+    public String getRemark() {
+        return remark;
+    }
+
+    public void setRemark(String remark) {
+        this.remark = remark;
+    }
+
+    public Integer getState() {
+        return state;
+    }
+
+    public void setState(Integer state) {
+        this.state = state;
+    }
+
+    public String getCreateUser() {
+        return createUser;
+    }
+
+    public void setCreateUser(String createUser) {
+        this.createUser = createUser;
+    }
+
+    public Date getCreateTime() {
+        return createTime;
+    }
+
+    public void setCreateTime(Date createTime) {
+        this.createTime = createTime;
+    }
+
+    public String getModifiedUser() {
+        return modifiedUser;
+    }
+
+    public void setModifiedUser(String modifiedUser) {
+        this.modifiedUser = modifiedUser;
+    }
+
+    public Date getModifiedTime() {
+        return modifiedTime;
+    }
+
+    public void setModifiedTime(Date modifiedTime) {
+        this.modifiedTime = modifiedTime;
+    }
+
+    public List<ProductExpansion> getProductExpansions() {
+        return productExpansions;
+    }
+
+    public void setProductExpansions(List<ProductExpansion> productExpansions) {
+        this.productExpansions = productExpansions;
+    }
+
+    public List<ProductBelong> getProductBelongs() {
+        return productBelongs;
+    }
+
+    public void setProductBelongs(List<ProductBelong> productBelongs) {
+        this.productBelongs = productBelongs;
+    }
+
+    public ProductType getProductType() {
+        return productType;
+    }
+
+    public void setProductType(ProductType productType) {
+        this.productType = productType;
+    }
+
+    public PovertyArea getPovertyArea() {
+        return povertyArea;
+    }
+
+    public void setPovertyArea(PovertyArea povertyArea) {
+        this.povertyArea = povertyArea;
+    }
+}

carbon-back/carbon-back-common/src/main/java/com/hcloud/microserver/facade/carbon/entity/ProductType.java

@@ -0,0 +1,102 @@
+package com.hcloud.microserver.facade.carbon.entity;
+
+import lombok.ToString;
+
+import java.io.Serializable;
+import java.util.Date;
+import java.util.List;
+
+@ToString
+public class ProductType implements Serializable {
+    private static final long serialVersionUID = 7596000431263823352L;
+
+    private String guid;
+
+    private String parentId;
+
+    private String typeName;
+
+    private String typeVal;
+
+    private Integer state;
+
+    private Date modifiedTime;
+
+    private String methodology;
+
+    private String typeDesc;
+
+    private List<ProductTypeExpansion> productTypeExpansions;
+
+    public String getGuid() {
+        return guid;
+    }
+
+    public void setGuid(String guid) {
+        this.guid = guid;
+    }
+
+    public String getParentId() {
+        return parentId;
+    }
+
+    public void setParentId(String parentId) {
+        this.parentId = parentId;
+    }
+
+    public String getTypeName() {
+        return typeName;
+    }
+
+    public void setTypeName(String typeName) {
+        this.typeName = typeName;
+    }
+
+    public String getTypeVal() {
+        return typeVal;
+    }
+
+    public void setTypeVal(String typeVal) {
+        this.typeVal = typeVal;
+    }
+
+    public Integer getState() {
+        return state;
+    }
+
+    public void setState(Integer state) {
+        this.state = state;
+    }
+
+    public Date getModifiedTime() {
+        return modifiedTime;
+    }
+
+    public void setModifiedTime(Date modifiedTime) {
+        this.modifiedTime = modifiedTime;
+    }
+
+    public String getMethodology() {
+        return methodology;
+    }
+
+    public void setMethodology(String methodology) {
+        this.methodology = methodology;
+    }
+
+    public String getTypeDesc() {
+        return typeDesc;
+    }
+
+    public void setTypeDesc(String typeDesc) {
+        this.typeDesc = typeDesc;
+    }
+
+    public List<ProductTypeExpansion> getProductTypeExpansions() {
+        return productTypeExpansions;
+    }
+
+    public void setProductTypeExpansions(List<ProductTypeExpansion> productTypeExpansions) {
+        this.productTypeExpansions = productTypeExpansions;
+    }
+}

carbon-back/carbon-back-common/src/main/java/com/hcloud/microserver/facade/carbon/entity/ProductTypeExpansion.java

@@ -0,0 +1,85 @@
+package com.hcloud.microserver.facade.carbon.entity;
+
+import java.io.Serializable;
+import java.util.Date;
+
+public class ProductTypeExpansion implements Serializable {
+
+    private static final long serialVersionUID = 3286665272122183240L;
+    private String guid;
+    private String fkProductTypeGuid;
+    private String fkProductGuid;
+    private String expansionItem;
+    private Integer state;
+    private Date createTime;
+    private Date modifiedTime;
+
+    public String getGuid() {
+        return guid;
+    }
+
+    public void setGuid(String guid) {
+        this.guid = guid;
+    }
+
+    public String getFkProductTypeGuid() {
+        return fkProductTypeGuid;
+    }
+
+    public void setFkProductTypeGuid(String fkProductTypeGuid) {
+        this.fkProductTypeGuid = fkProductTypeGuid;
+    }
+
+    public String getFkProductGuid() {
+        return fkProductGuid;
+    }
+
+    public void setFkProductGuid(String fkProductGuid) {
+        this.fkProductGuid = fkProductGuid;
+    }
+
+    public String getExpansionItem() {
+        return expansionItem;
+    }
+
+    public void setExpansionItem(String expansionItem) {
+        this.expansionItem = expansionItem;
+    }
+
+    public Integer getState() {
+        return state;
+    }
+
+    public void setState(Integer state) {
+        this.state = state;
+    }
+
+    public Date getCreateTime() {
+        return createTime;
+    }
+
+    public void setCreateTime(Date createTime) {
+        this.createTime = createTime;
+    }
+
+    public Date getModifiedTime() {
+        return modifiedTime;
+    }
+
+    public void setModifiedTime(Date modifiedTime) {
+        this.modifiedTime = modifiedTime;
+    }
+
+    @Override
+    public String toString() {
+        return "ProductTypeExpansion{" +
+                "guid='" + guid + '\'' +
+                ", fkProductTypeGuid='" + fkProductTypeGuid + '\'' +
+                ", fkProductGuid='" + fkProductGuid + '\'' +
+                ", expansionItem='" + expansionItem + '\'' +
+                ", state=" + state +
+                ", createTime=" + createTime +
+                ", modifiedTime=" + modifiedTime +
+                '}';
+    }
+}

carbon-back/carbon-back-common/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-back/carbon-back-common/src/main/java/com/hcloud/microserver/facade/carbon/forms/BaseDictionaryForm.java

@@ -0,0 +1,34 @@
+package com.hcloud.microserver.facade.carbon.forms;
+
+import com.hcloud.microserver.commoncore.base.BaseForm;
+import lombok.Data;
+
+import java.util.Date;
+
+@Data
+public class BaseDictionaryForm extends BaseForm {
+
+    private String guid;
+
+    private String fkOrgGuid;
+
+    private String fkTypeGuid;
+
+    private String dicname;
+
+    private String diccode;
+
+    private Integer isForbiden;
+
+    private Integer orderby;
+
+    private String remark;
+
+    private Integer state;
+
+    private Date createTime;
+
+    private Date modifiedTime;
+
+    private String typeName;
+}

carbon-back/carbon-back-common/src/main/java/com/hcloud/microserver/facade/carbon/forms/CarbonTrendForm.java

@@ -0,0 +1,27 @@
+package com.hcloud.microserver.facade.carbon.forms;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.hcloud.microserver.commoncore.base.BaseForm;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.Date;
+@Data
+@ApiModel(value = "CarbonTrendForm",description = "时间段查询方式")
+public class CarbonTrendForm extends BaseForm {
+
+    @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss", timezone="GMT+8")
+    @ApiModelProperty("开始时间")
+    private Date startTime;
+
+
+    @ApiModelProperty("结束时间")
+    @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss", timezone="GMT+8")
+    private Date endTime;
+
+
+    @ApiModelProperty("查询方式")
+    private String way;
+
+}

carbon-back/carbon-back-common/src/main/java/com/hcloud/microserver/facade/carbon/forms/CollectiveFarmerForm.java

@@ -0,0 +1,64 @@
+package com.hcloud.microserver.facade.carbon.forms;
+
+import com.hcloud.microserver.commoncore.base.BaseForm;
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.util.Date;
+import java.util.List;
+
+@Data
+public class CollectiveFarmerForm extends BaseForm {
+    private String guid;
+
+    private String fkPovertyAreaId;
+
+    private String collectiveCode;
+
+    private String collectiveName;
+
+    private Integer collectivePersonNum;
+
+    private String orgUnit;
+
+    private String remark;
+
+    private String collectiveImages;
+
+    private String bankName;
+
+    private String bankCardNo;
+
+    private Integer isEnable;
+
+    private Integer state;
+
+    private String createUser;
+
+    private Date createTime;
+
+    private String modifiedUser;
+
+    private Date modifiedTime;
+
+    private BigDecimal recieveMoney;
+
+    private BigDecimal actualMoney;
+
+    private String phone;
+
+    private String condition;
+
+    private List<FarmerInfoForm> farmerInfoForms;
+
+    private String provinceId;
+
+    private String cityId;
+
+    private String townId;
+
+    private String countyId;
+
+    private String villageId;
+
+}

carbon-back/carbon-back-common/src/main/java/com/hcloud/microserver/facade/carbon/forms/CustomerChannelForm.java

@@ -0,0 +1,25 @@
+package com.hcloud.microserver.facade.carbon.forms;
+
+import com.hcloud.microserver.commoncore.base.BaseForm;
+import lombok.Data;
+import lombok.extern.slf4j.Slf4j;
+
+/**
+ * @author xiezt
+ */
+@Data
+@Slf4j
+public class CustomerChannelForm extends BaseForm {
+
+    private String guid;
+
+    private String fkCustomerId;
+
+    private String channelName;
+
+    private String channelKeywordOne;
+
+    private String channelKeywordTwo;
+
+    private String channelKeywordThree;
+}

carbon-back/carbon-back-common/src/main/java/com/hcloud/microserver/facade/carbon/forms/CustomerCompanyInfoForm.java

@@ -0,0 +1,49 @@
+package com.hcloud.microserver.facade.carbon.forms;
+
+import com.hcloud.microserver.commoncore.base.BaseForm;
+import lombok.Data;
+import lombok.extern.slf4j.Slf4j;
+
+import java.util.List;
+
+
+/**
+ * @author JYJ
+ */
+@Data
+@Slf4j
+public class CustomerCompanyInfoForm extends BaseForm {
+
+    private String guid;
+
+    private String fkCustomerId;
+
+    private String companyName;
+
+    private String orgCode;
+
+    private String principals;
+
+    private String phone;
+
+    private String email;
+
+    private String companyAddress;
+
+    private String companyImages;
+
+    private String condition;
+
+    private Integer customerType;
+
+    private String pid;
+
+    /**
+     * 手机验证码
+     */
+    private String phoneMsg;
+
+    private List<String> imageList;
+
+    private Integer companyType;
+}

carbon-back/carbon-back-common/src/main/java/com/hcloud/microserver/facade/carbon/forms/CustomerCompanyTypeForm.java

@@ -0,0 +1,28 @@
+package com.hcloud.microserver.facade.carbon.forms;
+
+import com.hcloud.microserver.commoncore.base.BaseForm;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiModel;
+import lombok.Data;
+
+import java.util.Date;
+
+@Data
+@ApiModel("企业类型信息")
+public class CustomerCompanyTypeForm extends BaseForm {
+    private String guid;
+
+    private String parentId;
+
+    private String typeName;
+
+    private String typeVal;
+
+    private Integer state;
+
+    private Date modifiedTime;
+
+    private String methodology;
+
+    private String typeDesc;
+}

carbon-back/carbon-back-common/src/main/java/com/hcloud/microserver/facade/carbon/forms/CustomerInfoForm.java

@@ -0,0 +1,80 @@
+package com.hcloud.microserver.facade.carbon.forms;
+
+import com.hcloud.microserver.commoncore.base.BaseForm;
+import lombok.Data;
+import lombok.extern.slf4j.Slf4j;
+
+import java.math.BigDecimal;
+import java.util.List;
+
+/**
+ * @author xiezt
+ */
+@Data
+@Slf4j
+public class CustomerInfoForm extends BaseForm {
+
+    private String guid;
+
+    private String account;
+
+    private String passwd;
+
+    private Integer customerType;
+
+    private String customerName;
+
+    private String nickName;
+
+    private String pid;
+
+    private String phone;
+
+    private Integer sex;
+
+    private Integer score;
+
+    private String wxId;
+
+    private String unionId;
+
+    private String headImage;
+
+    private Integer isCompany;
+
+    private Integer isValidate;
+
+    private Integer isEnable;
+
+    private String queryStr;
+
+    private BigDecimal carbonAmount;
+
+    private Integer goodsNum;
+
+    private Integer farmerNum;
+
+    private Integer farmerPersonNum;
+    /**
+     * 购物车商品列表
+     */
+    private List<GoodsInfoForm> goodsList;
+
+    /**
+     * 登录渠道
+     */
+    private Integer loginType;
+
+    /**
+     * 企业认证信息
+     */
+    private CustomerCompanyInfoForm customerCompanyInfoForm;
+
+    /**
+     * 渠道类型
+     */
+    private Integer channelType;
+
+
+
+}

carbon-back/carbon-back-common/src/main/java/com/hcloud/microserver/facade/carbon/forms/DayCarbonFrom.java

@@ -0,0 +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-back/carbon-back-common/src/main/java/com/hcloud/microserver/facade/carbon/forms/FarmerInfoForm.java

@@ -0,0 +1,80 @@
+package com.hcloud.microserver.facade.carbon.forms;
+
+import com.hcloud.microserver.commoncore.base.BaseForm;
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ * @author xiezt
+ */
+@Data
+public class FarmerInfoForm extends BaseForm {
+
+    private String guid;
+
+    private String fkPovertyAreaId;
+
+    private String fkCollectiveId;
+
+    private String farmerCode;
+
+    private String farmerName;
+
+    private Integer familyNum;
+
+    private Integer sex;
+
+    private String pid;
+
+    private String nation;
+
+    private String education;
+
+    private String phone;
+
+    private String bankCardNo;
+
+    private BigDecimal incomeVal;
+
+    private String farmerType;
+
+    private String farmerRemark;
+
+    private String farmerImages;
+
+    private String villageOrg;
+
+    private Integer isEnable;
+
+    private Integer state;
+
+    private String createUser;
+
+    private Date createTime;
+
+    private String modifiedUser;
+
+    private Date modifiedTime;
+
+    private String bankClearingMsg;
+
+    private BigDecimal recieveMoney;
+
+    private BigDecimal actualMoney;
+
+    private String condition;
+
+    private String provinceId;
+
+    private String cityId;
+
+    private String townId;
+
+    private String countyId;
+
+    private String villageId;
+
+    private Integer queryFlag;
+}

carbon-back/carbon-back-common/src/main/java/com/hcloud/microserver/facade/carbon/forms/GoodsCredentialInfoForm.java

@@ -0,0 +1,37 @@
+package com.hcloud.microserver.facade.carbon.forms;
+
+import com.hcloud.microserver.commoncore.base.BaseForm;
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ * @author xiezt
+ */
+@Data
+public class GoodsCredentialInfoForm extends BaseForm {
+
+    private String guid;
+
+    private String fkCustomerId;
+
+    private String fkOrderId;
+
+    private String fkOrderDetailId;
+
+    private String credentialNo;
+
+    private Date buyDate;
+
+    private BigDecimal carbonAmount;
+
+    private String productAddress;
+
+    private Integer farmerCount;
+
+    private String farmerNames;
+
+    private String creImages;
+
+}

carbon-back/carbon-back-common/src/main/java/com/hcloud/microserver/facade/carbon/forms/GoodsDetailForm.java

@@ -0,0 +1,37 @@
+package com.hcloud.microserver.facade.carbon.forms;
+
+import com.hcloud.microserver.commoncore.base.BaseForm;
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+@Data
+public class GoodsDetailForm extends BaseForm {
+
+    private String guid;
+
+    private String fkGoodsGuid;
+
+    private String fkProductGuid;
+
+    private String productName;
+
+    private String productCode;
+
+    private String saleUnit;
+
+    private BigDecimal carbonVal;
+
+    private Integer isEnable;
+
+    private Integer farmerNums;
+
+    private Integer state;
+
+    private Date createTime;
+
+    private Date modifiedTime;
+
+    private String condition;
+}

carbon-back/carbon-back-common/src/main/java/com/hcloud/microserver/facade/carbon/forms/GoodsInfoForm.java

@@ -0,0 +1,80 @@
+package com.hcloud.microserver.facade.carbon.forms;
+
+import com.hcloud.microserver.commoncore.base.BaseForm;
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * @author xiezt
+ */
+@Data
+public class GoodsInfoForm extends BaseForm {
+
+    private String guid;
+
+    private String goodsType;
+
+    private String goodsCode;
+
+    private String goodsName;
+
+    private BigDecimal carbonVal;
+
+    private BigDecimal price;
+
+    private String goodsDesc;
+
+    private String goodsImages;
+
+    private Date goodsSaleDate;
+
+    private Integer isSale;
+
+    private Integer state;
+
+    private String createUser;
+
+    private Date createTime;
+
+    private String modifiedUser;
+
+    private Date modifiedTime;
+
+    private String goodsUse;
+
+    /**
+     * 非t_goods_info表字段,需要join其他表用于显示的字段
+     */
+    private String productTypeName;
+
+    private BigDecimal saledCarbonSkin;
+
+
+    private BigDecimal unsaledCarbonSkin;
+
+    /**
+     * 页面用到的参数
+     */
+    private String condition;
+
+    private List<GoodsDetailForm> goodsDetailForms;
+
+    private String queryStr;
+
+    /**
+     * 冗余t_goods_sale_info的字段
+     */
+    private String saleTargets; // 销售对象
+
+    private Integer saleType; // 销售类型
+
+    /**
+     * 购买数量
+     */
+    private BigDecimal carbonSkin;
+
+
+}

carbon-back/carbon-back-common/src/main/java/com/hcloud/microserver/facade/carbon/forms/GoodsOrderDetailForm.java

@@ -0,0 +1,48 @@
+package com.hcloud.microserver.facade.carbon.forms;
+
+import com.hcloud.microserver.commoncore.base.BaseForm;
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+/**
+ * @author JYJ
+ */
+@Data
+public class GoodsOrderDetailForm extends BaseForm {
+
+    private String guid;
+
+    private String fkOrderGuid;
+
+    private String fkGoodsGuid;
+
+    private String goodsName;
+
+    private BigDecimal goodsPrice;
+
+    private BigDecimal saleNum;
+
+    private BigDecimal amount;
+
+    /**
+     * 商品编号
+     */
+    private String goodsNo;
+    /**
+     * 商品类型
+     */
+    private String goodsType;
+    /**
+     * 碳汇产生时间
+     */
+    private String goodsSaleDate;
+
+    private String goodsImages;
+
+    private String goodsDesc;
+    /**
+     * 商品用途
+     */
+    private String goodsUse;
+}

carbon-back/carbon-back-common/src/main/java/com/hcloud/microserver/facade/carbon/forms/GoodsOrderInfoForm.java

@@ -0,0 +1,112 @@
+package com.hcloud.microserver.facade.carbon.forms;
+
+import com.hcloud.microserver.commoncore.base.BaseForm;
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * @author xiezt
+ */
+@Data
+public class GoodsOrderInfoForm extends BaseForm {
+
+    private String guid;
+
+    private String fkCustomerGuid;
+
+    private String orderNo;
+
+    private String customerName;
+
+    private String customerType;
+
+    private BigDecimal orderAmount;
+
+    private BigDecimal orderCarbonAmount;
+
+    private Integer orderStatus;
+
+    /**
+     * 交易方式
+     */
+    private String tradeType;
+    /**
+     * 订单支付流水编号
+     */
+    private String PayNo;
+
+    /**
+     * 商品订单详情
+     */
+    private List<GoodsOrderDetailForm> goodsOrderDetailForm;
+
+    /**
+     * 商品列表
+     */
+    private List<GoodsInfoForm> goodsList;
+    /**
+     * 支付渠道
+     */
+    private Integer payChannel;
+    /**
+     * 购买起始时间
+     */
+    private String beginDate;
+    /**
+     * 购买结束时间
+     */
+    private String endDate;
+    /**
+     * 客户账号
+     */
+    private String account;
+    /**
+     * 完成支付的支付流水信息
+     */
+    private GoodsPayOrderForm payOrderInfo;
+    /**
+     * 订单支付流水列表
+     */
+    private List<GoodsPayOrderForm> payOrderFormList;
+
+    /**
+     * 爱心用户信息
+     */
+    private CustomerInfoForm customerInfoForm;
+
+    /**
+     * 支付金额
+     */
+    private BigDecimal payAmount;
+
+    /**
+     * 购买时间
+     */
+    private Date createTime;
+    /**
+     * 证书编号
+     */
+    private String credentialNo;
+    /**
+     * 支付流水号
+     */
+    private String payNo;
+
+    /**
+     * 模糊查询条件
+     */
+    private String condition;
+
+    /**
+     * 离线支付申请备注
+     */
+    private String applyRemark;
+
+    /**
+     * 订单商品用途
+     */
+    private String goodsUse;
+}

carbon-back/carbon-back-common/src/main/java/com/hcloud/microserver/facade/carbon/forms/GoodsPayOrderForm.java

@@ -0,0 +1,35 @@
+package com.hcloud.microserver.facade.carbon.forms;
+
+import com.hcloud.microserver.commoncore.base.BaseForm;
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ * @author xiezt
+ */
+@Data
+public class GoodsPayOrderForm extends BaseForm {
+
+    private String guid;
+
+    private String fkCustomerId;
+
+    private String fkOrderId;
+
+    private String orderNo;
+
+    private String payNo;
+
+    private BigDecimal payAmount;
+
+    private Integer payChannel;
+
+    private Date payTime;
+
+    private Integer payStatus;
+
+    private String tradeType;
+
+}

carbon-back/carbon-back-common/src/main/java/com/hcloud/microserver/facade/carbon/forms/GoodsSaleInfoForm.java

@@ -0,0 +1,35 @@
+package com.hcloud.microserver.facade.carbon.forms;
+
+import com.hcloud.microserver.commoncore.base.BaseForm;
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+/**
+ * @author xiezt
+ */
+@Data
+public class GoodsSaleInfoForm extends BaseForm {
+
+    private String guid;
+
+    private String fkGoodsGuid;
+
+    private BigDecimal salePrice;
+
+    private BigDecimal companyPrice;
+
+    private BigDecimal memberPrice;
+
+    private BigDecimal saledCarbonSkin;
+
+    private BigDecimal unsaledCarbonSkin;
+
+    private Integer isEnable;
+
+    private Integer saleType;
+
+    private String saleTargets;
+
+    private String saleUnit;
+}

carbon-back/carbon-back-common/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 String dataFrom;
+
+}

carbon-back/carbon-back-common/src/main/java/com/hcloud/microserver/facade/carbon/forms/OrderPayApplyForm.java

@@ -0,0 +1,39 @@
+package com.hcloud.microserver.facade.carbon.forms;
+
+import com.hcloud.microserver.commoncore.base.BaseForm;
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+/**
+ * @author xiezt
+ */
+@Data
+public class OrderPayApplyForm extends BaseForm {
+
+    private String guid;
+
+    private String fkCustomerId;
+
+    private String fkOrderId;
+
+    private String applyUserName;
+
+    private BigDecimal payAmount;
+
+    private String remark;
+
+    private Integer applyStatus;
+
+    private String orderNo;
+
+    private BigDecimal orderCarbonAmount;
+
+    private Integer orderStatus;
+
+    private String beginTime;
+
+    private String endTime;
+
+    private String account;
+}

carbon-back/carbon-back-common/src/main/java/com/hcloud/microserver/facade/carbon/forms/OrderPayVoucherForm.java

@@ -0,0 +1,45 @@
+package com.hcloud.microserver.facade.carbon.forms;
+
+import com.hcloud.microserver.commoncore.base.BaseForm;
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ * @author xiezt
+ */
+@Data
+public class OrderPayVoucherForm extends BaseForm {
+
+    private String guid;
+
+    private String fkOrderId;
+
+    private String fkCustomerId;
+
+    private String fkApplyId;
+
+    private String payUserName;
+
+    private String payBank;
+
+    private String payCardNo;
+
+    private BigDecimal payAmount;
+
+    private Date payTime;
+
+    private String voucherImages;
+
+    private Date beginDate;
+
+    private Date endDate;
+
+    private Integer orderStatus;
+
+    private String account;
+
+    private String orderNo;
+
+}

carbon-back/carbon-back-common/src/main/java/com/hcloud/microserver/facade/carbon/forms/PaymentForm.java

@@ -0,0 +1,22 @@
+package com.hcloud.microserver.facade.carbon.forms;
+
+import com.hcloud.microserver.commoncore.base.BaseForm;
+import lombok.Data;
+
+import java.util.Date;
+
+@Data
+public class PaymentForm extends BaseForm {
+    private String orderId;
+    private String orderNo;
+    private String payNo;
+    private String orderTime;
+    private Integer orderStatus;
+    private String account;
+    private String customerName;
+    private String payBank;
+    private String payCardNo;
+    private String payChannel;
+    private String payAmount;
+    private String payTime;
+}

carbon-back/carbon-back-common/src/main/java/com/hcloud/microserver/facade/carbon/forms/PovertyAreaForm.java

@@ -0,0 +1,67 @@
+package com.hcloud.microserver.facade.carbon.forms;
+
+import com.hcloud.microserver.commoncore.base.BaseForm;
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.util.Date;
+import java.util.List;
+
+@Data
+public class PovertyAreaForm extends BaseForm {
+
+    private String guid;
+
+    private String povertyAreaName;
+
+    private String areaAddress;
+
+    private String areaDesc;
+
+    private String cityId;
+
+    private String countyId;
+
+    private String townId;
+
+    private String villageId;
+
+    private String areaImages;
+
+    private Integer isEnable;
+
+    private Integer state;
+
+    private String createUser;
+
+    private Date createTime;
+
+    private String modifiedUser;
+
+    private Date modifiedTime;
+
+    private String condition;
+
+    private String provinceId;
+
+    private Integer familyNum;
+
+    private List<FarmerInfoForm> farmerInfoList;
+
+    /**
+     * 总的农户数
+     */
+    private Integer farmerNum;
+    /**
+     * 总的贫困人口数
+     */
+    private Integer farmerPersonNum;
+    /**
+     * 总的购碳资金数
+     */
+    private BigDecimal saleAmount;
+    /**
+     * 总的涉及商品数量
+     */
+    private Integer goodsNum;
+}

carbon-back/carbon-back-common/src/main/java/com/hcloud/microserver/facade/carbon/forms/ProductBelongForm.java

@@ -0,0 +1,31 @@
+package com.hcloud.microserver.facade.carbon.forms;
+
+import com.hcloud.microserver.commoncore.base.BaseForm;
+import lombok.Data;
+
+import java.util.Date;
+
+@Data
+public class ProductBelongForm extends BaseForm {
+    private String guid;
+
+    private String fkProductGuid;
+
+    private String fkFarmerGuid;
+
+    private String farmerName;
+
+    private String farmerVillage;
+
+    private Integer farmerNum;
+
+    private Integer state;
+
+    private Date createTime;
+
+    private Date modifiedTime;
+
+    private Integer belongType;
+
+    private String condition;
+}

carbon-back/carbon-back-common/src/main/java/com/hcloud/microserver/facade/carbon/forms/ProductExpansionForm.java

@@ -0,0 +1,27 @@
+package com.hcloud.microserver.facade.carbon.forms;
+
+import lombok.Data;
+
+import java.util.Date;
+
+@Data
+public class ProductExpansionForm {
+
+    private String guid;
+
+    private String fkProductGuid;
+
+    private String fkProductTypeGuid;
+
+    private String expansionItem;
+
+    private String expansionVal;
+
+    private Integer state;
+
+    private Date createTime;
+
+    private Date modifiedTime;
+
+    private String condition;
+}

carbon-back/carbon-back-common/src/main/java/com/hcloud/microserver/facade/carbon/forms/ProductInfoForm.java

@@ -0,0 +1,59 @@
+package com.hcloud.microserver.facade.carbon.forms;
+
+import com.hcloud.microserver.commoncore.base.BaseForm;
+import com.hcloud.microserver.facade.carbon.entity.ProductType;
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.util.Date;
+import java.util.List;
+
+@Data
+public class ProductInfoForm extends BaseForm {
+    private String guid;
+
+    private String fkProductType;
+
+    private String fkCarbonRule;
+
+    private String fkPovertyArea;
+
+    private String productName;
+
+    private String productCode;
+
+    private Date carbonGenerateDate;
+
+    private Integer productValidateNum;
+
+    private Date carbonRefreshTime;
+
+    private BigDecimal carbonSink;
+
+    private String productImgs;
+
+    private Integer isEnable;
+
+    private String remark;
+
+    private Integer state;
+
+    private String createUser;
+
+    private Date createTime;
+
+    private String modifiedUser;
+
+    private Date modifiedTime;
+
+    private String condition;
+
+    private ProductType productType;
+
+    private List<ProductBelongForm> productBelongForms;
+
+    private List<ProductExpansionForm> productExpansionForms;
+
+    // 冗余一个贫困集体的参数
+    private CollectiveFarmerForm collectiveFarmerForm;
+}

carbon-back/carbon-back-common/src/main/java/com/hcloud/microserver/facade/carbon/forms/ProductTypeExpansionForm.java

@@ -0,0 +1,17 @@
+package com.hcloud.microserver.facade.carbon.forms;
+
+import lombok.Data;
+
+import java.util.Date;
+
+@Data
+public class ProductTypeExpansionForm {
+
+    private String guid;
+    private String fkProductTypeGuid;
+    private String fkProductGuid;
+    private String expansionItem;
+    private Integer state;
+    private Date createTime;
+    private Date modifiedTime;
+}

carbon-back/carbon-back-common/src/main/java/com/hcloud/microserver/facade/carbon/forms/ProductTypeForm.java

@@ -0,0 +1,32 @@
+package com.hcloud.microserver.facade.carbon.forms;
+
+import com.hcloud.microserver.commoncore.base.BaseForm;
+import lombok.Data;
+
+import java.util.Date;
+import java.util.List;
+
+@Data
+public class ProductTypeForm extends BaseForm {
+    private String guid;
+
+    private String parentId;
+
+    private String typeName;
+
+    private String typeVal;
+
+    private Integer state;
+
+    private Date modifiedTime;
+
+    private String methodology;
+
+    private String typeDesc;
+
+    private String condition;
+
+    List<ProductExpansionForm> productExpansionForms;
+
+    List<ProductTypeExpansionForm> productTypeExpansionForms;
+}

carbon-back/carbon-back-common/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-back/carbon-back-service/pom.xml

@@ -0,0 +1,119 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <artifactId>carbon-back</artifactId>
+        <groupId>com.hcloud.microserver</groupId>
+        <version>0.0.1-SNAPSHOT</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>carbon-back-service</artifactId>
+
+    <dependencies>
+        <dependency>
+            <groupId>com.hcloud.microserver</groupId>
+            <artifactId>carbon-security</artifactId>
+            <version>0.0.1-SNAPSHOT</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-web</artifactId>
+        </dependency>
+        <!-- nacos discovery-->
+        <dependency>
+            <groupId>com.alibaba.cloud</groupId>
+            <artifactId>spring-cloud-starter-alibaba-nacos-discovery</artifactId>
+        </dependency>
+        <!-- nacos config -->
+        <dependency>
+            <groupId>com.alibaba.cloud</groupId>
+            <artifactId>spring-cloud-starter-alibaba-nacos-config</artifactId>
+        </dependency>
+        <!--zipkin-->
+        <dependency>
+            <groupId>org.springframework.cloud</groupId>
+            <artifactId>spring-cloud-starter-zipkin</artifactId>
+        </dependency>
+        <!-- spring boot admin client -->
+        <dependency>
+            <groupId>de.codecentric</groupId>
+            <artifactId>spring-boot-admin-starter-client</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>net.logstash.logback</groupId>
+            <artifactId>logstash-logback-encoder</artifactId>
+        </dependency>
+        <!-- xls格式excel依赖包 -->
+        <dependency>
+            <groupId>org.apache.poi</groupId>
+            <artifactId>poi</artifactId>
+            <version>3.17</version>
+        </dependency>
+        <!--xlsx格式excel依赖包-->
+        <dependency>
+            <groupId>org.apache.poi</groupId>
+            <artifactId>poi-ooxml</artifactId>
+            <version>3.17</version>
+        </dependency>
+        <!--easyexcel，推荐使用2.0 以上版本，功能更加完善-->
+        <dependency>
+            <groupId>com.alibaba</groupId>
+            <artifactId>easyexcel</artifactId>
+            <version>2.2.6</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-test</artifactId>
+            <version>5.1.7.RELEASE</version>
+            <scope>compile</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.commons</groupId>
+            <artifactId>commons-io</artifactId>
+            <version>1.3.2</version>
+        </dependency>
+        <dependency>
+            <groupId>com.qiniu</groupId>
+            <artifactId>qiniu-java-sdk</artifactId>
+            <version>7.2.28</version>
+        </dependency>
+
+        <dependency>
+            <groupId>com.github.xiaoymin</groupId>
+            <artifactId>knife4j-micro-spring-boot-starter</artifactId>
+            <version>2.0.4</version>
+        </dependency>
+        <dependency>
+            <groupId>mysql</groupId>
+            <artifactId>mysql-connector-java</artifactId>
+            <scope>runtime</scope>
+        </dependency>
+        <!-- druid -->
+        <dependency>
+            <groupId>com.alibaba</groupId>
+            <artifactId>druid</artifactId>
+            <version>1.2.3</version>
+        </dependency>
+
+
+        <dependency>
+            <artifactId>carbon-back-common</artifactId>
+            <groupId>com.hcloud.microserver</groupId>
+            <version>0.0.1-SNAPSHOT</version>
+        </dependency>
+        <dependency>
+
+            <groupId>commons-httpclient</groupId>
+
+            <artifactId>commons-httpclient</artifactId>
+
+            <version>3.1</version>
+
+        </dependency>
+
+    </dependencies>
+</project>

carbon-back/carbon-back-service/src/main/java/com/hcloud/microserver/bank/bo/CarbonBaseController.java

@@ -0,0 +1,19 @@
+package com.hcloud.microserver.bank.bo;
+
+import com.hcloud.microserver.commoncore.base.BaseController;
+import com.hcloud.microserver.commoncore.base.ResponseBase;
+import com.hcloud.microserver.system.util.CurrUserUtil;
+
+public class CarbonBaseController extends BaseController {
+
+    public String getUserId(){
+        return CurrUserUtil.getUserId();
+    }
+
+    public ResponseBase thisReturn(int i){
+        if (i>0){
+            return responseResultSuccess();
+        }
+        return responseResultFailure();
+    }
+}

carbon-back/carbon-back-service/src/main/java/com/hcloud/microserver/bank/bo/CompanyBO.java

@@ -0,0 +1,39 @@
+package com.hcloud.microserver.bank.bo;
+
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * @author JYJ
+ */
+@Data
+public class CompanyBO {
+    private String guid;
+
+    private String fkCustomerId;
+
+    private String companyName;
+
+    private String orgCode;
+
+    private String principals;
+
+    private String phone;
+
+    private String email;
+
+    private String companyAddress;
+
+    private String companyImages;
+
+    private Integer state;
+
+    private Date createTime;
+
+    private Date modifiedTime;
+
+    private String account;
+
+    private Integer customerType;
+}

carbon-back/carbon-back-service/src/main/java/com/hcloud/microserver/bank/bo/CredentialInfoBO.java

@@ -0,0 +1,56 @@
+package com.hcloud.microserver.bank.bo;
+
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+/**
+ * @author xiezt
+ */
+@Data
+public class CredentialInfoBO {
+
+    /**
+     * 证书编号
+     */
+    private String credentialNo;
+    /**
+     * 购买日期
+     */
+    private String buyDate;
+    /**
+     * 购买的碳汇量
+     */
+    private BigDecimal carbonAmount;
+    /**
+     * 贫困户区域信息
+     */
+    private String farmerVillage;
+    /**
+     * 贫困户姓名及集体会名称
+     */
+    private String farmerName;
+    /**
+     * 帮扶农户数量
+     */
+    private Integer farmerNum;
+
+    /**
+     * 客户姓名
+     */
+    private String customerName;
+    /**
+     * 客户昵称
+     */
+    private String nickName;
+
+    /**
+     * 企业名称
+     */
+    private String companyName;
+
+    /**
+     * 订单金额
+     */
+    private BigDecimal OrderAmount;
+}

carbon-back/carbon-back-service/src/main/java/com/hcloud/microserver/bank/bo/CustomerInfoBO.java

@@ -0,0 +1,67 @@
+package com.hcloud.microserver.bank.bo;
+
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ * @author xiezt
+ */
+@Data
+public class CustomerInfoBO {
+
+    private String guid;
+
+    private String account;
+
+    private String passwd;
+
+    private String customerName;
+
+    private String customerType;
+
+    private Integer isCompany;
+
+    private Integer isValidate;
+
+    private String nickName;
+
+    private String customerPhone;
+
+    private String pid;
+
+    private Integer score;
+
+    private String sexName;
+
+    private String companyName;
+
+    private String principals;
+
+    private String companyPhone;
+
+    private BigDecimal carbonAmount;
+
+    private Integer goodsNum;
+
+    private Integer farmerNum;
+
+    private Integer farmerPersonNum;
+
+    private Date createTime;
+
+    private Date modifiedTime;
+
+    private Integer isEnable;
+
+    private String wxId;
+
+    private String unionId;
+
+    private String headImage;
+
+    private String phone;
+
+    private Integer sex;
+}

carbon-back/carbon-back-service/src/main/java/com/hcloud/microserver/bank/bo/FarmerInfoBO.java

@@ -0,0 +1,28 @@
+package com.hcloud.microserver.bank.bo;
+
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+/**
+ * @author xiezt
+ */
+@Data
+public class FarmerInfoBO {
+    /**
+     *
+     */
+    private String guid;
+    /**
+     *
+     */
+    private String collectiveId;
+    /**
+     *
+     */
+    private BigDecimal recieveMoney;
+    /**
+     *
+     */
+    private BigDecimal actualMoney;
+}

carbon-back/carbon-back-service/src/main/java/com/hcloud/microserver/bank/bo/GoodsDetailBO.java

@@ -0,0 +1,36 @@
+package com.hcloud.microserver.bank.bo;
+
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+@Data
+public class GoodsDetailBO {
+
+    private String guid;
+
+    private String fkGoodsGuid;
+
+    private String fkProductGuid;
+
+    private String productName;
+
+    private String productCode;
+
+    private String saleUnit;
+
+    private BigDecimal carbonVal;
+
+    private Integer isEnable;
+
+    private Integer farmerNums;
+
+    private Integer state;
+
+    private Date createTime;
+
+    private Date modifiedTime;
+
+    private ProductInfoBO productInfo;
+}

carbon-back/carbon-back-service/src/main/java/com/hcloud/microserver/bank/bo/GoodsInfoBO.java

@@ -0,0 +1,52 @@
+package com.hcloud.microserver.bank.bo;
+
+import com.hcloud.microserver.facade.carbon.entity.GoodsDetail;
+import com.hcloud.microserver.facade.carbon.entity.ProductInfo;
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.util.List;
+
+/**
+ * @author xiezt
+ */
+@Data
+public class GoodsInfoBO {
+
+    private String guid;
+
+    private String goodsCode;
+
+    private String goodsName;
+
+    private String goodsImages;
+
+    private String goodsType;
+
+    private String price;
+
+    private String goodsUse;
+
+    private String saleUnit;
+
+    private String fkProductGuid;
+
+    private List<GoodsDetail> goodsDetails;
+
+    private List<ProductInfo> productInfos;
+
+    /**
+     * 已销售的碳汇量
+     */
+    private BigDecimal saledCarbonSkin;
+
+    /**
+     * 未销售的碳汇量
+     */
+    private BigDecimal unsaledCarbonSkin;
+
+    /**
+     * 总碳汇量
+     */
+    private BigDecimal carbonVal;
+}

carbon-back/carbon-back-service/src/main/java/com/hcloud/microserver/bank/bo/GoodsPayOrderBO.java

@@ -0,0 +1,30 @@
+package com.hcloud.microserver.bank.bo;
+
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+@Data
+public class GoodsPayOrderBO {
+
+    private String guid;
+
+    private String fkCustomerId;
+
+    private String fkOrderId;
+
+    private String orderNo;
+
+    private String payNo;
+
+    private BigDecimal payAmount;
+
+    private Integer payChannel;
+
+    private Date payTime;
+
+    private Integer payStatus;
+
+    private String tradeType;
+}

carbon-back/carbon-back-service/src/main/java/com/hcloud/microserver/bank/bo/OrderDetailBO.java

@@ -0,0 +1,8 @@
+package com.hcloud.microserver.bank.bo;
+
+import lombok.Data;
+
+@Data
+public class OrderDetailBO {
+
+}

carbon-back/carbon-back-service/src/main/java/com/hcloud/microserver/bank/bo/OrderDetailInfoBO.java

@@ -0,0 +1,65 @@
+package com.hcloud.microserver.bank.bo;
+
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+/**
+ * @author xiezt
+ */
+@Data
+public class OrderDetailInfoBO {
+
+    /**
+     * 订单Id
+     */
+    private String fkOrderGuid;
+
+    /**
+     * 商品Id
+     */
+    private String fkGoodsGuid;
+
+    /**
+     * 商品编号
+     */
+    private String goodsNo;
+    /**
+     * 商品名称
+     */
+    private String goodsName;
+    /**
+     * 商品类型
+     */
+    private String goodsType;
+    /**
+     * 碳汇产生时间
+     */
+    private String goodsSaleDate;
+    /**
+     * 商品单价
+     */
+    private BigDecimal goodsPrice;
+    /**
+     * 销售数量
+     */
+    private Integer saleNum;
+    /**
+     * 购买金额
+     */
+    private BigDecimal amount;
+    /**
+     * 产品图片
+     */
+    private String goodsImages;
+
+    /**
+     * 商品描述
+     */
+    private String goodsDesc;
+
+    /**
+     * 商品用途
+     */
+    private String goodsUse;
+}

carbon-back/carbon-back-service/src/main/java/com/hcloud/microserver/bank/bo/OrderInfoBO.java

@@ -0,0 +1,79 @@
+package com.hcloud.microserver.bank.bo;
+
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ * @author xiezt
+ */
+@Data
+public class OrderInfoBO {
+
+    /**
+     * 订单数据唯一主键
+     */
+    private String guid;
+
+    /**
+     * 订单编号
+     */
+    private String orderNo;
+    /**
+     * 客户账号
+     */
+    private String account;
+    /**
+     * 客户名称
+     */
+    private String customerName;
+    /**
+     * 支付渠道
+     */
+    private String payChannel;
+    /**
+     * 支付金额
+     */
+    private BigDecimal payAmount;
+    /**
+     * 购买碳汇量
+     */
+    private BigDecimal orderCarbonAmount;
+    /**
+     * 订单状态
+     */
+    private String orderStatus;
+    /**
+     * 购买时间
+     */
+    private Date createTime;
+    /**
+     * 证书编号
+     */
+    private String credentialNo;
+    /**
+     * 支付流水号
+     */
+    private String payNo;
+
+    /**
+     * 订单金额
+     */
+    private BigDecimal orderAmount;
+
+    /**
+     * 电话
+     */
+    private String phone;
+
+    /**
+     *
+     */
+    private String customerTypeName;
+
+    /**
+     * 商品用途
+     */
+    private String goodsUse;
+}

carbon-back/carbon-back-service/src/main/java/com/hcloud/microserver/bank/bo/OrderPayApplyBO.java

@@ -0,0 +1,21 @@
+package com.hcloud.microserver.bank.bo;
+
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+@Data
+public class OrderPayApplyBO {
+    private String guid;
+    private String orderGuid;
+    private String orderNo;
+    private String goodsName;
+    private String account;
+    private String customerName;
+    private BigDecimal payAmount;
+    private BigDecimal carbonVal;
+    private Date orderTime;
+    private Integer orderStatus;
+    private String orderStatusName;
+}

carbon-back/carbon-back-service/src/main/java/com/hcloud/microserver/bank/bo/PayApplyInfoBO.java

@@ -0,0 +1,33 @@
+package com.hcloud.microserver.bank.bo;
+
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ * @author xiezt
+ */
+@Data
+public class PayApplyInfoBO {
+
+    private String guid;
+
+    private String orderId;
+
+    private String orderNo;
+
+    private String account;
+
+    private String applyUserName;
+
+    private BigDecimal payAmount;
+
+    private BigDecimal orderCarbonAmount;
+
+    private Integer orderStatus;
+
+    private Date orderTime;
+
+    private String goodsName;
+}

carbon-back/carbon-back-service/src/main/java/com/hcloud/microserver/bank/bo/PayVoucherBO.java

@@ -0,0 +1,44 @@
+package com.hcloud.microserver.bank.bo;
+
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+@Data
+public class PayVoucherBO {
+
+    private String guid;
+
+    private String fkOrderId;
+
+    private String fkCustomerId;
+
+    private String fkApplyId;
+
+    private String payUserName;
+
+    private String payBank;
+
+    private String payCardNo;
+
+    private BigDecimal payAmount;
+
+    private Date payTime;
+
+    private String voucherImages;
+
+    private Integer state;
+
+    private Date createTime;
+
+    private Date modifiedTime;
+
+    private Integer orderStatus;
+
+    private String orderNo;
+
+    private String account;
+
+    private Date orderTime;
+}

carbon-back/carbon-back-service/src/main/java/com/hcloud/microserver/bank/bo/PaymentBO.java

@@ -0,0 +1,21 @@
+package com.hcloud.microserver.bank.bo;
+
+import lombok.Data;
+
+import java.util.Date;
+
+@Data
+public class PaymentBO {
+    private String orderId;
+    private String orderNo;
+    private String payNo;
+    private Date orderTime;
+    private Integer orderStatus;
+    private String account;
+    private String customerName;
+    private String payBank;
+    private String payCardNo;
+    private String payChannel;
+    private String payAmount;
+    private Date payTime;
+}

carbon-back/carbon-back-service/src/main/java/com/hcloud/microserver/bank/bo/PovertyAreaBO.java

@@ -0,0 +1,63 @@
+package com.hcloud.microserver.bank.bo;
+
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+/**
+ * @author xiezt
+ */
+@Data
+public class PovertyAreaBO {
+
+    /**
+     * guid
+     */
+
+    private String guid;
+
+    /**
+     * 总的农户数
+     */
+    private Integer farmerNum;
+    /**
+     * 总的贫困人口数
+     */
+    private Integer farmerPersonNum;
+    /**
+     * 总的购碳资金数
+     */
+    private BigDecimal saleAmount;
+    /**
+     * 总的涉及商品数量
+     */
+    private Integer goodsNum;
+
+    /**
+     * 区域地址
+     */
+    private String areaAddress;
+    /**
+     * 贫困区域描述
+     */
+    private String areDesc;
+    /**
+     * 区域照片
+     */
+    private String areaImages;
+
+    /**
+     * 贫困户总数
+     */
+    private Integer familyNum;
+
+    /**
+     * 贫困区域地址
+     */
+    private String povertyAreaName;
+
+    /**
+     * 贫困村编码
+     */
+    private String villageId;
+}

carbon-back/carbon-back-service/src/main/java/com/hcloud/microserver/bank/bo/ProductBelongBO.java

@@ -0,0 +1,29 @@
+package com.hcloud.microserver.bank.bo;
+
+import lombok.Data;
+
+import java.util.Date;
+
+@Data
+public class ProductBelongBO {
+
+    private String guid;
+
+    private String fkProductGuid;
+
+    private String fkFarmerGuid;
+
+    private String farmerName;
+
+    private String farmerVillage;
+
+    private Integer farmerNum;
+
+    private Integer state;
+
+    private Date createTime;
+
+    private Date modifiedTime;
+
+    private Integer belongType;
+}

carbon-back/carbon-back-service/src/main/java/com/hcloud/microserver/bank/bo/ProductExpansionBO.java

@@ -0,0 +1,25 @@
+package com.hcloud.microserver.bank.bo;
+
+import lombok.Data;
+
+import java.util.Date;
+
+@Data
+public class ProductExpansionBO {
+
+    private String guid;
+
+    private String fkProductGuid;
+
+    private String fkProductTypeGuid;
+
+    private String expansionItem;
+
+    private String expansionVal;
+
+    private Integer state;
+
+    private Date createTime;
+
+    private Date modifiedTime;
+}

carbon-back/carbon-back-service/src/main/java/com/hcloud/microserver/bank/bo/ProductInfoBO.java

@@ -0,0 +1,56 @@
+package com.hcloud.microserver.bank.bo;
+
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.util.Date;
+import java.util.List;
+
+@Data
+public class ProductInfoBO {
+    private String guid;
+
+    private String fkProductType;
+
+    private String fkProductTypeName;
+
+    private String fkCarbonRule;
+
+    private String fkPovertyArea;
+
+    private String fkPovertyAreaName;
+
+    private String productName;
+
+    private String productCode;
+
+    private Date carbonGenerateDate;
+
+    private Integer productValidateNum;
+
+    private Date carbonRefreshTime;
+
+    private BigDecimal carbonSink;
+
+    private String productImgs;
+
+    private Integer isEnable;
+
+    private String remark;
+
+    private Integer state;
+
+    private String createUser;
+
+    private Date createTime;
+
+    private String modifiedUser;
+
+    private Date modifiedTime;
+
+    private ProductTypeBO productType;
+
+    private ProductBelongBO productBelong;
+
+    private List<ProductExpansionBO> productExpansions;
+}

carbon-back/carbon-back-service/src/main/java/com/hcloud/microserver/bank/bo/ProductTypeBO.java

@@ -0,0 +1,27 @@
+package com.hcloud.microserver.bank.bo;
+
+import lombok.Data;
+
+import java.util.Date;
+import java.util.List;
+
+@Data
+public class ProductTypeBO {
+    private String guid;
+
+    private String parentId;
+
+    private String typeName;
+
+    private String typeVal;
+
+    private Integer state;
+
+    private Date modifiedTime;
+
+    private String methodology;
+
+    private String typeDesc;
+
+    List<ProductTypeExpansionBO> productTypeExpansions;
+}

carbon-back/carbon-back-service/src/main/java/com/hcloud/microserver/bank/bo/ProductTypeExpansionBO.java

@@ -0,0 +1,17 @@
+package com.hcloud.microserver.bank.bo;
+
+import lombok.Data;
+
+import java.util.Date;
+
+@Data
+public class ProductTypeExpansionBO {
+
+    private String guid;
+    private String fkProductTypeGuid;
+    private String fkProductGuid;
+    private String expansionItem;
+    private Integer state;
+    private Date createTime;
+    private Date modifiedTime;
+}

carbon-back/carbon-back-service/src/main/java/com/hcloud/microserver/bank/bo/WebLog.java

@@ -0,0 +1,61 @@
+package com.hcloud.microserver.bank.bo;
+
+import lombok.Data;
+
+/**
+ * Controller层的日志封装类
+ * Created by macro on 2018/4/26.
+ */
+@Data
+public class WebLog {
+    /**
+     * 操作描述
+     */
+    private String description;
+
+    /**
+     * 操作用户
+     */
+    private String username;
+
+    /**
+     * 操作时间
+     */
+    private Long startTime;
+
+    /**
+     * 消耗时间
+     */
+    private Integer spendTime;
+
+    /**
+     * 根路径
+     */
+    private String basePath;
+
+    /**
+     * URI
+     */
+    private String uri;
+
+    /**
+     * URL
+     */
+    private String url;
+
+    /**
+     * 请求类型
+     */
+    private String method;
+
+    /**
+     * IP地址
+     */
+    private String ip;
+
+    private Object parameter;
+
+    private Object result;
+
+
+}

carbon-back/carbon-back-service/src/main/java/com/hcloud/microserver/bank/component/BindingResultAspect.java

@@ -0,0 +1,43 @@
+package com.hcloud.microserver.bank.component;
+
+import com.hcloud.microserver.commoncore.base.CommonResult;
+import org.aspectj.lang.ProceedingJoinPoint;
+import org.aspectj.lang.annotation.Around;
+import org.aspectj.lang.annotation.Aspect;
+import org.aspectj.lang.annotation.Pointcut;
+import org.springframework.core.annotation.Order;
+import org.springframework.stereotype.Component;
+import org.springframework.validation.BindingResult;
+import org.springframework.validation.FieldError;
+
+/**
+ * HibernateValidator错误结果处理切面
+ * Created by macro on 2018/4/26.
+ */
+@Aspect
+@Component
+@Order(2)
+public class BindingResultAspect {
+    @Pointcut("execution(public * com.hwrj.cloud.admin.controller.*.*(..))")
+    public void BindingResult() {
+    }
+
+    @Around("BindingResult()")
+    public Object doAround(ProceedingJoinPoint joinPoint) throws Throwable {
+        Object[] args = joinPoint.getArgs();
+        for (Object arg : args) {
+            if (arg instanceof BindingResult) {
+                BindingResult result = (BindingResult) arg;
+                if (result.hasErrors()) {
+                    FieldError fieldError = result.getFieldError();
+                    if(fieldError!=null){
+                        return CommonResult.validateFailed(fieldError.getDefaultMessage());
+                    }else{
+                        return CommonResult.validateFailed();
+                    }
+                }
+            }
+        }
+        return joinPoint.proceed();
+    }
+}

carbon-back/carbon-back-service/src/main/java/com/hcloud/microserver/bank/component/WebLogAspect.java

@@ -0,0 +1,124 @@
+package com.hcloud.microserver.bank.component;
+
+import cn.hutool.core.util.StrUtil;
+import cn.hutool.core.util.URLUtil;
+import cn.hutool.json.JSONUtil;
+import com.hcloud.microserver.bank.bo.WebLog;
+import io.swagger.annotations.ApiOperation;
+import net.logstash.logback.marker.Markers;
+import org.aspectj.lang.JoinPoint;
+import org.aspectj.lang.ProceedingJoinPoint;
+import org.aspectj.lang.Signature;
+import org.aspectj.lang.annotation.*;
+import org.aspectj.lang.reflect.MethodSignature;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.core.annotation.Order;
+import org.springframework.stereotype.Component;
+import org.springframework.util.StringUtils;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.context.request.RequestContextHolder;
+import org.springframework.web.context.request.ServletRequestAttributes;
+
+import javax.servlet.http.HttpServletRequest;
+import java.lang.reflect.Method;
+import java.lang.reflect.Parameter;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 统一日志处理切面
+ * Created by macro on 2018/4/26.
+ */
+@Aspect
+@Component
+@Order(1)
+public class WebLogAspect {
+    private static final Logger LOGGER = LoggerFactory.getLogger(WebLogAspect.class);
+
+    @Pointcut("execution(public * com.hwrj.cloud.admin.controller.*.*(..))")
+    public void webLog() {
+    }
+
+    @Before("webLog()")
+    public void doBefore(JoinPoint joinPoint) throws Throwable {
+    }
+
+    @AfterReturning(value = "webLog()", returning = "ret")
+    public void doAfterReturning(Object ret) throws Throwable {
+    }
+
+    @Around("webLog()")
+    public Object doAround(ProceedingJoinPoint joinPoint) throws Throwable {
+        long startTime = System.currentTimeMillis();
+        //获取当前请求对象
+        ServletRequestAttributes attributes = (ServletRequestAttributes) RequestContextHolder.getRequestAttributes();
+        HttpServletRequest request = attributes.getRequest();
+        //记录请求信息(通过Logstash传入Elasticsearch)
+        WebLog webLog = new WebLog();
+        Object result = joinPoint.proceed();
+        Signature signature = joinPoint.getSignature();
+        MethodSignature methodSignature = (MethodSignature) signature;
+        Method method = methodSignature.getMethod();
+        if (method.isAnnotationPresent(ApiOperation.class)) {
+            ApiOperation log = method.getAnnotation(ApiOperation.class);
+            webLog.setDescription(log.value());
+        }
+        long endTime = System.currentTimeMillis();
+        String urlStr = request.getRequestURL().toString();
+        webLog.setBasePath(StrUtil.removeSuffix(urlStr, URLUtil.url(urlStr).getPath()));
+        webLog.setIp(request.getRemoteUser());
+        webLog.setMethod(request.getMethod());
+        webLog.setParameter(getParameter(method, joinPoint.getArgs()));
+        webLog.setResult(result);
+        webLog.setSpendTime((int) (endTime - startTime));
+        webLog.setStartTime(startTime);
+        webLog.setUri(request.getRequestURI());
+        webLog.setUrl(request.getRequestURL().toString());
+        Map<String,Object> logMap = new HashMap<>();
+        logMap.put("url",webLog.getUrl());
+        logMap.put("method",webLog.getMethod());
+        logMap.put("parameter",webLog.getParameter());
+        logMap.put("spendTime",webLog.getSpendTime());
+        logMap.put("description",webLog.getDescription());
+//        LOGGER.info("{}", JSONUtil.parse(webLog));
+        LOGGER.info(Markers.appendEntries(logMap), JSONUtil.parse(webLog).toString());
+        return result;
+    }
+
+    /**
+     * 根据方法和传入的参数获取请求参数
+     */
+    private Object getParameter(Method method, Object[] args) {
+        List<Object> argList = new ArrayList<>();
+        Parameter[] parameters = method.getParameters();
+        for (int i = 0; i < parameters.length; i++) {
+            //将RequestBody注解修饰的参数作为请求参数
+            RequestBody requestBody = parameters[i].getAnnotation(RequestBody.class);
+            if (requestBody != null) {
+                argList.add(args[i]);
+            }
+            //将RequestParam注解修饰的参数作为请求参数
+            RequestParam requestParam = parameters[i].getAnnotation(RequestParam.class);
+            if (requestParam != null) {
+                Map<String, Object> map = new HashMap<>();
+                String key = parameters[i].getName();
+                if (!StringUtils.isEmpty(requestParam.value())) {
+                    key = requestParam.value();
+                }
+                map.put(key, args[i]);
+                argList.add(map);
+            }
+        }
+        if (argList.size() == 0) {
+            return null;
+        } else if (argList.size() == 1) {
+            return argList.get(0);
+        } else {
+            return argList;
+        }
+    }
+}

carbon-back/carbon-back-service/src/main/java/com/hcloud/microserver/bank/controller/BaseDictionaryController.java

@@ -0,0 +1,36 @@
+package com.hcloud.microserver.bank.controller;
+
+import com.hcloud.microserver.bank.service.BaseDictionaryService;
+import com.hcloud.microserver.commoncore.base.BaseController;
+import com.hcloud.microserver.commoncore.base.ResponseBase;
+import com.hcloud.microserver.commoncore.util.BeanCopyUtil;
+import com.hcloud.microserver.facade.carbon.entity.BaseDictionary;
+import com.hcloud.microserver.facade.carbon.forms.BaseDictionaryForm;
+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;
+
+import java.util.List;
+
+@RestController
+@RequestMapping("/web/dic")
+public class BaseDictionaryController extends BaseController {
+
+    @Autowired
+    private BaseDictionaryService baseDictionaryService;
+
+    /**
+     * 条件查询字典
+     * @param baseDictionaryForm
+     * @return
+     */
+    @PostMapping("/findByEntity")
+    public ResponseBase findByEntity(@RequestBody BaseDictionaryForm baseDictionaryForm) {
+
+        BaseDictionary baseDictionary = BeanCopyUtil.convertBean(baseDictionaryForm, BaseDictionary.class);
+        List<BaseDictionary> baseDictionaries = this.baseDictionaryService.findByEntity(baseDictionary);
+        return responseResultSuccess(baseDictionaries);
+    }
+}

carbon-back/carbon-back-service/src/main/java/com/hcloud/microserver/bank/controller/BasePositionController.java

@@ -0,0 +1,49 @@
+package com.hcloud.microserver.bank.controller;
+
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
+import com.hcloud.microserver.bank.service.BasePositionService;
+import com.hcloud.microserver.commoncore.base.BaseController;
+import com.hcloud.microserver.commoncore.base.ResponseBase;
+import com.hcloud.microserver.facade.carbon.entity.BasePosition;
+import io.swagger.annotations.Api;
+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;
+
+import java.util.List;
+
+@Slf4j
+@RestController
+@RequestMapping("/web/position")
+@Api(description = "基本区域信息管理服务")
+public class BasePositionController extends BaseController {
+
+    @Autowired
+    private BasePositionService basePositionService;
+
+    @PostMapping("/findByCodeAndLevel")
+    public ResponseBase findByCodeAndLevel(@RequestBody BasePosition basePosition) {
+        List<BasePosition> positionList = this.basePositionService.queryByCodeAndLevel(basePosition);
+        return responseResultSuccess(positionList);
+    }
+
+    @PostMapping("/findByCodes")
+    private ResponseBase findByCodes(@RequestBody JSONObject parameters) {
+        log.info("看看参数: {}", parameters);
+        JSONArray codesArray = parameters.getJSONArray("codes");
+        List<String> codes = codesArray.toJavaList(String.class);
+        log.info("能不能转换: {}", codes);
+        List<BasePosition> positionList = this.basePositionService.queryByCodes(codes);
+        return responseResultSuccess(positionList);
+    }
+
+    @PostMapping("/findChongqingArea")
+    private ResponseBase findChongqingArea(@RequestBody(required = false) BasePosition basePosition) {
+        List<BasePosition> positionList = this.basePositionService.queryByChongqingArea(basePosition);
+        return responseResultSuccess(positionList);
+    }
+}

carbon-back/carbon-back-service/src/main/java/com/hcloud/microserver/bank/controller/CollectiveFarmerController.java

@@ -0,0 +1,67 @@
+package com.hcloud.microserver.bank.controller;
+
+import com.github.pagehelper.PageInfo;
+import com.hcloud.microserver.bank.service.CollectiveFarmerService;
+import com.hcloud.microserver.commoncore.base.BaseController;
+import com.hcloud.microserver.commoncore.base.ResponseBase;
+import com.hcloud.microserver.facade.carbon.forms.CollectiveFarmerForm;
+import com.hcloud.microserver.system.util.CurrUserUtil;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+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 xiezt
+ */
+@RestController
+@RequestMapping("/web/collectiveFarmer")
+@Api(description = "集体农户信息管理服务")
+public class CollectiveFarmerController extends BaseController {
+
+    @Autowired
+    private CollectiveFarmerService collectiveFarmerService;
+
+    @ApiOperation(value = "分页查询集体农户信息",notes = "分页查询集体农户信息")
+    @PostMapping("/searchByPage")
+    public ResponseBase searchByPage(@RequestBody CollectiveFarmerForm collectiveFarmerForm) {
+        PageInfo pageInfo = this.collectiveFarmerService.queryListByPage(collectiveFarmerForm);
+        return responseSuccess(pageInfo);
+    }
+
+    @ApiOperation(value = "添加集体农户信息",notes = "添加集体农户信息")
+    @PostMapping("/save")
+    public ResponseBase save(@RequestBody CollectiveFarmerForm collectiveFarmerForm) {
+        String userId = CurrUserUtil.getUserId();
+        collectiveFarmerForm.setCreateUser(userId);
+        collectiveFarmerForm.setModifiedUser(userId);
+        int save = this.collectiveFarmerService.save(collectiveFarmerForm);
+        if (save>0) {
+            return responseResultSuccess();
+        }
+        return responseResultFailure();
+    }
+
+    @ApiOperation(value = "修改集体农户信息",notes = "修改集体农户信息")
+    @PostMapping("/update")
+    public ResponseBase update(@RequestBody CollectiveFarmerForm collectiveFarmerForm) {
+        String userId = CurrUserUtil.getUserId();
+        collectiveFarmerForm.setModifiedUser(userId);
+        int success = this.collectiveFarmerService.modify(collectiveFarmerForm);
+        if (success> 0)
+            return responseResultSuccess();
+        return responseResultFailure();
+    }
+
+    @ApiOperation(value = "删除集体农户信息",notes = "删除集体农户信息")
+    @PostMapping("/delete")
+    public ResponseBase del(@RequestBody CollectiveFarmerForm collectiveFarmerForm) {
+        int success = this.collectiveFarmerService.softRemove(collectiveFarmerForm);
+        if (success> 0)
+            return responseResultSuccess();
+        return responseResultFailure();
+    }
+}

carbon-back/carbon-back-service/src/main/java/com/hcloud/microserver/bank/controller/CompanyController.java

@@ -0,0 +1,90 @@
+package com.hcloud.microserver.bank.controller;
+
+import com.alibaba.fastjson.JSONObject;
+import com.github.pagehelper.PageInfo;
+import com.hcloud.microserver.bank.service.CompanyService;
+import com.hcloud.microserver.bank.service.CustomerCompanyInfoService;
+import com.hcloud.microserver.commoncore.base.BaseController;
+import com.hcloud.microserver.commoncore.base.ResponseBase;
+import com.hcloud.microserver.commoncore.util.BeanCopyUtil;
+import com.hcloud.microserver.facade.carbon.entity.CustomerCompanyInfo;
+import com.hcloud.microserver.facade.carbon.entity.CustomerInfo;
+import com.hcloud.microserver.facade.carbon.forms.CustomerCompanyInfoForm;
+import com.hcloud.microserver.facade.carbon.forms.CustomerInfoForm;
+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.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+@Slf4j
+@RestController
+@RequestMapping("/web/company")
+@Api(description = "企业信息管理服务")
+public class CompanyController extends BaseController {
+
+
+    @Autowired
+    private CustomerCompanyInfoService customerCompanyInfoService;
+
+    @Autowired
+    private CompanyService companyService;
+
+    @ApiOperation(value = "查询企业信息")
+    @PostMapping("/searchByPage")
+    public ResponseBase searchByPage(@RequestBody CustomerCompanyInfoForm customerCompanyInfoForm) {
+        PageInfo pageInfo = this.customerCompanyInfoService.queryListByPage(customerCompanyInfoForm);
+        return responseSuccess(pageInfo);
+    }
+
+    @ApiOperation(value = "添加企业信息")
+    @PostMapping("/add")
+    public ResponseBase addCompany(@RequestBody JSONObject jsonObject) {
+        log.info("前端的参数: {}", jsonObject.toJSONString());
+        CustomerInfoForm customerInfoForm = jsonObject.getObject("customerInfoForm", CustomerInfoForm.class);
+        CustomerCompanyInfoForm customerCompanyInfoForm = jsonObject.getObject("customerCompanyInfoForm", CustomerCompanyInfoForm.class);
+
+        CustomerInfo customerInfo = BeanCopyUtil.convertBean(customerInfoForm, CustomerInfo.class);
+        CustomerCompanyInfo customerCompanyInfo = BeanCopyUtil.convertBean(customerCompanyInfoForm, CustomerCompanyInfo.class);
+        int success = this.companyService.saveCompany(customerInfo, customerCompanyInfo);
+        if (success>0){
+            return responseResultSuccess();
+        }
+        return responseResultFailure();
+    }
+
+    @ApiOperation(value = "修改企业信息")
+    @PostMapping("/update")
+    public ResponseBase updateCompany(@RequestBody JSONObject jsonObject) {
+        log.info("前端的参数: {}", jsonObject.toJSONString());
+        CustomerInfoForm customerInfoForm = jsonObject.getObject("customerInfoForm", CustomerInfoForm.class);
+        CustomerCompanyInfoForm customerCompanyInfoForm = jsonObject.getObject("customerCompanyInfoForm", CustomerCompanyInfoForm.class);
+
+        CustomerInfo customerInfo = BeanCopyUtil.convertBean(customerInfoForm, CustomerInfo.class);
+        CustomerCompanyInfo customerCompanyInfo = BeanCopyUtil.convertBean(customerCompanyInfoForm, CustomerCompanyInfo.class);
+
+        int success = this.companyService.modifyCompany(customerInfo, customerCompanyInfo);
+        if (success>0){
+            return responseResultSuccess();
+        }
+        return responseResultFailure();    }
+
+    @ApiOperation(value = "删除企业信息")
+    @PostMapping("/delete")
+    public ResponseBase deleteCompany(@RequestBody JSONObject jsonObject) {
+        log.info("前端的参数: {}", jsonObject.toJSONString());
+        CustomerInfoForm customerInfoForm = jsonObject.getObject("customerInfoForm", CustomerInfoForm.class);
+        CustomerCompanyInfoForm customerCompanyInfoForm = jsonObject.getObject("customerCompanyInfoForm", CustomerCompanyInfoForm.class);
+
+        CustomerInfo customerInfo = BeanCopyUtil.convertBean(customerInfoForm, CustomerInfo.class);
+        CustomerCompanyInfo customerCompanyInfo = BeanCopyUtil.convertBean(customerCompanyInfoForm, CustomerCompanyInfo.class);
+
+        int success = this.companyService.removeCompany(customerInfo, customerCompanyInfo);
+        if (success>0){
+            return responseResultSuccess();
+        }
+        return responseResultFailure();    }
+}

carbon-back/carbon-back-service/src/main/java/com/hcloud/microserver/bank/controller/CustomerCompanyTypeController.java

@@ -0,0 +1,103 @@
+package com.hcloud.microserver.bank.controller;
+
+import com.github.pagehelper.PageInfo;
+import com.hcloud.microserver.bank.service.CustomerCompanyTypeService;
+import com.hcloud.microserver.commoncore.base.BaseController;
+import com.hcloud.microserver.commoncore.base.ResponseBase;
+import com.hcloud.microserver.commoncore.base.ResultVO;
+import com.hcloud.microserver.commoncore.enums.ResultEnum;
+import com.hcloud.microserver.facade.carbon.entity.CustomerCompanyType;
+import com.hcloud.microserver.facade.carbon.forms.CustomerCompanyTypeForm;
+import io.swagger.annotations.*;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import javax.validation.Valid;
+import java.util.List;
+
+@RestController
+@RequestMapping("/customerCompanyType")
+@Api(description = "企业类型管理")
+public class CustomerCompanyTypeController extends BaseController {
+
+    @Autowired
+    private CustomerCompanyTypeService customerCompanyTypeService;
+
+    @ApiOperation(value = "企业类型添加")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "customerCompanyType",value = "企业类型信息",dataType = "CustomerCompanyType")
+    })
+    @ApiResponse(code = 0, message = "操作成功")
+    @PostMapping("/save")
+    public ResponseBase save(@RequestBody @Valid CustomerCompanyType customerCompanyType){
+        int i = customerCompanyTypeService.saveSelective(customerCompanyType);
+        ResultVO resultVO = new ResultVO();
+        if (i < 1){
+            resultVO.setCode(ResultEnum.FAILURE.getCode());
+            resultVO.setMsg(ResultEnum.FAILURE.getMsg());
+            return responseError(resultVO);
+        }
+       return responseSuccess(resultVO);
+    }
+
+    @ApiOperation(value = "企业类型修改")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "customerCompanyType",value = "企业类型信息",dataType = "CustomerCompanyType")
+    })
+    @ApiResponse(code = 0, message = "操作成功")
+    @PostMapping("/update")
+    public ResponseBase update(@RequestBody @Valid CustomerCompanyType customerCompanyType){
+        int i = customerCompanyTypeService.modifyByPrimaryKeySelective(customerCompanyType);
+        ResultVO resultVO = new ResultVO();
+        if (i < 1){
+            resultVO.setCode(ResultEnum.FAILURE.getCode());
+            resultVO.setMsg(ResultEnum.FAILURE.getMsg());
+            return responseError(resultVO);
+        }
+        return responseSuccess(resultVO);
+    }
+
+    @ApiOperation(value = "企业类型详情")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "guid",value = "主键",dataType = "String")
+    })
+    @ApiResponse(code = 0, message = "操作成功")
+    @GetMapping("/findById")
+    public ResponseBase findById(@RequestParam("guid") String guid){
+        CustomerCompanyType customerCompanyType = customerCompanyTypeService.queryByPrimaryKey(guid);
+        ResultVO resultVO = new ResultVO();
+        resultVO.setData(customerCompanyType);
+        return responseSuccess(resultVO);
+    }
+
+    @ApiOperation(value = "企业类型信息删除")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "guid",value = "主键",dataType = "String")
+    })
+    @ApiResponse(code = 0, message = "操作成功")
+    @GetMapping("/delete")
+    public ResponseBase delete(@RequestParam("guid") String guid){
+        int i = customerCompanyTypeService.delByPrimaryKey(guid);
+        ResultVO resultVO = new ResultVO();
+        if (i < 1){
+            resultVO.setCode(ResultEnum.FAILURE.getCode());
+            resultVO.setMsg(ResultEnum.FAILURE.getMsg());
+            return responseError(resultVO);
+        }
+        return responseSuccess(resultVO);
+    }
+
+    @ApiOperation(value = "企业类型列表")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "customerCompanyTypeForm",value = "企业类型信息",dataType = "CustomerCompanyTypeForm")
+    })
+    @ApiResponse(code = 0, message = "操作成功")
+    @PostMapping("/list")
+    public ResponseBase selectList(@RequestBody CustomerCompanyTypeForm customerCompanyTypeForm){
+        PageInfo<List<CustomerCompanyType>> pageInfo = customerCompanyTypeService.selectList(customerCompanyTypeForm);
+        ResultVO resultVO = new ResultVO();
+        resultVO.setData(pageInfo.getList());
+        resultVO.setCount(pageInfo.getTotal());
+        return responseSuccess(resultVO);
+    }
+}

carbon-back/carbon-back-service/src/main/java/com/hcloud/microserver/bank/controller/CustomerInfoController.java

@@ -0,0 +1,58 @@
+package com.hcloud.microserver.bank.controller;
+
+import com.github.pagehelper.PageInfo;
+import com.hcloud.microserver.bank.service.CustomerInfoService;
+import com.hcloud.microserver.commoncore.base.BaseController;
+import com.hcloud.microserver.commoncore.base.ResponseBase;
+import com.hcloud.microserver.facade.carbon.forms.CustomerInfoForm;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+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 JYJ
+ */
+@RestController
+@RequestMapping("/web/customer")
+@Api(description = "管理端客户服务")
+public class CustomerInfoController extends BaseController {
+
+    @Autowired
+    private CustomerInfoService customerInfoService;
+
+    /**
+     * 分页查询爱心用户信息
+     *
+     * @param customerInfoForm
+     * @return
+     */
+    @ApiOperation(value = "分页查询爱心用户信息")
+    @PostMapping("/searchByPage")
+    public ResponseBase searchCustomerInfoByPage(@RequestBody CustomerInfoForm customerInfoForm) {
+        PageInfo pageInfo = customerInfoService.searchCustomerByPage(customerInfoForm);
+        return responseSuccess(pageInfo);
+    }
+
+    @ApiOperation(value = "充值爱心用户信息密码")
+    @PostMapping("/resetPassword")
+    public ResponseBase resetPassword(@RequestBody CustomerInfoForm customerInfoForm) {
+        int i = this.customerInfoService.resetPassword(customerInfoForm);
+        if (i>0){
+            return responseResultSuccess();
+        }
+        return responseResultFailure();
+    }
+
+    @ApiOperation(value = "修改爱心用户信息")
+    @PostMapping("/update")
+    public ResponseBase update(@RequestBody CustomerInfoForm customerInfoForm) {
+        int i = customerInfoService.modifyByPrimaryKeySelective(customerInfoForm);
+        if (i>0){
+            return responseResultSuccess();
+        }
+        return responseResultFailure();    }
+}

carbon-back/carbon-back-service/src/main/java/com/hcloud/microserver/bank/controller/FarmerInfoController.java

@@ -0,0 +1,73 @@
+package com.hcloud.microserver.bank.controller;
+
+import com.github.pagehelper.PageInfo;
+import com.hcloud.microserver.bank.service.FarmerInfoService;
+import com.hcloud.microserver.commoncore.base.BaseController;
+import com.hcloud.microserver.commoncore.base.ResponseBase;
+import com.hcloud.microserver.facade.carbon.entity.FarmerInfo;
+import com.hcloud.microserver.facade.carbon.forms.FarmerInfoForm;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+@RestController
+@RequestMapping("/web/farmer")
+@Api(description = "农户信息管理服务")
+public class FarmerInfoController extends BaseController {
+
+    @Autowired
+    private FarmerInfoService farmerInfoService;
+
+    @ApiOperation(value = "分页查询农户信息")
+    @PostMapping("/searchByPage")
+    public ResponseBase searchByPage(@RequestBody FarmerInfoForm farmerInfoForm) {
+        PageInfo pageInfo = this.farmerInfoService.queryListByPage(farmerInfoForm);
+        return responseSuccess(pageInfo);
+    }
+    @ApiOperation(value = "新增农户信息")
+    @PostMapping("/save")
+    public ResponseBase save(@RequestBody FarmerInfoForm farmerInfoForm) {
+        int success = this.farmerInfoService.save(farmerInfoForm);
+        if (success>0){
+            return responseResultSuccess();
+        }
+        return responseResultFailure();
+    }
+    @ApiOperation(value = "修改农户信息")
+    @PostMapping("/update")
+    public ResponseBase update(@RequestBody FarmerInfoForm farmerInfoForm) {
+        int success = this.farmerInfoService.modify(farmerInfoForm);
+        if (success>0){
+            return responseResultSuccess();
+        }
+        return responseResultFailure();
+    }
+
+    @ApiOperation(value = "删除农户信息")
+    @PostMapping("/delete")
+    public ResponseBase del(@RequestBody FarmerInfoForm farmerInfoForm) {
+        int success = this.farmerInfoService.softRemove(farmerInfoForm);
+        if (success>0){
+            return responseResultSuccess();
+        }
+        return responseResultFailure();
+    }
+
+    @ApiOperation(value = "通过集体查询农户信息")
+    @PostMapping("/searchByCollectiveId")
+    public ResponseBase findByCollectiveId(@RequestParam(name = "collectiveId") String collectiveId) {
+        List<FarmerInfo> farmerInfos = this.farmerInfoService.queryByCollectiveId(collectiveId);
+        return responseResultSuccess(farmerInfos);
+    }
+
+    @ApiOperation(value = "通过产品查询农户信息")
+    @PostMapping("/searchByProductGuid")
+    public ResponseBase searchByProductGuid(@RequestParam(name = "productGuid") String productGuid) {
+        List<FarmerInfo> farmerInfos = this.farmerInfoService.queryByProductGuid(productGuid);
+        return responseResultSuccess(farmerInfos);
+    }
+
+}

carbon-back/carbon-back-service/src/main/java/com/hcloud/microserver/bank/controller/GoodsInfoController.java

@@ -0,0 +1,103 @@
+package com.hcloud.microserver.bank.controller;
+
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
+import com.github.pagehelper.PageInfo;
+import com.hcloud.microserver.bank.service.GoodsInfoService;
+import com.hcloud.microserver.commoncore.base.BaseController;
+import com.hcloud.microserver.commoncore.base.ResponseBase;
+import com.hcloud.microserver.facade.carbon.entity.GoodsInfo;
+import com.hcloud.microserver.facade.carbon.entity.GoodsSaleInfo;
+import com.hcloud.microserver.facade.carbon.entity.ProductInfo;
+import com.hcloud.microserver.facade.carbon.forms.GoodsInfoForm;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+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;
+
+import java.util.List;
+import java.util.Objects;
+
+/**
+ * @author xiezt
+ */
+@RestController
+@RequestMapping("/web/goods")
+@Api(description = "商品信息管理服务")
+public class GoodsInfoController extends BaseController {
+
+    @Autowired
+    private GoodsInfoService goodsInfoService;
+
+    @ApiOperation("商品上下架")
+    @PostMapping("/shelves")
+    public ResponseBase shelves(@RequestBody List<GoodsInfoForm> goodsInfoForms) {
+        int success = this.goodsInfoService.batchShelves(goodsInfoForms);
+        if (success>0){
+            return responseResultSuccess();
+        }
+        return responseResultFailure();    }
+
+    @ApiOperation("商品删除")
+    @PostMapping("/delete")
+    public ResponseBase delete(@RequestBody GoodsInfoForm goodsInfoForm) {
+        int success = this.goodsInfoService.remove(goodsInfoForm);
+        if (success>0){
+            return responseResultSuccess();
+        }
+        return responseResultFailure();
+    }
+
+    @ApiOperation("修改商品信息")
+    @PostMapping("/update")
+    public ResponseBase update(@RequestBody GoodsInfoForm goodsInfoForm) {
+        int success = this.goodsInfoService.modify(goodsInfoForm);
+        if (success>0){
+            return responseResultSuccess();
+        }
+        return responseResultFailure();    }
+
+    @ApiOperation("分页查询商品信息")
+    @PostMapping("/searchByPage")
+    public ResponseBase searchByPage(@RequestBody GoodsInfoForm goodsInfoForm) {
+        PageInfo pageInfo = this.goodsInfoService.queryListByPage(goodsInfoForm);
+        return responseSuccess(pageInfo);
+
+    }
+    @ApiOperation("分页查询商品关联信息")
+    @PostMapping("/searchJoinListByPage")
+    public ResponseBase searchJoinListByPage(@RequestBody GoodsInfoForm goodsInfoForm) {
+        PageInfo pageInfo = this.goodsInfoService.queryJoinListByPage(goodsInfoForm);
+        return responseSuccess(pageInfo);
+    }
+
+    @ApiOperation("修改商品信息")
+    @PostMapping("/updateGoods")
+    public ResponseBase modifyGoods(@RequestBody JSONObject jsonObject) {
+        JSONArray jsonArray = jsonObject.getJSONArray("productInfos");
+        List<ProductInfo> productInfos = JSONObject.parseArray(jsonArray.toJSONString(), ProductInfo.class);
+        GoodsInfoForm goodsInfoForm = jsonObject.getObject("goodsInfoForm", GoodsInfoForm.class);
+        boolean cond1 = Objects.nonNull(productInfos) && productInfos.size() > 0;
+        boolean cond2 = Objects.nonNull(goodsInfoForm);
+        if (cond1 && cond2) {
+            GoodsInfo goodsInfo = new GoodsInfo();
+            GoodsSaleInfo goodsSaleInfo = new GoodsSaleInfo();
+            goodsInfo.setGuid(goodsInfoForm.getGuid());
+            goodsInfo.setCarbonVal(goodsInfoForm.getCarbonVal());
+            goodsInfo.setPrice(goodsInfoForm.getPrice());
+            goodsInfo.setGoodsSaleDate(goodsInfoForm.getGoodsSaleDate());
+            goodsInfo.setGoodsUse(goodsInfoForm.getGoodsUse());
+            goodsSaleInfo.setSaleTargets(goodsInfoForm.getSaleTargets());
+            goodsSaleInfo.setSaleType(goodsInfoForm.getSaleType());
+            int success = this.goodsInfoService.modifyGoods(goodsInfo, goodsSaleInfo, productInfos);
+            if (success > 0) {
+                return responseResultSuccess();
+            }
+        }
+
+        return responseResultFailure();
+    }
+}

carbon-back/carbon-back-service/src/main/java/com/hcloud/microserver/bank/controller/OrderDetailController.java

@@ -0,0 +1,31 @@
+package com.hcloud.microserver.bank.controller;
+
+import com.hcloud.microserver.bank.service.OrderDetailInfoService;
+import com.hcloud.microserver.commoncore.base.BaseController;
+import com.hcloud.microserver.commoncore.base.ResponseBase;
+import com.hcloud.microserver.facade.carbon.entity.GoodsOrderDetail;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.List;
+
+@RestController
+@RequestMapping("/web/orderDetail")
+@Api(tags = "OrderDetailController",description = "订单详细信息管理")
+public class OrderDetailController extends BaseController {
+
+    @Autowired
+    private OrderDetailInfoService orderDetailInfoService;
+
+    @ApiOperation("分页查询订单详细信息")
+    @PostMapping("/searchByOrderGuid")
+    public ResponseBase searchByOrderGuid(@RequestParam(name = "orderGuid") String orderGuid) {
+        List<GoodsOrderDetail> goodsOrderDetails = this.orderDetailInfoService.findByGoodsOrderInfoGuid(orderGuid);
+        return responseResultSuccess(goodsOrderDetails);
+    }
+}

carbon-back/carbon-back-service/src/main/java/com/hcloud/microserver/bank/controller/OrderInfoController.java

@@ -0,0 +1,31 @@
+package com.hcloud.microserver.bank.controller;
+
+import com.github.pagehelper.PageInfo;
+import com.hcloud.microserver.bank.service.OrderInfoService;
+import com.hcloud.microserver.commoncore.base.BaseController;
+import com.hcloud.microserver.commoncore.base.ResponseBase;
+import com.hcloud.microserver.facade.carbon.forms.GoodsOrderInfoForm;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+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;
+
+@RestController
+@RequestMapping("/web/order")
+@Api(description = "订单信息管理服务")
+public class OrderInfoController extends BaseController {
+
+    @Autowired
+    private OrderInfoService orderInfoService;
+
+    @ApiOperation("分页查询订单信息")
+    @PostMapping("/searchByPage")
+    public ResponseBase searchByPage(@RequestBody GoodsOrderInfoForm goodsOrderInfoForm) {
+        PageInfo pageInfo = orderInfoService.searchOrderInfoByPage(goodsOrderInfoForm);
+        return responseSuccess(pageInfo);
+    }
+
+}