Browse Source

统一包结构

qiubo 4 years ago
parent
commit
5af1141d89
100 changed files with 3721 additions and 4549 deletions
  1. 0 10
      carbon-admin/carbon-admin-common/src/main/java/com/hcloud/microserver/facade/carbon/CarbonManageApplication.java
  2. 0 24
      carbon-admin/carbon-admin-common/src/main/java/com/hcloud/microserver/facade/carbon/entity/BasePosition.java
  3. 0 125
      carbon-admin/carbon-admin-common/src/main/java/com/hcloud/microserver/facade/carbon/entity/CarbonCalculateRule.java
  4. 0 56
      carbon-admin/carbon-admin-common/src/main/java/com/hcloud/microserver/facade/carbon/entity/CarbonPlatformStatiticsNum.java
  5. 0 34
      carbon-admin/carbon-admin-common/src/main/java/com/hcloud/microserver/facade/carbon/entity/CarbonStatisticsBuyTrend.java
  6. 0 17
      carbon-admin/carbon-admin-common/src/main/java/com/hcloud/microserver/facade/carbon/entity/CarbonStatisticsFarmer.java
  7. 0 20
      carbon-admin/carbon-admin-common/src/main/java/com/hcloud/microserver/facade/carbon/entity/CarbonStatisticsProduct.java
  8. 0 213
      carbon-admin/carbon-admin-common/src/main/java/com/hcloud/microserver/facade/carbon/entity/CollectiveFarmer.java
  9. 0 20
      carbon-admin/carbon-admin-common/src/main/java/com/hcloud/microserver/facade/carbon/entity/CollectiveProductBelong.java
  10. 0 76
      carbon-admin/carbon-admin-common/src/main/java/com/hcloud/microserver/facade/carbon/entity/CustomerChannel.java
  11. 0 134
      carbon-admin/carbon-admin-common/src/main/java/com/hcloud/microserver/facade/carbon/entity/CustomerCompanyInfo.java
  12. 0 117
      carbon-admin/carbon-admin-common/src/main/java/com/hcloud/microserver/facade/carbon/entity/CustomerCompanyType.java
  13. 0 218
      carbon-admin/carbon-admin-common/src/main/java/com/hcloud/microserver/facade/carbon/entity/CustomerInfo.java
  14. 0 17
      carbon-admin/carbon-admin-common/src/main/java/com/hcloud/microserver/facade/carbon/entity/DayCarbonBO.java
  15. 0 282
      carbon-admin/carbon-admin-common/src/main/java/com/hcloud/microserver/facade/carbon/entity/FarmerInfo.java
  16. 0 21
      carbon-admin/carbon-admin-common/src/main/java/com/hcloud/microserver/facade/carbon/entity/FarmerProductBelong.java
  17. 0 169
      carbon-admin/carbon-admin-common/src/main/java/com/hcloud/microserver/facade/carbon/entity/GoodsCredentialInfo.java
  18. 0 147
      carbon-admin/carbon-admin-common/src/main/java/com/hcloud/microserver/facade/carbon/entity/GoodsDetail.java
  19. 0 227
      carbon-admin/carbon-admin-common/src/main/java/com/hcloud/microserver/facade/carbon/entity/GoodsInfo.java
  20. 0 120
      carbon-admin/carbon-admin-common/src/main/java/com/hcloud/microserver/facade/carbon/entity/GoodsOrderDetail.java
  21. 0 146
      carbon-admin/carbon-admin-common/src/main/java/com/hcloud/microserver/facade/carbon/entity/GoodsOrderInfo.java
  22. 0 116
      carbon-admin/carbon-admin-common/src/main/java/com/hcloud/microserver/facade/carbon/entity/GoodsPayOrder.java
  23. 0 143
      carbon-admin/carbon-admin-common/src/main/java/com/hcloud/microserver/facade/carbon/entity/GoodsSaleInfo.java
  24. 0 24
      carbon-admin/carbon-admin-common/src/main/java/com/hcloud/microserver/facade/carbon/entity/GroupNumBO.java
  25. 0 106
      carbon-admin/carbon-admin-common/src/main/java/com/hcloud/microserver/facade/carbon/entity/OrderPayApply.java
  26. 0 140
      carbon-admin/carbon-admin-common/src/main/java/com/hcloud/microserver/facade/carbon/entity/OrderPayVoucher.java
  27. 0 45
      carbon-admin/carbon-admin-common/src/main/java/com/hcloud/microserver/facade/carbon/entity/PovertyArea.java
  28. 0 121
      carbon-admin/carbon-admin-common/src/main/java/com/hcloud/microserver/facade/carbon/entity/ProductBelong.java
  29. 0 101
      carbon-admin/carbon-admin-common/src/main/java/com/hcloud/microserver/facade/carbon/entity/ProductExpansion.java
  30. 0 233
      carbon-admin/carbon-admin-common/src/main/java/com/hcloud/microserver/facade/carbon/entity/ProductInfo.java
  31. 0 102
      carbon-admin/carbon-admin-common/src/main/java/com/hcloud/microserver/facade/carbon/entity/ProductType.java
  32. 0 85
      carbon-admin/carbon-admin-common/src/main/java/com/hcloud/microserver/facade/carbon/entity/ProductTypeExpansion.java
  33. 0 25
      carbon-admin/carbon-admin-common/src/main/java/com/hcloud/microserver/facade/carbon/entity/UserBuyBO.java
  34. 0 27
      carbon-admin/carbon-admin-common/src/main/java/com/hcloud/microserver/facade/carbon/forms/CarbonTrendForm.java
  35. 0 64
      carbon-admin/carbon-admin-common/src/main/java/com/hcloud/microserver/facade/carbon/forms/CollectiveFarmerForm.java
  36. 0 25
      carbon-admin/carbon-admin-common/src/main/java/com/hcloud/microserver/facade/carbon/forms/CustomerChannelForm.java
  37. 0 49
      carbon-admin/carbon-admin-common/src/main/java/com/hcloud/microserver/facade/carbon/forms/CustomerCompanyInfoForm.java
  38. 0 28
      carbon-admin/carbon-admin-common/src/main/java/com/hcloud/microserver/facade/carbon/forms/CustomerCompanyTypeForm.java
  39. 0 80
      carbon-admin/carbon-admin-common/src/main/java/com/hcloud/microserver/facade/carbon/forms/CustomerInfoForm.java
  40. 0 14
      carbon-admin/carbon-admin-common/src/main/java/com/hcloud/microserver/facade/carbon/forms/DayCarbonFrom.java
  41. 0 80
      carbon-admin/carbon-admin-common/src/main/java/com/hcloud/microserver/facade/carbon/forms/FarmerInfoForm.java
  42. 0 37
      carbon-admin/carbon-admin-common/src/main/java/com/hcloud/microserver/facade/carbon/forms/GoodsCredentialInfoForm.java
  43. 0 37
      carbon-admin/carbon-admin-common/src/main/java/com/hcloud/microserver/facade/carbon/forms/GoodsDetailForm.java
  44. 0 80
      carbon-admin/carbon-admin-common/src/main/java/com/hcloud/microserver/facade/carbon/forms/GoodsInfoForm.java
  45. 0 48
      carbon-admin/carbon-admin-common/src/main/java/com/hcloud/microserver/facade/carbon/forms/GoodsOrderDetailForm.java
  46. 0 112
      carbon-admin/carbon-admin-common/src/main/java/com/hcloud/microserver/facade/carbon/forms/GoodsOrderInfoForm.java
  47. 0 35
      carbon-admin/carbon-admin-common/src/main/java/com/hcloud/microserver/facade/carbon/forms/GoodsPayOrderForm.java
  48. 0 35
      carbon-admin/carbon-admin-common/src/main/java/com/hcloud/microserver/facade/carbon/forms/GoodsSaleInfoForm.java
  49. 0 16
      carbon-admin/carbon-admin-common/src/main/java/com/hcloud/microserver/facade/carbon/forms/GroupNumFrom.java
  50. 0 39
      carbon-admin/carbon-admin-common/src/main/java/com/hcloud/microserver/facade/carbon/forms/OrderPayApplyForm.java
  51. 0 45
      carbon-admin/carbon-admin-common/src/main/java/com/hcloud/microserver/facade/carbon/forms/OrderPayVoucherForm.java
  52. 0 22
      carbon-admin/carbon-admin-common/src/main/java/com/hcloud/microserver/facade/carbon/forms/PaymentForm.java
  53. 0 67
      carbon-admin/carbon-admin-common/src/main/java/com/hcloud/microserver/facade/carbon/forms/PovertyAreaForm.java
  54. 0 31
      carbon-admin/carbon-admin-common/src/main/java/com/hcloud/microserver/facade/carbon/forms/ProductBelongForm.java
  55. 0 27
      carbon-admin/carbon-admin-common/src/main/java/com/hcloud/microserver/facade/carbon/forms/ProductExpansionForm.java
  56. 0 59
      carbon-admin/carbon-admin-common/src/main/java/com/hcloud/microserver/facade/carbon/forms/ProductInfoForm.java
  57. 0 17
      carbon-admin/carbon-admin-common/src/main/java/com/hcloud/microserver/facade/carbon/forms/ProductTypeExpansionForm.java
  58. 0 32
      carbon-admin/carbon-admin-common/src/main/java/com/hcloud/microserver/facade/carbon/forms/ProductTypeForm.java
  59. 0 9
      carbon-admin/carbon-admin-common/src/main/java/com/hcloud/microserver/facade/carbon/forms/UserBuyFrom.java
  60. 10 0
      carbon-admin/carbon-admin-common/src/main/java/com/hcloud/microserver/system/facade/carbon/CarbonManageApplication.java
  61. 24 0
      carbon-admin/carbon-admin-common/src/main/java/com/hcloud/microserver/system/facade/carbon/entity/BasePosition.java
  62. 125 0
      carbon-admin/carbon-admin-common/src/main/java/com/hcloud/microserver/system/facade/carbon/entity/CarbonCalculateRule.java
  63. 56 0
      carbon-admin/carbon-admin-common/src/main/java/com/hcloud/microserver/system/facade/carbon/entity/CarbonPlatformStatiticsNum.java
  64. 34 0
      carbon-admin/carbon-admin-common/src/main/java/com/hcloud/microserver/system/facade/carbon/entity/CarbonStatisticsBuyTrend.java
  65. 17 0
      carbon-admin/carbon-admin-common/src/main/java/com/hcloud/microserver/system/facade/carbon/entity/CarbonStatisticsFarmer.java
  66. 20 0
      carbon-admin/carbon-admin-common/src/main/java/com/hcloud/microserver/system/facade/carbon/entity/CarbonStatisticsProduct.java
  67. 213 0
      carbon-admin/carbon-admin-common/src/main/java/com/hcloud/microserver/system/facade/carbon/entity/CollectiveFarmer.java
  68. 20 0
      carbon-admin/carbon-admin-common/src/main/java/com/hcloud/microserver/system/facade/carbon/entity/CollectiveProductBelong.java
  69. 76 0
      carbon-admin/carbon-admin-common/src/main/java/com/hcloud/microserver/system/facade/carbon/entity/CustomerChannel.java
  70. 134 0
      carbon-admin/carbon-admin-common/src/main/java/com/hcloud/microserver/system/facade/carbon/entity/CustomerCompanyInfo.java
  71. 117 0
      carbon-admin/carbon-admin-common/src/main/java/com/hcloud/microserver/system/facade/carbon/entity/CustomerCompanyType.java
  72. 218 0
      carbon-admin/carbon-admin-common/src/main/java/com/hcloud/microserver/system/facade/carbon/entity/CustomerInfo.java
  73. 17 0
      carbon-admin/carbon-admin-common/src/main/java/com/hcloud/microserver/system/facade/carbon/entity/DayCarbonBO.java
  74. 282 0
      carbon-admin/carbon-admin-common/src/main/java/com/hcloud/microserver/system/facade/carbon/entity/FarmerInfo.java
  75. 21 0
      carbon-admin/carbon-admin-common/src/main/java/com/hcloud/microserver/system/facade/carbon/entity/FarmerProductBelong.java
  76. 169 0
      carbon-admin/carbon-admin-common/src/main/java/com/hcloud/microserver/system/facade/carbon/entity/GoodsCredentialInfo.java
  77. 147 0
      carbon-admin/carbon-admin-common/src/main/java/com/hcloud/microserver/system/facade/carbon/entity/GoodsDetail.java
  78. 227 0
      carbon-admin/carbon-admin-common/src/main/java/com/hcloud/microserver/system/facade/carbon/entity/GoodsInfo.java
  79. 120 0
      carbon-admin/carbon-admin-common/src/main/java/com/hcloud/microserver/system/facade/carbon/entity/GoodsOrderDetail.java
  80. 146 0
      carbon-admin/carbon-admin-common/src/main/java/com/hcloud/microserver/system/facade/carbon/entity/GoodsOrderInfo.java
  81. 116 0
      carbon-admin/carbon-admin-common/src/main/java/com/hcloud/microserver/system/facade/carbon/entity/GoodsPayOrder.java
  82. 143 0
      carbon-admin/carbon-admin-common/src/main/java/com/hcloud/microserver/system/facade/carbon/entity/GoodsSaleInfo.java
  83. 24 0
      carbon-admin/carbon-admin-common/src/main/java/com/hcloud/microserver/system/facade/carbon/entity/GroupNumBO.java
  84. 106 0
      carbon-admin/carbon-admin-common/src/main/java/com/hcloud/microserver/system/facade/carbon/entity/OrderPayApply.java
  85. 140 0
      carbon-admin/carbon-admin-common/src/main/java/com/hcloud/microserver/system/facade/carbon/entity/OrderPayVoucher.java
  86. 45 0
      carbon-admin/carbon-admin-common/src/main/java/com/hcloud/microserver/system/facade/carbon/entity/PovertyArea.java
  87. 121 0
      carbon-admin/carbon-admin-common/src/main/java/com/hcloud/microserver/system/facade/carbon/entity/ProductBelong.java
  88. 101 0
      carbon-admin/carbon-admin-common/src/main/java/com/hcloud/microserver/system/facade/carbon/entity/ProductExpansion.java
  89. 233 0
      carbon-admin/carbon-admin-common/src/main/java/com/hcloud/microserver/system/facade/carbon/entity/ProductInfo.java
  90. 102 0
      carbon-admin/carbon-admin-common/src/main/java/com/hcloud/microserver/system/facade/carbon/entity/ProductType.java
  91. 85 0
      carbon-admin/carbon-admin-common/src/main/java/com/hcloud/microserver/system/facade/carbon/entity/ProductTypeExpansion.java
  92. 25 0
      carbon-admin/carbon-admin-common/src/main/java/com/hcloud/microserver/system/facade/carbon/entity/UserBuyBO.java
  93. 27 0
      carbon-admin/carbon-admin-common/src/main/java/com/hcloud/microserver/system/facade/carbon/forms/CarbonTrendForm.java
  94. 64 0
      carbon-admin/carbon-admin-common/src/main/java/com/hcloud/microserver/system/facade/carbon/forms/CollectiveFarmerForm.java
  95. 25 0
      carbon-admin/carbon-admin-common/src/main/java/com/hcloud/microserver/system/facade/carbon/forms/CustomerChannelForm.java
  96. 49 0
      carbon-admin/carbon-admin-common/src/main/java/com/hcloud/microserver/system/facade/carbon/forms/CustomerCompanyInfoForm.java
  97. 28 0
      carbon-admin/carbon-admin-common/src/main/java/com/hcloud/microserver/system/facade/carbon/forms/CustomerCompanyTypeForm.java
  98. 80 0
      carbon-admin/carbon-admin-common/src/main/java/com/hcloud/microserver/system/facade/carbon/forms/CustomerInfoForm.java
  99. 14 0
      carbon-admin/carbon-admin-common/src/main/java/com/hcloud/microserver/system/facade/carbon/forms/DayCarbonFrom.java
  100. 0 0
      carbon-admin/carbon-admin-common/src/main/java/com/hcloud/microserver/system/facade/carbon/forms/FarmerInfoForm.java

+ 0 - 10
carbon-admin/carbon-admin-common/src/main/java/com/hcloud/microserver/facade/carbon/CarbonManageApplication.java

@@ -1,10 +0,0 @@
-package com.hcloud.microserver.facade.carbon;
-
-import org.springframework.boot.SpringApplication;
-
-
-public class CarbonManageApplication {
-    public static void main(String[] args) {
-        SpringApplication.run(CarbonManageApplication.class, args);
-    }
-}

+ 0 - 24
carbon-admin/carbon-admin-common/src/main/java/com/hcloud/microserver/facade/carbon/entity/BasePosition.java

@@ -1,24 +0,0 @@
-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;
-}

+ 0 - 125
carbon-admin/carbon-admin-common/src/main/java/com/hcloud/microserver/facade/carbon/entity/CarbonCalculateRule.java

@@ -1,125 +0,0 @@
-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;
-    }
-}

+ 0 - 56
carbon-admin/carbon-admin-common/src/main/java/com/hcloud/microserver/facade/carbon/entity/CarbonPlatformStatiticsNum.java

@@ -1,56 +0,0 @@
-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;
-
-
-
-
-
-
-}

+ 0 - 34
carbon-admin/carbon-admin-common/src/main/java/com/hcloud/microserver/facade/carbon/entity/CarbonStatisticsBuyTrend.java

@@ -1,34 +0,0 @@
-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;
-
-}

+ 0 - 17
carbon-admin/carbon-admin-common/src/main/java/com/hcloud/microserver/facade/carbon/entity/CarbonStatisticsFarmer.java

@@ -1,17 +0,0 @@
-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;
-
-}

+ 0 - 20
carbon-admin/carbon-admin-common/src/main/java/com/hcloud/microserver/facade/carbon/entity/CarbonStatisticsProduct.java

@@ -1,20 +0,0 @@
-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;
-
-}

+ 0 - 213
carbon-admin/carbon-admin-common/src/main/java/com/hcloud/microserver/facade/carbon/entity/CollectiveFarmer.java

@@ -1,213 +0,0 @@
-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;
-    }
-}

+ 0 - 20
carbon-admin/carbon-admin-common/src/main/java/com/hcloud/microserver/facade/carbon/entity/CollectiveProductBelong.java

@@ -1,20 +0,0 @@
-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;
-    }
-}

+ 0 - 76
carbon-admin/carbon-admin-common/src/main/java/com/hcloud/microserver/facade/carbon/entity/CustomerChannel.java

@@ -1,76 +0,0 @@
-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;
-    }
-}

+ 0 - 134
carbon-admin/carbon-admin-common/src/main/java/com/hcloud/microserver/facade/carbon/entity/CustomerCompanyInfo.java

@@ -1,134 +0,0 @@
-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;
-    }
-}

+ 0 - 117
carbon-admin/carbon-admin-common/src/main/java/com/hcloud/microserver/facade/carbon/entity/CustomerCompanyType.java

@@ -1,117 +0,0 @@
-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;
-
-    private String createUser;
-
-    private Date createTime;
-
-    private String modifiedUser;
-
-    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();
-    }
-
-    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;
-    }
-}

+ 0 - 218
carbon-admin/carbon-admin-common/src/main/java/com/hcloud/microserver/facade/carbon/entity/CustomerInfo.java

@@ -1,218 +0,0 @@
-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();
-    }
-}

+ 0 - 17
carbon-admin/carbon-admin-common/src/main/java/com/hcloud/microserver/facade/carbon/entity/DayCarbonBO.java

@@ -1,17 +0,0 @@
-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;
-}

+ 0 - 282
carbon-admin/carbon-admin-common/src/main/java/com/hcloud/microserver/facade/carbon/entity/FarmerInfo.java

@@ -1,282 +0,0 @@
-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;
-    }
-}

+ 0 - 21
carbon-admin/carbon-admin-common/src/main/java/com/hcloud/microserver/facade/carbon/entity/FarmerProductBelong.java

@@ -1,21 +0,0 @@
-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;
-    }
-}

+ 0 - 169
carbon-admin/carbon-admin-common/src/main/java/com/hcloud/microserver/facade/carbon/entity/GoodsCredentialInfo.java

@@ -1,169 +0,0 @@
-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;
-    }
-}

+ 0 - 147
carbon-admin/carbon-admin-common/src/main/java/com/hcloud/microserver/facade/carbon/entity/GoodsDetail.java

@@ -1,147 +0,0 @@
-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 +
-                '}';
-    }
-}

+ 0 - 227
carbon-admin/carbon-admin-common/src/main/java/com/hcloud/microserver/facade/carbon/entity/GoodsInfo.java

@@ -1,227 +0,0 @@
-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;
-    }
-}

+ 0 - 120
carbon-admin/carbon-admin-common/src/main/java/com/hcloud/microserver/facade/carbon/entity/GoodsOrderDetail.java

@@ -1,120 +0,0 @@
-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;
-    }
-}

+ 0 - 146
carbon-admin/carbon-admin-common/src/main/java/com/hcloud/microserver/facade/carbon/entity/GoodsOrderInfo.java

@@ -1,146 +0,0 @@
-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();
-    }
-}

+ 0 - 116
carbon-admin/carbon-admin-common/src/main/java/com/hcloud/microserver/facade/carbon/entity/GoodsPayOrder.java

@@ -1,116 +0,0 @@
-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;
-    }
-}

+ 0 - 143
carbon-admin/carbon-admin-common/src/main/java/com/hcloud/microserver/facade/carbon/entity/GoodsSaleInfo.java

@@ -1,143 +0,0 @@
-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;
-    }
-}

+ 0 - 24
carbon-admin/carbon-admin-common/src/main/java/com/hcloud/microserver/facade/carbon/entity/GroupNumBO.java

@@ -1,24 +0,0 @@
-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;
-}

+ 0 - 106
carbon-admin/carbon-admin-common/src/main/java/com/hcloud/microserver/facade/carbon/entity/OrderPayApply.java

@@ -1,106 +0,0 @@
-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;
-    }
-}

+ 0 - 140
carbon-admin/carbon-admin-common/src/main/java/com/hcloud/microserver/facade/carbon/entity/OrderPayVoucher.java

@@ -1,140 +0,0 @@
-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;
-    }
-}

+ 0 - 45
carbon-admin/carbon-admin-common/src/main/java/com/hcloud/microserver/facade/carbon/entity/PovertyArea.java

@@ -1,45 +0,0 @@
-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;
-}

+ 0 - 121
carbon-admin/carbon-admin-common/src/main/java/com/hcloud/microserver/facade/carbon/entity/ProductBelong.java

@@ -1,121 +0,0 @@
-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;
-    }
-}

+ 0 - 101
carbon-admin/carbon-admin-common/src/main/java/com/hcloud/microserver/facade/carbon/entity/ProductExpansion.java

@@ -1,101 +0,0 @@
-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 +
-                '}';
-    }
-}

+ 0 - 233
carbon-admin/carbon-admin-common/src/main/java/com/hcloud/microserver/facade/carbon/entity/ProductInfo.java

@@ -1,233 +0,0 @@
-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;
-    }
-}

+ 0 - 102
carbon-admin/carbon-admin-common/src/main/java/com/hcloud/microserver/facade/carbon/entity/ProductType.java

@@ -1,102 +0,0 @@
-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;
-    }
-}

+ 0 - 85
carbon-admin/carbon-admin-common/src/main/java/com/hcloud/microserver/facade/carbon/entity/ProductTypeExpansion.java

@@ -1,85 +0,0 @@
-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 +
-                '}';
-    }
-}

+ 0 - 25
carbon-admin/carbon-admin-common/src/main/java/com/hcloud/microserver/facade/carbon/entity/UserBuyBO.java

@@ -1,25 +0,0 @@
-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;
-
-}

+ 0 - 27
carbon-admin/carbon-admin-common/src/main/java/com/hcloud/microserver/facade/carbon/forms/CarbonTrendForm.java

@@ -1,27 +0,0 @@
-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;
-
-}

+ 0 - 64
carbon-admin/carbon-admin-common/src/main/java/com/hcloud/microserver/facade/carbon/forms/CollectiveFarmerForm.java

@@ -1,64 +0,0 @@
-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;
-
-}

+ 0 - 25
carbon-admin/carbon-admin-common/src/main/java/com/hcloud/microserver/facade/carbon/forms/CustomerChannelForm.java

@@ -1,25 +0,0 @@
-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;
-}

+ 0 - 49
carbon-admin/carbon-admin-common/src/main/java/com/hcloud/microserver/facade/carbon/forms/CustomerCompanyInfoForm.java

@@ -1,49 +0,0 @@
-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;
-}

+ 0 - 28
carbon-admin/carbon-admin-common/src/main/java/com/hcloud/microserver/facade/carbon/forms/CustomerCompanyTypeForm.java

@@ -1,28 +0,0 @@
-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;
-}

+ 0 - 80
carbon-admin/carbon-admin-common/src/main/java/com/hcloud/microserver/facade/carbon/forms/CustomerInfoForm.java

@@ -1,80 +0,0 @@
-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;
-
-
-
-}

+ 0 - 14
carbon-admin/carbon-admin-common/src/main/java/com/hcloud/microserver/facade/carbon/forms/DayCarbonFrom.java

@@ -1,14 +0,0 @@
-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;
-}

+ 0 - 80
carbon-admin/carbon-admin-common/src/main/java/com/hcloud/microserver/facade/carbon/forms/FarmerInfoForm.java

@@ -1,80 +0,0 @@
-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;
-}

+ 0 - 37
carbon-admin/carbon-admin-common/src/main/java/com/hcloud/microserver/facade/carbon/forms/GoodsCredentialInfoForm.java

@@ -1,37 +0,0 @@
-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;
-
-}

+ 0 - 37
carbon-admin/carbon-admin-common/src/main/java/com/hcloud/microserver/facade/carbon/forms/GoodsDetailForm.java

@@ -1,37 +0,0 @@
-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;
-}

+ 0 - 80
carbon-admin/carbon-admin-common/src/main/java/com/hcloud/microserver/facade/carbon/forms/GoodsInfoForm.java

@@ -1,80 +0,0 @@
-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;
-
-
-}

+ 0 - 48
carbon-admin/carbon-admin-common/src/main/java/com/hcloud/microserver/facade/carbon/forms/GoodsOrderDetailForm.java

@@ -1,48 +0,0 @@
-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;
-}

+ 0 - 112
carbon-admin/carbon-admin-common/src/main/java/com/hcloud/microserver/facade/carbon/forms/GoodsOrderInfoForm.java

@@ -1,112 +0,0 @@
-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;
-}

+ 0 - 35
carbon-admin/carbon-admin-common/src/main/java/com/hcloud/microserver/facade/carbon/forms/GoodsPayOrderForm.java

@@ -1,35 +0,0 @@
-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;
-
-}

+ 0 - 35
carbon-admin/carbon-admin-common/src/main/java/com/hcloud/microserver/facade/carbon/forms/GoodsSaleInfoForm.java

@@ -1,35 +0,0 @@
-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;
-}

+ 0 - 16
carbon-admin/carbon-admin-common/src/main/java/com/hcloud/microserver/facade/carbon/forms/GroupNumFrom.java

@@ -1,16 +0,0 @@
-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;
-
-}

+ 0 - 39
carbon-admin/carbon-admin-common/src/main/java/com/hcloud/microserver/facade/carbon/forms/OrderPayApplyForm.java

@@ -1,39 +0,0 @@
-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;
-}

+ 0 - 45
carbon-admin/carbon-admin-common/src/main/java/com/hcloud/microserver/facade/carbon/forms/OrderPayVoucherForm.java

@@ -1,45 +0,0 @@
-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;
-
-}

+ 0 - 22
carbon-admin/carbon-admin-common/src/main/java/com/hcloud/microserver/facade/carbon/forms/PaymentForm.java

@@ -1,22 +0,0 @@
-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;
-}

+ 0 - 67
carbon-admin/carbon-admin-common/src/main/java/com/hcloud/microserver/facade/carbon/forms/PovertyAreaForm.java

@@ -1,67 +0,0 @@
-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;
-}

+ 0 - 31
carbon-admin/carbon-admin-common/src/main/java/com/hcloud/microserver/facade/carbon/forms/ProductBelongForm.java

@@ -1,31 +0,0 @@
-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;
-}

+ 0 - 27
carbon-admin/carbon-admin-common/src/main/java/com/hcloud/microserver/facade/carbon/forms/ProductExpansionForm.java

@@ -1,27 +0,0 @@
-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;
-}

+ 0 - 59
carbon-admin/carbon-admin-common/src/main/java/com/hcloud/microserver/facade/carbon/forms/ProductInfoForm.java

@@ -1,59 +0,0 @@
-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;
-}

+ 0 - 17
carbon-admin/carbon-admin-common/src/main/java/com/hcloud/microserver/facade/carbon/forms/ProductTypeExpansionForm.java

@@ -1,17 +0,0 @@
-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;
-}

+ 0 - 32
carbon-admin/carbon-admin-common/src/main/java/com/hcloud/microserver/facade/carbon/forms/ProductTypeForm.java

@@ -1,32 +0,0 @@
-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;
-}

+ 0 - 9
carbon-admin/carbon-admin-common/src/main/java/com/hcloud/microserver/facade/carbon/forms/UserBuyFrom.java

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

+ 10 - 0
carbon-admin/carbon-admin-common/src/main/java/com/hcloud/microserver/system/facade/carbon/CarbonManageApplication.java

@@ -0,0 +1,10 @@
+package com.hcloud.microserver.system.facade.carbon;
+
+import org.springframework.boot.SpringApplication;
+
+
+public class CarbonManageApplication {
+    public static void main(String[] args) {
+        SpringApplication.run(CarbonManageApplication.class, args);
+    }
+}

+ 24 - 0
carbon-admin/carbon-admin-common/src/main/java/com/hcloud/microserver/system/facade/carbon/entity/BasePosition.java

@@ -0,0 +1,24 @@
+package com.hcloud.microserver.system.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;
+}

+ 125 - 0
carbon-admin/carbon-admin-common/src/main/java/com/hcloud/microserver/system/facade/carbon/entity/CarbonCalculateRule.java

@@ -0,0 +1,125 @@
+package com.hcloud.microserver.system.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;
+    }
+}

+ 56 - 0
carbon-admin/carbon-admin-common/src/main/java/com/hcloud/microserver/system/facade/carbon/entity/CarbonPlatformStatiticsNum.java

@@ -0,0 +1,56 @@
+package com.hcloud.microserver.system.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;
+
+
+
+
+
+
+}

+ 34 - 0
carbon-admin/carbon-admin-common/src/main/java/com/hcloud/microserver/system/facade/carbon/entity/CarbonStatisticsBuyTrend.java

@@ -0,0 +1,34 @@
+package com.hcloud.microserver.system.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;
+
+}

+ 17 - 0
carbon-admin/carbon-admin-common/src/main/java/com/hcloud/microserver/system/facade/carbon/entity/CarbonStatisticsFarmer.java

@@ -0,0 +1,17 @@
+package com.hcloud.microserver.system.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;
+
+}

+ 20 - 0
carbon-admin/carbon-admin-common/src/main/java/com/hcloud/microserver/system/facade/carbon/entity/CarbonStatisticsProduct.java

@@ -0,0 +1,20 @@
+package com.hcloud.microserver.system.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;
+
+}

+ 213 - 0
carbon-admin/carbon-admin-common/src/main/java/com/hcloud/microserver/system/facade/carbon/entity/CollectiveFarmer.java

@@ -0,0 +1,213 @@
+package com.hcloud.microserver.system.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;
+    }
+}

+ 20 - 0
carbon-admin/carbon-admin-common/src/main/java/com/hcloud/microserver/system/facade/carbon/entity/CollectiveProductBelong.java

@@ -0,0 +1,20 @@
+package com.hcloud.microserver.system.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;
+    }
+}

+ 76 - 0
carbon-admin/carbon-admin-common/src/main/java/com/hcloud/microserver/system/facade/carbon/entity/CustomerChannel.java

@@ -0,0 +1,76 @@
+package com.hcloud.microserver.system.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;
+    }
+}

+ 134 - 0
carbon-admin/carbon-admin-common/src/main/java/com/hcloud/microserver/system/facade/carbon/entity/CustomerCompanyInfo.java

@@ -0,0 +1,134 @@
+package com.hcloud.microserver.system.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;
+    }
+}

+ 117 - 0
carbon-admin/carbon-admin-common/src/main/java/com/hcloud/microserver/system/facade/carbon/entity/CustomerCompanyType.java

@@ -0,0 +1,117 @@
+package com.hcloud.microserver.system.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;
+
+    private String createUser;
+
+    private Date createTime;
+
+    private String modifiedUser;
+
+    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();
+    }
+
+    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;
+    }
+}

+ 218 - 0
carbon-admin/carbon-admin-common/src/main/java/com/hcloud/microserver/system/facade/carbon/entity/CustomerInfo.java

@@ -0,0 +1,218 @@
+package com.hcloud.microserver.system.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();
+    }
+}

+ 17 - 0
carbon-admin/carbon-admin-common/src/main/java/com/hcloud/microserver/system/facade/carbon/entity/DayCarbonBO.java

@@ -0,0 +1,17 @@
+package com.hcloud.microserver.system.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;
+}

+ 282 - 0
carbon-admin/carbon-admin-common/src/main/java/com/hcloud/microserver/system/facade/carbon/entity/FarmerInfo.java

@@ -0,0 +1,282 @@
+package com.hcloud.microserver.system.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;
+    }
+}

+ 21 - 0
carbon-admin/carbon-admin-common/src/main/java/com/hcloud/microserver/system/facade/carbon/entity/FarmerProductBelong.java

@@ -0,0 +1,21 @@
+package com.hcloud.microserver.system.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;
+    }
+}

+ 169 - 0
carbon-admin/carbon-admin-common/src/main/java/com/hcloud/microserver/system/facade/carbon/entity/GoodsCredentialInfo.java

@@ -0,0 +1,169 @@
+package com.hcloud.microserver.system.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;
+    }
+}

+ 147 - 0
carbon-admin/carbon-admin-common/src/main/java/com/hcloud/microserver/system/facade/carbon/entity/GoodsDetail.java

@@ -0,0 +1,147 @@
+package com.hcloud.microserver.system.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 +
+                '}';
+    }
+}

+ 227 - 0
carbon-admin/carbon-admin-common/src/main/java/com/hcloud/microserver/system/facade/carbon/entity/GoodsInfo.java

@@ -0,0 +1,227 @@
+package com.hcloud.microserver.system.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;
+    }
+}

+ 120 - 0
carbon-admin/carbon-admin-common/src/main/java/com/hcloud/microserver/system/facade/carbon/entity/GoodsOrderDetail.java

@@ -0,0 +1,120 @@
+package com.hcloud.microserver.system.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;
+    }
+}

+ 146 - 0
carbon-admin/carbon-admin-common/src/main/java/com/hcloud/microserver/system/facade/carbon/entity/GoodsOrderInfo.java

@@ -0,0 +1,146 @@
+package com.hcloud.microserver.system.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();
+    }
+}

+ 116 - 0
carbon-admin/carbon-admin-common/src/main/java/com/hcloud/microserver/system/facade/carbon/entity/GoodsPayOrder.java

@@ -0,0 +1,116 @@
+package com.hcloud.microserver.system.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;
+    }
+}

+ 143 - 0
carbon-admin/carbon-admin-common/src/main/java/com/hcloud/microserver/system/facade/carbon/entity/GoodsSaleInfo.java

@@ -0,0 +1,143 @@
+package com.hcloud.microserver.system.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;
+    }
+}

+ 24 - 0
carbon-admin/carbon-admin-common/src/main/java/com/hcloud/microserver/system/facade/carbon/entity/GroupNumBO.java

@@ -0,0 +1,24 @@
+package com.hcloud.microserver.system.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;
+}

+ 106 - 0
carbon-admin/carbon-admin-common/src/main/java/com/hcloud/microserver/system/facade/carbon/entity/OrderPayApply.java

@@ -0,0 +1,106 @@
+package com.hcloud.microserver.system.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;
+    }
+}

+ 140 - 0
carbon-admin/carbon-admin-common/src/main/java/com/hcloud/microserver/system/facade/carbon/entity/OrderPayVoucher.java

@@ -0,0 +1,140 @@
+package com.hcloud.microserver.system.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;
+    }
+}

+ 45 - 0
carbon-admin/carbon-admin-common/src/main/java/com/hcloud/microserver/system/facade/carbon/entity/PovertyArea.java

@@ -0,0 +1,45 @@
+package com.hcloud.microserver.system.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;
+}

+ 121 - 0
carbon-admin/carbon-admin-common/src/main/java/com/hcloud/microserver/system/facade/carbon/entity/ProductBelong.java

@@ -0,0 +1,121 @@
+package com.hcloud.microserver.system.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;
+    }
+}

+ 101 - 0
carbon-admin/carbon-admin-common/src/main/java/com/hcloud/microserver/system/facade/carbon/entity/ProductExpansion.java

@@ -0,0 +1,101 @@
+package com.hcloud.microserver.system.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 +
+                '}';
+    }
+}

+ 233 - 0
carbon-admin/carbon-admin-common/src/main/java/com/hcloud/microserver/system/facade/carbon/entity/ProductInfo.java

@@ -0,0 +1,233 @@
+package com.hcloud.microserver.system.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;
+    }
+}

+ 102 - 0
carbon-admin/carbon-admin-common/src/main/java/com/hcloud/microserver/system/facade/carbon/entity/ProductType.java

@@ -0,0 +1,102 @@
+package com.hcloud.microserver.system.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;
+    }
+}

+ 85 - 0
carbon-admin/carbon-admin-common/src/main/java/com/hcloud/microserver/system/facade/carbon/entity/ProductTypeExpansion.java

@@ -0,0 +1,85 @@
+package com.hcloud.microserver.system.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 +
+                '}';
+    }
+}

+ 25 - 0
carbon-admin/carbon-admin-common/src/main/java/com/hcloud/microserver/system/facade/carbon/entity/UserBuyBO.java

@@ -0,0 +1,25 @@
+package com.hcloud.microserver.system.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;
+
+}

+ 27 - 0
carbon-admin/carbon-admin-common/src/main/java/com/hcloud/microserver/system/facade/carbon/forms/CarbonTrendForm.java

@@ -0,0 +1,27 @@
+package com.hcloud.microserver.system.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;
+
+}

+ 64 - 0
carbon-admin/carbon-admin-common/src/main/java/com/hcloud/microserver/system/facade/carbon/forms/CollectiveFarmerForm.java

@@ -0,0 +1,64 @@
+package com.hcloud.microserver.system.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;
+
+}

+ 25 - 0
carbon-admin/carbon-admin-common/src/main/java/com/hcloud/microserver/system/facade/carbon/forms/CustomerChannelForm.java

@@ -0,0 +1,25 @@
+package com.hcloud.microserver.system.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;
+}

+ 49 - 0
carbon-admin/carbon-admin-common/src/main/java/com/hcloud/microserver/system/facade/carbon/forms/CustomerCompanyInfoForm.java

@@ -0,0 +1,49 @@
+package com.hcloud.microserver.system.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;
+}

+ 28 - 0
carbon-admin/carbon-admin-common/src/main/java/com/hcloud/microserver/system/facade/carbon/forms/CustomerCompanyTypeForm.java

@@ -0,0 +1,28 @@
+package com.hcloud.microserver.system.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;
+}

+ 80 - 0
carbon-admin/carbon-admin-common/src/main/java/com/hcloud/microserver/system/facade/carbon/forms/CustomerInfoForm.java

@@ -0,0 +1,80 @@
+package com.hcloud.microserver.system.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;
+
+
+
+}

+ 14 - 0
carbon-admin/carbon-admin-common/src/main/java/com/hcloud/microserver/system/facade/carbon/forms/DayCarbonFrom.java

@@ -0,0 +1,14 @@
+package com.hcloud.microserver.system.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;
+}

+ 0 - 0
carbon-admin/carbon-admin-common/src/main/java/com/hcloud/microserver/system/facade/carbon/forms/FarmerInfoForm.java


Some files were not shown because too many files changed in this diff