添加请求时间过滤问题，修复清分打款，添加常见问题，修复各路bug

carbon-api-mbg/src/main/java/com/hcloud/microserver/mbg/mapper/TCarbonProblemMapper.java

@@ -0,0 +1,36 @@
+package com.hcloud.microserver.mbg.mapper;
+
+import com.hcloud.microserver.mbg.modul.TCarbonProblem;
+import com.hcloud.microserver.mbg.modul.TCarbonProblemExample;
+import java.util.List;
+import org.apache.ibatis.annotations.Param;
+
+public interface TCarbonProblemMapper {
+    long countByExample(TCarbonProblemExample example);
+
+    int deleteByExample(TCarbonProblemExample example);
+
+    int deleteByPrimaryKey(Long guid);
+
+    int insert(TCarbonProblem record);
+
+    int insertSelective(TCarbonProblem record);
+
+    List<TCarbonProblem> selectByExampleWithBLOBs(TCarbonProblemExample example);
+
+    List<TCarbonProblem> selectByExample(TCarbonProblemExample example);
+
+    TCarbonProblem selectByPrimaryKey(Long guid);
+
+    int updateByExampleSelective(@Param("record") TCarbonProblem record, @Param("example") TCarbonProblemExample example);
+
+    int updateByExampleWithBLOBs(@Param("record") TCarbonProblem record, @Param("example") TCarbonProblemExample example);
+
+    int updateByExample(@Param("record") TCarbonProblem record, @Param("example") TCarbonProblemExample example);
+
+    int updateByPrimaryKeySelective(TCarbonProblem record);
+
+    int updateByPrimaryKeyWithBLOBs(TCarbonProblem record);
+
+    int updateByPrimaryKey(TCarbonProblem record);
+}

carbon-api-mbg/src/main/java/com/hcloud/microserver/mbg/mapper/TCollectiveFarmerMapper.java

@@ -0,0 +1,30 @@
+package com.hcloud.microserver.mbg.mapper;
+
+import com.hcloud.microserver.mbg.modul.TCollectiveFarmer;
+import com.hcloud.microserver.mbg.modul.TCollectiveFarmerExample;
+import java.util.List;
+import org.apache.ibatis.annotations.Param;
+
+public interface TCollectiveFarmerMapper {
+    long countByExample(TCollectiveFarmerExample example);
+
+    int deleteByExample(TCollectiveFarmerExample example);
+
+    int deleteByPrimaryKey(String guid);
+
+    int insert(TCollectiveFarmer record);
+
+    int insertSelective(TCollectiveFarmer record);
+
+    List<TCollectiveFarmer> selectByExample(TCollectiveFarmerExample example);
+
+    TCollectiveFarmer selectByPrimaryKey(String guid);
+
+    int updateByExampleSelective(@Param("record") TCollectiveFarmer record, @Param("example") TCollectiveFarmerExample example);
+
+    int updateByExample(@Param("record") TCollectiveFarmer record, @Param("example") TCollectiveFarmerExample example);
+
+    int updateByPrimaryKeySelective(TCollectiveFarmer record);
+
+    int updateByPrimaryKey(TCollectiveFarmer record);
+}

carbon-api-mbg/src/main/java/com/hcloud/microserver/mbg/mapper/TCustomerCarbonValMapper.java

@@ -0,0 +1,30 @@
+package com.hcloud.microserver.mbg.mapper;
+
+import com.hcloud.microserver.mbg.modul.TCustomerCarbonVal;
+import com.hcloud.microserver.mbg.modul.TCustomerCarbonValExample;
+import java.util.List;
+import org.apache.ibatis.annotations.Param;
+
+public interface TCustomerCarbonValMapper {
+    long countByExample(TCustomerCarbonValExample example);
+
+    int deleteByExample(TCustomerCarbonValExample example);
+
+    int deleteByPrimaryKey(String guid);
+
+    int insert(TCustomerCarbonVal record);
+
+    int insertSelective(TCustomerCarbonVal record);
+
+    List<TCustomerCarbonVal> selectByExample(TCustomerCarbonValExample example);
+
+    TCustomerCarbonVal selectByPrimaryKey(String guid);
+
+    int updateByExampleSelective(@Param("record") TCustomerCarbonVal record, @Param("example") TCustomerCarbonValExample example);
+
+    int updateByExample(@Param("record") TCustomerCarbonVal record, @Param("example") TCustomerCarbonValExample example);
+
+    int updateByPrimaryKeySelective(TCustomerCarbonVal record);
+
+    int updateByPrimaryKey(TCustomerCarbonVal record);
+}

carbon-api-mbg/src/main/java/com/hcloud/microserver/mbg/mapper/TFarmerInfoMapper.java

@@ -0,0 +1,30 @@
+package com.hcloud.microserver.mbg.mapper;
+
+import com.hcloud.microserver.mbg.modul.TFarmerInfo;
+import com.hcloud.microserver.mbg.modul.TFarmerInfoExample;
+import java.util.List;
+import org.apache.ibatis.annotations.Param;
+
+public interface TFarmerInfoMapper {
+    long countByExample(TFarmerInfoExample example);
+
+    int deleteByExample(TFarmerInfoExample example);
+
+    int deleteByPrimaryKey(String guid);
+
+    int insert(TFarmerInfo record);
+
+    int insertSelective(TFarmerInfo record);
+
+    List<TFarmerInfo> selectByExample(TFarmerInfoExample example);
+
+    TFarmerInfo selectByPrimaryKey(String guid);
+
+    int updateByExampleSelective(@Param("record") TFarmerInfo record, @Param("example") TFarmerInfoExample example);
+
+    int updateByExample(@Param("record") TFarmerInfo record, @Param("example") TFarmerInfoExample example);
+
+    int updateByPrimaryKeySelective(TFarmerInfo record);
+
+    int updateByPrimaryKey(TFarmerInfo record);
+}

carbon-api-mbg/src/main/java/com/hcloud/microserver/mbg/mapper/TGoodsInfoMapper.java

@@ -0,0 +1,30 @@
+package com.hcloud.microserver.mbg.mapper;
+
+import com.hcloud.microserver.mbg.modul.TGoodsInfo;
+import com.hcloud.microserver.mbg.modul.TGoodsInfoExample;
+import java.util.List;
+import org.apache.ibatis.annotations.Param;
+
+public interface TGoodsInfoMapper {
+    long countByExample(TGoodsInfoExample example);
+
+    int deleteByExample(TGoodsInfoExample example);
+
+    int deleteByPrimaryKey(String guid);
+
+    int insert(TGoodsInfo record);
+
+    int insertSelective(TGoodsInfo record);
+
+    List<TGoodsInfo> selectByExample(TGoodsInfoExample example);
+
+    TGoodsInfo selectByPrimaryKey(String guid);
+
+    int updateByExampleSelective(@Param("record") TGoodsInfo record, @Param("example") TGoodsInfoExample example);
+
+    int updateByExample(@Param("record") TGoodsInfo record, @Param("example") TGoodsInfoExample example);
+
+    int updateByPrimaryKeySelective(TGoodsInfo record);
+
+    int updateByPrimaryKey(TGoodsInfo record);
+}

carbon-api-mbg/src/main/java/com/hcloud/microserver/mbg/mapper/TGoodsOrderInfoMapper.java

@@ -0,0 +1,30 @@
+package com.hcloud.microserver.mbg.mapper;
+
+import com.hcloud.microserver.mbg.modul.TGoodsOrderInfo;
+import com.hcloud.microserver.mbg.modul.TGoodsOrderInfoExample;
+import java.util.List;
+import org.apache.ibatis.annotations.Param;
+
+public interface TGoodsOrderInfoMapper {
+    long countByExample(TGoodsOrderInfoExample example);
+
+    int deleteByExample(TGoodsOrderInfoExample example);
+
+    int deleteByPrimaryKey(String guid);
+
+    int insert(TGoodsOrderInfo record);
+
+    int insertSelective(TGoodsOrderInfo record);
+
+    List<TGoodsOrderInfo> selectByExample(TGoodsOrderInfoExample example);
+
+    TGoodsOrderInfo selectByPrimaryKey(String guid);
+
+    int updateByExampleSelective(@Param("record") TGoodsOrderInfo record, @Param("example") TGoodsOrderInfoExample example);
+
+    int updateByExample(@Param("record") TGoodsOrderInfo record, @Param("example") TGoodsOrderInfoExample example);
+
+    int updateByPrimaryKeySelective(TGoodsOrderInfo record);
+
+    int updateByPrimaryKey(TGoodsOrderInfo record);
+}

carbon-api-mbg/src/main/java/com/hcloud/microserver/mbg/mapper/TProductInfoMapper.java

@@ -0,0 +1,30 @@
+package com.hcloud.microserver.mbg.mapper;
+
+import com.hcloud.microserver.mbg.modul.TProductInfo;
+import com.hcloud.microserver.mbg.modul.TProductInfoExample;
+import java.util.List;
+import org.apache.ibatis.annotations.Param;
+
+public interface TProductInfoMapper {
+    long countByExample(TProductInfoExample example);
+
+    int deleteByExample(TProductInfoExample example);
+
+    int deleteByPrimaryKey(String guid);
+
+    int insert(TProductInfo record);
+
+    int insertSelective(TProductInfo record);
+
+    List<TProductInfo> selectByExample(TProductInfoExample example);
+
+    TProductInfo selectByPrimaryKey(String guid);
+
+    int updateByExampleSelective(@Param("record") TProductInfo record, @Param("example") TProductInfoExample example);
+
+    int updateByExample(@Param("record") TProductInfo record, @Param("example") TProductInfoExample example);
+
+    int updateByPrimaryKeySelective(TProductInfo record);
+
+    int updateByPrimaryKey(TProductInfo record);
+}

carbon-api-mbg/src/main/java/com/hcloud/microserver/mbg/modul/TCarbonProblem.java

@@ -0,0 +1,116 @@
+package com.hcloud.microserver.mbg.modul;
+
+import io.swagger.annotations.ApiModelProperty;
+import java.io.Serializable;
+import java.util.Date;
+
+public class TCarbonProblem implements Serializable {
+    @ApiModelProperty(value = "序列号")
+    private Long guid;
+
+    @ApiModelProperty(value = "问题名称")
+    private String problemName;
+
+    @ApiModelProperty(value = "问题类型")
+    private Integer problemType;
+
+    @ApiModelProperty(value = "问题状态：1-禁用 0-非禁用")
+    private Integer state;
+
+    @ApiModelProperty(value = "创建时间")
+    private Date createTime;
+
+    @ApiModelProperty(value = "创建人id")
+    private Long createId;
+
+    @ApiModelProperty(value = "创建人名称")
+    private String createName;
+
+    @ApiModelProperty(value = "问题答案")
+    private String problemAnswer;
+
+    private static final long serialVersionUID = 1L;
+
+    public Long getGuid() {
+        return guid;
+    }
+
+    public void setGuid(Long guid) {
+        this.guid = guid;
+    }
+
+    public String getProblemName() {
+        return problemName;
+    }
+
+    public void setProblemName(String problemName) {
+        this.problemName = problemName;
+    }
+
+    public Integer getProblemType() {
+        return problemType;
+    }
+
+    public void setProblemType(Integer problemType) {
+        this.problemType = problemType;
+    }
+
+    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 Long getCreateId() {
+        return createId;
+    }
+
+    public void setCreateId(Long createId) {
+        this.createId = createId;
+    }
+
+    public String getCreateName() {
+        return createName;
+    }
+
+    public void setCreateName(String createName) {
+        this.createName = createName;
+    }
+
+    public String getProblemAnswer() {
+        return problemAnswer;
+    }
+
+    public void setProblemAnswer(String problemAnswer) {
+        this.problemAnswer = problemAnswer;
+    }
+
+    @Override
+    public String toString() {
+        StringBuilder sb = new StringBuilder();
+        sb.append(getClass().getSimpleName());
+        sb.append(" [");
+        sb.append("Hash = ").append(hashCode());
+        sb.append(", guid=").append(guid);
+        sb.append(", problemName=").append(problemName);
+        sb.append(", problemType=").append(problemType);
+        sb.append(", state=").append(state);
+        sb.append(", createTime=").append(createTime);
+        sb.append(", createId=").append(createId);
+        sb.append(", createName=").append(createName);
+        sb.append(", problemAnswer=").append(problemAnswer);
+        sb.append(", serialVersionUID=").append(serialVersionUID);
+        sb.append("]");
+        return sb.toString();
+    }
+}

carbon-api-mbg/src/main/java/com/hcloud/microserver/mbg/modul/TCarbonProblemExample.java

@@ -0,0 +1,641 @@
+package com.hcloud.microserver.mbg.modul;
+
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+
+public class TCarbonProblemExample {
+    protected String orderByClause;
+
+    protected boolean distinct;
+
+    protected List<Criteria> oredCriteria;
+
+    public TCarbonProblemExample() {
+        oredCriteria = new ArrayList<Criteria>();
+    }
+
+    public void setOrderByClause(String orderByClause) {
+        this.orderByClause = orderByClause;
+    }
+
+    public String getOrderByClause() {
+        return orderByClause;
+    }
+
+    public void setDistinct(boolean distinct) {
+        this.distinct = distinct;
+    }
+
+    public boolean isDistinct() {
+        return distinct;
+    }
+
+    public List<Criteria> getOredCriteria() {
+        return oredCriteria;
+    }
+
+    public void or(Criteria criteria) {
+        oredCriteria.add(criteria);
+    }
+
+    public Criteria or() {
+        Criteria criteria = createCriteriaInternal();
+        oredCriteria.add(criteria);
+        return criteria;
+    }
+
+    public Criteria createCriteria() {
+        Criteria criteria = createCriteriaInternal();
+        if (oredCriteria.size() == 0) {
+            oredCriteria.add(criteria);
+        }
+        return criteria;
+    }
+
+    protected Criteria createCriteriaInternal() {
+        Criteria criteria = new Criteria();
+        return criteria;
+    }
+
+    public void clear() {
+        oredCriteria.clear();
+        orderByClause = null;
+        distinct = false;
+    }
+
+    protected abstract static class GeneratedCriteria {
+        protected List<Criterion> criteria;
+
+        protected GeneratedCriteria() {
+            super();
+            criteria = new ArrayList<Criterion>();
+        }
+
+        public boolean isValid() {
+            return criteria.size() > 0;
+        }
+
+        public List<Criterion> getAllCriteria() {
+            return criteria;
+        }
+
+        public List<Criterion> getCriteria() {
+            return criteria;
+        }
+
+        protected void addCriterion(String condition) {
+            if (condition == null) {
+                throw new RuntimeException("Value for condition cannot be null");
+            }
+            criteria.add(new Criterion(condition));
+        }
+
+        protected void addCriterion(String condition, Object value, String property) {
+            if (value == null) {
+                throw new RuntimeException("Value for " + property + " cannot be null");
+            }
+            criteria.add(new Criterion(condition, value));
+        }
+
+        protected void addCriterion(String condition, Object value1, Object value2, String property) {
+            if (value1 == null || value2 == null) {
+                throw new RuntimeException("Between values for " + property + " cannot be null");
+            }
+            criteria.add(new Criterion(condition, value1, value2));
+        }
+
+        public Criteria andGuidIsNull() {
+            addCriterion("guid is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andGuidIsNotNull() {
+            addCriterion("guid is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andGuidEqualTo(Long value) {
+            addCriterion("guid =", value, "guid");
+            return (Criteria) this;
+        }
+
+        public Criteria andGuidNotEqualTo(Long value) {
+            addCriterion("guid <>", value, "guid");
+            return (Criteria) this;
+        }
+
+        public Criteria andGuidGreaterThan(Long value) {
+            addCriterion("guid >", value, "guid");
+            return (Criteria) this;
+        }
+
+        public Criteria andGuidGreaterThanOrEqualTo(Long value) {
+            addCriterion("guid >=", value, "guid");
+            return (Criteria) this;
+        }
+
+        public Criteria andGuidLessThan(Long value) {
+            addCriterion("guid <", value, "guid");
+            return (Criteria) this;
+        }
+
+        public Criteria andGuidLessThanOrEqualTo(Long value) {
+            addCriterion("guid <=", value, "guid");
+            return (Criteria) this;
+        }
+
+        public Criteria andGuidIn(List<Long> values) {
+            addCriterion("guid in", values, "guid");
+            return (Criteria) this;
+        }
+
+        public Criteria andGuidNotIn(List<Long> values) {
+            addCriterion("guid not in", values, "guid");
+            return (Criteria) this;
+        }
+
+        public Criteria andGuidBetween(Long value1, Long value2) {
+            addCriterion("guid between", value1, value2, "guid");
+            return (Criteria) this;
+        }
+
+        public Criteria andGuidNotBetween(Long value1, Long value2) {
+            addCriterion("guid not between", value1, value2, "guid");
+            return (Criteria) this;
+        }
+
+        public Criteria andProblemNameIsNull() {
+            addCriterion("problem_name is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andProblemNameIsNotNull() {
+            addCriterion("problem_name is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andProblemNameEqualTo(String value) {
+            addCriterion("problem_name =", value, "problemName");
+            return (Criteria) this;
+        }
+
+        public Criteria andProblemNameNotEqualTo(String value) {
+            addCriterion("problem_name <>", value, "problemName");
+            return (Criteria) this;
+        }
+
+        public Criteria andProblemNameGreaterThan(String value) {
+            addCriterion("problem_name >", value, "problemName");
+            return (Criteria) this;
+        }
+
+        public Criteria andProblemNameGreaterThanOrEqualTo(String value) {
+            addCriterion("problem_name >=", value, "problemName");
+            return (Criteria) this;
+        }
+
+        public Criteria andProblemNameLessThan(String value) {
+            addCriterion("problem_name <", value, "problemName");
+            return (Criteria) this;
+        }
+
+        public Criteria andProblemNameLessThanOrEqualTo(String value) {
+            addCriterion("problem_name <=", value, "problemName");
+            return (Criteria) this;
+        }
+
+        public Criteria andProblemNameLike(String value) {
+            addCriterion("problem_name like", value, "problemName");
+            return (Criteria) this;
+        }
+
+        public Criteria andProblemNameNotLike(String value) {
+            addCriterion("problem_name not like", value, "problemName");
+            return (Criteria) this;
+        }
+
+        public Criteria andProblemNameIn(List<String> values) {
+            addCriterion("problem_name in", values, "problemName");
+            return (Criteria) this;
+        }
+
+        public Criteria andProblemNameNotIn(List<String> values) {
+            addCriterion("problem_name not in", values, "problemName");
+            return (Criteria) this;
+        }
+
+        public Criteria andProblemNameBetween(String value1, String value2) {
+            addCriterion("problem_name between", value1, value2, "problemName");
+            return (Criteria) this;
+        }
+
+        public Criteria andProblemNameNotBetween(String value1, String value2) {
+            addCriterion("problem_name not between", value1, value2, "problemName");
+            return (Criteria) this;
+        }
+
+        public Criteria andProblemTypeIsNull() {
+            addCriterion("problem_type is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andProblemTypeIsNotNull() {
+            addCriterion("problem_type is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andProblemTypeEqualTo(Integer value) {
+            addCriterion("problem_type =", value, "problemType");
+            return (Criteria) this;
+        }
+
+        public Criteria andProblemTypeNotEqualTo(Integer value) {
+            addCriterion("problem_type <>", value, "problemType");
+            return (Criteria) this;
+        }
+
+        public Criteria andProblemTypeGreaterThan(Integer value) {
+            addCriterion("problem_type >", value, "problemType");
+            return (Criteria) this;
+        }
+
+        public Criteria andProblemTypeGreaterThanOrEqualTo(Integer value) {
+            addCriterion("problem_type >=", value, "problemType");
+            return (Criteria) this;
+        }
+
+        public Criteria andProblemTypeLessThan(Integer value) {
+            addCriterion("problem_type <", value, "problemType");
+            return (Criteria) this;
+        }
+
+        public Criteria andProblemTypeLessThanOrEqualTo(Integer value) {
+            addCriterion("problem_type <=", value, "problemType");
+            return (Criteria) this;
+        }
+
+        public Criteria andProblemTypeIn(List<Integer> values) {
+            addCriterion("problem_type in", values, "problemType");
+            return (Criteria) this;
+        }
+
+        public Criteria andProblemTypeNotIn(List<Integer> values) {
+            addCriterion("problem_type not in", values, "problemType");
+            return (Criteria) this;
+        }
+
+        public Criteria andProblemTypeBetween(Integer value1, Integer value2) {
+            addCriterion("problem_type between", value1, value2, "problemType");
+            return (Criteria) this;
+        }
+
+        public Criteria andProblemTypeNotBetween(Integer value1, Integer value2) {
+            addCriterion("problem_type not between", value1, value2, "problemType");
+            return (Criteria) this;
+        }
+
+        public Criteria andStateIsNull() {
+            addCriterion("state is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andStateIsNotNull() {
+            addCriterion("state is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andStateEqualTo(Integer value) {
+            addCriterion("state =", value, "state");
+            return (Criteria) this;
+        }
+
+        public Criteria andStateNotEqualTo(Integer value) {
+            addCriterion("state <>", value, "state");
+            return (Criteria) this;
+        }
+
+        public Criteria andStateGreaterThan(Integer value) {
+            addCriterion("state >", value, "state");
+            return (Criteria) this;
+        }
+
+        public Criteria andStateGreaterThanOrEqualTo(Integer value) {
+            addCriterion("state >=", value, "state");
+            return (Criteria) this;
+        }
+
+        public Criteria andStateLessThan(Integer value) {
+            addCriterion("state <", value, "state");
+            return (Criteria) this;
+        }
+
+        public Criteria andStateLessThanOrEqualTo(Integer value) {
+            addCriterion("state <=", value, "state");
+            return (Criteria) this;
+        }
+
+        public Criteria andStateIn(List<Integer> values) {
+            addCriterion("state in", values, "state");
+            return (Criteria) this;
+        }
+
+        public Criteria andStateNotIn(List<Integer> values) {
+            addCriterion("state not in", values, "state");
+            return (Criteria) this;
+        }
+
+        public Criteria andStateBetween(Integer value1, Integer value2) {
+            addCriterion("state between", value1, value2, "state");
+            return (Criteria) this;
+        }
+
+        public Criteria andStateNotBetween(Integer value1, Integer value2) {
+            addCriterion("state not between", value1, value2, "state");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeIsNull() {
+            addCriterion("create_time is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeIsNotNull() {
+            addCriterion("create_time is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeEqualTo(Date value) {
+            addCriterion("create_time =", value, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeNotEqualTo(Date value) {
+            addCriterion("create_time <>", value, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeGreaterThan(Date value) {
+            addCriterion("create_time >", value, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeGreaterThanOrEqualTo(Date value) {
+            addCriterion("create_time >=", value, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeLessThan(Date value) {
+            addCriterion("create_time <", value, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeLessThanOrEqualTo(Date value) {
+            addCriterion("create_time <=", value, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeIn(List<Date> values) {
+            addCriterion("create_time in", values, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeNotIn(List<Date> values) {
+            addCriterion("create_time not in", values, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeBetween(Date value1, Date value2) {
+            addCriterion("create_time between", value1, value2, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeNotBetween(Date value1, Date value2) {
+            addCriterion("create_time not between", value1, value2, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateIdIsNull() {
+            addCriterion("create_id is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateIdIsNotNull() {
+            addCriterion("create_id is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateIdEqualTo(Long value) {
+            addCriterion("create_id =", value, "createId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateIdNotEqualTo(Long value) {
+            addCriterion("create_id <>", value, "createId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateIdGreaterThan(Long value) {
+            addCriterion("create_id >", value, "createId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateIdGreaterThanOrEqualTo(Long value) {
+            addCriterion("create_id >=", value, "createId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateIdLessThan(Long value) {
+            addCriterion("create_id <", value, "createId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateIdLessThanOrEqualTo(Long value) {
+            addCriterion("create_id <=", value, "createId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateIdIn(List<Long> values) {
+            addCriterion("create_id in", values, "createId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateIdNotIn(List<Long> values) {
+            addCriterion("create_id not in", values, "createId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateIdBetween(Long value1, Long value2) {
+            addCriterion("create_id between", value1, value2, "createId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateIdNotBetween(Long value1, Long value2) {
+            addCriterion("create_id not between", value1, value2, "createId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateNameIsNull() {
+            addCriterion("create_name is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateNameIsNotNull() {
+            addCriterion("create_name is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateNameEqualTo(String value) {
+            addCriterion("create_name =", value, "createName");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateNameNotEqualTo(String value) {
+            addCriterion("create_name <>", value, "createName");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateNameGreaterThan(String value) {
+            addCriterion("create_name >", value, "createName");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateNameGreaterThanOrEqualTo(String value) {
+            addCriterion("create_name >=", value, "createName");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateNameLessThan(String value) {
+            addCriterion("create_name <", value, "createName");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateNameLessThanOrEqualTo(String value) {
+            addCriterion("create_name <=", value, "createName");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateNameLike(String value) {
+            addCriterion("create_name like", value, "createName");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateNameNotLike(String value) {
+            addCriterion("create_name not like", value, "createName");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateNameIn(List<String> values) {
+            addCriterion("create_name in", values, "createName");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateNameNotIn(List<String> values) {
+            addCriterion("create_name not in", values, "createName");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateNameBetween(String value1, String value2) {
+            addCriterion("create_name between", value1, value2, "createName");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateNameNotBetween(String value1, String value2) {
+            addCriterion("create_name not between", value1, value2, "createName");
+            return (Criteria) this;
+        }
+    }
+
+    public static class Criteria extends GeneratedCriteria {
+
+        protected Criteria() {
+            super();
+        }
+    }
+
+    public static class Criterion {
+        private String condition;
+
+        private Object value;
+
+        private Object secondValue;
+
+        private boolean noValue;
+
+        private boolean singleValue;
+
+        private boolean betweenValue;
+
+        private boolean listValue;
+
+        private String typeHandler;
+
+        public String getCondition() {
+            return condition;
+        }
+
+        public Object getValue() {
+            return value;
+        }
+
+        public Object getSecondValue() {
+            return secondValue;
+        }
+
+        public boolean isNoValue() {
+            return noValue;
+        }
+
+        public boolean isSingleValue() {
+            return singleValue;
+        }
+
+        public boolean isBetweenValue() {
+            return betweenValue;
+        }
+
+        public boolean isListValue() {
+            return listValue;
+        }
+
+        public String getTypeHandler() {
+            return typeHandler;
+        }
+
+        protected Criterion(String condition) {
+            super();
+            this.condition = condition;
+            this.typeHandler = null;
+            this.noValue = true;
+        }
+
+        protected Criterion(String condition, Object value, String typeHandler) {
+            super();
+            this.condition = condition;
+            this.value = value;
+            this.typeHandler = typeHandler;
+            if (value instanceof List<?>) {
+                this.listValue = true;
+            } else {
+                this.singleValue = true;
+            }
+        }
+
+        protected Criterion(String condition, Object value) {
+            this(condition, value, null);
+        }
+
+        protected Criterion(String condition, Object value, Object secondValue, String typeHandler) {
+            super();
+            this.condition = condition;
+            this.value = value;
+            this.secondValue = secondValue;
+            this.typeHandler = typeHandler;
+            this.betweenValue = true;
+        }
+
+        protected Criterion(String condition, Object value, Object secondValue) {
+            this(condition, value, secondValue, null);
+        }
+    }
+}

carbon-api-mbg/src/main/java/com/hcloud/microserver/mbg/modul/TCollectiveFarmer.java

@@ -0,0 +1,273 @@
+package com.hcloud.microserver.mbg.modul;
+
+import io.swagger.annotations.ApiModelProperty;
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Date;
+
+public class TCollectiveFarmer implements Serializable {
+    @ApiModelProperty(value = "序列")
+    private String guid;
+
+    @ApiModelProperty(value = "贫困区域id")
+    private String fkPovertyAreaId;
+
+    @ApiModelProperty(value = "集体户编码")
+    private String collectiveCode;
+
+    @ApiModelProperty(value = "集体户名称")
+    private String collectiveName;
+
+    @ApiModelProperty(value = "集体户人员个数")
+    private Integer collectivePersonNum;
+
+    @ApiModelProperty(value = "集体户单位")
+    private String orgUnit;
+
+    @ApiModelProperty(value = "备注信息")
+    private String remark;
+
+    @ApiModelProperty(value = "集体户图片")
+    private String collectiveImages;
+
+    @ApiModelProperty(value = "集体户银行名称")
+    private String bankName;
+
+    @ApiModelProperty(value = "集体户银行卡号")
+    private String bankCardNo;
+
+    @ApiModelProperty(value = "是否激活")
+    private Integer isEnable;
+
+    @ApiModelProperty(value = "记录状态")
+    private Integer state;
+
+    @ApiModelProperty(value = "创建人")
+    private String createUser;
+
+    @ApiModelProperty(value = "创建时间")
+    private Date createTime;
+
+    @ApiModelProperty(value = "修改人")
+    private String modifiedUser;
+
+    @ApiModelProperty(value = "修改时间")
+    private Date modifiedTime;
+
+    @ApiModelProperty(value = "累计应收金额")
+    private BigDecimal recieveMoney;
+
+    @ApiModelProperty(value = "累计实收金额")
+    private BigDecimal actualMoney;
+
+    @ApiModelProperty(value = "联系电话")
+    private String phone;
+
+    @ApiModelProperty(value = "银行机构代码")
+    private String bankCode;
+
+    @ApiModelProperty(value = "银行卡状态0-启用，1-禁用")
+    private Integer bankStatus;
+
+    private static final long serialVersionUID = 1L;
+
+    public String getGuid() {
+        return guid;
+    }
+
+    public void setGuid(String guid) {
+        this.guid = guid;
+    }
+
+    public String getFkPovertyAreaId() {
+        return fkPovertyAreaId;
+    }
+
+    public void setFkPovertyAreaId(String fkPovertyAreaId) {
+        this.fkPovertyAreaId = fkPovertyAreaId;
+    }
+
+    public String getCollectiveCode() {
+        return collectiveCode;
+    }
+
+    public void setCollectiveCode(String collectiveCode) {
+        this.collectiveCode = collectiveCode;
+    }
+
+    public String getCollectiveName() {
+        return collectiveName;
+    }
+
+    public void setCollectiveName(String collectiveName) {
+        this.collectiveName = collectiveName;
+    }
+
+    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;
+    }
+
+    public String getRemark() {
+        return remark;
+    }
+
+    public void setRemark(String remark) {
+        this.remark = remark;
+    }
+
+    public String getCollectiveImages() {
+        return collectiveImages;
+    }
+
+    public void setCollectiveImages(String collectiveImages) {
+        this.collectiveImages = collectiveImages;
+    }
+
+    public String getBankName() {
+        return bankName;
+    }
+
+    public void setBankName(String bankName) {
+        this.bankName = bankName;
+    }
+
+    public String getBankCardNo() {
+        return bankCardNo;
+    }
+
+    public void setBankCardNo(String bankCardNo) {
+        this.bankCardNo = bankCardNo;
+    }
+
+    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;
+    }
+
+    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 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 String getBankCode() {
+        return bankCode;
+    }
+
+    public void setBankCode(String bankCode) {
+        this.bankCode = bankCode;
+    }
+
+    public Integer getBankStatus() {
+        return bankStatus;
+    }
+
+    public void setBankStatus(Integer bankStatus) {
+        this.bankStatus = bankStatus;
+    }
+
+    @Override
+    public String toString() {
+        StringBuilder sb = new StringBuilder();
+        sb.append(getClass().getSimpleName());
+        sb.append(" [");
+        sb.append("Hash = ").append(hashCode());
+        sb.append(", guid=").append(guid);
+        sb.append(", fkPovertyAreaId=").append(fkPovertyAreaId);
+        sb.append(", collectiveCode=").append(collectiveCode);
+        sb.append(", collectiveName=").append(collectiveName);
+        sb.append(", collectivePersonNum=").append(collectivePersonNum);
+        sb.append(", orgUnit=").append(orgUnit);
+        sb.append(", remark=").append(remark);
+        sb.append(", collectiveImages=").append(collectiveImages);
+        sb.append(", bankName=").append(bankName);
+        sb.append(", bankCardNo=").append(bankCardNo);
+        sb.append(", isEnable=").append(isEnable);
+        sb.append(", state=").append(state);
+        sb.append(", createUser=").append(createUser);
+        sb.append(", createTime=").append(createTime);
+        sb.append(", modifiedUser=").append(modifiedUser);
+        sb.append(", modifiedTime=").append(modifiedTime);
+        sb.append(", recieveMoney=").append(recieveMoney);
+        sb.append(", actualMoney=").append(actualMoney);
+        sb.append(", phone=").append(phone);
+        sb.append(", bankCode=").append(bankCode);
+        sb.append(", bankStatus=").append(bankStatus);
+        sb.append(", serialVersionUID=").append(serialVersionUID);
+        sb.append("]");
+        return sb.toString();
+    }
+}

carbon-api-mbg/src/main/java/com/hcloud/microserver/mbg/modul/TCustomerCarbonVal.java

@@ -0,0 +1,189 @@
+package com.hcloud.microserver.mbg.modul;
+
+import io.swagger.annotations.ApiModelProperty;
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Date;
+
+public class TCustomerCarbonVal implements Serializable {
+    @ApiModelProperty(value = "序列")
+    private String guid;
+
+    @ApiModelProperty(value = "用户id")
+    private String tCustomerId;
+
+    @ApiModelProperty(value = "用户名称")
+    private String tCustomerName;
+
+    @ApiModelProperty(value = "购买碳汇量")
+    private BigDecimal carbonVal;
+
+    @ApiModelProperty(value = "状态 1 新增 0 减去")
+    private Integer status;
+
+    @ApiModelProperty(value = "类型 1购买碳汇 2企业碳中和 3大型活动碳中和 4碳履约 5为重庆市碳排放量做贡献")
+    private Integer type;
+
+    @ApiModelProperty(value = "来源表id")
+    private String tbGuid;
+
+    @ApiModelProperty(value = "表名称")
+    private String tbName;
+
+    @ApiModelProperty(value = "来源明细")
+    private String remarks;
+
+    @ApiModelProperty(value = "年份")
+    private Integer yearTime;
+
+    @ApiModelProperty(value = "创建人")
+    private String createUser;
+
+    @ApiModelProperty(value = "创建时间")
+    private Date createTime;
+
+    @ApiModelProperty(value = "更新人")
+    private String updateUser;
+
+    @ApiModelProperty(value = "更新时间")
+    private Date updateTime;
+
+    private static final long serialVersionUID = 1L;
+
+    public String getGuid() {
+        return guid;
+    }
+
+    public void setGuid(String guid) {
+        this.guid = guid;
+    }
+
+    public String gettCustomerId() {
+        return tCustomerId;
+    }
+
+    public void settCustomerId(String tCustomerId) {
+        this.tCustomerId = tCustomerId;
+    }
+
+    public String gettCustomerName() {
+        return tCustomerName;
+    }
+
+    public void settCustomerName(String tCustomerName) {
+        this.tCustomerName = tCustomerName;
+    }
+
+    public BigDecimal getCarbonVal() {
+        return carbonVal;
+    }
+
+    public void setCarbonVal(BigDecimal carbonVal) {
+        this.carbonVal = carbonVal;
+    }
+
+    public Integer getStatus() {
+        return status;
+    }
+
+    public void setStatus(Integer status) {
+        this.status = status;
+    }
+
+    public Integer getType() {
+        return type;
+    }
+
+    public void setType(Integer type) {
+        this.type = type;
+    }
+
+    public String getTbGuid() {
+        return tbGuid;
+    }
+
+    public void setTbGuid(String tbGuid) {
+        this.tbGuid = tbGuid;
+    }
+
+    public String getTbName() {
+        return tbName;
+    }
+
+    public void setTbName(String tbName) {
+        this.tbName = tbName;
+    }
+
+    public String getRemarks() {
+        return remarks;
+    }
+
+    public void setRemarks(String remarks) {
+        this.remarks = remarks;
+    }
+
+    public Integer getYearTime() {
+        return yearTime;
+    }
+
+    public void setYearTime(Integer yearTime) {
+        this.yearTime = yearTime;
+    }
+
+    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 getUpdateUser() {
+        return updateUser;
+    }
+
+    public void setUpdateUser(String updateUser) {
+        this.updateUser = updateUser;
+    }
+
+    public Date getUpdateTime() {
+        return updateTime;
+    }
+
+    public void setUpdateTime(Date updateTime) {
+        this.updateTime = updateTime;
+    }
+
+    @Override
+    public String toString() {
+        StringBuilder sb = new StringBuilder();
+        sb.append(getClass().getSimpleName());
+        sb.append(" [");
+        sb.append("Hash = ").append(hashCode());
+        sb.append(", guid=").append(guid);
+        sb.append(", tCustomerId=").append(tCustomerId);
+        sb.append(", tCustomerName=").append(tCustomerName);
+        sb.append(", carbonVal=").append(carbonVal);
+        sb.append(", status=").append(status);
+        sb.append(", type=").append(type);
+        sb.append(", tbGuid=").append(tbGuid);
+        sb.append(", tbName=").append(tbName);
+        sb.append(", remarks=").append(remarks);
+        sb.append(", yearTime=").append(yearTime);
+        sb.append(", createUser=").append(createUser);
+        sb.append(", createTime=").append(createTime);
+        sb.append(", updateUser=").append(updateUser);
+        sb.append(", updateTime=").append(updateTime);
+        sb.append(", serialVersionUID=").append(serialVersionUID);
+        sb.append("]");
+        return sb.toString();
+    }
+}

carbon-api-mbg/src/main/java/com/hcloud/microserver/mbg/modul/TFarmerInfo.java

@@ -0,0 +1,369 @@
+package com.hcloud.microserver.mbg.modul;
+
+import io.swagger.annotations.ApiModelProperty;
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Date;
+
+public class TFarmerInfo implements Serializable {
+    @ApiModelProperty(value = "序列")
+    private String guid;
+
+    @ApiModelProperty(value = "扶贫区域信息")
+    private String fkPovertyAreaId;
+
+    @ApiModelProperty(value = "贫困集体信息")
+    private String fkCollectiveId;
+
+    @ApiModelProperty(value = "贫困户编号")
+    private String farmerCode;
+
+    @ApiModelProperty(value = "贫困户姓名")
+    private String farmerName;
+
+    @ApiModelProperty(value = "家庭人数")
+    private Integer familyNum;
+
+    @ApiModelProperty(value = "性别")
+    private Integer sex;
+
+    @ApiModelProperty(value = "身份证号")
+    private String pid;
+
+    @ApiModelProperty(value = "民族")
+    private String nation;
+
+    @ApiModelProperty(value = "文化程度")
+    private String education;
+
+    @ApiModelProperty(value = "联系电话")
+    private String phone;
+
+    @ApiModelProperty(value = "银行卡号")
+    private String bankCardNo;
+
+    @ApiModelProperty(value = "年平均收入")
+    private BigDecimal incomeVal;
+
+    @ApiModelProperty(value = "贫困户类型")
+    private String farmerType;
+
+    @ApiModelProperty(value = "贫困户描述")
+    private String farmerRemark;
+
+    @ApiModelProperty(value = "贫困户照片")
+    private String farmerImages;
+
+    @ApiModelProperty(value = "所属村民组")
+    private String villageOrg;
+
+    @ApiModelProperty(value = "是否启用")
+    private Integer isEnable;
+
+    @ApiModelProperty(value = "记录状态")
+    private Integer state;
+
+    @ApiModelProperty(value = "创建人")
+    private String createUser;
+
+    @ApiModelProperty(value = "创建时间")
+    private Date createTime;
+
+    @ApiModelProperty(value = "修改人")
+    private String modifiedUser;
+
+    @ApiModelProperty(value = "修改时间")
+    private Date modifiedTime;
+
+    @ApiModelProperty(value = "银行打款信息")
+    private String bankClearingMsg;
+
+    @ApiModelProperty(value = "累计应收金额")
+    private BigDecimal recieveMoney;
+
+    @ApiModelProperty(value = "累计实收金额")
+    private BigDecimal actualMoney;
+
+    @ApiModelProperty(value = "开户行名称")
+    private String bankName;
+
+    @ApiModelProperty(value = "银行卡状态：1-禁用，0-能用")
+    private Integer bankStatus;
+
+    @ApiModelProperty(value = "开户行机构代码")
+    private String bankCode;
+
+    private static final long serialVersionUID = 1L;
+
+    public String getGuid() {
+        return guid;
+    }
+
+    public void setGuid(String guid) {
+        this.guid = guid;
+    }
+
+    public String getFkPovertyAreaId() {
+        return fkPovertyAreaId;
+    }
+
+    public void setFkPovertyAreaId(String fkPovertyAreaId) {
+        this.fkPovertyAreaId = fkPovertyAreaId;
+    }
+
+    public String getFkCollectiveId() {
+        return fkCollectiveId;
+    }
+
+    public void setFkCollectiveId(String fkCollectiveId) {
+        this.fkCollectiveId = fkCollectiveId;
+    }
+
+    public String getFarmerCode() {
+        return farmerCode;
+    }
+
+    public void setFarmerCode(String farmerCode) {
+        this.farmerCode = farmerCode;
+    }
+
+    public String getFarmerName() {
+        return farmerName;
+    }
+
+    public void setFarmerName(String farmerName) {
+        this.farmerName = farmerName;
+    }
+
+    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;
+    }
+
+    public String getNation() {
+        return nation;
+    }
+
+    public void setNation(String nation) {
+        this.nation = nation;
+    }
+
+    public String getEducation() {
+        return education;
+    }
+
+    public void setEducation(String education) {
+        this.education = education;
+    }
+
+    public String getPhone() {
+        return phone;
+    }
+
+    public void setPhone(String phone) {
+        this.phone = phone;
+    }
+
+    public String getBankCardNo() {
+        return bankCardNo;
+    }
+
+    public void setBankCardNo(String bankCardNo) {
+        this.bankCardNo = bankCardNo;
+    }
+
+    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;
+    }
+
+    public String getFarmerRemark() {
+        return farmerRemark;
+    }
+
+    public void setFarmerRemark(String farmerRemark) {
+        this.farmerRemark = farmerRemark;
+    }
+
+    public String getFarmerImages() {
+        return farmerImages;
+    }
+
+    public void setFarmerImages(String farmerImages) {
+        this.farmerImages = farmerImages;
+    }
+
+    public String getVillageOrg() {
+        return villageOrg;
+    }
+
+    public void setVillageOrg(String villageOrg) {
+        this.villageOrg = villageOrg;
+    }
+
+    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;
+    }
+
+    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 String getBankClearingMsg() {
+        return bankClearingMsg;
+    }
+
+    public void setBankClearingMsg(String bankClearingMsg) {
+        this.bankClearingMsg = bankClearingMsg;
+    }
+
+    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 getBankName() {
+        return bankName;
+    }
+
+    public void setBankName(String bankName) {
+        this.bankName = bankName;
+    }
+
+    public Integer getBankStatus() {
+        return bankStatus;
+    }
+
+    public void setBankStatus(Integer bankStatus) {
+        this.bankStatus = bankStatus;
+    }
+
+    public String getBankCode() {
+        return bankCode;
+    }
+
+    public void setBankCode(String bankCode) {
+        this.bankCode = bankCode;
+    }
+
+    @Override
+    public String toString() {
+        StringBuilder sb = new StringBuilder();
+        sb.append(getClass().getSimpleName());
+        sb.append(" [");
+        sb.append("Hash = ").append(hashCode());
+        sb.append(", guid=").append(guid);
+        sb.append(", fkPovertyAreaId=").append(fkPovertyAreaId);
+        sb.append(", fkCollectiveId=").append(fkCollectiveId);
+        sb.append(", farmerCode=").append(farmerCode);
+        sb.append(", farmerName=").append(farmerName);
+        sb.append(", familyNum=").append(familyNum);
+        sb.append(", sex=").append(sex);
+        sb.append(", pid=").append(pid);
+        sb.append(", nation=").append(nation);
+        sb.append(", education=").append(education);
+        sb.append(", phone=").append(phone);
+        sb.append(", bankCardNo=").append(bankCardNo);
+        sb.append(", incomeVal=").append(incomeVal);
+        sb.append(", farmerType=").append(farmerType);
+        sb.append(", farmerRemark=").append(farmerRemark);
+        sb.append(", farmerImages=").append(farmerImages);
+        sb.append(", villageOrg=").append(villageOrg);
+        sb.append(", isEnable=").append(isEnable);
+        sb.append(", state=").append(state);
+        sb.append(", createUser=").append(createUser);
+        sb.append(", createTime=").append(createTime);
+        sb.append(", modifiedUser=").append(modifiedUser);
+        sb.append(", modifiedTime=").append(modifiedTime);
+        sb.append(", bankClearingMsg=").append(bankClearingMsg);
+        sb.append(", recieveMoney=").append(recieveMoney);
+        sb.append(", actualMoney=").append(actualMoney);
+        sb.append(", bankName=").append(bankName);
+        sb.append(", bankStatus=").append(bankStatus);
+        sb.append(", bankCode=").append(bankCode);
+        sb.append(", serialVersionUID=").append(serialVersionUID);
+        sb.append("]");
+        return sb.toString();
+    }
+}

carbon-api-mbg/src/main/java/com/hcloud/microserver/mbg/modul/TGoodsInfo.java

@@ -0,0 +1,210 @@
+package com.hcloud.microserver.mbg.modul;
+
+import io.swagger.annotations.ApiModelProperty;
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Date;
+
+public class TGoodsInfo implements Serializable {
+    @ApiModelProperty(value = "序列")
+    private String guid;
+
+    @ApiModelProperty(value = "商品类型")
+    private String goodsType;
+
+    @ApiModelProperty(value = "商品编码")
+    private String goodsCode;
+
+    @ApiModelProperty(value = "商品名称")
+    private String goodsName;
+
+    @ApiModelProperty(value = "碳汇量")
+    private BigDecimal carbonVal;
+
+    @ApiModelProperty(value = "售价")
+    private BigDecimal price;
+
+    @ApiModelProperty(value = "商品描述")
+    private String goodsDesc;
+
+    @ApiModelProperty(value = "商品图片")
+    private String goodsImages;
+
+    @ApiModelProperty(value = "商品销售期")
+    private Date goodsSaleDate;
+
+    private Integer isSale;
+
+    @ApiModelProperty(value = "记录状态")
+    private Integer state;
+
+    @ApiModelProperty(value = "创建人")
+    private String createUser;
+
+    private Date createTime;
+
+    @ApiModelProperty(value = "修改人")
+    private String modifiedUser;
+
+    private Date modifiedTime;
+
+    @ApiModelProperty(value = "商品用途")
+    private String goodsUse;
+
+    private static final long serialVersionUID = 1L;
+
+    public String getGuid() {
+        return guid;
+    }
+
+    public void setGuid(String guid) {
+        this.guid = guid;
+    }
+
+    public String getGoodsType() {
+        return goodsType;
+    }
+
+    public void setGoodsType(String goodsType) {
+        this.goodsType = goodsType;
+    }
+
+    public String getGoodsCode() {
+        return goodsCode;
+    }
+
+    public void setGoodsCode(String goodsCode) {
+        this.goodsCode = goodsCode;
+    }
+
+    public String getGoodsName() {
+        return goodsName;
+    }
+
+    public void setGoodsName(String goodsName) {
+        this.goodsName = goodsName;
+    }
+
+    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;
+    }
+
+    public String getGoodsImages() {
+        return goodsImages;
+    }
+
+    public void setGoodsImages(String goodsImages) {
+        this.goodsImages = goodsImages;
+    }
+
+    public Date getGoodsSaleDate() {
+        return goodsSaleDate;
+    }
+
+    public void setGoodsSaleDate(Date goodsSaleDate) {
+        this.goodsSaleDate = goodsSaleDate;
+    }
+
+    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;
+    }
+
+    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 String getGoodsUse() {
+        return goodsUse;
+    }
+
+    public void setGoodsUse(String goodsUse) {
+        this.goodsUse = goodsUse;
+    }
+
+    @Override
+    public String toString() {
+        StringBuilder sb = new StringBuilder();
+        sb.append(getClass().getSimpleName());
+        sb.append(" [");
+        sb.append("Hash = ").append(hashCode());
+        sb.append(", guid=").append(guid);
+        sb.append(", goodsType=").append(goodsType);
+        sb.append(", goodsCode=").append(goodsCode);
+        sb.append(", goodsName=").append(goodsName);
+        sb.append(", carbonVal=").append(carbonVal);
+        sb.append(", price=").append(price);
+        sb.append(", goodsDesc=").append(goodsDesc);
+        sb.append(", goodsImages=").append(goodsImages);
+        sb.append(", goodsSaleDate=").append(goodsSaleDate);
+        sb.append(", isSale=").append(isSale);
+        sb.append(", state=").append(state);
+        sb.append(", createUser=").append(createUser);
+        sb.append(", createTime=").append(createTime);
+        sb.append(", modifiedUser=").append(modifiedUser);
+        sb.append(", modifiedTime=").append(modifiedTime);
+        sb.append(", goodsUse=").append(goodsUse);
+        sb.append(", serialVersionUID=").append(serialVersionUID);
+        sb.append("]");
+        return sb.toString();
+    }
+}

carbon-api-mbg/src/main/java/com/hcloud/microserver/mbg/modul/TGoodsOrderInfo.java

@@ -0,0 +1,201 @@
+package com.hcloud.microserver.mbg.modul;
+
+import io.swagger.annotations.ApiModelProperty;
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Date;
+
+public class TGoodsOrderInfo implements Serializable {
+    @ApiModelProperty(value = "序列")
+    private String guid;
+
+    @ApiModelProperty(value = "用户id")
+    private String fkCustomerGuid;
+
+    @ApiModelProperty(value = "订单编号")
+    private String orderNo;
+
+    @ApiModelProperty(value = "客户名称")
+    private String customerName;
+
+    @ApiModelProperty(value = "客户类型")
+    private String customerType;
+
+    @ApiModelProperty(value = "订单金额")
+    private BigDecimal orderAmount;
+
+    @ApiModelProperty(value = "订单购碳量")
+    private BigDecimal orderCarbonAmount;
+
+    @ApiModelProperty(value = "订单状态  1.未付款. 2.已完成（线上线下订单都完全完成了）3.未审核,4.后台审核等待打款, 5.已经打款等待再次审核 ")
+    private Integer orderStatus;
+
+    @ApiModelProperty(value = "记录状态 0无效 1有效")
+    private Integer state;
+
+    @ApiModelProperty(value = "创建人")
+    private String createUser;
+
+    @ApiModelProperty(value = "创建时间")
+    private Date createTime;
+
+    @ApiModelProperty(value = "修改人")
+    private String modifiedUser;
+
+    @ApiModelProperty(value = "修改时间")
+    private Date modifiedTime;
+
+    @ApiModelProperty(value = "支付流水号（成功支付后的回填，初始是空值）")
+    private String payNo;
+
+    @ApiModelProperty(value = "订单类型0:线上订单，1：认购订单，2：后台订单")
+    private Integer orderType;
+
+    private static final long serialVersionUID = 1L;
+
+    public String getGuid() {
+        return guid;
+    }
+
+    public void setGuid(String guid) {
+        this.guid = guid;
+    }
+
+    public String getFkCustomerGuid() {
+        return fkCustomerGuid;
+    }
+
+    public void setFkCustomerGuid(String fkCustomerGuid) {
+        this.fkCustomerGuid = fkCustomerGuid;
+    }
+
+    public String getOrderNo() {
+        return orderNo;
+    }
+
+    public void setOrderNo(String orderNo) {
+        this.orderNo = orderNo;
+    }
+
+    public String getCustomerName() {
+        return customerName;
+    }
+
+    public void setCustomerName(String customerName) {
+        this.customerName = customerName;
+    }
+
+    public String getCustomerType() {
+        return customerType;
+    }
+
+    public void setCustomerType(String customerType) {
+        this.customerType = customerType;
+    }
+
+    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;
+    }
+
+    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 String getPayNo() {
+        return payNo;
+    }
+
+    public void setPayNo(String payNo) {
+        this.payNo = payNo;
+    }
+
+    public Integer getOrderType() {
+        return orderType;
+    }
+
+    public void setOrderType(Integer orderType) {
+        this.orderType = orderType;
+    }
+
+    @Override
+    public String toString() {
+        StringBuilder sb = new StringBuilder();
+        sb.append(getClass().getSimpleName());
+        sb.append(" [");
+        sb.append("Hash = ").append(hashCode());
+        sb.append(", guid=").append(guid);
+        sb.append(", fkCustomerGuid=").append(fkCustomerGuid);
+        sb.append(", orderNo=").append(orderNo);
+        sb.append(", customerName=").append(customerName);
+        sb.append(", customerType=").append(customerType);
+        sb.append(", orderAmount=").append(orderAmount);
+        sb.append(", orderCarbonAmount=").append(orderCarbonAmount);
+        sb.append(", orderStatus=").append(orderStatus);
+        sb.append(", state=").append(state);
+        sb.append(", createUser=").append(createUser);
+        sb.append(", createTime=").append(createTime);
+        sb.append(", modifiedUser=").append(modifiedUser);
+        sb.append(", modifiedTime=").append(modifiedTime);
+        sb.append(", payNo=").append(payNo);
+        sb.append(", orderType=").append(orderType);
+        sb.append(", serialVersionUID=").append(serialVersionUID);
+        sb.append("]");
+        return sb.toString();
+    }
+}

carbon-api-mbg/src/main/java/com/hcloud/microserver/mbg/modul/TProductInfo.java

@@ -0,0 +1,236 @@
+package com.hcloud.microserver.mbg.modul;
+
+import io.swagger.annotations.ApiModelProperty;
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Date;
+
+public class TProductInfo implements Serializable {
+    private String guid;
+
+    @ApiModelProperty(value = "产品类型")
+    private String fkProductType;
+
+    @ApiModelProperty(value = "碳汇计算规则")
+    private String fkCarbonRule;
+
+    @ApiModelProperty(value = "扶贫区域信息")
+    private String fkPovertyArea;
+
+    @ApiModelProperty(value = "产品名称")
+    private String productName;
+
+    @ApiModelProperty(value = "产品编码")
+    private String productCode;
+
+    @ApiModelProperty(value = "碳汇量产生时间")
+    private Date carbonGenerateDate;
+
+    @ApiModelProperty(value = "产品有效周期")
+    private Integer productValidateNum;
+
+    @ApiModelProperty(value = "碳汇量刷新时间")
+    private Date carbonRefreshTime;
+
+    @ApiModelProperty(value = "产品碳汇量")
+    private BigDecimal carbonSink;
+
+    @ApiModelProperty(value = "产品图片")
+    private String productImgs;
+
+    @ApiModelProperty(value = "是否启用")
+    private Integer isEnable;
+
+    @ApiModelProperty(value = "备注")
+    private String remark;
+
+    @ApiModelProperty(value = "记录状态")
+    private Integer state;
+
+    @ApiModelProperty(value = "创建人")
+    private String createUser;
+
+    @ApiModelProperty(value = "创建时间")
+    private Date createTime;
+
+    @ApiModelProperty(value = "修改人")
+    private String modifiedUser;
+
+    @ApiModelProperty(value = "修改时间")
+    private Date modifiedTime;
+
+    private static final long serialVersionUID = 1L;
+
+    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;
+    }
+
+    @Override
+    public String toString() {
+        StringBuilder sb = new StringBuilder();
+        sb.append(getClass().getSimpleName());
+        sb.append(" [");
+        sb.append("Hash = ").append(hashCode());
+        sb.append(", guid=").append(guid);
+        sb.append(", fkProductType=").append(fkProductType);
+        sb.append(", fkCarbonRule=").append(fkCarbonRule);
+        sb.append(", fkPovertyArea=").append(fkPovertyArea);
+        sb.append(", productName=").append(productName);
+        sb.append(", productCode=").append(productCode);
+        sb.append(", carbonGenerateDate=").append(carbonGenerateDate);
+        sb.append(", productValidateNum=").append(productValidateNum);
+        sb.append(", carbonRefreshTime=").append(carbonRefreshTime);
+        sb.append(", carbonSink=").append(carbonSink);
+        sb.append(", productImgs=").append(productImgs);
+        sb.append(", isEnable=").append(isEnable);
+        sb.append(", remark=").append(remark);
+        sb.append(", state=").append(state);
+        sb.append(", createUser=").append(createUser);
+        sb.append(", createTime=").append(createTime);
+        sb.append(", modifiedUser=").append(modifiedUser);
+        sb.append(", modifiedTime=").append(modifiedTime);
+        sb.append(", serialVersionUID=").append(serialVersionUID);
+        sb.append("]");
+        return sb.toString();
+    }
+}

carbon-api-mbg/src/main/resources/com/hcloud/microserver/mbg/mapper/TCarbonProblemMapper.xml

@@ -0,0 +1,304 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.hcloud.microserver.mbg.mapper.TCarbonProblemMapper">
+  <resultMap id="BaseResultMap" type="com.hcloud.microserver.mbg.modul.TCarbonProblem">
+    <id column="guid" jdbcType="BIGINT" property="guid" />
+    <result column="problem_name" jdbcType="VARCHAR" property="problemName" />
+    <result column="problem_type" jdbcType="INTEGER" property="problemType" />
+    <result column="state" jdbcType="INTEGER" property="state" />
+    <result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
+    <result column="create_id" jdbcType="BIGINT" property="createId" />
+    <result column="create_name" jdbcType="VARCHAR" property="createName" />
+  </resultMap>
+  <resultMap extends="BaseResultMap" id="ResultMapWithBLOBs" type="com.hcloud.microserver.mbg.modul.TCarbonProblem">
+    <result column="problem_answer" jdbcType="LONGVARCHAR" property="problemAnswer" />
+  </resultMap>
+  <sql id="Example_Where_Clause">
+    <where>
+      <foreach collection="oredCriteria" item="criteria" separator="or">
+        <if test="criteria.valid">
+          <trim prefix="(" prefixOverrides="and" suffix=")">
+            <foreach collection="criteria.criteria" item="criterion">
+              <choose>
+                <when test="criterion.noValue">
+                  and ${criterion.condition}
+                </when>
+                <when test="criterion.singleValue">
+                  and ${criterion.condition} #{criterion.value}
+                </when>
+                <when test="criterion.betweenValue">
+                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
+                </when>
+                <when test="criterion.listValue">
+                  and ${criterion.condition}
+                  <foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
+                    #{listItem}
+                  </foreach>
+                </when>
+              </choose>
+            </foreach>
+          </trim>
+        </if>
+      </foreach>
+    </where>
+  </sql>
+  <sql id="Update_By_Example_Where_Clause">
+    <where>
+      <foreach collection="example.oredCriteria" item="criteria" separator="or">
+        <if test="criteria.valid">
+          <trim prefix="(" prefixOverrides="and" suffix=")">
+            <foreach collection="criteria.criteria" item="criterion">
+              <choose>
+                <when test="criterion.noValue">
+                  and ${criterion.condition}
+                </when>
+                <when test="criterion.singleValue">
+                  and ${criterion.condition} #{criterion.value}
+                </when>
+                <when test="criterion.betweenValue">
+                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
+                </when>
+                <when test="criterion.listValue">
+                  and ${criterion.condition}
+                  <foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
+                    #{listItem}
+                  </foreach>
+                </when>
+              </choose>
+            </foreach>
+          </trim>
+        </if>
+      </foreach>
+    </where>
+  </sql>
+  <sql id="Base_Column_List">
+    guid, problem_name, problem_type, state, create_time, create_id, create_name
+  </sql>
+  <sql id="Blob_Column_List">
+    problem_answer
+  </sql>
+  <select id="selectByExampleWithBLOBs" parameterType="com.hcloud.microserver.mbg.modul.TCarbonProblemExample" resultMap="ResultMapWithBLOBs">
+    select
+    <if test="distinct">
+      distinct
+    </if>
+    <include refid="Base_Column_List" />
+    ,
+    <include refid="Blob_Column_List" />
+    from t_carbon_problem
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+    <if test="orderByClause != null">
+      order by ${orderByClause}
+    </if>
+  </select>
+  <select id="selectByExample" parameterType="com.hcloud.microserver.mbg.modul.TCarbonProblemExample" resultMap="BaseResultMap">
+    select
+    <if test="distinct">
+      distinct
+    </if>
+    <include refid="Base_Column_List" />
+    from t_carbon_problem
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+    <if test="orderByClause != null">
+      order by ${orderByClause}
+    </if>
+  </select>
+  <select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="ResultMapWithBLOBs">
+    select 
+    <include refid="Base_Column_List" />
+    ,
+    <include refid="Blob_Column_List" />
+    from t_carbon_problem
+    where guid = #{guid,jdbcType=BIGINT}
+  </select>
+  <delete id="deleteByPrimaryKey" parameterType="java.lang.Long">
+    delete from t_carbon_problem
+    where guid = #{guid,jdbcType=BIGINT}
+  </delete>
+  <delete id="deleteByExample" parameterType="com.hcloud.microserver.mbg.modul.TCarbonProblemExample">
+    delete from t_carbon_problem
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+  </delete>
+  <insert id="insert" parameterType="com.hcloud.microserver.mbg.modul.TCarbonProblem">
+    <selectKey keyProperty="guid" order="AFTER" resultType="java.lang.Long">
+      SELECT LAST_INSERT_ID()
+    </selectKey>
+    insert into t_carbon_problem (problem_name, problem_type, state, 
+      create_time, create_id, create_name, 
+      problem_answer)
+    values (#{problemName,jdbcType=VARCHAR}, #{problemType,jdbcType=INTEGER}, #{state,jdbcType=INTEGER}, 
+      #{createTime,jdbcType=TIMESTAMP}, #{createId,jdbcType=BIGINT}, #{createName,jdbcType=VARCHAR}, 
+      #{problemAnswer,jdbcType=LONGVARCHAR})
+  </insert>
+  <insert id="insertSelective" parameterType="com.hcloud.microserver.mbg.modul.TCarbonProblem">
+    <selectKey keyProperty="guid" order="AFTER" resultType="java.lang.Long">
+      SELECT LAST_INSERT_ID()
+    </selectKey>
+    insert into t_carbon_problem
+    <trim prefix="(" suffix=")" suffixOverrides=",">
+      <if test="problemName != null">
+        problem_name,
+      </if>
+      <if test="problemType != null">
+        problem_type,
+      </if>
+      <if test="state != null">
+        state,
+      </if>
+      <if test="createTime != null">
+        create_time,
+      </if>
+      <if test="createId != null">
+        create_id,
+      </if>
+      <if test="createName != null">
+        create_name,
+      </if>
+      <if test="problemAnswer != null">
+        problem_answer,
+      </if>
+    </trim>
+    <trim prefix="values (" suffix=")" suffixOverrides=",">
+      <if test="problemName != null">
+        #{problemName,jdbcType=VARCHAR},
+      </if>
+      <if test="problemType != null">
+        #{problemType,jdbcType=INTEGER},
+      </if>
+      <if test="state != null">
+        #{state,jdbcType=INTEGER},
+      </if>
+      <if test="createTime != null">
+        #{createTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="createId != null">
+        #{createId,jdbcType=BIGINT},
+      </if>
+      <if test="createName != null">
+        #{createName,jdbcType=VARCHAR},
+      </if>
+      <if test="problemAnswer != null">
+        #{problemAnswer,jdbcType=LONGVARCHAR},
+      </if>
+    </trim>
+  </insert>
+  <select id="countByExample" parameterType="com.hcloud.microserver.mbg.modul.TCarbonProblemExample" resultType="java.lang.Long">
+    select count(*) from t_carbon_problem
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+  </select>
+  <update id="updateByExampleSelective" parameterType="map">
+    update t_carbon_problem
+    <set>
+      <if test="record.guid != null">
+        guid = #{record.guid,jdbcType=BIGINT},
+      </if>
+      <if test="record.problemName != null">
+        problem_name = #{record.problemName,jdbcType=VARCHAR},
+      </if>
+      <if test="record.problemType != null">
+        problem_type = #{record.problemType,jdbcType=INTEGER},
+      </if>
+      <if test="record.state != null">
+        state = #{record.state,jdbcType=INTEGER},
+      </if>
+      <if test="record.createTime != null">
+        create_time = #{record.createTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="record.createId != null">
+        create_id = #{record.createId,jdbcType=BIGINT},
+      </if>
+      <if test="record.createName != null">
+        create_name = #{record.createName,jdbcType=VARCHAR},
+      </if>
+      <if test="record.problemAnswer != null">
+        problem_answer = #{record.problemAnswer,jdbcType=LONGVARCHAR},
+      </if>
+    </set>
+    <if test="_parameter != null">
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+  </update>
+  <update id="updateByExampleWithBLOBs" parameterType="map">
+    update t_carbon_problem
+    set guid = #{record.guid,jdbcType=BIGINT},
+      problem_name = #{record.problemName,jdbcType=VARCHAR},
+      problem_type = #{record.problemType,jdbcType=INTEGER},
+      state = #{record.state,jdbcType=INTEGER},
+      create_time = #{record.createTime,jdbcType=TIMESTAMP},
+      create_id = #{record.createId,jdbcType=BIGINT},
+      create_name = #{record.createName,jdbcType=VARCHAR},
+      problem_answer = #{record.problemAnswer,jdbcType=LONGVARCHAR}
+    <if test="_parameter != null">
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+  </update>
+  <update id="updateByExample" parameterType="map">
+    update t_carbon_problem
+    set guid = #{record.guid,jdbcType=BIGINT},
+      problem_name = #{record.problemName,jdbcType=VARCHAR},
+      problem_type = #{record.problemType,jdbcType=INTEGER},
+      state = #{record.state,jdbcType=INTEGER},
+      create_time = #{record.createTime,jdbcType=TIMESTAMP},
+      create_id = #{record.createId,jdbcType=BIGINT},
+      create_name = #{record.createName,jdbcType=VARCHAR}
+    <if test="_parameter != null">
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+  </update>
+  <update id="updateByPrimaryKeySelective" parameterType="com.hcloud.microserver.mbg.modul.TCarbonProblem">
+    update t_carbon_problem
+    <set>
+      <if test="problemName != null">
+        problem_name = #{problemName,jdbcType=VARCHAR},
+      </if>
+      <if test="problemType != null">
+        problem_type = #{problemType,jdbcType=INTEGER},
+      </if>
+      <if test="state != null">
+        state = #{state,jdbcType=INTEGER},
+      </if>
+      <if test="createTime != null">
+        create_time = #{createTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="createId != null">
+        create_id = #{createId,jdbcType=BIGINT},
+      </if>
+      <if test="createName != null">
+        create_name = #{createName,jdbcType=VARCHAR},
+      </if>
+      <if test="problemAnswer != null">
+        problem_answer = #{problemAnswer,jdbcType=LONGVARCHAR},
+      </if>
+    </set>
+    where guid = #{guid,jdbcType=BIGINT}
+  </update>
+  <update id="updateByPrimaryKeyWithBLOBs" parameterType="com.hcloud.microserver.mbg.modul.TCarbonProblem">
+    update t_carbon_problem
+    set problem_name = #{problemName,jdbcType=VARCHAR},
+      problem_type = #{problemType,jdbcType=INTEGER},
+      state = #{state,jdbcType=INTEGER},
+      create_time = #{createTime,jdbcType=TIMESTAMP},
+      create_id = #{createId,jdbcType=BIGINT},
+      create_name = #{createName,jdbcType=VARCHAR},
+      problem_answer = #{problemAnswer,jdbcType=LONGVARCHAR}
+    where guid = #{guid,jdbcType=BIGINT}
+  </update>
+  <update id="updateByPrimaryKey" parameterType="com.hcloud.microserver.mbg.modul.TCarbonProblem">
+    update t_carbon_problem
+    set problem_name = #{problemName,jdbcType=VARCHAR},
+      problem_type = #{problemType,jdbcType=INTEGER},
+      state = #{state,jdbcType=INTEGER},
+      create_time = #{createTime,jdbcType=TIMESTAMP},
+      create_id = #{createId,jdbcType=BIGINT},
+      create_name = #{createName,jdbcType=VARCHAR}
+    where guid = #{guid,jdbcType=BIGINT}
+  </update>
+</mapper>

carbon-api-mbg/src/main/resources/com/hcloud/microserver/mbg/mapper/TCollectiveFarmerMapper.xml

@@ -0,0 +1,466 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.hcloud.microserver.mbg.mapper.TCollectiveFarmerMapper">
+  <resultMap id="BaseResultMap" type="com.hcloud.microserver.mbg.modul.TCollectiveFarmer">
+    <id column="guid" jdbcType="CHAR" property="guid" />
+    <result column="fk_poverty_area_id" jdbcType="CHAR" property="fkPovertyAreaId" />
+    <result column="collective_code" jdbcType="VARCHAR" property="collectiveCode" />
+    <result column="collective_name" jdbcType="VARCHAR" property="collectiveName" />
+    <result column="collective_person_num" jdbcType="INTEGER" property="collectivePersonNum" />
+    <result column="org_unit" jdbcType="VARCHAR" property="orgUnit" />
+    <result column="remark" jdbcType="VARCHAR" property="remark" />
+    <result column="collective_images" jdbcType="VARCHAR" property="collectiveImages" />
+    <result column="bank_name" jdbcType="VARCHAR" property="bankName" />
+    <result column="bank_card_no" jdbcType="VARCHAR" property="bankCardNo" />
+    <result column="is_enable" jdbcType="INTEGER" property="isEnable" />
+    <result column="state" jdbcType="INTEGER" property="state" />
+    <result column="create_user" jdbcType="CHAR" property="createUser" />
+    <result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
+    <result column="modified_user" jdbcType="CHAR" property="modifiedUser" />
+    <result column="modified_time" jdbcType="TIMESTAMP" property="modifiedTime" />
+    <result column="recieve_money" jdbcType="DECIMAL" property="recieveMoney" />
+    <result column="actual_money" jdbcType="DECIMAL" property="actualMoney" />
+    <result column="phone" jdbcType="VARCHAR" property="phone" />
+    <result column="bank_code" jdbcType="VARCHAR" property="bankCode" />
+    <result column="bank_status" jdbcType="INTEGER" property="bankStatus" />
+  </resultMap>
+  <sql id="Example_Where_Clause">
+    <where>
+      <foreach collection="oredCriteria" item="criteria" separator="or">
+        <if test="criteria.valid">
+          <trim prefix="(" prefixOverrides="and" suffix=")">
+            <foreach collection="criteria.criteria" item="criterion">
+              <choose>
+                <when test="criterion.noValue">
+                  and ${criterion.condition}
+                </when>
+                <when test="criterion.singleValue">
+                  and ${criterion.condition} #{criterion.value}
+                </when>
+                <when test="criterion.betweenValue">
+                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
+                </when>
+                <when test="criterion.listValue">
+                  and ${criterion.condition}
+                  <foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
+                    #{listItem}
+                  </foreach>
+                </when>
+              </choose>
+            </foreach>
+          </trim>
+        </if>
+      </foreach>
+    </where>
+  </sql>
+  <sql id="Update_By_Example_Where_Clause">
+    <where>
+      <foreach collection="example.oredCriteria" item="criteria" separator="or">
+        <if test="criteria.valid">
+          <trim prefix="(" prefixOverrides="and" suffix=")">
+            <foreach collection="criteria.criteria" item="criterion">
+              <choose>
+                <when test="criterion.noValue">
+                  and ${criterion.condition}
+                </when>
+                <when test="criterion.singleValue">
+                  and ${criterion.condition} #{criterion.value}
+                </when>
+                <when test="criterion.betweenValue">
+                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
+                </when>
+                <when test="criterion.listValue">
+                  and ${criterion.condition}
+                  <foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
+                    #{listItem}
+                  </foreach>
+                </when>
+              </choose>
+            </foreach>
+          </trim>
+        </if>
+      </foreach>
+    </where>
+  </sql>
+  <sql id="Base_Column_List">
+    guid, fk_poverty_area_id, collective_code, collective_name, collective_person_num, 
+    org_unit, remark, collective_images, bank_name, bank_card_no, is_enable, state, create_user, 
+    create_time, modified_user, modified_time, recieve_money, actual_money, phone, bank_code, 
+    bank_status
+  </sql>
+  <select id="selectByExample" parameterType="com.hcloud.microserver.mbg.modul.TCollectiveFarmerExample" resultMap="BaseResultMap">
+    select
+    <if test="distinct">
+      distinct
+    </if>
+    <include refid="Base_Column_List" />
+    from t_collective_farmer
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+    <if test="orderByClause != null">
+      order by ${orderByClause}
+    </if>
+  </select>
+  <select id="selectByPrimaryKey" parameterType="java.lang.String" resultMap="BaseResultMap">
+    select 
+    <include refid="Base_Column_List" />
+    from t_collective_farmer
+    where guid = #{guid,jdbcType=CHAR}
+  </select>
+  <delete id="deleteByPrimaryKey" parameterType="java.lang.String">
+    delete from t_collective_farmer
+    where guid = #{guid,jdbcType=CHAR}
+  </delete>
+  <delete id="deleteByExample" parameterType="com.hcloud.microserver.mbg.modul.TCollectiveFarmerExample">
+    delete from t_collective_farmer
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+  </delete>
+  <insert id="insert" parameterType="com.hcloud.microserver.mbg.modul.TCollectiveFarmer">
+    insert into t_collective_farmer (guid, fk_poverty_area_id, collective_code, 
+      collective_name, collective_person_num, org_unit, 
+      remark, collective_images, bank_name, 
+      bank_card_no, is_enable, state, 
+      create_user, create_time, modified_user, 
+      modified_time, recieve_money, actual_money, 
+      phone, bank_code, bank_status
+      )
+    values (#{guid,jdbcType=CHAR}, #{fkPovertyAreaId,jdbcType=CHAR}, #{collectiveCode,jdbcType=VARCHAR}, 
+      #{collectiveName,jdbcType=VARCHAR}, #{collectivePersonNum,jdbcType=INTEGER}, #{orgUnit,jdbcType=VARCHAR}, 
+      #{remark,jdbcType=VARCHAR}, #{collectiveImages,jdbcType=VARCHAR}, #{bankName,jdbcType=VARCHAR}, 
+      #{bankCardNo,jdbcType=VARCHAR}, #{isEnable,jdbcType=INTEGER}, #{state,jdbcType=INTEGER}, 
+      #{createUser,jdbcType=CHAR}, #{createTime,jdbcType=TIMESTAMP}, #{modifiedUser,jdbcType=CHAR}, 
+      #{modifiedTime,jdbcType=TIMESTAMP}, #{recieveMoney,jdbcType=DECIMAL}, #{actualMoney,jdbcType=DECIMAL}, 
+      #{phone,jdbcType=VARCHAR}, #{bankCode,jdbcType=VARCHAR}, #{bankStatus,jdbcType=INTEGER}
+      )
+  </insert>
+  <insert id="insertSelective" parameterType="com.hcloud.microserver.mbg.modul.TCollectiveFarmer">
+    insert into t_collective_farmer
+    <trim prefix="(" suffix=")" suffixOverrides=",">
+      <if test="guid != null">
+        guid,
+      </if>
+      <if test="fkPovertyAreaId != null">
+        fk_poverty_area_id,
+      </if>
+      <if test="collectiveCode != null">
+        collective_code,
+      </if>
+      <if test="collectiveName != null">
+        collective_name,
+      </if>
+      <if test="collectivePersonNum != null">
+        collective_person_num,
+      </if>
+      <if test="orgUnit != null">
+        org_unit,
+      </if>
+      <if test="remark != null">
+        remark,
+      </if>
+      <if test="collectiveImages != null">
+        collective_images,
+      </if>
+      <if test="bankName != null">
+        bank_name,
+      </if>
+      <if test="bankCardNo != null">
+        bank_card_no,
+      </if>
+      <if test="isEnable != null">
+        is_enable,
+      </if>
+      <if test="state != null">
+        state,
+      </if>
+      <if test="createUser != null">
+        create_user,
+      </if>
+      <if test="createTime != null">
+        create_time,
+      </if>
+      <if test="modifiedUser != null">
+        modified_user,
+      </if>
+      <if test="modifiedTime != null">
+        modified_time,
+      </if>
+      <if test="recieveMoney != null">
+        recieve_money,
+      </if>
+      <if test="actualMoney != null">
+        actual_money,
+      </if>
+      <if test="phone != null">
+        phone,
+      </if>
+      <if test="bankCode != null">
+        bank_code,
+      </if>
+      <if test="bankStatus != null">
+        bank_status,
+      </if>
+    </trim>
+    <trim prefix="values (" suffix=")" suffixOverrides=",">
+      <if test="guid != null">
+        #{guid,jdbcType=CHAR},
+      </if>
+      <if test="fkPovertyAreaId != null">
+        #{fkPovertyAreaId,jdbcType=CHAR},
+      </if>
+      <if test="collectiveCode != null">
+        #{collectiveCode,jdbcType=VARCHAR},
+      </if>
+      <if test="collectiveName != null">
+        #{collectiveName,jdbcType=VARCHAR},
+      </if>
+      <if test="collectivePersonNum != null">
+        #{collectivePersonNum,jdbcType=INTEGER},
+      </if>
+      <if test="orgUnit != null">
+        #{orgUnit,jdbcType=VARCHAR},
+      </if>
+      <if test="remark != null">
+        #{remark,jdbcType=VARCHAR},
+      </if>
+      <if test="collectiveImages != null">
+        #{collectiveImages,jdbcType=VARCHAR},
+      </if>
+      <if test="bankName != null">
+        #{bankName,jdbcType=VARCHAR},
+      </if>
+      <if test="bankCardNo != null">
+        #{bankCardNo,jdbcType=VARCHAR},
+      </if>
+      <if test="isEnable != null">
+        #{isEnable,jdbcType=INTEGER},
+      </if>
+      <if test="state != null">
+        #{state,jdbcType=INTEGER},
+      </if>
+      <if test="createUser != null">
+        #{createUser,jdbcType=CHAR},
+      </if>
+      <if test="createTime != null">
+        #{createTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="modifiedUser != null">
+        #{modifiedUser,jdbcType=CHAR},
+      </if>
+      <if test="modifiedTime != null">
+        #{modifiedTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="recieveMoney != null">
+        #{recieveMoney,jdbcType=DECIMAL},
+      </if>
+      <if test="actualMoney != null">
+        #{actualMoney,jdbcType=DECIMAL},
+      </if>
+      <if test="phone != null">
+        #{phone,jdbcType=VARCHAR},
+      </if>
+      <if test="bankCode != null">
+        #{bankCode,jdbcType=VARCHAR},
+      </if>
+      <if test="bankStatus != null">
+        #{bankStatus,jdbcType=INTEGER},
+      </if>
+    </trim>
+  </insert>
+  <select id="countByExample" parameterType="com.hcloud.microserver.mbg.modul.TCollectiveFarmerExample" resultType="java.lang.Long">
+    select count(*) from t_collective_farmer
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+  </select>
+  <update id="updateByExampleSelective" parameterType="map">
+    update t_collective_farmer
+    <set>
+      <if test="record.guid != null">
+        guid = #{record.guid,jdbcType=CHAR},
+      </if>
+      <if test="record.fkPovertyAreaId != null">
+        fk_poverty_area_id = #{record.fkPovertyAreaId,jdbcType=CHAR},
+      </if>
+      <if test="record.collectiveCode != null">
+        collective_code = #{record.collectiveCode,jdbcType=VARCHAR},
+      </if>
+      <if test="record.collectiveName != null">
+        collective_name = #{record.collectiveName,jdbcType=VARCHAR},
+      </if>
+      <if test="record.collectivePersonNum != null">
+        collective_person_num = #{record.collectivePersonNum,jdbcType=INTEGER},
+      </if>
+      <if test="record.orgUnit != null">
+        org_unit = #{record.orgUnit,jdbcType=VARCHAR},
+      </if>
+      <if test="record.remark != null">
+        remark = #{record.remark,jdbcType=VARCHAR},
+      </if>
+      <if test="record.collectiveImages != null">
+        collective_images = #{record.collectiveImages,jdbcType=VARCHAR},
+      </if>
+      <if test="record.bankName != null">
+        bank_name = #{record.bankName,jdbcType=VARCHAR},
+      </if>
+      <if test="record.bankCardNo != null">
+        bank_card_no = #{record.bankCardNo,jdbcType=VARCHAR},
+      </if>
+      <if test="record.isEnable != null">
+        is_enable = #{record.isEnable,jdbcType=INTEGER},
+      </if>
+      <if test="record.state != null">
+        state = #{record.state,jdbcType=INTEGER},
+      </if>
+      <if test="record.createUser != null">
+        create_user = #{record.createUser,jdbcType=CHAR},
+      </if>
+      <if test="record.createTime != null">
+        create_time = #{record.createTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="record.modifiedUser != null">
+        modified_user = #{record.modifiedUser,jdbcType=CHAR},
+      </if>
+      <if test="record.modifiedTime != null">
+        modified_time = #{record.modifiedTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="record.recieveMoney != null">
+        recieve_money = #{record.recieveMoney,jdbcType=DECIMAL},
+      </if>
+      <if test="record.actualMoney != null">
+        actual_money = #{record.actualMoney,jdbcType=DECIMAL},
+      </if>
+      <if test="record.phone != null">
+        phone = #{record.phone,jdbcType=VARCHAR},
+      </if>
+      <if test="record.bankCode != null">
+        bank_code = #{record.bankCode,jdbcType=VARCHAR},
+      </if>
+      <if test="record.bankStatus != null">
+        bank_status = #{record.bankStatus,jdbcType=INTEGER},
+      </if>
+    </set>
+    <if test="_parameter != null">
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+  </update>
+  <update id="updateByExample" parameterType="map">
+    update t_collective_farmer
+    set guid = #{record.guid,jdbcType=CHAR},
+      fk_poverty_area_id = #{record.fkPovertyAreaId,jdbcType=CHAR},
+      collective_code = #{record.collectiveCode,jdbcType=VARCHAR},
+      collective_name = #{record.collectiveName,jdbcType=VARCHAR},
+      collective_person_num = #{record.collectivePersonNum,jdbcType=INTEGER},
+      org_unit = #{record.orgUnit,jdbcType=VARCHAR},
+      remark = #{record.remark,jdbcType=VARCHAR},
+      collective_images = #{record.collectiveImages,jdbcType=VARCHAR},
+      bank_name = #{record.bankName,jdbcType=VARCHAR},
+      bank_card_no = #{record.bankCardNo,jdbcType=VARCHAR},
+      is_enable = #{record.isEnable,jdbcType=INTEGER},
+      state = #{record.state,jdbcType=INTEGER},
+      create_user = #{record.createUser,jdbcType=CHAR},
+      create_time = #{record.createTime,jdbcType=TIMESTAMP},
+      modified_user = #{record.modifiedUser,jdbcType=CHAR},
+      modified_time = #{record.modifiedTime,jdbcType=TIMESTAMP},
+      recieve_money = #{record.recieveMoney,jdbcType=DECIMAL},
+      actual_money = #{record.actualMoney,jdbcType=DECIMAL},
+      phone = #{record.phone,jdbcType=VARCHAR},
+      bank_code = #{record.bankCode,jdbcType=VARCHAR},
+      bank_status = #{record.bankStatus,jdbcType=INTEGER}
+    <if test="_parameter != null">
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+  </update>
+  <update id="updateByPrimaryKeySelective" parameterType="com.hcloud.microserver.mbg.modul.TCollectiveFarmer">
+    update t_collective_farmer
+    <set>
+      <if test="fkPovertyAreaId != null">
+        fk_poverty_area_id = #{fkPovertyAreaId,jdbcType=CHAR},
+      </if>
+      <if test="collectiveCode != null">
+        collective_code = #{collectiveCode,jdbcType=VARCHAR},
+      </if>
+      <if test="collectiveName != null">
+        collective_name = #{collectiveName,jdbcType=VARCHAR},
+      </if>
+      <if test="collectivePersonNum != null">
+        collective_person_num = #{collectivePersonNum,jdbcType=INTEGER},
+      </if>
+      <if test="orgUnit != null">
+        org_unit = #{orgUnit,jdbcType=VARCHAR},
+      </if>
+      <if test="remark != null">
+        remark = #{remark,jdbcType=VARCHAR},
+      </if>
+      <if test="collectiveImages != null">
+        collective_images = #{collectiveImages,jdbcType=VARCHAR},
+      </if>
+      <if test="bankName != null">
+        bank_name = #{bankName,jdbcType=VARCHAR},
+      </if>
+      <if test="bankCardNo != null">
+        bank_card_no = #{bankCardNo,jdbcType=VARCHAR},
+      </if>
+      <if test="isEnable != null">
+        is_enable = #{isEnable,jdbcType=INTEGER},
+      </if>
+      <if test="state != null">
+        state = #{state,jdbcType=INTEGER},
+      </if>
+      <if test="createUser != null">
+        create_user = #{createUser,jdbcType=CHAR},
+      </if>
+      <if test="createTime != null">
+        create_time = #{createTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="modifiedUser != null">
+        modified_user = #{modifiedUser,jdbcType=CHAR},
+      </if>
+      <if test="modifiedTime != null">
+        modified_time = #{modifiedTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="recieveMoney != null">
+        recieve_money = #{recieveMoney,jdbcType=DECIMAL},
+      </if>
+      <if test="actualMoney != null">
+        actual_money = #{actualMoney,jdbcType=DECIMAL},
+      </if>
+      <if test="phone != null">
+        phone = #{phone,jdbcType=VARCHAR},
+      </if>
+      <if test="bankCode != null">
+        bank_code = #{bankCode,jdbcType=VARCHAR},
+      </if>
+      <if test="bankStatus != null">
+        bank_status = #{bankStatus,jdbcType=INTEGER},
+      </if>
+    </set>
+    where guid = #{guid,jdbcType=CHAR}
+  </update>
+  <update id="updateByPrimaryKey" parameterType="com.hcloud.microserver.mbg.modul.TCollectiveFarmer">
+    update t_collective_farmer
+    set fk_poverty_area_id = #{fkPovertyAreaId,jdbcType=CHAR},
+      collective_code = #{collectiveCode,jdbcType=VARCHAR},
+      collective_name = #{collectiveName,jdbcType=VARCHAR},
+      collective_person_num = #{collectivePersonNum,jdbcType=INTEGER},
+      org_unit = #{orgUnit,jdbcType=VARCHAR},
+      remark = #{remark,jdbcType=VARCHAR},
+      collective_images = #{collectiveImages,jdbcType=VARCHAR},
+      bank_name = #{bankName,jdbcType=VARCHAR},
+      bank_card_no = #{bankCardNo,jdbcType=VARCHAR},
+      is_enable = #{isEnable,jdbcType=INTEGER},
+      state = #{state,jdbcType=INTEGER},
+      create_user = #{createUser,jdbcType=CHAR},
+      create_time = #{createTime,jdbcType=TIMESTAMP},
+      modified_user = #{modifiedUser,jdbcType=CHAR},
+      modified_time = #{modifiedTime,jdbcType=TIMESTAMP},
+      recieve_money = #{recieveMoney,jdbcType=DECIMAL},
+      actual_money = #{actualMoney,jdbcType=DECIMAL},
+      phone = #{phone,jdbcType=VARCHAR},
+      bank_code = #{bankCode,jdbcType=VARCHAR},
+      bank_status = #{bankStatus,jdbcType=INTEGER}
+    where guid = #{guid,jdbcType=CHAR}
+  </update>
+</mapper>

carbon-api-mbg/src/main/resources/com/hcloud/microserver/mbg/mapper/TCustomerCarbonValMapper.xml

@@ -0,0 +1,353 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.hcloud.microserver.mbg.mapper.TCustomerCarbonValMapper">
+  <resultMap id="BaseResultMap" type="com.hcloud.microserver.mbg.modul.TCustomerCarbonVal">
+    <id column="guid" jdbcType="CHAR" property="guid" />
+    <result column="t_customer_id" jdbcType="CHAR" property="tCustomerId" />
+    <result column="t_customer_name" jdbcType="VARCHAR" property="tCustomerName" />
+    <result column="carbon_val" jdbcType="DECIMAL" property="carbonVal" />
+    <result column="status" jdbcType="INTEGER" property="status" />
+    <result column="type" jdbcType="INTEGER" property="type" />
+    <result column="tb_guid" jdbcType="CHAR" property="tbGuid" />
+    <result column="tb_name" jdbcType="CHAR" property="tbName" />
+    <result column="remarks" jdbcType="CHAR" property="remarks" />
+    <result column="year_time" jdbcType="INTEGER" property="yearTime" />
+    <result column="create_user" jdbcType="CHAR" property="createUser" />
+    <result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
+    <result column="update_user" jdbcType="CHAR" property="updateUser" />
+    <result column="update_time" jdbcType="TIMESTAMP" property="updateTime" />
+  </resultMap>
+  <sql id="Example_Where_Clause">
+    <where>
+      <foreach collection="oredCriteria" item="criteria" separator="or">
+        <if test="criteria.valid">
+          <trim prefix="(" prefixOverrides="and" suffix=")">
+            <foreach collection="criteria.criteria" item="criterion">
+              <choose>
+                <when test="criterion.noValue">
+                  and ${criterion.condition}
+                </when>
+                <when test="criterion.singleValue">
+                  and ${criterion.condition} #{criterion.value}
+                </when>
+                <when test="criterion.betweenValue">
+                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
+                </when>
+                <when test="criterion.listValue">
+                  and ${criterion.condition}
+                  <foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
+                    #{listItem}
+                  </foreach>
+                </when>
+              </choose>
+            </foreach>
+          </trim>
+        </if>
+      </foreach>
+    </where>
+  </sql>
+  <sql id="Update_By_Example_Where_Clause">
+    <where>
+      <foreach collection="example.oredCriteria" item="criteria" separator="or">
+        <if test="criteria.valid">
+          <trim prefix="(" prefixOverrides="and" suffix=")">
+            <foreach collection="criteria.criteria" item="criterion">
+              <choose>
+                <when test="criterion.noValue">
+                  and ${criterion.condition}
+                </when>
+                <when test="criterion.singleValue">
+                  and ${criterion.condition} #{criterion.value}
+                </when>
+                <when test="criterion.betweenValue">
+                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
+                </when>
+                <when test="criterion.listValue">
+                  and ${criterion.condition}
+                  <foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
+                    #{listItem}
+                  </foreach>
+                </when>
+              </choose>
+            </foreach>
+          </trim>
+        </if>
+      </foreach>
+    </where>
+  </sql>
+  <sql id="Base_Column_List">
+    guid, t_customer_id, t_customer_name, carbon_val, status, type, tb_guid, tb_name, 
+    remarks, year_time, create_user, create_time, update_user, update_time
+  </sql>
+  <select id="selectByExample" parameterType="com.hcloud.microserver.mbg.modul.TCustomerCarbonValExample" resultMap="BaseResultMap">
+    select
+    <if test="distinct">
+      distinct
+    </if>
+    <include refid="Base_Column_List" />
+    from t_customer_carbon_val
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+    <if test="orderByClause != null">
+      order by ${orderByClause}
+    </if>
+  </select>
+  <select id="selectByPrimaryKey" parameterType="java.lang.String" resultMap="BaseResultMap">
+    select 
+    <include refid="Base_Column_List" />
+    from t_customer_carbon_val
+    where guid = #{guid,jdbcType=CHAR}
+  </select>
+  <delete id="deleteByPrimaryKey" parameterType="java.lang.String">
+    delete from t_customer_carbon_val
+    where guid = #{guid,jdbcType=CHAR}
+  </delete>
+  <delete id="deleteByExample" parameterType="com.hcloud.microserver.mbg.modul.TCustomerCarbonValExample">
+    delete from t_customer_carbon_val
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+  </delete>
+  <insert id="insert" parameterType="com.hcloud.microserver.mbg.modul.TCustomerCarbonVal">
+    insert into t_customer_carbon_val (guid, t_customer_id, t_customer_name, 
+      carbon_val, status, type, 
+      tb_guid, tb_name, remarks, year_time, 
+      create_user, create_time, update_user, 
+      update_time)
+    values (#{guid,jdbcType=CHAR}, #{tCustomerId,jdbcType=CHAR}, #{tCustomerName,jdbcType=VARCHAR}, 
+      #{carbonVal,jdbcType=DECIMAL}, #{status,jdbcType=INTEGER}, #{type,jdbcType=INTEGER}, 
+      #{tbGuid,jdbcType=CHAR}, #{tbName,jdbcType=CHAR}, #{remarks,jdbcType=CHAR}, #{yearTime,jdbcType=INTEGER}, 
+      #{createUser,jdbcType=CHAR}, #{createTime,jdbcType=TIMESTAMP}, #{updateUser,jdbcType=CHAR}, 
+      #{updateTime,jdbcType=TIMESTAMP})
+  </insert>
+  <insert id="insertSelective" parameterType="com.hcloud.microserver.mbg.modul.TCustomerCarbonVal">
+    insert into t_customer_carbon_val
+    <trim prefix="(" suffix=")" suffixOverrides=",">
+      <if test="guid != null">
+        guid,
+      </if>
+      <if test="tCustomerId != null">
+        t_customer_id,
+      </if>
+      <if test="tCustomerName != null">
+        t_customer_name,
+      </if>
+      <if test="carbonVal != null">
+        carbon_val,
+      </if>
+      <if test="status != null">
+        status,
+      </if>
+      <if test="type != null">
+        type,
+      </if>
+      <if test="tbGuid != null">
+        tb_guid,
+      </if>
+      <if test="tbName != null">
+        tb_name,
+      </if>
+      <if test="remarks != null">
+        remarks,
+      </if>
+      <if test="yearTime != null">
+        year_time,
+      </if>
+      <if test="createUser != null">
+        create_user,
+      </if>
+      <if test="createTime != null">
+        create_time,
+      </if>
+      <if test="updateUser != null">
+        update_user,
+      </if>
+      <if test="updateTime != null">
+        update_time,
+      </if>
+    </trim>
+    <trim prefix="values (" suffix=")" suffixOverrides=",">
+      <if test="guid != null">
+        #{guid,jdbcType=CHAR},
+      </if>
+      <if test="tCustomerId != null">
+        #{tCustomerId,jdbcType=CHAR},
+      </if>
+      <if test="tCustomerName != null">
+        #{tCustomerName,jdbcType=VARCHAR},
+      </if>
+      <if test="carbonVal != null">
+        #{carbonVal,jdbcType=DECIMAL},
+      </if>
+      <if test="status != null">
+        #{status,jdbcType=INTEGER},
+      </if>
+      <if test="type != null">
+        #{type,jdbcType=INTEGER},
+      </if>
+      <if test="tbGuid != null">
+        #{tbGuid,jdbcType=CHAR},
+      </if>
+      <if test="tbName != null">
+        #{tbName,jdbcType=CHAR},
+      </if>
+      <if test="remarks != null">
+        #{remarks,jdbcType=CHAR},
+      </if>
+      <if test="yearTime != null">
+        #{yearTime,jdbcType=INTEGER},
+      </if>
+      <if test="createUser != null">
+        #{createUser,jdbcType=CHAR},
+      </if>
+      <if test="createTime != null">
+        #{createTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="updateUser != null">
+        #{updateUser,jdbcType=CHAR},
+      </if>
+      <if test="updateTime != null">
+        #{updateTime,jdbcType=TIMESTAMP},
+      </if>
+    </trim>
+  </insert>
+  <select id="countByExample" parameterType="com.hcloud.microserver.mbg.modul.TCustomerCarbonValExample" resultType="java.lang.Long">
+    select count(*) from t_customer_carbon_val
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+  </select>
+  <update id="updateByExampleSelective" parameterType="map">
+    update t_customer_carbon_val
+    <set>
+      <if test="record.guid != null">
+        guid = #{record.guid,jdbcType=CHAR},
+      </if>
+      <if test="record.tCustomerId != null">
+        t_customer_id = #{record.tCustomerId,jdbcType=CHAR},
+      </if>
+      <if test="record.tCustomerName != null">
+        t_customer_name = #{record.tCustomerName,jdbcType=VARCHAR},
+      </if>
+      <if test="record.carbonVal != null">
+        carbon_val = #{record.carbonVal,jdbcType=DECIMAL},
+      </if>
+      <if test="record.status != null">
+        status = #{record.status,jdbcType=INTEGER},
+      </if>
+      <if test="record.type != null">
+        type = #{record.type,jdbcType=INTEGER},
+      </if>
+      <if test="record.tbGuid != null">
+        tb_guid = #{record.tbGuid,jdbcType=CHAR},
+      </if>
+      <if test="record.tbName != null">
+        tb_name = #{record.tbName,jdbcType=CHAR},
+      </if>
+      <if test="record.remarks != null">
+        remarks = #{record.remarks,jdbcType=CHAR},
+      </if>
+      <if test="record.yearTime != null">
+        year_time = #{record.yearTime,jdbcType=INTEGER},
+      </if>
+      <if test="record.createUser != null">
+        create_user = #{record.createUser,jdbcType=CHAR},
+      </if>
+      <if test="record.createTime != null">
+        create_time = #{record.createTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="record.updateUser != null">
+        update_user = #{record.updateUser,jdbcType=CHAR},
+      </if>
+      <if test="record.updateTime != null">
+        update_time = #{record.updateTime,jdbcType=TIMESTAMP},
+      </if>
+    </set>
+    <if test="_parameter != null">
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+  </update>
+  <update id="updateByExample" parameterType="map">
+    update t_customer_carbon_val
+    set guid = #{record.guid,jdbcType=CHAR},
+      t_customer_id = #{record.tCustomerId,jdbcType=CHAR},
+      t_customer_name = #{record.tCustomerName,jdbcType=VARCHAR},
+      carbon_val = #{record.carbonVal,jdbcType=DECIMAL},
+      status = #{record.status,jdbcType=INTEGER},
+      type = #{record.type,jdbcType=INTEGER},
+      tb_guid = #{record.tbGuid,jdbcType=CHAR},
+      tb_name = #{record.tbName,jdbcType=CHAR},
+      remarks = #{record.remarks,jdbcType=CHAR},
+      year_time = #{record.yearTime,jdbcType=INTEGER},
+      create_user = #{record.createUser,jdbcType=CHAR},
+      create_time = #{record.createTime,jdbcType=TIMESTAMP},
+      update_user = #{record.updateUser,jdbcType=CHAR},
+      update_time = #{record.updateTime,jdbcType=TIMESTAMP}
+    <if test="_parameter != null">
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+  </update>
+  <update id="updateByPrimaryKeySelective" parameterType="com.hcloud.microserver.mbg.modul.TCustomerCarbonVal">
+    update t_customer_carbon_val
+    <set>
+      <if test="tCustomerId != null">
+        t_customer_id = #{tCustomerId,jdbcType=CHAR},
+      </if>
+      <if test="tCustomerName != null">
+        t_customer_name = #{tCustomerName,jdbcType=VARCHAR},
+      </if>
+      <if test="carbonVal != null">
+        carbon_val = #{carbonVal,jdbcType=DECIMAL},
+      </if>
+      <if test="status != null">
+        status = #{status,jdbcType=INTEGER},
+      </if>
+      <if test="type != null">
+        type = #{type,jdbcType=INTEGER},
+      </if>
+      <if test="tbGuid != null">
+        tb_guid = #{tbGuid,jdbcType=CHAR},
+      </if>
+      <if test="tbName != null">
+        tb_name = #{tbName,jdbcType=CHAR},
+      </if>
+      <if test="remarks != null">
+        remarks = #{remarks,jdbcType=CHAR},
+      </if>
+      <if test="yearTime != null">
+        year_time = #{yearTime,jdbcType=INTEGER},
+      </if>
+      <if test="createUser != null">
+        create_user = #{createUser,jdbcType=CHAR},
+      </if>
+      <if test="createTime != null">
+        create_time = #{createTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="updateUser != null">
+        update_user = #{updateUser,jdbcType=CHAR},
+      </if>
+      <if test="updateTime != null">
+        update_time = #{updateTime,jdbcType=TIMESTAMP},
+      </if>
+    </set>
+    where guid = #{guid,jdbcType=CHAR}
+  </update>
+  <update id="updateByPrimaryKey" parameterType="com.hcloud.microserver.mbg.modul.TCustomerCarbonVal">
+    update t_customer_carbon_val
+    set t_customer_id = #{tCustomerId,jdbcType=CHAR},
+      t_customer_name = #{tCustomerName,jdbcType=VARCHAR},
+      carbon_val = #{carbonVal,jdbcType=DECIMAL},
+      status = #{status,jdbcType=INTEGER},
+      type = #{type,jdbcType=INTEGER},
+      tb_guid = #{tbGuid,jdbcType=CHAR},
+      tb_name = #{tbName,jdbcType=CHAR},
+      remarks = #{remarks,jdbcType=CHAR},
+      year_time = #{yearTime,jdbcType=INTEGER},
+      create_user = #{createUser,jdbcType=CHAR},
+      create_time = #{createTime,jdbcType=TIMESTAMP},
+      update_user = #{updateUser,jdbcType=CHAR},
+      update_time = #{updateTime,jdbcType=TIMESTAMP}
+    where guid = #{guid,jdbcType=CHAR}
+  </update>
+</mapper>

carbon-api-mbg/src/main/resources/com/hcloud/microserver/mbg/mapper/TFarmerInfoMapper.xml

@@ -0,0 +1,591 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.hcloud.microserver.mbg.mapper.TFarmerInfoMapper">
+  <resultMap id="BaseResultMap" type="com.hcloud.microserver.mbg.modul.TFarmerInfo">
+    <id column="guid" jdbcType="CHAR" property="guid" />
+    <result column="fk_poverty_area_id" jdbcType="CHAR" property="fkPovertyAreaId" />
+    <result column="fk_collective_id" jdbcType="CHAR" property="fkCollectiveId" />
+    <result column="farmer_code" jdbcType="VARCHAR" property="farmerCode" />
+    <result column="farmer_name" jdbcType="VARCHAR" property="farmerName" />
+    <result column="family_num" jdbcType="INTEGER" property="familyNum" />
+    <result column="sex" jdbcType="INTEGER" property="sex" />
+    <result column="pid" jdbcType="CHAR" property="pid" />
+    <result column="nation" jdbcType="VARCHAR" property="nation" />
+    <result column="education" jdbcType="VARCHAR" property="education" />
+    <result column="phone" jdbcType="VARCHAR" property="phone" />
+    <result column="bank_card_no" jdbcType="VARCHAR" property="bankCardNo" />
+    <result column="income_val" jdbcType="DECIMAL" property="incomeVal" />
+    <result column="farmer_type" jdbcType="VARCHAR" property="farmerType" />
+    <result column="farmer_remark" jdbcType="VARCHAR" property="farmerRemark" />
+    <result column="farmer_images" jdbcType="VARCHAR" property="farmerImages" />
+    <result column="village_org" jdbcType="CHAR" property="villageOrg" />
+    <result column="is_enable" jdbcType="INTEGER" property="isEnable" />
+    <result column="state" jdbcType="INTEGER" property="state" />
+    <result column="create_user" jdbcType="CHAR" property="createUser" />
+    <result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
+    <result column="modified_user" jdbcType="CHAR" property="modifiedUser" />
+    <result column="modified_time" jdbcType="TIMESTAMP" property="modifiedTime" />
+    <result column="bank_clearing_msg" jdbcType="VARCHAR" property="bankClearingMsg" />
+    <result column="recieve_money" jdbcType="DECIMAL" property="recieveMoney" />
+    <result column="actual_money" jdbcType="DECIMAL" property="actualMoney" />
+    <result column="bank_name" jdbcType="VARCHAR" property="bankName" />
+    <result column="bank_status" jdbcType="INTEGER" property="bankStatus" />
+    <result column="bank_code" jdbcType="VARCHAR" property="bankCode" />
+  </resultMap>
+  <sql id="Example_Where_Clause">
+    <where>
+      <foreach collection="oredCriteria" item="criteria" separator="or">
+        <if test="criteria.valid">
+          <trim prefix="(" prefixOverrides="and" suffix=")">
+            <foreach collection="criteria.criteria" item="criterion">
+              <choose>
+                <when test="criterion.noValue">
+                  and ${criterion.condition}
+                </when>
+                <when test="criterion.singleValue">
+                  and ${criterion.condition} #{criterion.value}
+                </when>
+                <when test="criterion.betweenValue">
+                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
+                </when>
+                <when test="criterion.listValue">
+                  and ${criterion.condition}
+                  <foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
+                    #{listItem}
+                  </foreach>
+                </when>
+              </choose>
+            </foreach>
+          </trim>
+        </if>
+      </foreach>
+    </where>
+  </sql>
+  <sql id="Update_By_Example_Where_Clause">
+    <where>
+      <foreach collection="example.oredCriteria" item="criteria" separator="or">
+        <if test="criteria.valid">
+          <trim prefix="(" prefixOverrides="and" suffix=")">
+            <foreach collection="criteria.criteria" item="criterion">
+              <choose>
+                <when test="criterion.noValue">
+                  and ${criterion.condition}
+                </when>
+                <when test="criterion.singleValue">
+                  and ${criterion.condition} #{criterion.value}
+                </when>
+                <when test="criterion.betweenValue">
+                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
+                </when>
+                <when test="criterion.listValue">
+                  and ${criterion.condition}
+                  <foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
+                    #{listItem}
+                  </foreach>
+                </when>
+              </choose>
+            </foreach>
+          </trim>
+        </if>
+      </foreach>
+    </where>
+  </sql>
+  <sql id="Base_Column_List">
+    guid, fk_poverty_area_id, fk_collective_id, farmer_code, farmer_name, family_num, 
+    sex, pid, nation, education, phone, bank_card_no, income_val, farmer_type, farmer_remark, 
+    farmer_images, village_org, is_enable, state, create_user, create_time, modified_user, 
+    modified_time, bank_clearing_msg, recieve_money, actual_money, bank_name, bank_status, 
+    bank_code
+  </sql>
+  <select id="selectByExample" parameterType="com.hcloud.microserver.mbg.modul.TFarmerInfoExample" resultMap="BaseResultMap">
+    select
+    <if test="distinct">
+      distinct
+    </if>
+    <include refid="Base_Column_List" />
+    from t_farmer_info
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+    <if test="orderByClause != null">
+      order by ${orderByClause}
+    </if>
+  </select>
+  <select id="selectByPrimaryKey" parameterType="java.lang.String" resultMap="BaseResultMap">
+    select 
+    <include refid="Base_Column_List" />
+    from t_farmer_info
+    where guid = #{guid,jdbcType=CHAR}
+  </select>
+  <delete id="deleteByPrimaryKey" parameterType="java.lang.String">
+    delete from t_farmer_info
+    where guid = #{guid,jdbcType=CHAR}
+  </delete>
+  <delete id="deleteByExample" parameterType="com.hcloud.microserver.mbg.modul.TFarmerInfoExample">
+    delete from t_farmer_info
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+  </delete>
+  <insert id="insert" parameterType="com.hcloud.microserver.mbg.modul.TFarmerInfo">
+    insert into t_farmer_info (guid, fk_poverty_area_id, fk_collective_id, 
+      farmer_code, farmer_name, family_num, 
+      sex, pid, nation, education, 
+      phone, bank_card_no, income_val, 
+      farmer_type, farmer_remark, farmer_images, 
+      village_org, is_enable, state, 
+      create_user, create_time, modified_user, 
+      modified_time, bank_clearing_msg, recieve_money, 
+      actual_money, bank_name, bank_status, 
+      bank_code)
+    values (#{guid,jdbcType=CHAR}, #{fkPovertyAreaId,jdbcType=CHAR}, #{fkCollectiveId,jdbcType=CHAR}, 
+      #{farmerCode,jdbcType=VARCHAR}, #{farmerName,jdbcType=VARCHAR}, #{familyNum,jdbcType=INTEGER}, 
+      #{sex,jdbcType=INTEGER}, #{pid,jdbcType=CHAR}, #{nation,jdbcType=VARCHAR}, #{education,jdbcType=VARCHAR}, 
+      #{phone,jdbcType=VARCHAR}, #{bankCardNo,jdbcType=VARCHAR}, #{incomeVal,jdbcType=DECIMAL}, 
+      #{farmerType,jdbcType=VARCHAR}, #{farmerRemark,jdbcType=VARCHAR}, #{farmerImages,jdbcType=VARCHAR}, 
+      #{villageOrg,jdbcType=CHAR}, #{isEnable,jdbcType=INTEGER}, #{state,jdbcType=INTEGER}, 
+      #{createUser,jdbcType=CHAR}, #{createTime,jdbcType=TIMESTAMP}, #{modifiedUser,jdbcType=CHAR}, 
+      #{modifiedTime,jdbcType=TIMESTAMP}, #{bankClearingMsg,jdbcType=VARCHAR}, #{recieveMoney,jdbcType=DECIMAL}, 
+      #{actualMoney,jdbcType=DECIMAL}, #{bankName,jdbcType=VARCHAR}, #{bankStatus,jdbcType=INTEGER}, 
+      #{bankCode,jdbcType=VARCHAR})
+  </insert>
+  <insert id="insertSelective" parameterType="com.hcloud.microserver.mbg.modul.TFarmerInfo">
+    insert into t_farmer_info
+    <trim prefix="(" suffix=")" suffixOverrides=",">
+      <if test="guid != null">
+        guid,
+      </if>
+      <if test="fkPovertyAreaId != null">
+        fk_poverty_area_id,
+      </if>
+      <if test="fkCollectiveId != null">
+        fk_collective_id,
+      </if>
+      <if test="farmerCode != null">
+        farmer_code,
+      </if>
+      <if test="farmerName != null">
+        farmer_name,
+      </if>
+      <if test="familyNum != null">
+        family_num,
+      </if>
+      <if test="sex != null">
+        sex,
+      </if>
+      <if test="pid != null">
+        pid,
+      </if>
+      <if test="nation != null">
+        nation,
+      </if>
+      <if test="education != null">
+        education,
+      </if>
+      <if test="phone != null">
+        phone,
+      </if>
+      <if test="bankCardNo != null">
+        bank_card_no,
+      </if>
+      <if test="incomeVal != null">
+        income_val,
+      </if>
+      <if test="farmerType != null">
+        farmer_type,
+      </if>
+      <if test="farmerRemark != null">
+        farmer_remark,
+      </if>
+      <if test="farmerImages != null">
+        farmer_images,
+      </if>
+      <if test="villageOrg != null">
+        village_org,
+      </if>
+      <if test="isEnable != null">
+        is_enable,
+      </if>
+      <if test="state != null">
+        state,
+      </if>
+      <if test="createUser != null">
+        create_user,
+      </if>
+      <if test="createTime != null">
+        create_time,
+      </if>
+      <if test="modifiedUser != null">
+        modified_user,
+      </if>
+      <if test="modifiedTime != null">
+        modified_time,
+      </if>
+      <if test="bankClearingMsg != null">
+        bank_clearing_msg,
+      </if>
+      <if test="recieveMoney != null">
+        recieve_money,
+      </if>
+      <if test="actualMoney != null">
+        actual_money,
+      </if>
+      <if test="bankName != null">
+        bank_name,
+      </if>
+      <if test="bankStatus != null">
+        bank_status,
+      </if>
+      <if test="bankCode != null">
+        bank_code,
+      </if>
+    </trim>
+    <trim prefix="values (" suffix=")" suffixOverrides=",">
+      <if test="guid != null">
+        #{guid,jdbcType=CHAR},
+      </if>
+      <if test="fkPovertyAreaId != null">
+        #{fkPovertyAreaId,jdbcType=CHAR},
+      </if>
+      <if test="fkCollectiveId != null">
+        #{fkCollectiveId,jdbcType=CHAR},
+      </if>
+      <if test="farmerCode != null">
+        #{farmerCode,jdbcType=VARCHAR},
+      </if>
+      <if test="farmerName != null">
+        #{farmerName,jdbcType=VARCHAR},
+      </if>
+      <if test="familyNum != null">
+        #{familyNum,jdbcType=INTEGER},
+      </if>
+      <if test="sex != null">
+        #{sex,jdbcType=INTEGER},
+      </if>
+      <if test="pid != null">
+        #{pid,jdbcType=CHAR},
+      </if>
+      <if test="nation != null">
+        #{nation,jdbcType=VARCHAR},
+      </if>
+      <if test="education != null">
+        #{education,jdbcType=VARCHAR},
+      </if>
+      <if test="phone != null">
+        #{phone,jdbcType=VARCHAR},
+      </if>
+      <if test="bankCardNo != null">
+        #{bankCardNo,jdbcType=VARCHAR},
+      </if>
+      <if test="incomeVal != null">
+        #{incomeVal,jdbcType=DECIMAL},
+      </if>
+      <if test="farmerType != null">
+        #{farmerType,jdbcType=VARCHAR},
+      </if>
+      <if test="farmerRemark != null">
+        #{farmerRemark,jdbcType=VARCHAR},
+      </if>
+      <if test="farmerImages != null">
+        #{farmerImages,jdbcType=VARCHAR},
+      </if>
+      <if test="villageOrg != null">
+        #{villageOrg,jdbcType=CHAR},
+      </if>
+      <if test="isEnable != null">
+        #{isEnable,jdbcType=INTEGER},
+      </if>
+      <if test="state != null">
+        #{state,jdbcType=INTEGER},
+      </if>
+      <if test="createUser != null">
+        #{createUser,jdbcType=CHAR},
+      </if>
+      <if test="createTime != null">
+        #{createTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="modifiedUser != null">
+        #{modifiedUser,jdbcType=CHAR},
+      </if>
+      <if test="modifiedTime != null">
+        #{modifiedTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="bankClearingMsg != null">
+        #{bankClearingMsg,jdbcType=VARCHAR},
+      </if>
+      <if test="recieveMoney != null">
+        #{recieveMoney,jdbcType=DECIMAL},
+      </if>
+      <if test="actualMoney != null">
+        #{actualMoney,jdbcType=DECIMAL},
+      </if>
+      <if test="bankName != null">
+        #{bankName,jdbcType=VARCHAR},
+      </if>
+      <if test="bankStatus != null">
+        #{bankStatus,jdbcType=INTEGER},
+      </if>
+      <if test="bankCode != null">
+        #{bankCode,jdbcType=VARCHAR},
+      </if>
+    </trim>
+  </insert>
+  <select id="countByExample" parameterType="com.hcloud.microserver.mbg.modul.TFarmerInfoExample" resultType="java.lang.Long">
+    select count(*) from t_farmer_info
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+  </select>
+  <update id="updateByExampleSelective" parameterType="map">
+    update t_farmer_info
+    <set>
+      <if test="record.guid != null">
+        guid = #{record.guid,jdbcType=CHAR},
+      </if>
+      <if test="record.fkPovertyAreaId != null">
+        fk_poverty_area_id = #{record.fkPovertyAreaId,jdbcType=CHAR},
+      </if>
+      <if test="record.fkCollectiveId != null">
+        fk_collective_id = #{record.fkCollectiveId,jdbcType=CHAR},
+      </if>
+      <if test="record.farmerCode != null">
+        farmer_code = #{record.farmerCode,jdbcType=VARCHAR},
+      </if>
+      <if test="record.farmerName != null">
+        farmer_name = #{record.farmerName,jdbcType=VARCHAR},
+      </if>
+      <if test="record.familyNum != null">
+        family_num = #{record.familyNum,jdbcType=INTEGER},
+      </if>
+      <if test="record.sex != null">
+        sex = #{record.sex,jdbcType=INTEGER},
+      </if>
+      <if test="record.pid != null">
+        pid = #{record.pid,jdbcType=CHAR},
+      </if>
+      <if test="record.nation != null">
+        nation = #{record.nation,jdbcType=VARCHAR},
+      </if>
+      <if test="record.education != null">
+        education = #{record.education,jdbcType=VARCHAR},
+      </if>
+      <if test="record.phone != null">
+        phone = #{record.phone,jdbcType=VARCHAR},
+      </if>
+      <if test="record.bankCardNo != null">
+        bank_card_no = #{record.bankCardNo,jdbcType=VARCHAR},
+      </if>
+      <if test="record.incomeVal != null">
+        income_val = #{record.incomeVal,jdbcType=DECIMAL},
+      </if>
+      <if test="record.farmerType != null">
+        farmer_type = #{record.farmerType,jdbcType=VARCHAR},
+      </if>
+      <if test="record.farmerRemark != null">
+        farmer_remark = #{record.farmerRemark,jdbcType=VARCHAR},
+      </if>
+      <if test="record.farmerImages != null">
+        farmer_images = #{record.farmerImages,jdbcType=VARCHAR},
+      </if>
+      <if test="record.villageOrg != null">
+        village_org = #{record.villageOrg,jdbcType=CHAR},
+      </if>
+      <if test="record.isEnable != null">
+        is_enable = #{record.isEnable,jdbcType=INTEGER},
+      </if>
+      <if test="record.state != null">
+        state = #{record.state,jdbcType=INTEGER},
+      </if>
+      <if test="record.createUser != null">
+        create_user = #{record.createUser,jdbcType=CHAR},
+      </if>
+      <if test="record.createTime != null">
+        create_time = #{record.createTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="record.modifiedUser != null">
+        modified_user = #{record.modifiedUser,jdbcType=CHAR},
+      </if>
+      <if test="record.modifiedTime != null">
+        modified_time = #{record.modifiedTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="record.bankClearingMsg != null">
+        bank_clearing_msg = #{record.bankClearingMsg,jdbcType=VARCHAR},
+      </if>
+      <if test="record.recieveMoney != null">
+        recieve_money = #{record.recieveMoney,jdbcType=DECIMAL},
+      </if>
+      <if test="record.actualMoney != null">
+        actual_money = #{record.actualMoney,jdbcType=DECIMAL},
+      </if>
+      <if test="record.bankName != null">
+        bank_name = #{record.bankName,jdbcType=VARCHAR},
+      </if>
+      <if test="record.bankStatus != null">
+        bank_status = #{record.bankStatus,jdbcType=INTEGER},
+      </if>
+      <if test="record.bankCode != null">
+        bank_code = #{record.bankCode,jdbcType=VARCHAR},
+      </if>
+    </set>
+    <if test="_parameter != null">
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+  </update>
+  <update id="updateByExample" parameterType="map">
+    update t_farmer_info
+    set guid = #{record.guid,jdbcType=CHAR},
+      fk_poverty_area_id = #{record.fkPovertyAreaId,jdbcType=CHAR},
+      fk_collective_id = #{record.fkCollectiveId,jdbcType=CHAR},
+      farmer_code = #{record.farmerCode,jdbcType=VARCHAR},
+      farmer_name = #{record.farmerName,jdbcType=VARCHAR},
+      family_num = #{record.familyNum,jdbcType=INTEGER},
+      sex = #{record.sex,jdbcType=INTEGER},
+      pid = #{record.pid,jdbcType=CHAR},
+      nation = #{record.nation,jdbcType=VARCHAR},
+      education = #{record.education,jdbcType=VARCHAR},
+      phone = #{record.phone,jdbcType=VARCHAR},
+      bank_card_no = #{record.bankCardNo,jdbcType=VARCHAR},
+      income_val = #{record.incomeVal,jdbcType=DECIMAL},
+      farmer_type = #{record.farmerType,jdbcType=VARCHAR},
+      farmer_remark = #{record.farmerRemark,jdbcType=VARCHAR},
+      farmer_images = #{record.farmerImages,jdbcType=VARCHAR},
+      village_org = #{record.villageOrg,jdbcType=CHAR},
+      is_enable = #{record.isEnable,jdbcType=INTEGER},
+      state = #{record.state,jdbcType=INTEGER},
+      create_user = #{record.createUser,jdbcType=CHAR},
+      create_time = #{record.createTime,jdbcType=TIMESTAMP},
+      modified_user = #{record.modifiedUser,jdbcType=CHAR},
+      modified_time = #{record.modifiedTime,jdbcType=TIMESTAMP},
+      bank_clearing_msg = #{record.bankClearingMsg,jdbcType=VARCHAR},
+      recieve_money = #{record.recieveMoney,jdbcType=DECIMAL},
+      actual_money = #{record.actualMoney,jdbcType=DECIMAL},
+      bank_name = #{record.bankName,jdbcType=VARCHAR},
+      bank_status = #{record.bankStatus,jdbcType=INTEGER},
+      bank_code = #{record.bankCode,jdbcType=VARCHAR}
+    <if test="_parameter != null">
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+  </update>
+  <update id="updateByPrimaryKeySelective" parameterType="com.hcloud.microserver.mbg.modul.TFarmerInfo">
+    update t_farmer_info
+    <set>
+      <if test="fkPovertyAreaId != null">
+        fk_poverty_area_id = #{fkPovertyAreaId,jdbcType=CHAR},
+      </if>
+      <if test="fkCollectiveId != null">
+        fk_collective_id = #{fkCollectiveId,jdbcType=CHAR},
+      </if>
+      <if test="farmerCode != null">
+        farmer_code = #{farmerCode,jdbcType=VARCHAR},
+      </if>
+      <if test="farmerName != null">
+        farmer_name = #{farmerName,jdbcType=VARCHAR},
+      </if>
+      <if test="familyNum != null">
+        family_num = #{familyNum,jdbcType=INTEGER},
+      </if>
+      <if test="sex != null">
+        sex = #{sex,jdbcType=INTEGER},
+      </if>
+      <if test="pid != null">
+        pid = #{pid,jdbcType=CHAR},
+      </if>
+      <if test="nation != null">
+        nation = #{nation,jdbcType=VARCHAR},
+      </if>
+      <if test="education != null">
+        education = #{education,jdbcType=VARCHAR},
+      </if>
+      <if test="phone != null">
+        phone = #{phone,jdbcType=VARCHAR},
+      </if>
+      <if test="bankCardNo != null">
+        bank_card_no = #{bankCardNo,jdbcType=VARCHAR},
+      </if>
+      <if test="incomeVal != null">
+        income_val = #{incomeVal,jdbcType=DECIMAL},
+      </if>
+      <if test="farmerType != null">
+        farmer_type = #{farmerType,jdbcType=VARCHAR},
+      </if>
+      <if test="farmerRemark != null">
+        farmer_remark = #{farmerRemark,jdbcType=VARCHAR},
+      </if>
+      <if test="farmerImages != null">
+        farmer_images = #{farmerImages,jdbcType=VARCHAR},
+      </if>
+      <if test="villageOrg != null">
+        village_org = #{villageOrg,jdbcType=CHAR},
+      </if>
+      <if test="isEnable != null">
+        is_enable = #{isEnable,jdbcType=INTEGER},
+      </if>
+      <if test="state != null">
+        state = #{state,jdbcType=INTEGER},
+      </if>
+      <if test="createUser != null">
+        create_user = #{createUser,jdbcType=CHAR},
+      </if>
+      <if test="createTime != null">
+        create_time = #{createTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="modifiedUser != null">
+        modified_user = #{modifiedUser,jdbcType=CHAR},
+      </if>
+      <if test="modifiedTime != null">
+        modified_time = #{modifiedTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="bankClearingMsg != null">
+        bank_clearing_msg = #{bankClearingMsg,jdbcType=VARCHAR},
+      </if>
+      <if test="recieveMoney != null">
+        recieve_money = #{recieveMoney,jdbcType=DECIMAL},
+      </if>
+      <if test="actualMoney != null">
+        actual_money = #{actualMoney,jdbcType=DECIMAL},
+      </if>
+      <if test="bankName != null">
+        bank_name = #{bankName,jdbcType=VARCHAR},
+      </if>
+      <if test="bankStatus != null">
+        bank_status = #{bankStatus,jdbcType=INTEGER},
+      </if>
+      <if test="bankCode != null">
+        bank_code = #{bankCode,jdbcType=VARCHAR},
+      </if>
+    </set>
+    where guid = #{guid,jdbcType=CHAR}
+  </update>
+  <update id="updateByPrimaryKey" parameterType="com.hcloud.microserver.mbg.modul.TFarmerInfo">
+    update t_farmer_info
+    set fk_poverty_area_id = #{fkPovertyAreaId,jdbcType=CHAR},
+      fk_collective_id = #{fkCollectiveId,jdbcType=CHAR},
+      farmer_code = #{farmerCode,jdbcType=VARCHAR},
+      farmer_name = #{farmerName,jdbcType=VARCHAR},
+      family_num = #{familyNum,jdbcType=INTEGER},
+      sex = #{sex,jdbcType=INTEGER},
+      pid = #{pid,jdbcType=CHAR},
+      nation = #{nation,jdbcType=VARCHAR},
+      education = #{education,jdbcType=VARCHAR},
+      phone = #{phone,jdbcType=VARCHAR},
+      bank_card_no = #{bankCardNo,jdbcType=VARCHAR},
+      income_val = #{incomeVal,jdbcType=DECIMAL},
+      farmer_type = #{farmerType,jdbcType=VARCHAR},
+      farmer_remark = #{farmerRemark,jdbcType=VARCHAR},
+      farmer_images = #{farmerImages,jdbcType=VARCHAR},
+      village_org = #{villageOrg,jdbcType=CHAR},
+      is_enable = #{isEnable,jdbcType=INTEGER},
+      state = #{state,jdbcType=INTEGER},
+      create_user = #{createUser,jdbcType=CHAR},
+      create_time = #{createTime,jdbcType=TIMESTAMP},
+      modified_user = #{modifiedUser,jdbcType=CHAR},
+      modified_time = #{modifiedTime,jdbcType=TIMESTAMP},
+      bank_clearing_msg = #{bankClearingMsg,jdbcType=VARCHAR},
+      recieve_money = #{recieveMoney,jdbcType=DECIMAL},
+      actual_money = #{actualMoney,jdbcType=DECIMAL},
+      bank_name = #{bankName,jdbcType=VARCHAR},
+      bank_status = #{bankStatus,jdbcType=INTEGER},
+      bank_code = #{bankCode,jdbcType=VARCHAR}
+    where guid = #{guid,jdbcType=CHAR}
+  </update>
+</mapper>

carbon-api-mbg/src/main/resources/com/hcloud/microserver/mbg/mapper/TGoodsInfoMapper.xml

@@ -0,0 +1,386 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.hcloud.microserver.mbg.mapper.TGoodsInfoMapper">
+  <resultMap id="BaseResultMap" type="com.hcloud.microserver.mbg.modul.TGoodsInfo">
+    <id column="guid" jdbcType="CHAR" property="guid" />
+    <result column="goods_type" jdbcType="CHAR" property="goodsType" />
+    <result column="goods_code" jdbcType="VARCHAR" property="goodsCode" />
+    <result column="goods_name" jdbcType="VARCHAR" property="goodsName" />
+    <result column="carbon_val" jdbcType="DECIMAL" property="carbonVal" />
+    <result column="price" jdbcType="DECIMAL" property="price" />
+    <result column="goods_desc" jdbcType="VARCHAR" property="goodsDesc" />
+    <result column="goods_images" jdbcType="VARCHAR" property="goodsImages" />
+    <result column="goods_sale_date" jdbcType="DATE" property="goodsSaleDate" />
+    <result column="is_sale" jdbcType="INTEGER" property="isSale" />
+    <result column="state" jdbcType="INTEGER" property="state" />
+    <result column="create_user" jdbcType="CHAR" property="createUser" />
+    <result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
+    <result column="modified_user" jdbcType="CHAR" property="modifiedUser" />
+    <result column="modified_time" jdbcType="TIMESTAMP" property="modifiedTime" />
+    <result column="goods_use" jdbcType="CHAR" property="goodsUse" />
+  </resultMap>
+  <sql id="Example_Where_Clause">
+    <where>
+      <foreach collection="oredCriteria" item="criteria" separator="or">
+        <if test="criteria.valid">
+          <trim prefix="(" prefixOverrides="and" suffix=")">
+            <foreach collection="criteria.criteria" item="criterion">
+              <choose>
+                <when test="criterion.noValue">
+                  and ${criterion.condition}
+                </when>
+                <when test="criterion.singleValue">
+                  and ${criterion.condition} #{criterion.value}
+                </when>
+                <when test="criterion.betweenValue">
+                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
+                </when>
+                <when test="criterion.listValue">
+                  and ${criterion.condition}
+                  <foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
+                    #{listItem}
+                  </foreach>
+                </when>
+              </choose>
+            </foreach>
+          </trim>
+        </if>
+      </foreach>
+    </where>
+  </sql>
+  <sql id="Update_By_Example_Where_Clause">
+    <where>
+      <foreach collection="example.oredCriteria" item="criteria" separator="or">
+        <if test="criteria.valid">
+          <trim prefix="(" prefixOverrides="and" suffix=")">
+            <foreach collection="criteria.criteria" item="criterion">
+              <choose>
+                <when test="criterion.noValue">
+                  and ${criterion.condition}
+                </when>
+                <when test="criterion.singleValue">
+                  and ${criterion.condition} #{criterion.value}
+                </when>
+                <when test="criterion.betweenValue">
+                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
+                </when>
+                <when test="criterion.listValue">
+                  and ${criterion.condition}
+                  <foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
+                    #{listItem}
+                  </foreach>
+                </when>
+              </choose>
+            </foreach>
+          </trim>
+        </if>
+      </foreach>
+    </where>
+  </sql>
+  <sql id="Base_Column_List">
+    guid, goods_type, goods_code, goods_name, carbon_val, price, goods_desc, goods_images, 
+    goods_sale_date, is_sale, state, create_user, create_time, modified_user, modified_time, 
+    goods_use
+  </sql>
+  <select id="selectByExample" parameterType="com.hcloud.microserver.mbg.modul.TGoodsInfoExample" resultMap="BaseResultMap">
+    select
+    <if test="distinct">
+      distinct
+    </if>
+    <include refid="Base_Column_List" />
+    from t_goods_info
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+    <if test="orderByClause != null">
+      order by ${orderByClause}
+    </if>
+  </select>
+  <select id="selectByPrimaryKey" parameterType="java.lang.String" resultMap="BaseResultMap">
+    select 
+    <include refid="Base_Column_List" />
+    from t_goods_info
+    where guid = #{guid,jdbcType=CHAR}
+  </select>
+  <delete id="deleteByPrimaryKey" parameterType="java.lang.String">
+    delete from t_goods_info
+    where guid = #{guid,jdbcType=CHAR}
+  </delete>
+  <delete id="deleteByExample" parameterType="com.hcloud.microserver.mbg.modul.TGoodsInfoExample">
+    delete from t_goods_info
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+  </delete>
+  <insert id="insert" parameterType="com.hcloud.microserver.mbg.modul.TGoodsInfo">
+    insert into t_goods_info (guid, goods_type, goods_code, 
+      goods_name, carbon_val, price, 
+      goods_desc, goods_images, goods_sale_date, 
+      is_sale, state, create_user, 
+      create_time, modified_user, modified_time, 
+      goods_use)
+    values (#{guid,jdbcType=CHAR}, #{goodsType,jdbcType=CHAR}, #{goodsCode,jdbcType=VARCHAR}, 
+      #{goodsName,jdbcType=VARCHAR}, #{carbonVal,jdbcType=DECIMAL}, #{price,jdbcType=DECIMAL}, 
+      #{goodsDesc,jdbcType=VARCHAR}, #{goodsImages,jdbcType=VARCHAR}, #{goodsSaleDate,jdbcType=DATE}, 
+      #{isSale,jdbcType=INTEGER}, #{state,jdbcType=INTEGER}, #{createUser,jdbcType=CHAR}, 
+      #{createTime,jdbcType=TIMESTAMP}, #{modifiedUser,jdbcType=CHAR}, #{modifiedTime,jdbcType=TIMESTAMP}, 
+      #{goodsUse,jdbcType=CHAR})
+  </insert>
+  <insert id="insertSelective" parameterType="com.hcloud.microserver.mbg.modul.TGoodsInfo">
+    insert into t_goods_info
+    <trim prefix="(" suffix=")" suffixOverrides=",">
+      <if test="guid != null">
+        guid,
+      </if>
+      <if test="goodsType != null">
+        goods_type,
+      </if>
+      <if test="goodsCode != null">
+        goods_code,
+      </if>
+      <if test="goodsName != null">
+        goods_name,
+      </if>
+      <if test="carbonVal != null">
+        carbon_val,
+      </if>
+      <if test="price != null">
+        price,
+      </if>
+      <if test="goodsDesc != null">
+        goods_desc,
+      </if>
+      <if test="goodsImages != null">
+        goods_images,
+      </if>
+      <if test="goodsSaleDate != null">
+        goods_sale_date,
+      </if>
+      <if test="isSale != null">
+        is_sale,
+      </if>
+      <if test="state != null">
+        state,
+      </if>
+      <if test="createUser != null">
+        create_user,
+      </if>
+      <if test="createTime != null">
+        create_time,
+      </if>
+      <if test="modifiedUser != null">
+        modified_user,
+      </if>
+      <if test="modifiedTime != null">
+        modified_time,
+      </if>
+      <if test="goodsUse != null">
+        goods_use,
+      </if>
+    </trim>
+    <trim prefix="values (" suffix=")" suffixOverrides=",">
+      <if test="guid != null">
+        #{guid,jdbcType=CHAR},
+      </if>
+      <if test="goodsType != null">
+        #{goodsType,jdbcType=CHAR},
+      </if>
+      <if test="goodsCode != null">
+        #{goodsCode,jdbcType=VARCHAR},
+      </if>
+      <if test="goodsName != null">
+        #{goodsName,jdbcType=VARCHAR},
+      </if>
+      <if test="carbonVal != null">
+        #{carbonVal,jdbcType=DECIMAL},
+      </if>
+      <if test="price != null">
+        #{price,jdbcType=DECIMAL},
+      </if>
+      <if test="goodsDesc != null">
+        #{goodsDesc,jdbcType=VARCHAR},
+      </if>
+      <if test="goodsImages != null">
+        #{goodsImages,jdbcType=VARCHAR},
+      </if>
+      <if test="goodsSaleDate != null">
+        #{goodsSaleDate,jdbcType=DATE},
+      </if>
+      <if test="isSale != null">
+        #{isSale,jdbcType=INTEGER},
+      </if>
+      <if test="state != null">
+        #{state,jdbcType=INTEGER},
+      </if>
+      <if test="createUser != null">
+        #{createUser,jdbcType=CHAR},
+      </if>
+      <if test="createTime != null">
+        #{createTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="modifiedUser != null">
+        #{modifiedUser,jdbcType=CHAR},
+      </if>
+      <if test="modifiedTime != null">
+        #{modifiedTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="goodsUse != null">
+        #{goodsUse,jdbcType=CHAR},
+      </if>
+    </trim>
+  </insert>
+  <select id="countByExample" parameterType="com.hcloud.microserver.mbg.modul.TGoodsInfoExample" resultType="java.lang.Long">
+    select count(*) from t_goods_info
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+  </select>
+  <update id="updateByExampleSelective" parameterType="map">
+    update t_goods_info
+    <set>
+      <if test="record.guid != null">
+        guid = #{record.guid,jdbcType=CHAR},
+      </if>
+      <if test="record.goodsType != null">
+        goods_type = #{record.goodsType,jdbcType=CHAR},
+      </if>
+      <if test="record.goodsCode != null">
+        goods_code = #{record.goodsCode,jdbcType=VARCHAR},
+      </if>
+      <if test="record.goodsName != null">
+        goods_name = #{record.goodsName,jdbcType=VARCHAR},
+      </if>
+      <if test="record.carbonVal != null">
+        carbon_val = #{record.carbonVal,jdbcType=DECIMAL},
+      </if>
+      <if test="record.price != null">
+        price = #{record.price,jdbcType=DECIMAL},
+      </if>
+      <if test="record.goodsDesc != null">
+        goods_desc = #{record.goodsDesc,jdbcType=VARCHAR},
+      </if>
+      <if test="record.goodsImages != null">
+        goods_images = #{record.goodsImages,jdbcType=VARCHAR},
+      </if>
+      <if test="record.goodsSaleDate != null">
+        goods_sale_date = #{record.goodsSaleDate,jdbcType=DATE},
+      </if>
+      <if test="record.isSale != null">
+        is_sale = #{record.isSale,jdbcType=INTEGER},
+      </if>
+      <if test="record.state != null">
+        state = #{record.state,jdbcType=INTEGER},
+      </if>
+      <if test="record.createUser != null">
+        create_user = #{record.createUser,jdbcType=CHAR},
+      </if>
+      <if test="record.createTime != null">
+        create_time = #{record.createTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="record.modifiedUser != null">
+        modified_user = #{record.modifiedUser,jdbcType=CHAR},
+      </if>
+      <if test="record.modifiedTime != null">
+        modified_time = #{record.modifiedTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="record.goodsUse != null">
+        goods_use = #{record.goodsUse,jdbcType=CHAR},
+      </if>
+    </set>
+    <if test="_parameter != null">
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+  </update>
+  <update id="updateByExample" parameterType="map">
+    update t_goods_info
+    set guid = #{record.guid,jdbcType=CHAR},
+      goods_type = #{record.goodsType,jdbcType=CHAR},
+      goods_code = #{record.goodsCode,jdbcType=VARCHAR},
+      goods_name = #{record.goodsName,jdbcType=VARCHAR},
+      carbon_val = #{record.carbonVal,jdbcType=DECIMAL},
+      price = #{record.price,jdbcType=DECIMAL},
+      goods_desc = #{record.goodsDesc,jdbcType=VARCHAR},
+      goods_images = #{record.goodsImages,jdbcType=VARCHAR},
+      goods_sale_date = #{record.goodsSaleDate,jdbcType=DATE},
+      is_sale = #{record.isSale,jdbcType=INTEGER},
+      state = #{record.state,jdbcType=INTEGER},
+      create_user = #{record.createUser,jdbcType=CHAR},
+      create_time = #{record.createTime,jdbcType=TIMESTAMP},
+      modified_user = #{record.modifiedUser,jdbcType=CHAR},
+      modified_time = #{record.modifiedTime,jdbcType=TIMESTAMP},
+      goods_use = #{record.goodsUse,jdbcType=CHAR}
+    <if test="_parameter != null">
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+  </update>
+  <update id="updateByPrimaryKeySelective" parameterType="com.hcloud.microserver.mbg.modul.TGoodsInfo">
+    update t_goods_info
+    <set>
+      <if test="goodsType != null">
+        goods_type = #{goodsType,jdbcType=CHAR},
+      </if>
+      <if test="goodsCode != null">
+        goods_code = #{goodsCode,jdbcType=VARCHAR},
+      </if>
+      <if test="goodsName != null">
+        goods_name = #{goodsName,jdbcType=VARCHAR},
+      </if>
+      <if test="carbonVal != null">
+        carbon_val = #{carbonVal,jdbcType=DECIMAL},
+      </if>
+      <if test="price != null">
+        price = #{price,jdbcType=DECIMAL},
+      </if>
+      <if test="goodsDesc != null">
+        goods_desc = #{goodsDesc,jdbcType=VARCHAR},
+      </if>
+      <if test="goodsImages != null">
+        goods_images = #{goodsImages,jdbcType=VARCHAR},
+      </if>
+      <if test="goodsSaleDate != null">
+        goods_sale_date = #{goodsSaleDate,jdbcType=DATE},
+      </if>
+      <if test="isSale != null">
+        is_sale = #{isSale,jdbcType=INTEGER},
+      </if>
+      <if test="state != null">
+        state = #{state,jdbcType=INTEGER},
+      </if>
+      <if test="createUser != null">
+        create_user = #{createUser,jdbcType=CHAR},
+      </if>
+      <if test="createTime != null">
+        create_time = #{createTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="modifiedUser != null">
+        modified_user = #{modifiedUser,jdbcType=CHAR},
+      </if>
+      <if test="modifiedTime != null">
+        modified_time = #{modifiedTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="goodsUse != null">
+        goods_use = #{goodsUse,jdbcType=CHAR},
+      </if>
+    </set>
+    where guid = #{guid,jdbcType=CHAR}
+  </update>
+  <update id="updateByPrimaryKey" parameterType="com.hcloud.microserver.mbg.modul.TGoodsInfo">
+    update t_goods_info
+    set goods_type = #{goodsType,jdbcType=CHAR},
+      goods_code = #{goodsCode,jdbcType=VARCHAR},
+      goods_name = #{goodsName,jdbcType=VARCHAR},
+      carbon_val = #{carbonVal,jdbcType=DECIMAL},
+      price = #{price,jdbcType=DECIMAL},
+      goods_desc = #{goodsDesc,jdbcType=VARCHAR},
+      goods_images = #{goodsImages,jdbcType=VARCHAR},
+      goods_sale_date = #{goodsSaleDate,jdbcType=DATE},
+      is_sale = #{isSale,jdbcType=INTEGER},
+      state = #{state,jdbcType=INTEGER},
+      create_user = #{createUser,jdbcType=CHAR},
+      create_time = #{createTime,jdbcType=TIMESTAMP},
+      modified_user = #{modifiedUser,jdbcType=CHAR},
+      modified_time = #{modifiedTime,jdbcType=TIMESTAMP},
+      goods_use = #{goodsUse,jdbcType=CHAR}
+    where guid = #{guid,jdbcType=CHAR}
+  </update>
+</mapper>

carbon-api-mbg/src/main/resources/com/hcloud/microserver/mbg/mapper/TGoodsOrderInfoMapper.xml

@@ -0,0 +1,371 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.hcloud.microserver.mbg.mapper.TGoodsOrderInfoMapper">
+  <resultMap id="BaseResultMap" type="com.hcloud.microserver.mbg.modul.TGoodsOrderInfo">
+    <id column="guid" jdbcType="CHAR" property="guid" />
+    <result column="fk_customer_guid" jdbcType="CHAR" property="fkCustomerGuid" />
+    <result column="order_no" jdbcType="CHAR" property="orderNo" />
+    <result column="customer_name" jdbcType="VARCHAR" property="customerName" />
+    <result column="customer_type" jdbcType="VARCHAR" property="customerType" />
+    <result column="order_amount" jdbcType="DECIMAL" property="orderAmount" />
+    <result column="order_carbon_amount" jdbcType="DECIMAL" property="orderCarbonAmount" />
+    <result column="order_status" jdbcType="INTEGER" property="orderStatus" />
+    <result column="state" jdbcType="INTEGER" property="state" />
+    <result column="create_user" jdbcType="CHAR" property="createUser" />
+    <result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
+    <result column="modified_user" jdbcType="CHAR" property="modifiedUser" />
+    <result column="modified_time" jdbcType="TIMESTAMP" property="modifiedTime" />
+    <result column="pay_no" jdbcType="VARCHAR" property="payNo" />
+    <result column="order_type" jdbcType="INTEGER" property="orderType" />
+  </resultMap>
+  <sql id="Example_Where_Clause">
+    <where>
+      <foreach collection="oredCriteria" item="criteria" separator="or">
+        <if test="criteria.valid">
+          <trim prefix="(" prefixOverrides="and" suffix=")">
+            <foreach collection="criteria.criteria" item="criterion">
+              <choose>
+                <when test="criterion.noValue">
+                  and ${criterion.condition}
+                </when>
+                <when test="criterion.singleValue">
+                  and ${criterion.condition} #{criterion.value}
+                </when>
+                <when test="criterion.betweenValue">
+                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
+                </when>
+                <when test="criterion.listValue">
+                  and ${criterion.condition}
+                  <foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
+                    #{listItem}
+                  </foreach>
+                </when>
+              </choose>
+            </foreach>
+          </trim>
+        </if>
+      </foreach>
+    </where>
+  </sql>
+  <sql id="Update_By_Example_Where_Clause">
+    <where>
+      <foreach collection="example.oredCriteria" item="criteria" separator="or">
+        <if test="criteria.valid">
+          <trim prefix="(" prefixOverrides="and" suffix=")">
+            <foreach collection="criteria.criteria" item="criterion">
+              <choose>
+                <when test="criterion.noValue">
+                  and ${criterion.condition}
+                </when>
+                <when test="criterion.singleValue">
+                  and ${criterion.condition} #{criterion.value}
+                </when>
+                <when test="criterion.betweenValue">
+                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
+                </when>
+                <when test="criterion.listValue">
+                  and ${criterion.condition}
+                  <foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
+                    #{listItem}
+                  </foreach>
+                </when>
+              </choose>
+            </foreach>
+          </trim>
+        </if>
+      </foreach>
+    </where>
+  </sql>
+  <sql id="Base_Column_List">
+    guid, fk_customer_guid, order_no, customer_name, customer_type, order_amount, order_carbon_amount, 
+    order_status, state, create_user, create_time, modified_user, modified_time, pay_no, 
+    order_type
+  </sql>
+  <select id="selectByExample" parameterType="com.hcloud.microserver.mbg.modul.TGoodsOrderInfoExample" resultMap="BaseResultMap">
+    select
+    <if test="distinct">
+      distinct
+    </if>
+    <include refid="Base_Column_List" />
+    from t_goods_order_info
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+    <if test="orderByClause != null">
+      order by ${orderByClause}
+    </if>
+  </select>
+  <select id="selectByPrimaryKey" parameterType="java.lang.String" resultMap="BaseResultMap">
+    select 
+    <include refid="Base_Column_List" />
+    from t_goods_order_info
+    where guid = #{guid,jdbcType=CHAR}
+  </select>
+  <delete id="deleteByPrimaryKey" parameterType="java.lang.String">
+    delete from t_goods_order_info
+    where guid = #{guid,jdbcType=CHAR}
+  </delete>
+  <delete id="deleteByExample" parameterType="com.hcloud.microserver.mbg.modul.TGoodsOrderInfoExample">
+    delete from t_goods_order_info
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+  </delete>
+  <insert id="insert" parameterType="com.hcloud.microserver.mbg.modul.TGoodsOrderInfo">
+    insert into t_goods_order_info (guid, fk_customer_guid, order_no, 
+      customer_name, customer_type, order_amount, 
+      order_carbon_amount, order_status, state, 
+      create_user, create_time, modified_user, 
+      modified_time, pay_no, order_type
+      )
+    values (#{guid,jdbcType=CHAR}, #{fkCustomerGuid,jdbcType=CHAR}, #{orderNo,jdbcType=CHAR}, 
+      #{customerName,jdbcType=VARCHAR}, #{customerType,jdbcType=VARCHAR}, #{orderAmount,jdbcType=DECIMAL}, 
+      #{orderCarbonAmount,jdbcType=DECIMAL}, #{orderStatus,jdbcType=INTEGER}, #{state,jdbcType=INTEGER}, 
+      #{createUser,jdbcType=CHAR}, #{createTime,jdbcType=TIMESTAMP}, #{modifiedUser,jdbcType=CHAR}, 
+      #{modifiedTime,jdbcType=TIMESTAMP}, #{payNo,jdbcType=VARCHAR}, #{orderType,jdbcType=INTEGER}
+      )
+  </insert>
+  <insert id="insertSelective" parameterType="com.hcloud.microserver.mbg.modul.TGoodsOrderInfo">
+    insert into t_goods_order_info
+    <trim prefix="(" suffix=")" suffixOverrides=",">
+      <if test="guid != null">
+        guid,
+      </if>
+      <if test="fkCustomerGuid != null">
+        fk_customer_guid,
+      </if>
+      <if test="orderNo != null">
+        order_no,
+      </if>
+      <if test="customerName != null">
+        customer_name,
+      </if>
+      <if test="customerType != null">
+        customer_type,
+      </if>
+      <if test="orderAmount != null">
+        order_amount,
+      </if>
+      <if test="orderCarbonAmount != null">
+        order_carbon_amount,
+      </if>
+      <if test="orderStatus != null">
+        order_status,
+      </if>
+      <if test="state != null">
+        state,
+      </if>
+      <if test="createUser != null">
+        create_user,
+      </if>
+      <if test="createTime != null">
+        create_time,
+      </if>
+      <if test="modifiedUser != null">
+        modified_user,
+      </if>
+      <if test="modifiedTime != null">
+        modified_time,
+      </if>
+      <if test="payNo != null">
+        pay_no,
+      </if>
+      <if test="orderType != null">
+        order_type,
+      </if>
+    </trim>
+    <trim prefix="values (" suffix=")" suffixOverrides=",">
+      <if test="guid != null">
+        #{guid,jdbcType=CHAR},
+      </if>
+      <if test="fkCustomerGuid != null">
+        #{fkCustomerGuid,jdbcType=CHAR},
+      </if>
+      <if test="orderNo != null">
+        #{orderNo,jdbcType=CHAR},
+      </if>
+      <if test="customerName != null">
+        #{customerName,jdbcType=VARCHAR},
+      </if>
+      <if test="customerType != null">
+        #{customerType,jdbcType=VARCHAR},
+      </if>
+      <if test="orderAmount != null">
+        #{orderAmount,jdbcType=DECIMAL},
+      </if>
+      <if test="orderCarbonAmount != null">
+        #{orderCarbonAmount,jdbcType=DECIMAL},
+      </if>
+      <if test="orderStatus != null">
+        #{orderStatus,jdbcType=INTEGER},
+      </if>
+      <if test="state != null">
+        #{state,jdbcType=INTEGER},
+      </if>
+      <if test="createUser != null">
+        #{createUser,jdbcType=CHAR},
+      </if>
+      <if test="createTime != null">
+        #{createTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="modifiedUser != null">
+        #{modifiedUser,jdbcType=CHAR},
+      </if>
+      <if test="modifiedTime != null">
+        #{modifiedTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="payNo != null">
+        #{payNo,jdbcType=VARCHAR},
+      </if>
+      <if test="orderType != null">
+        #{orderType,jdbcType=INTEGER},
+      </if>
+    </trim>
+  </insert>
+  <select id="countByExample" parameterType="com.hcloud.microserver.mbg.modul.TGoodsOrderInfoExample" resultType="java.lang.Long">
+    select count(*) from t_goods_order_info
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+  </select>
+  <update id="updateByExampleSelective" parameterType="map">
+    update t_goods_order_info
+    <set>
+      <if test="record.guid != null">
+        guid = #{record.guid,jdbcType=CHAR},
+      </if>
+      <if test="record.fkCustomerGuid != null">
+        fk_customer_guid = #{record.fkCustomerGuid,jdbcType=CHAR},
+      </if>
+      <if test="record.orderNo != null">
+        order_no = #{record.orderNo,jdbcType=CHAR},
+      </if>
+      <if test="record.customerName != null">
+        customer_name = #{record.customerName,jdbcType=VARCHAR},
+      </if>
+      <if test="record.customerType != null">
+        customer_type = #{record.customerType,jdbcType=VARCHAR},
+      </if>
+      <if test="record.orderAmount != null">
+        order_amount = #{record.orderAmount,jdbcType=DECIMAL},
+      </if>
+      <if test="record.orderCarbonAmount != null">
+        order_carbon_amount = #{record.orderCarbonAmount,jdbcType=DECIMAL},
+      </if>
+      <if test="record.orderStatus != null">
+        order_status = #{record.orderStatus,jdbcType=INTEGER},
+      </if>
+      <if test="record.state != null">
+        state = #{record.state,jdbcType=INTEGER},
+      </if>
+      <if test="record.createUser != null">
+        create_user = #{record.createUser,jdbcType=CHAR},
+      </if>
+      <if test="record.createTime != null">
+        create_time = #{record.createTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="record.modifiedUser != null">
+        modified_user = #{record.modifiedUser,jdbcType=CHAR},
+      </if>
+      <if test="record.modifiedTime != null">
+        modified_time = #{record.modifiedTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="record.payNo != null">
+        pay_no = #{record.payNo,jdbcType=VARCHAR},
+      </if>
+      <if test="record.orderType != null">
+        order_type = #{record.orderType,jdbcType=INTEGER},
+      </if>
+    </set>
+    <if test="_parameter != null">
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+  </update>
+  <update id="updateByExample" parameterType="map">
+    update t_goods_order_info
+    set guid = #{record.guid,jdbcType=CHAR},
+      fk_customer_guid = #{record.fkCustomerGuid,jdbcType=CHAR},
+      order_no = #{record.orderNo,jdbcType=CHAR},
+      customer_name = #{record.customerName,jdbcType=VARCHAR},
+      customer_type = #{record.customerType,jdbcType=VARCHAR},
+      order_amount = #{record.orderAmount,jdbcType=DECIMAL},
+      order_carbon_amount = #{record.orderCarbonAmount,jdbcType=DECIMAL},
+      order_status = #{record.orderStatus,jdbcType=INTEGER},
+      state = #{record.state,jdbcType=INTEGER},
+      create_user = #{record.createUser,jdbcType=CHAR},
+      create_time = #{record.createTime,jdbcType=TIMESTAMP},
+      modified_user = #{record.modifiedUser,jdbcType=CHAR},
+      modified_time = #{record.modifiedTime,jdbcType=TIMESTAMP},
+      pay_no = #{record.payNo,jdbcType=VARCHAR},
+      order_type = #{record.orderType,jdbcType=INTEGER}
+    <if test="_parameter != null">
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+  </update>
+  <update id="updateByPrimaryKeySelective" parameterType="com.hcloud.microserver.mbg.modul.TGoodsOrderInfo">
+    update t_goods_order_info
+    <set>
+      <if test="fkCustomerGuid != null">
+        fk_customer_guid = #{fkCustomerGuid,jdbcType=CHAR},
+      </if>
+      <if test="orderNo != null">
+        order_no = #{orderNo,jdbcType=CHAR},
+      </if>
+      <if test="customerName != null">
+        customer_name = #{customerName,jdbcType=VARCHAR},
+      </if>
+      <if test="customerType != null">
+        customer_type = #{customerType,jdbcType=VARCHAR},
+      </if>
+      <if test="orderAmount != null">
+        order_amount = #{orderAmount,jdbcType=DECIMAL},
+      </if>
+      <if test="orderCarbonAmount != null">
+        order_carbon_amount = #{orderCarbonAmount,jdbcType=DECIMAL},
+      </if>
+      <if test="orderStatus != null">
+        order_status = #{orderStatus,jdbcType=INTEGER},
+      </if>
+      <if test="state != null">
+        state = #{state,jdbcType=INTEGER},
+      </if>
+      <if test="createUser != null">
+        create_user = #{createUser,jdbcType=CHAR},
+      </if>
+      <if test="createTime != null">
+        create_time = #{createTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="modifiedUser != null">
+        modified_user = #{modifiedUser,jdbcType=CHAR},
+      </if>
+      <if test="modifiedTime != null">
+        modified_time = #{modifiedTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="payNo != null">
+        pay_no = #{payNo,jdbcType=VARCHAR},
+      </if>
+      <if test="orderType != null">
+        order_type = #{orderType,jdbcType=INTEGER},
+      </if>
+    </set>
+    where guid = #{guid,jdbcType=CHAR}
+  </update>
+  <update id="updateByPrimaryKey" parameterType="com.hcloud.microserver.mbg.modul.TGoodsOrderInfo">
+    update t_goods_order_info
+    set fk_customer_guid = #{fkCustomerGuid,jdbcType=CHAR},
+      order_no = #{orderNo,jdbcType=CHAR},
+      customer_name = #{customerName,jdbcType=VARCHAR},
+      customer_type = #{customerType,jdbcType=VARCHAR},
+      order_amount = #{orderAmount,jdbcType=DECIMAL},
+      order_carbon_amount = #{orderCarbonAmount,jdbcType=DECIMAL},
+      order_status = #{orderStatus,jdbcType=INTEGER},
+      state = #{state,jdbcType=INTEGER},
+      create_user = #{createUser,jdbcType=CHAR},
+      create_time = #{createTime,jdbcType=TIMESTAMP},
+      modified_user = #{modifiedUser,jdbcType=CHAR},
+      modified_time = #{modifiedTime,jdbcType=TIMESTAMP},
+      pay_no = #{payNo,jdbcType=VARCHAR},
+      order_type = #{orderType,jdbcType=INTEGER}
+    where guid = #{guid,jdbcType=CHAR}
+  </update>
+</mapper>

carbon-api-mbg/src/main/resources/com/hcloud/microserver/mbg/mapper/TProductInfoMapper.xml

@@ -0,0 +1,418 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.hcloud.microserver.mbg.mapper.TProductInfoMapper">
+  <resultMap id="BaseResultMap" type="com.hcloud.microserver.mbg.modul.TProductInfo">
+    <id column="guid" jdbcType="CHAR" property="guid" />
+    <result column="fk_product_type" jdbcType="CHAR" property="fkProductType" />
+    <result column="fk_carbon_rule" jdbcType="CHAR" property="fkCarbonRule" />
+    <result column="fk_poverty_area" jdbcType="CHAR" property="fkPovertyArea" />
+    <result column="product_name" jdbcType="VARCHAR" property="productName" />
+    <result column="product_code" jdbcType="CHAR" property="productCode" />
+    <result column="carbon_generate_date" jdbcType="DATE" property="carbonGenerateDate" />
+    <result column="product_validate_num" jdbcType="INTEGER" property="productValidateNum" />
+    <result column="carbon_refresh_time" jdbcType="DATE" property="carbonRefreshTime" />
+    <result column="carbon_sink" jdbcType="DECIMAL" property="carbonSink" />
+    <result column="product_imgs" jdbcType="VARCHAR" property="productImgs" />
+    <result column="is_enable" jdbcType="INTEGER" property="isEnable" />
+    <result column="remark" jdbcType="VARCHAR" property="remark" />
+    <result column="state" jdbcType="INTEGER" property="state" />
+    <result column="create_user" jdbcType="CHAR" property="createUser" />
+    <result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
+    <result column="modified_user" jdbcType="CHAR" property="modifiedUser" />
+    <result column="modified_time" jdbcType="TIMESTAMP" property="modifiedTime" />
+  </resultMap>
+  <sql id="Example_Where_Clause">
+    <where>
+      <foreach collection="oredCriteria" item="criteria" separator="or">
+        <if test="criteria.valid">
+          <trim prefix="(" prefixOverrides="and" suffix=")">
+            <foreach collection="criteria.criteria" item="criterion">
+              <choose>
+                <when test="criterion.noValue">
+                  and ${criterion.condition}
+                </when>
+                <when test="criterion.singleValue">
+                  and ${criterion.condition} #{criterion.value}
+                </when>
+                <when test="criterion.betweenValue">
+                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
+                </when>
+                <when test="criterion.listValue">
+                  and ${criterion.condition}
+                  <foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
+                    #{listItem}
+                  </foreach>
+                </when>
+              </choose>
+            </foreach>
+          </trim>
+        </if>
+      </foreach>
+    </where>
+  </sql>
+  <sql id="Update_By_Example_Where_Clause">
+    <where>
+      <foreach collection="example.oredCriteria" item="criteria" separator="or">
+        <if test="criteria.valid">
+          <trim prefix="(" prefixOverrides="and" suffix=")">
+            <foreach collection="criteria.criteria" item="criterion">
+              <choose>
+                <when test="criterion.noValue">
+                  and ${criterion.condition}
+                </when>
+                <when test="criterion.singleValue">
+                  and ${criterion.condition} #{criterion.value}
+                </when>
+                <when test="criterion.betweenValue">
+                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
+                </when>
+                <when test="criterion.listValue">
+                  and ${criterion.condition}
+                  <foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
+                    #{listItem}
+                  </foreach>
+                </when>
+              </choose>
+            </foreach>
+          </trim>
+        </if>
+      </foreach>
+    </where>
+  </sql>
+  <sql id="Base_Column_List">
+    guid, fk_product_type, fk_carbon_rule, fk_poverty_area, product_name, product_code, 
+    carbon_generate_date, product_validate_num, carbon_refresh_time, carbon_sink, product_imgs, 
+    is_enable, remark, state, create_user, create_time, modified_user, modified_time
+  </sql>
+  <select id="selectByExample" parameterType="com.hcloud.microserver.mbg.modul.TProductInfoExample" resultMap="BaseResultMap">
+    select
+    <if test="distinct">
+      distinct
+    </if>
+    <include refid="Base_Column_List" />
+    from t_product_info
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+    <if test="orderByClause != null">
+      order by ${orderByClause}
+    </if>
+  </select>
+  <select id="selectByPrimaryKey" parameterType="java.lang.String" resultMap="BaseResultMap">
+    select 
+    <include refid="Base_Column_List" />
+    from t_product_info
+    where guid = #{guid,jdbcType=CHAR}
+  </select>
+  <delete id="deleteByPrimaryKey" parameterType="java.lang.String">
+    delete from t_product_info
+    where guid = #{guid,jdbcType=CHAR}
+  </delete>
+  <delete id="deleteByExample" parameterType="com.hcloud.microserver.mbg.modul.TProductInfoExample">
+    delete from t_product_info
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+  </delete>
+  <insert id="insert" parameterType="com.hcloud.microserver.mbg.modul.TProductInfo">
+    insert into t_product_info (guid, fk_product_type, fk_carbon_rule, 
+      fk_poverty_area, product_name, product_code, 
+      carbon_generate_date, product_validate_num, carbon_refresh_time, 
+      carbon_sink, product_imgs, is_enable, 
+      remark, state, create_user, 
+      create_time, modified_user, modified_time
+      )
+    values (#{guid,jdbcType=CHAR}, #{fkProductType,jdbcType=CHAR}, #{fkCarbonRule,jdbcType=CHAR}, 
+      #{fkPovertyArea,jdbcType=CHAR}, #{productName,jdbcType=VARCHAR}, #{productCode,jdbcType=CHAR}, 
+      #{carbonGenerateDate,jdbcType=DATE}, #{productValidateNum,jdbcType=INTEGER}, #{carbonRefreshTime,jdbcType=DATE}, 
+      #{carbonSink,jdbcType=DECIMAL}, #{productImgs,jdbcType=VARCHAR}, #{isEnable,jdbcType=INTEGER}, 
+      #{remark,jdbcType=VARCHAR}, #{state,jdbcType=INTEGER}, #{createUser,jdbcType=CHAR}, 
+      #{createTime,jdbcType=TIMESTAMP}, #{modifiedUser,jdbcType=CHAR}, #{modifiedTime,jdbcType=TIMESTAMP}
+      )
+  </insert>
+  <insert id="insertSelective" parameterType="com.hcloud.microserver.mbg.modul.TProductInfo">
+    insert into t_product_info
+    <trim prefix="(" suffix=")" suffixOverrides=",">
+      <if test="guid != null">
+        guid,
+      </if>
+      <if test="fkProductType != null">
+        fk_product_type,
+      </if>
+      <if test="fkCarbonRule != null">
+        fk_carbon_rule,
+      </if>
+      <if test="fkPovertyArea != null">
+        fk_poverty_area,
+      </if>
+      <if test="productName != null">
+        product_name,
+      </if>
+      <if test="productCode != null">
+        product_code,
+      </if>
+      <if test="carbonGenerateDate != null">
+        carbon_generate_date,
+      </if>
+      <if test="productValidateNum != null">
+        product_validate_num,
+      </if>
+      <if test="carbonRefreshTime != null">
+        carbon_refresh_time,
+      </if>
+      <if test="carbonSink != null">
+        carbon_sink,
+      </if>
+      <if test="productImgs != null">
+        product_imgs,
+      </if>
+      <if test="isEnable != null">
+        is_enable,
+      </if>
+      <if test="remark != null">
+        remark,
+      </if>
+      <if test="state != null">
+        state,
+      </if>
+      <if test="createUser != null">
+        create_user,
+      </if>
+      <if test="createTime != null">
+        create_time,
+      </if>
+      <if test="modifiedUser != null">
+        modified_user,
+      </if>
+      <if test="modifiedTime != null">
+        modified_time,
+      </if>
+    </trim>
+    <trim prefix="values (" suffix=")" suffixOverrides=",">
+      <if test="guid != null">
+        #{guid,jdbcType=CHAR},
+      </if>
+      <if test="fkProductType != null">
+        #{fkProductType,jdbcType=CHAR},
+      </if>
+      <if test="fkCarbonRule != null">
+        #{fkCarbonRule,jdbcType=CHAR},
+      </if>
+      <if test="fkPovertyArea != null">
+        #{fkPovertyArea,jdbcType=CHAR},
+      </if>
+      <if test="productName != null">
+        #{productName,jdbcType=VARCHAR},
+      </if>
+      <if test="productCode != null">
+        #{productCode,jdbcType=CHAR},
+      </if>
+      <if test="carbonGenerateDate != null">
+        #{carbonGenerateDate,jdbcType=DATE},
+      </if>
+      <if test="productValidateNum != null">
+        #{productValidateNum,jdbcType=INTEGER},
+      </if>
+      <if test="carbonRefreshTime != null">
+        #{carbonRefreshTime,jdbcType=DATE},
+      </if>
+      <if test="carbonSink != null">
+        #{carbonSink,jdbcType=DECIMAL},
+      </if>
+      <if test="productImgs != null">
+        #{productImgs,jdbcType=VARCHAR},
+      </if>
+      <if test="isEnable != null">
+        #{isEnable,jdbcType=INTEGER},
+      </if>
+      <if test="remark != null">
+        #{remark,jdbcType=VARCHAR},
+      </if>
+      <if test="state != null">
+        #{state,jdbcType=INTEGER},
+      </if>
+      <if test="createUser != null">
+        #{createUser,jdbcType=CHAR},
+      </if>
+      <if test="createTime != null">
+        #{createTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="modifiedUser != null">
+        #{modifiedUser,jdbcType=CHAR},
+      </if>
+      <if test="modifiedTime != null">
+        #{modifiedTime,jdbcType=TIMESTAMP},
+      </if>
+    </trim>
+  </insert>
+  <select id="countByExample" parameterType="com.hcloud.microserver.mbg.modul.TProductInfoExample" resultType="java.lang.Long">
+    select count(*) from t_product_info
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+  </select>
+  <update id="updateByExampleSelective" parameterType="map">
+    update t_product_info
+    <set>
+      <if test="record.guid != null">
+        guid = #{record.guid,jdbcType=CHAR},
+      </if>
+      <if test="record.fkProductType != null">
+        fk_product_type = #{record.fkProductType,jdbcType=CHAR},
+      </if>
+      <if test="record.fkCarbonRule != null">
+        fk_carbon_rule = #{record.fkCarbonRule,jdbcType=CHAR},
+      </if>
+      <if test="record.fkPovertyArea != null">
+        fk_poverty_area = #{record.fkPovertyArea,jdbcType=CHAR},
+      </if>
+      <if test="record.productName != null">
+        product_name = #{record.productName,jdbcType=VARCHAR},
+      </if>
+      <if test="record.productCode != null">
+        product_code = #{record.productCode,jdbcType=CHAR},
+      </if>
+      <if test="record.carbonGenerateDate != null">
+        carbon_generate_date = #{record.carbonGenerateDate,jdbcType=DATE},
+      </if>
+      <if test="record.productValidateNum != null">
+        product_validate_num = #{record.productValidateNum,jdbcType=INTEGER},
+      </if>
+      <if test="record.carbonRefreshTime != null">
+        carbon_refresh_time = #{record.carbonRefreshTime,jdbcType=DATE},
+      </if>
+      <if test="record.carbonSink != null">
+        carbon_sink = #{record.carbonSink,jdbcType=DECIMAL},
+      </if>
+      <if test="record.productImgs != null">
+        product_imgs = #{record.productImgs,jdbcType=VARCHAR},
+      </if>
+      <if test="record.isEnable != null">
+        is_enable = #{record.isEnable,jdbcType=INTEGER},
+      </if>
+      <if test="record.remark != null">
+        remark = #{record.remark,jdbcType=VARCHAR},
+      </if>
+      <if test="record.state != null">
+        state = #{record.state,jdbcType=INTEGER},
+      </if>
+      <if test="record.createUser != null">
+        create_user = #{record.createUser,jdbcType=CHAR},
+      </if>
+      <if test="record.createTime != null">
+        create_time = #{record.createTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="record.modifiedUser != null">
+        modified_user = #{record.modifiedUser,jdbcType=CHAR},
+      </if>
+      <if test="record.modifiedTime != null">
+        modified_time = #{record.modifiedTime,jdbcType=TIMESTAMP},
+      </if>
+    </set>
+    <if test="_parameter != null">
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+  </update>
+  <update id="updateByExample" parameterType="map">
+    update t_product_info
+    set guid = #{record.guid,jdbcType=CHAR},
+      fk_product_type = #{record.fkProductType,jdbcType=CHAR},
+      fk_carbon_rule = #{record.fkCarbonRule,jdbcType=CHAR},
+      fk_poverty_area = #{record.fkPovertyArea,jdbcType=CHAR},
+      product_name = #{record.productName,jdbcType=VARCHAR},
+      product_code = #{record.productCode,jdbcType=CHAR},
+      carbon_generate_date = #{record.carbonGenerateDate,jdbcType=DATE},
+      product_validate_num = #{record.productValidateNum,jdbcType=INTEGER},
+      carbon_refresh_time = #{record.carbonRefreshTime,jdbcType=DATE},
+      carbon_sink = #{record.carbonSink,jdbcType=DECIMAL},
+      product_imgs = #{record.productImgs,jdbcType=VARCHAR},
+      is_enable = #{record.isEnable,jdbcType=INTEGER},
+      remark = #{record.remark,jdbcType=VARCHAR},
+      state = #{record.state,jdbcType=INTEGER},
+      create_user = #{record.createUser,jdbcType=CHAR},
+      create_time = #{record.createTime,jdbcType=TIMESTAMP},
+      modified_user = #{record.modifiedUser,jdbcType=CHAR},
+      modified_time = #{record.modifiedTime,jdbcType=TIMESTAMP}
+    <if test="_parameter != null">
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+  </update>
+  <update id="updateByPrimaryKeySelective" parameterType="com.hcloud.microserver.mbg.modul.TProductInfo">
+    update t_product_info
+    <set>
+      <if test="fkProductType != null">
+        fk_product_type = #{fkProductType,jdbcType=CHAR},
+      </if>
+      <if test="fkCarbonRule != null">
+        fk_carbon_rule = #{fkCarbonRule,jdbcType=CHAR},
+      </if>
+      <if test="fkPovertyArea != null">
+        fk_poverty_area = #{fkPovertyArea,jdbcType=CHAR},
+      </if>
+      <if test="productName != null">
+        product_name = #{productName,jdbcType=VARCHAR},
+      </if>
+      <if test="productCode != null">
+        product_code = #{productCode,jdbcType=CHAR},
+      </if>
+      <if test="carbonGenerateDate != null">
+        carbon_generate_date = #{carbonGenerateDate,jdbcType=DATE},
+      </if>
+      <if test="productValidateNum != null">
+        product_validate_num = #{productValidateNum,jdbcType=INTEGER},
+      </if>
+      <if test="carbonRefreshTime != null">
+        carbon_refresh_time = #{carbonRefreshTime,jdbcType=DATE},
+      </if>
+      <if test="carbonSink != null">
+        carbon_sink = #{carbonSink,jdbcType=DECIMAL},
+      </if>
+      <if test="productImgs != null">
+        product_imgs = #{productImgs,jdbcType=VARCHAR},
+      </if>
+      <if test="isEnable != null">
+        is_enable = #{isEnable,jdbcType=INTEGER},
+      </if>
+      <if test="remark != null">
+        remark = #{remark,jdbcType=VARCHAR},
+      </if>
+      <if test="state != null">
+        state = #{state,jdbcType=INTEGER},
+      </if>
+      <if test="createUser != null">
+        create_user = #{createUser,jdbcType=CHAR},
+      </if>
+      <if test="createTime != null">
+        create_time = #{createTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="modifiedUser != null">
+        modified_user = #{modifiedUser,jdbcType=CHAR},
+      </if>
+      <if test="modifiedTime != null">
+        modified_time = #{modifiedTime,jdbcType=TIMESTAMP},
+      </if>
+    </set>
+    where guid = #{guid,jdbcType=CHAR}
+  </update>
+  <update id="updateByPrimaryKey" parameterType="com.hcloud.microserver.mbg.modul.TProductInfo">
+    update t_product_info
+    set fk_product_type = #{fkProductType,jdbcType=CHAR},
+      fk_carbon_rule = #{fkCarbonRule,jdbcType=CHAR},
+      fk_poverty_area = #{fkPovertyArea,jdbcType=CHAR},
+      product_name = #{productName,jdbcType=VARCHAR},
+      product_code = #{productCode,jdbcType=CHAR},
+      carbon_generate_date = #{carbonGenerateDate,jdbcType=DATE},
+      product_validate_num = #{productValidateNum,jdbcType=INTEGER},
+      carbon_refresh_time = #{carbonRefreshTime,jdbcType=DATE},
+      carbon_sink = #{carbonSink,jdbcType=DECIMAL},
+      product_imgs = #{productImgs,jdbcType=VARCHAR},
+      is_enable = #{isEnable,jdbcType=INTEGER},
+      remark = #{remark,jdbcType=VARCHAR},
+      state = #{state,jdbcType=INTEGER},
+      create_user = #{createUser,jdbcType=CHAR},
+      create_time = #{createTime,jdbcType=TIMESTAMP},
+      modified_user = #{modifiedUser,jdbcType=CHAR},
+      modified_time = #{modifiedTime,jdbcType=TIMESTAMP}
+    where guid = #{guid,jdbcType=CHAR}
+  </update>
+</mapper>

carbon-api-mbg/src/main/resources/generatorConfig.xml

@@ -37,8 +37,8 @@
         <javaClientGenerator type="XMLMAPPER" targetPackage="com.hcloud.microserver.mbg.mapper"
                              targetProject="carbon-api-mbg\src\main\java"/>
         <!--生成全部表tableName设为%-->
-        <table tableName="t_goods_info"/>
+        <table tableName="t_goods_order_info"/>
 <!--            <generatedKey column="guid" sqlStatement="MySql" identity="true"/>-->
 <!--        </table>-->
     </context>
-</generatorConfiguration>
+</generatorConfiguration>

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

@@ -0,0 +1,18 @@
+package com.hcloud.microserver.system.facade.carbon.entity;
+
+import com.hcloud.microserver.system.facade.carbon.forms.CustomerCompanyInfoForm;
+import com.hcloud.microserver.system.facade.carbon.forms.CustomerInfoForm;
+import io.swagger.annotations.ApiModel;
+import lombok.Data;
+import lombok.extern.slf4j.Slf4j;
+
+import java.io.Serializable;
+
+@Data
+@ApiModel("爱心企业和爱心用户信息form")
+public class CustomerInfoAndCustomerCompanyInfo implements Serializable {
+    private CustomerInfoForm customerInfoForm;
+
+    private CustomerCompanyInfoForm customerCompanyInfoForm;
+
+}

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

@@ -35,6 +35,16 @@ public class GoodsCredentialInfo {
 
     private Date createTime;
 
+    private Integer certType;
+
+    public Integer getCertType() {
+        return certType;
+    }
+
+    public void setCertType(Integer certType) {
+        this.certType = certType;
+    }
+
     private CustomerInfo customerInfo;
 
     private GoodsOrderInfo goodsOrderInfo;
@@ -166,4 +176,4 @@ public class GoodsCredentialInfo {
     public void setGoodsOrderInfo(GoodsOrderInfo goodsOrderInfo) {
         this.goodsOrderInfo = goodsOrderInfo;
     }
-}
+}

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

@@ -1,6 +1,7 @@
 package com.hcloud.microserver.system.facade.carbon.forms;
 
 import com.hcloud.microserver.commoncore.base.BaseForm;
+import com.hcloud.microserver.commoncore.base.CarbonBaseForm;
 import com.hcloud.microserver.system.facade.carbon.entity.PovertyArea;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -12,7 +13,7 @@ import java.util.List;
 
 @Data
 @ApiModel("集体form")
-public class CollectiveFarmerForm extends BaseForm {
+public class CollectiveFarmerForm extends CarbonBaseForm {
     @ApiModelProperty("序列")
     private String guid;
 

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

@@ -34,4 +34,6 @@ public class GoodsCredentialInfoForm extends BaseForm {
 
     private String creImages;
 
+    private Integer certType;
+
 }

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

@@ -0,0 +1,62 @@
+package com.hcloud.microserver.system.facade.carbon.forms;
+
+import com.hcloud.microserver.commoncore.base.CarbonBaseForm;
+import com.hcloud.microserver.commoncore.util.reflect.DateUtils;
+import com.hcloud.microserver.commoncore.util.string.StringUtils;
+import com.hcloud.microserver.mbg.modul.TCarbonProblem;
+import com.hcloud.microserver.mbg.modul.TCarbonProblemExample;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.Date;
+
+@Data
+@ApiModel("碳汇常见问题Form")
+public class TCarbonProblemForm extends CarbonBaseForm {
+
+    @ApiModelProperty(value = "序列号")
+    private Long guid;
+
+    @ApiModelProperty(value = "问题名称")
+    private String problemName;
+
+    @ApiModelProperty(value = "问题类型")
+    private Integer problemType;
+
+    @ApiModelProperty(value = "问题状态：1-禁用 0-非禁用")
+    private Integer state;
+
+    @ApiModelProperty(value = "开始创建创建时间")
+    private Date createTimeStart;
+
+    @ApiModelProperty(value = "结束创建时间")
+    private Date createTimeEnd;
+
+
+    public TCarbonProblemExample example(){
+        TCarbonProblemExample example = new TCarbonProblemExample();
+        TCarbonProblemExample.Criteria criteria = example.createCriteria();
+        if (this.guid != null){
+            criteria.andGuidEqualTo(this.guid);
+        }
+
+        if (StringUtils.isNotEmpty(this.problemName)){
+            criteria.andProblemNameLike("%"+this.problemName+"%");
+        }
+        if (this.state != null){
+            criteria.andStateEqualTo(this.state);
+        }
+        if (this.problemType != null){
+            criteria.andProblemTypeEqualTo(this.problemType);
+        }
+        if (this.createTimeStart != null){
+            criteria.andCreateTimeGreaterThanOrEqualTo(DateUtils.getTodayStartTime(this.createTimeStart));
+        }
+
+        if (this.createTimeEnd != null){
+            criteria.andCreateTimeLessThanOrEqualTo(DateUtils.getTodayEndTime(this.createTimeEnd));
+        }
+        return example;
+    }
+}

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

@@ -53,4 +53,14 @@ public class CredentialInfoBO {
      * 订单金额
      */
     private BigDecimal OrderAmount;
+    /**
+     * 年度
+     */
+    private String year;
+
+    /**
+     * 证书类型
+     */
+    private Integer certType;
+
 }

carbon-back/carbon-back-service/src/main/java/com/hcloud/microserver/system/bank/bo/excel/FarmerInfoImport.java

@@ -0,0 +1,123 @@
+package com.hcloud.microserver.system.bank.bo.excel;
+
+import com.alibaba.excel.annotation.ExcelIgnore;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.format.NumberFormat;
+import com.alibaba.excel.metadata.BaseRowModel;
+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 FarmerInfoImport extends BaseRowModel implements Serializable {
+
+    @ApiModelProperty(value = "序列")
+    @ExcelIgnore
+    private String guid;
+
+    @ApiModelProperty(value = "扶贫区域信息")
+    @ExcelIgnore
+    private String fkPovertyAreaId;
+
+    @ApiModelProperty(value = "贫困集体信息")
+    @ExcelIgnore
+    private String fkCollectiveId;
+
+    @ApiModelProperty(value = "省名称")
+    @ExcelProperty(value = "省名称")
+    private String provinceName;
+
+    @ApiModelProperty(value = "市名称")
+    @ExcelProperty(value = "市名称")
+    private String cityName;
+
+    @ApiModelProperty(value = "县名称")
+    @ExcelProperty(value = "县名称")
+    private String countyName;
+
+    @ApiModelProperty(value = "镇名称")
+    @ExcelProperty(value = "镇名称")
+    private String townName;
+
+
+    @ApiModelProperty(value = "村名称")
+    @ExcelProperty(value = "村名称")
+    private String villageName;
+
+    @ApiModelProperty(value = "村集体名称")
+    @ExcelProperty(value = "村集体名称")
+    private String collectiveName;
+
+    @ApiModelProperty(value = "农户编号")
+    @ExcelProperty(value = "农户编号")
+    private String farmerCode;
+
+    @ApiModelProperty(value = "农户姓名")
+    @ExcelProperty(value = "农户姓名")
+    private String farmerName;
+
+    @ApiModelProperty(value = "家庭人数")
+    @ExcelProperty(value = "家庭人数")
+    @NumberFormat("#")
+    private Integer familyNum;
+
+    @ApiModelProperty(value = "性别")
+    @ExcelProperty(value = "性别")
+    private String sex;
+
+    @ApiModelProperty(value = "身份证号")
+    @ExcelProperty(value = "身份证号")
+    private String pid;
+
+    @ApiModelProperty(value = "民族")
+    @ExcelProperty(value = "民族")
+    private String nation;
+
+    @ApiModelProperty(value = "文化程度")
+    @ExcelProperty(value = "文化程度")
+    private String education;
+
+    @ApiModelProperty(value = "联系电话")
+    @ExcelProperty(value = "联系电话")
+    private String phone;
+
+    @ApiModelProperty(value = "银行卡号")
+    @ExcelProperty(value = "银行卡号")
+    private String bankCardNo;
+
+    @ApiModelProperty(value = "年平均收入")
+    @ExcelProperty(value = "年平均收入")
+    @NumberFormat("#.##")
+    private BigDecimal incomeVal;
+
+    @ApiModelProperty(value = "贫困户类型")
+    @ExcelProperty(value = "贫困户类型")
+    private String farmerType;
+
+    @ApiModelProperty(value = "贫困户描述")
+    @ExcelProperty(value = "贫困户描述")
+    private String farmerRemark;
+
+    @ApiModelProperty(value = "贫困户照片")
+    @ExcelProperty(value = "贫困户照片")
+    private String farmerImages;
+
+    @ApiModelProperty(value = "所属村民组")
+    @ExcelProperty(value = "所属村民组")
+    private String villageOrg;
+
+
+
+    @ApiModelProperty(value = "开户行名称")
+    @ExcelProperty(value = "开户行名称")
+    private String bankName;
+
+
+    @ApiModelProperty(value = "开户行机构代码")
+    @ExcelProperty(value = "开户行机构代码")
+    private String bankCode;
+}

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

@@ -2,11 +2,13 @@ package com.hcloud.microserver.system.bank.controller;
 
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
+import com.hcloud.microserver.security.annotation.PreAuthorize;
 import com.hcloud.microserver.system.bank.service.BasePositionService;
 import com.hcloud.microserver.commoncore.base.BaseController;
 import com.hcloud.microserver.commoncore.base.ResponseBase;
 import com.hcloud.microserver.system.facade.carbon.entity.BasePosition;
 import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -25,14 +27,18 @@ public class BasePositionController extends BaseController {
     @Autowired
     private BasePositionService basePositionService;
 
+    @ApiOperation("通过编码查询区域信息Api")
+    @PreAuthorize(hasPermi = "position:find:code")
     @PostMapping("/findByCodeAndLevel")
-    public ResponseBase findByCodeAndLevel(@RequestBody BasePosition basePosition) {
+    public ResponseBase<BasePosition> findByCodeAndLevel(@RequestBody BasePosition basePosition) {
         List<BasePosition> positionList = this.basePositionService.queryByCodeAndLevel(basePosition);
         return responseResultSuccess(positionList);
     }
 
+    @ApiOperation("通过编码查询区域信息Api")
     @PostMapping("/findByCodes")
-    private ResponseBase findByCodes(@RequestBody JSONObject parameters) {
+    @PreAuthorize(hasPermi = "position:find:codes")
+    public ResponseBase findByCodes(@RequestBody JSONObject parameters) {
         log.info("看看参数: {}", parameters);
         JSONArray codesArray = parameters.getJSONArray("codes");
         List<String> codes = codesArray.toJavaList(String.class);
@@ -41,9 +47,11 @@ public class BasePositionController extends BaseController {
         return responseResultSuccess(positionList);
     }
 
+    @ApiOperation("查询重庆区域api")
     @PostMapping("/findChongqingArea")
-    private ResponseBase findChongqingArea(@RequestBody(required = false) BasePosition basePosition) {
-        List<BasePosition> positionList = this.basePositionService.queryByChongqingArea(basePosition);
+    @PreAuthorize(hasPermi = "position:find:cqarea")
+    public ResponseBase findChongqingArea(@RequestBody(required = false) BasePosition basePosition) {
+        List<BasePosition> positionList = basePositionService.queryByChongqingArea(basePosition);
         return responseResultSuccess(positionList);
     }
 }

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

@@ -1,6 +1,7 @@
 package com.hcloud.microserver.system.bank.controller;
 
 import com.github.pagehelper.PageInfo;
+import com.hcloud.microserver.security.annotation.PreAuthorize;
 import com.hcloud.microserver.system.bank.service.CollectiveFarmerService;
 import com.hcloud.microserver.commoncore.base.BaseController;
 import com.hcloud.microserver.commoncore.base.ResponseBase;
@@ -22,7 +23,7 @@ import java.util.List;
  */
 @RestController
 @RequestMapping("/web/collectiveFarmer")
-@Api(tags = "集体农户信息管理服务",description = "集体农户信息管理服务")
+@Api(tags = "农户集体信息管理api",description = "农户集体信息管理api")
 public class CollectiveFarmerController extends BaseController {
 
     @Autowired
@@ -30,6 +31,7 @@ public class CollectiveFarmerController extends BaseController {
 
     @ApiOperation(value = "分页查询集体农户信息",notes = "分页查询集体农户信息")
     @PostMapping("/searchByPage")
+    @PreAuthorize(hasPermi = "system:collective:search")
     public ResponseBase<List<CollectiveFarmer>> searchByPage(@RequestBody CollectiveFarmerForm collectiveFarmerForm) {
         PageInfo<CollectiveFarmer> listByPage = this.collectiveFarmerService.getListByPage(collectiveFarmerForm);
         return responseSuccess(listByPage);
@@ -37,6 +39,7 @@ public class CollectiveFarmerController extends BaseController {
 
     @ApiOperation(value = "添加集体农户信息",notes = "添加集体农户信息")
     @PostMapping("/save")
+    @PreAuthorize(hasPermi = "system:collective:save")
     public ResponseBase save(@RequestBody CollectiveFarmerForm collectiveFarmerForm) {
         String userId = CurrUserUtil.getUserId();
         collectiveFarmerForm.setCreateUser(userId);
@@ -50,6 +53,7 @@ public class CollectiveFarmerController extends BaseController {
 
     @ApiOperation(value = "修改集体农户信息",notes = "修改集体农户信息")
     @PostMapping("/update")
+    @PreAuthorize(hasPermi = "system:collective:update")
     public ResponseBase update(@RequestBody CollectiveFarmerForm collectiveFarmerForm) {
         String userId = CurrUserUtil.getUserId();
         collectiveFarmerForm.setModifiedUser(userId);
@@ -61,6 +65,7 @@ public class CollectiveFarmerController extends BaseController {
 
     @ApiOperation(value = "删除集体农户信息",notes = "删除集体农户信息")
     @PostMapping("/delete")
+    @PreAuthorize(hasPermi = "system:collective:delete")
     public ResponseBase del(@RequestBody CollectiveFarmerForm collectiveFarmerForm) {
         int success = this.collectiveFarmerService.softRemove(collectiveFarmerForm);
         if (success> 0)

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

@@ -2,6 +2,7 @@ package com.hcloud.microserver.system.bank.controller;
 
 import com.alibaba.fastjson.JSONObject;
 import com.github.pagehelper.PageInfo;
+import com.hcloud.microserver.security.annotation.PreAuthorize;
 import com.hcloud.microserver.system.bank.service.CompanyService;
 import com.hcloud.microserver.system.bank.service.CustomerCompanyInfoService;
 import com.hcloud.microserver.commoncore.base.BaseController;
@@ -9,6 +10,7 @@ import com.hcloud.microserver.commoncore.base.ResponseBase;
 import com.hcloud.microserver.commoncore.util.BeanCopyUtil;
 import com.hcloud.microserver.system.facade.carbon.entity.CustomerCompanyInfo;
 import com.hcloud.microserver.system.facade.carbon.entity.CustomerInfo;
+import com.hcloud.microserver.system.facade.carbon.entity.CustomerInfoAndCustomerCompanyInfo;
 import com.hcloud.microserver.system.facade.carbon.forms.CustomerCompanyInfoForm;
 import com.hcloud.microserver.system.facade.carbon.forms.CustomerInfoForm;
 import io.swagger.annotations.Api;
@@ -34,6 +36,7 @@ public class CompanyController extends BaseController {
     private CompanyService companyService;
 
     @ApiOperation(value = "查询企业信息")
+    @PreAuthorize(hasPermi = "system:company:query")
     @PostMapping("/searchByPage")
     public ResponseBase searchByPage(@RequestBody CustomerCompanyInfoForm customerCompanyInfoForm) {
         PageInfo pageInfo = this.customerCompanyInfoService.queryListByPage(customerCompanyInfoForm);
@@ -41,12 +44,19 @@ public class CompanyController extends BaseController {
     }
 
     @ApiOperation(value = "添加企业信息")
+    @PreAuthorize(hasPermi = "system:company:add")
     @PostMapping("/add")
-    public ResponseBase addCompany(@RequestBody JSONObject jsonObject) {
-        log.info("前端的参数: {}", jsonObject.toJSONString());
-        CustomerInfoForm customerInfoForm = jsonObject.getObject("customerInfoForm", CustomerInfoForm.class);
-        CustomerCompanyInfoForm customerCompanyInfoForm = jsonObject.getObject("customerCompanyInfoForm", CustomerCompanyInfoForm.class);
+    public ResponseBase addCompany(@RequestBody CustomerInfoAndCustomerCompanyInfo ccinfo) {
+        log.info("前端的参数: {}", JSONObject.toJSONString(ccinfo));
+//        CustomerInfoForm customerInfoForm = jsonObject.getObject("customerInfoForm", CustomerInfoForm.class);
+        CustomerInfoForm customerInfoForm = ccinfo.getCustomerInfoForm();
+
+
         CustomerInfo customerInfo = BeanCopyUtil.convertBean(customerInfoForm, CustomerInfo.class);
+
+        CustomerCompanyInfoForm customerCompanyInfoForm = ccinfo.getCustomerCompanyInfoForm();
+
+
         CustomerCompanyInfo customerCompanyInfo = BeanCopyUtil.convertBean(customerCompanyInfoForm, CustomerCompanyInfo.class);
         String companyType = customerInfoForm.getCompanyType();
         customerCompanyInfo.setCompanyType(companyType);
@@ -58,6 +68,7 @@ public class CompanyController extends BaseController {
     }
 
     @ApiOperation(value = "修改企业信息")
+    @PreAuthorize(hasPermi = "system:company:update")
     @PostMapping("/update")
     public ResponseBase updateCompany(@RequestBody JSONObject jsonObject) {
         log.info("前端的参数: {}", jsonObject.toJSONString());
@@ -74,6 +85,7 @@ public class CompanyController extends BaseController {
         return responseResultFailure();    }
 
     @ApiOperation(value = "删除企业信息")
+    @PreAuthorize(hasPermi = "system:company:delete")
     @PostMapping("/delete")
     public ResponseBase deleteCompany(@RequestBody JSONObject jsonObject) {
         log.info("前端的参数: {}", jsonObject.toJSONString());

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

@@ -1,6 +1,7 @@
 package com.hcloud.microserver.system.bank.controller;
 
 import com.github.pagehelper.PageInfo;
+import com.hcloud.microserver.security.annotation.PreAuthorize;
 import com.hcloud.microserver.system.bank.service.CustomerCompanyTypeService;
 import com.hcloud.microserver.commoncore.base.BaseController;
 import com.hcloud.microserver.commoncore.base.ResponseBase;
@@ -27,6 +28,7 @@ public class CustomerCompanyTypeController extends BaseController {
     @ApiImplicitParams({
             @ApiImplicitParam(name = "customerCompanyType",value = "企业类型信息",dataType = "CustomerCompanyType")
     })
+    @PreAuthorize(hasPermi = "system:companyType:save")
     @ApiResponse(code = 0, message = "操作成功")
     @PostMapping("/save")
     public ResponseBase save(@RequestBody @Valid CustomerCompanyType customerCompanyType){
@@ -44,6 +46,7 @@ public class CustomerCompanyTypeController extends BaseController {
     @ApiImplicitParams({
             @ApiImplicitParam(name = "customerCompanyType",value = "企业类型信息",dataType = "CustomerCompanyType")
     })
+    @PreAuthorize(hasPermi = "system:companyType:update")
     @ApiResponse(code = 0, message = "操作成功")
     @PostMapping("/update")
     public ResponseBase update(@RequestBody @Valid CustomerCompanyType customerCompanyType){
@@ -62,6 +65,7 @@ public class CustomerCompanyTypeController extends BaseController {
             @ApiImplicitParam(name = "guid",value = "主键",dataType = "String")
     })
     @ApiResponse(code = 0, message = "操作成功")
+    @PreAuthorize(hasPermi = "system:companyType:findById")
     @GetMapping("/findById")
     public ResponseBase findById(@RequestParam("guid") String guid){
         CustomerCompanyType customerCompanyType = customerCompanyTypeService.queryByPrimaryKey(guid);
@@ -75,6 +79,7 @@ public class CustomerCompanyTypeController extends BaseController {
             @ApiImplicitParam(name = "guid",value = "主键",dataType = "String")
     })
     @ApiResponse(code = 0, message = "操作成功")
+    @PreAuthorize(hasPermi = "system:companyType:delete")
     @GetMapping("/delete")
     public ResponseBase delete(@RequestParam("guid") String guid){
         int i = customerCompanyTypeService.delByPrimaryKey(guid);
@@ -92,6 +97,7 @@ public class CustomerCompanyTypeController extends BaseController {
             @ApiImplicitParam(name = "customerCompanyTypeForm",value = "企业类型信息",dataType = "CustomerCompanyTypeForm")
     })
     @ApiResponse(code = 0, message = "操作成功")
+    @PreAuthorize(hasPermi = "system:companyType:list")
     @PostMapping("/list")
     public ResponseBase selectList(@RequestBody CustomerCompanyTypeForm customerCompanyTypeForm){
         PageInfo<List<CustomerCompanyType>> pageInfo = customerCompanyTypeService.selectList(customerCompanyTypeForm);
@@ -103,6 +109,7 @@ public class CustomerCompanyTypeController extends BaseController {
 
     @ApiOperation(value = "企业类型全部数据")
     @ApiResponse(code = 0, message = "操作成功")
+    @PreAuthorize(hasPermi = "system:companyType:all")
     @GetMapping("/all")
     public ResponseBase selectAll(){
         CustomerCompanyTypeForm customerCompanyTypeForm = new CustomerCompanyTypeForm();

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

@@ -3,6 +3,7 @@ package com.hcloud.microserver.system.bank.controller;
 import cn.hutool.core.util.ObjectUtil;
 import com.github.pagehelper.PageInfo;
 import com.hcloud.microserver.commoncore.base.ResultVO;
+import com.hcloud.microserver.security.annotation.PreAuthorize;
 import com.hcloud.microserver.system.bank.service.CustomerInfoService;
 import com.hcloud.microserver.commoncore.base.BaseController;
 import com.hcloud.microserver.commoncore.base.ResponseBase;
@@ -35,13 +36,15 @@ public class CustomerInfoController extends BaseController {
      */
     @ApiOperation(value = "分页查询爱心用户信息")
     @PostMapping("/searchByPage")
+    @PreAuthorize(hasPermi = "system:customer:list")
     public ResponseBase searchCustomerInfoByPage(@RequestBody CustomerInfoForm customerInfoForm) {
         PageInfo pageInfo = customerInfoService.searchCustomerByPage(customerInfoForm);
         return responseSuccess(pageInfo);
     }
 
-    @ApiOperation(value = "充值爱心用户信息密码")
+    @ApiOperation(value = "重置爱心用户密码")
     @PostMapping("/resetPassword")
+    @PreAuthorize(hasPermi = "system:customer:resetPassword")
     public ResponseBase resetPassword(@RequestBody CustomerInfoForm customerInfoForm) {
         int i = this.customerInfoService.resetPassword(customerInfoForm);
         if (i>0){
@@ -51,6 +54,7 @@ public class CustomerInfoController extends BaseController {
     }
 
     @ApiOperation(value = "修改爱心用户信息")
+    @PreAuthorize(hasPermi = "system:customer:update")
     @PostMapping("/update")
     public ResponseBase update(@RequestBody CustomerInfoForm customerInfoForm) {
         int i = customerInfoService.modifyByPrimaryKeySelective(customerInfoForm);
@@ -64,7 +68,8 @@ public class CustomerInfoController extends BaseController {
      * 查询客户列表
      * @return
      */
-    @ApiOperation(value = "客户列表")
+    @ApiOperation(value = "查询客户列表")
+    @PreAuthorize(hasPermi = "system:customer:coustomerList")
     @GetMapping("/coustomer-list")
     public ResponseBase customerList(String companyName) {
         ResultVO resultVO = new ResultVO();

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

@@ -1,7 +1,10 @@
 package com.hcloud.microserver.system.bank.controller;
 
+import com.alibaba.excel.support.ExcelTypeEnum;
 import com.github.pagehelper.PageInfo;
+import com.hcloud.microserver.commoncore.util.EasyExcelUtil;
 import com.hcloud.microserver.security.annotation.PreAuthorize;
+import com.hcloud.microserver.system.bank.bo.excel.FarmerInfoImport;
 import com.hcloud.microserver.system.bank.service.FarmerInfoService;
 import com.hcloud.microserver.commoncore.base.BaseController;
 import com.hcloud.microserver.commoncore.base.ResponseBase;
@@ -9,9 +12,13 @@ import com.hcloud.microserver.system.facade.carbon.entity.FarmerInfo;
 import com.hcloud.microserver.system.facade.carbon.forms.FarmerInfoForm;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
+import org.apache.poi.ss.formula.functions.T;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
 
+import java.io.IOException;
+import java.io.InputStream;
 import java.util.List;
 
 @RestController
@@ -24,12 +31,14 @@ public class FarmerInfoController extends BaseController {
 
     @ApiOperation(value = "分页查询农户信息")
     @PostMapping("/searchByPage")
+    @PreAuthorize(hasPermi = "system:farmer:search")
     public ResponseBase<List<FarmerInfo>> searchByPage(@RequestBody FarmerInfoForm farmerInfoForm) {
         PageInfo<FarmerInfo> pageInfo = this.farmerInfoService.getListByPage(farmerInfoForm);
         return responseSuccess(pageInfo);
     }
     @ApiOperation(value = "新增农户信息")
     @PostMapping("/save")
+    @PreAuthorize(hasPermi = "system:farmer:save")
     public ResponseBase save(@RequestBody FarmerInfoForm farmerInfoForm) {
         int success = this.farmerInfoService.save(farmerInfoForm);
         if (success>0){
@@ -39,6 +48,7 @@ public class FarmerInfoController extends BaseController {
     }
     @ApiOperation(value = "修改农户信息")
     @PostMapping("/update")
+    @PreAuthorize(hasPermi = "system:farmer:update")
     public ResponseBase update(@RequestBody FarmerInfoForm farmerInfoForm) {
         int success = this.farmerInfoService.modify(farmerInfoForm);
         if (success>0){
@@ -49,6 +59,7 @@ public class FarmerInfoController extends BaseController {
 
     @ApiOperation(value = "删除农户信息")
     @PostMapping("/delete")
+    @PreAuthorize(hasPermi = "system:farmer:delete")
     public ResponseBase del(@RequestBody FarmerInfoForm farmerInfoForm) {
         int success = this.farmerInfoService.softRemove(farmerInfoForm);
         if (success>0){
@@ -59,6 +70,7 @@ public class FarmerInfoController extends BaseController {
 
     @ApiOperation(value = "通过集体查询农户信息")
     @PostMapping("/searchByCollectiveId")
+    @PreAuthorize(hasPermi = "system:farmer:searchByCollectiveId")
     public ResponseBase<FarmerInfo> findByCollectiveId(@RequestParam(name = "collectiveId") String collectiveId) {
         List<FarmerInfo> farmerInfos = this.farmerInfoService.queryByCollectiveId(collectiveId);
         return responseResultSuccess(farmerInfos);
@@ -66,9 +78,25 @@ public class FarmerInfoController extends BaseController {
 
     @ApiOperation(value = "通过产品查询农户信息")
     @PostMapping("/searchByProductGuid")
+    @PreAuthorize(hasPermi = "system:farmer:searchByProductGuid")
     public ResponseBase<FarmerInfo> searchByProductGuid(@RequestParam(name = "productGuid") String productGuid) {
         List<FarmerInfo> farmerInfos = this.farmerInfoService.queryByProductGuid(productGuid);
         return responseResultSuccess(farmerInfos);
     }
+    @ApiOperation(value = "导入农户信息")
+    @PostMapping("/import")
+    @PreAuthorize(hasPermi = "system:farmer:import")
+    public ResponseBase<FarmerInfo> importFarmer(@RequestParam(value = "file") MultipartFile file) {
+
+        try {
+
+            InputStream inputStream = file.getInputStream();
+            EasyExcelUtil.readExcelWithModel(inputStream, FarmerInfoImport.class, ExcelTypeEnum.XLSX,1,1);
+        } catch (IOException e) {
+            e.printStackTrace();
+        }
+
+        return responseResultSuccess();
+    }
 
 }

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

@@ -3,6 +3,7 @@ package com.hcloud.microserver.system.bank.controller;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.github.pagehelper.PageInfo;
+import com.hcloud.microserver.security.annotation.PreAuthorize;
 import com.hcloud.microserver.system.bank.service.GoodsInfoService;
 import com.hcloud.microserver.commoncore.base.BaseController;
 import com.hcloud.microserver.commoncore.base.ResponseBase;
@@ -33,6 +34,7 @@ public class GoodsInfoController extends BaseController {
     private GoodsInfoService goodsInfoService;
 
     @ApiOperation("商品上下架")
+    @PreAuthorize(hasPermi = "system:goods:shelves")
     @PostMapping("/shelves")
     public ResponseBase shelves(@RequestBody List<GoodsInfoForm> goodsInfoForms) {
         int success = this.goodsInfoService.batchShelves(goodsInfoForms);
@@ -44,6 +46,7 @@ public class GoodsInfoController extends BaseController {
     }
 
     @ApiOperation("商品删除")
+    @PreAuthorize(hasPermi = "system:goods:delete")
     @PostMapping("/delete")
     public ResponseBase delete(@RequestBody GoodsInfoForm goodsInfoForm) {
         int success = this.goodsInfoService.remove(goodsInfoForm);
@@ -54,6 +57,7 @@ public class GoodsInfoController extends BaseController {
     }
 
     @ApiOperation("修改商品信息")
+    @PreAuthorize(hasPermi = "system:goods:update")
     @PostMapping("/update")
     public ResponseBase update(@RequestBody GoodsInfoForm goodsInfoForm) {
         int success = this.goodsInfoService.modify(goodsInfoForm);
@@ -63,6 +67,7 @@ public class GoodsInfoController extends BaseController {
         return responseResultFailure();    }
 
     @ApiOperation("分页查询商品信息")
+    @PreAuthorize(hasPermi = "system:goods:searchByPage")
     @PostMapping("/searchByPage")
     public ResponseBase searchByPage(@RequestBody GoodsInfoForm goodsInfoForm) {
         PageInfo pageInfo = this.goodsInfoService.queryListByPage(goodsInfoForm);
@@ -70,6 +75,7 @@ public class GoodsInfoController extends BaseController {
 
     }
     @ApiOperation("分页查询商品关联信息")
+    @PreAuthorize(hasPermi = "system:goods:searchJoinListByPage")
     @PostMapping("/searchJoinListByPage")
     public ResponseBase searchJoinListByPage(@RequestBody GoodsInfoForm goodsInfoForm) {
         PageInfo pageInfo = this.goodsInfoService.queryJoinListByPage(goodsInfoForm);
@@ -77,6 +83,7 @@ public class GoodsInfoController extends BaseController {
     }
 
     @ApiOperation("修改商品信息")
+    @PreAuthorize(hasPermi = "system:goods:updateGoods")
     @PostMapping("/updateGoods")
     public ResponseBase modifyGoods(@RequestBody JSONObject jsonObject) {
         JSONArray jsonArray = jsonObject.getJSONArray("productInfos");

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

@@ -1,5 +1,6 @@
 package com.hcloud.microserver.system.bank.controller;
 
+import com.hcloud.microserver.security.annotation.PreAuthorize;
 import com.hcloud.microserver.system.bank.service.OrderDetailInfoService;
 import com.hcloud.microserver.commoncore.base.BaseController;
 import com.hcloud.microserver.commoncore.base.ResponseBase;
@@ -20,6 +21,7 @@ public class OrderDetailController extends BaseController {
     private OrderDetailInfoService orderDetailInfoService;
 
     @ApiOperation("分页查询订单详细信息")
+    @PreAuthorize(hasPermi = "system:orderDetail:searchByOrderGuid")
     @GetMapping("/searchByOrderGuid")
     public ResponseBase searchByOrderGuid(@RequestParam(name = "orderGuid") String orderGuid) {
         return responseResultSuccess(this.orderDetailInfoService.findByGoodsOrderInfoGuid(orderGuid));

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

@@ -3,6 +3,7 @@ package com.hcloud.microserver.system.bank.controller;
 import com.github.pagehelper.PageInfo;
 import com.hcloud.microserver.commoncore.base.ResultVO;
 import com.hcloud.microserver.commoncore.enums.ResultEnum;
+import com.hcloud.microserver.security.annotation.PreAuthorize;
 import com.hcloud.microserver.system.bank.bo.*;
 import com.hcloud.microserver.system.bank.service.OrderInfoService;
 import com.hcloud.microserver.commoncore.base.BaseController;
@@ -25,12 +26,14 @@ public class OrderInfoController extends BaseController {
     private OrderInfoService orderInfoService;
 
     @ApiOperation("分页查询订单信息")
+    @PreAuthorize(hasPermi = "system:order:searchByPage")
     @PostMapping("/searchByPage")
     public ResponseBase<OrderInfoBO> searchByPage(@RequestBody GoodsOrderInfoForm goodsOrderInfoForm) {
         PageInfo pageInfo = orderInfoService.searchOrderInfoByPage(goodsOrderInfoForm);
         return responseSuccess(pageInfo);
     }
     @ApiOperation("证书查看")
+    @PreAuthorize(hasPermi = "system:order:credential")
     @GetMapping("/credential")
     public ResponseBase<CredentialInfoBO> searchCredentialInfoBO(@RequestParam(name = "guid") String guid) {
         CredentialInfoBO credentialInfoBO = orderInfoService.searchCredentialInfo(guid);
@@ -47,6 +50,7 @@ public class OrderInfoController extends BaseController {
      *
      */
     @ApiOperation("后台创建订单")
+    @PreAuthorize(hasPermi = "system:order:createOrder")
     @PostMapping("/create-order")
     public ResponseBase create(@RequestBody CreateOrderBO createOrderBO) {
         int success = this.orderInfoService.createOrder(createOrderBO);
@@ -65,6 +69,7 @@ public class OrderInfoController extends BaseController {
      */
 
     @ApiOperation("查询线下订单列表")
+    @PreAuthorize(hasPermi = "system:order:offlineList")
     @GetMapping("/offline-order-list")
     public ResponseBase<OfflineOrderBO> queryOfflineOrderList(OfflineOrderCondidtionForm condidtionForm) {
         PageInfo pageInfo = orderInfoService.offlineOrderList(condidtionForm);
@@ -79,6 +84,7 @@ public class OrderInfoController extends BaseController {
      */
 
     @ApiOperation("查询线下订单详情")
+    @PreAuthorize(hasPermi = "system:order:offlineDetail")
     @GetMapping("/offline-order-detail")
     public ResponseBase<OfflineOrderDetailBO> queryOrderDetail(String guid) {
         OfflineOrderDetailBO order = orderInfoService.queryOfflineOrderDetial(guid);
@@ -95,6 +101,7 @@ public class OrderInfoController extends BaseController {
      */
 
     @ApiOperation("收款")
+    @PreAuthorize(hasPermi = "system:order:collectMoney")
     @PutMapping("/collect-money")
     public ResponseBase collectMoney(@RequestBody OfflineOrderPayVoucherForm payVoucher) {
         int success = this.orderInfoService.collectMoneyDeal(payVoucher);

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

@@ -2,6 +2,7 @@ package com.hcloud.microserver.system.bank.controller;
 
 import com.alibaba.fastjson.JSONObject;
 import com.github.pagehelper.PageInfo;
+import com.hcloud.microserver.security.annotation.PreAuthorize;
 import com.hcloud.microserver.system.bank.service.OrderPayApplyService;
 import com.hcloud.microserver.commoncore.base.BaseController;
 import com.hcloud.microserver.commoncore.base.ResponseBase;
@@ -27,6 +28,7 @@ public class PayApplyController extends BaseController {
     private OrderPayApplyService orderPayApplyService;
 
     @ApiOperation("分页查询订单支付信息")
+    @PreAuthorize(hasPermi = "system:payApply:query")
     @PostMapping("/searchByPage")
     public ResponseBase searchByPage(@RequestBody OrderPayApplyForm orderPayApplyForm) {
         PageInfo pageInfo = this.orderPayApplyService.searchByPage(orderPayApplyForm);
@@ -34,6 +36,7 @@ public class PayApplyController extends BaseController {
     }
 
     @ApiOperation("审核离线支付信息")
+    @PreAuthorize(hasPermi = "system:payApply:audit")
     @PostMapping("/audit")
     public ResponseBase audit(@RequestBody JSONObject jsonObject) {
         GoodsOrderInfoForm goodsOrderInfoForm = jsonObject.getObject("goodsOrderInfoForm", GoodsOrderInfoForm.class);
@@ -44,5 +47,6 @@ public class PayApplyController extends BaseController {
         if (success>0){
             return responseResultSuccess();
         }
-        return responseResultFailure();    }
+        return responseResultFailure();
+    }
 }

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

@@ -1,6 +1,7 @@
 package com.hcloud.microserver.system.bank.controller;
 
 import com.github.pagehelper.PageInfo;
+import com.hcloud.microserver.security.annotation.PreAuthorize;
 import com.hcloud.microserver.system.bank.service.OrderPayVoucherService;
 import com.hcloud.microserver.commoncore.base.BaseController;
 import com.hcloud.microserver.commoncore.base.ResponseBase;
@@ -21,6 +22,7 @@ public class PayVoucherController extends BaseController {
     private OrderPayVoucherService orderPayVoucherService;
 
     @PostMapping("/searchByPage")
+    @PreAuthorize(hasPermi = "system:voucher:query")
     public ResponseBase searchByPage(@RequestBody OrderPayVoucherForm orderPayVoucherForm) {
         PageInfo pageInfo = orderPayVoucherService.queryListByPage(orderPayVoucherForm);
         return responseSuccess(pageInfo);

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

@@ -2,6 +2,7 @@ package com.hcloud.microserver.system.bank.controller;
 
 import com.github.pagehelper.PageInfo;
 import com.hcloud.microserver.commoncore.base.BaseController;
+import com.hcloud.microserver.security.annotation.PreAuthorize;
 import com.hcloud.microserver.system.bank.service.PovertyAreaService;
 import com.hcloud.microserver.commoncore.base.ResponseBase;
 import com.hcloud.microserver.system.facade.carbon.entity.PovertyArea;
@@ -27,12 +28,14 @@ public class PovertyAreaController extends BaseController {
 
     @ApiOperation("分页查询贫困区域")
     @PostMapping("/searchByPage")
+    @PreAuthorize(hasPermi = "system:poverty:searchPage")
     public ResponseBase<List<PovertyArea>> searchByPage(@RequestBody PovertyAreaForm povertyAreaForm) {
         PageInfo<PovertyArea> list = this.povertyAreaService.getListByPage(povertyAreaForm);
         return responseSuccess(list);
     }
 
-    @ApiOperation("分页查询贫困区域")
+    @ApiOperation("查询贫困区域")
+    @PreAuthorize(hasPermi = "system:poverty:search")
     @GetMapping("/search")
     public ResponseBase<List<PovertyArea>> search(@ApiParam("区域名称")@RequestParam(value = "name",required = true) String name) {
         List<PovertyArea> list = this.povertyAreaService.listAll(name);
@@ -40,6 +43,7 @@ public class PovertyAreaController extends BaseController {
     }
 
     @ApiOperation("新增贫困区域")
+    @PreAuthorize(hasPermi = "system:poverty:save")
     @PostMapping("/save")
     public ResponseBase save(@RequestBody PovertyAreaForm povertyAreaForm) {
 
@@ -53,6 +57,7 @@ public class PovertyAreaController extends BaseController {
     }
 
     @ApiOperation("修改贫困区域")
+    @PreAuthorize(hasPermi = "system:poverty:update")
     @PostMapping("/update")
     public ResponseBase update(@RequestBody PovertyAreaForm povertyAreaForm) {
         int success = this.povertyAreaService.modify(povertyAreaForm);
@@ -63,6 +68,7 @@ public class PovertyAreaController extends BaseController {
     }
 
     @ApiOperation("删除贫困区域")
+    @PreAuthorize(hasPermi = "system:poverty:delete")
     @PostMapping("/del")
     public ResponseBase del(@RequestBody PovertyAreaForm povertyAreaForm) {
         int success = this.povertyAreaService.remove(povertyAreaForm);
@@ -73,6 +79,7 @@ public class PovertyAreaController extends BaseController {
     }
 
     @ApiOperation("查询贫困区域明细")
+    @PreAuthorize(hasPermi = "system:poverty:info")
     @GetMapping("/findByGuid")
     public ResponseBase<PovertyArea> findByGuid(@RequestParam(name = "guid") String guid) {
         PovertyArea povertyArea = this.povertyAreaService.findByGuid(guid);

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

@@ -3,6 +3,7 @@ package com.hcloud.microserver.system.bank.controller;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.github.pagehelper.PageInfo;
+import com.hcloud.microserver.security.annotation.PreAuthorize;
 import com.hcloud.microserver.system.bank.bo.CarbonBaseController;
 import com.hcloud.microserver.system.bank.service.ProductBelongService;
 import com.hcloud.microserver.system.bank.service.ProductExpansionService;
@@ -40,7 +41,8 @@ public class ProductInfoController extends CarbonBaseController {
     @Autowired
     private ProductBelongService productBelongService;
 
-    @ApiOperation("保存产品")
+    @ApiOperation("保存")
+    @PreAuthorize(hasPermi = "system:productInfo:save")
     @PostMapping("/save")
     public ResponseBase save(@RequestBody @Valid ProductInfoForm productInfoForm) {
         int success = this.productInfoService.save(productInfoForm);
@@ -49,6 +51,7 @@ public class ProductInfoController extends CarbonBaseController {
     }
 
     @ApiOperation("删除产品")
+    @PreAuthorize(hasPermi = "system:productInfo:delete")
     @PostMapping("/delete")
     public ResponseBase delete(@RequestBody ProductInfoForm productInfoForm) {
         int success = this.productInfoService.remove(productInfoForm);
@@ -56,6 +59,7 @@ public class ProductInfoController extends CarbonBaseController {
     }
 
     @ApiOperation("修改产品")
+    @PreAuthorize(hasPermi = "system:productInfo:update")
     @PostMapping("/update")
     public ResponseBase update(@RequestBody @Valid ProductInfoForm productInfoForm) {
         int success = this.productInfoService.modify(productInfoForm);
@@ -63,6 +67,7 @@ public class ProductInfoController extends CarbonBaseController {
     }
 
     @ApiOperation("分页获取产品")
+    @PreAuthorize(hasPermi = "system:productInfo:searchByPage")
     @PostMapping("/searchByPage")
     public ResponseBase searchByPage(@RequestBody ProductInfoForm productInfoForm) {
         PageInfo pageInfo = this.productInfoService.queryListByPage(productInfoForm);
@@ -70,6 +75,7 @@ public class ProductInfoController extends CarbonBaseController {
     }
 
     @ApiOperation("获取产品属性扩展")
+    @PreAuthorize(hasPermi = "system:productInfo:expansions")
     @PostMapping("/expansions")
     public ResponseBase expansions(@RequestParam("guid") String guid) {
         List<ProductExpansion> expansions = this.productExpansionService.searchByProductGuid(guid);
@@ -77,6 +83,7 @@ public class ProductInfoController extends CarbonBaseController {
     }
 
     @ApiOperation("获取产品属性")
+    @PreAuthorize(hasPermi = "system:productInfo:belongs")
     @PostMapping("/belongs")
     public ResponseBase belongs(@RequestParam("guid") String guid) {
         List<ProductBelong> belongs = productBelongService.searchByProductGuid(guid);
@@ -84,6 +91,7 @@ public class ProductInfoController extends CarbonBaseController {
     }
 
     @ApiOperation("发布产品")
+    @PreAuthorize(hasPermi = "system:productInfo:publish")
     @PostMapping("/publish")
     public ResponseBase publish(@RequestBody JSONObject jsonObject) {
         log.info("参数: {}", jsonObject);
@@ -110,6 +118,7 @@ public class ProductInfoController extends CarbonBaseController {
     }
 
     @ApiOperation("发布商品")
+    @PreAuthorize(hasPermi = "system:productInfo:publishGoods")
     @PostMapping("/publishGoods")
     public ResponseBase publishGoods(@RequestBody JSONObject jsonObject) {
         log.info("参数: {}", jsonObject.toJSONString());
@@ -143,6 +152,7 @@ public class ProductInfoController extends CarbonBaseController {
     }
 
     @ApiOperation("获取商品详细信息")
+    @PreAuthorize(hasPermi = "system:productInfo:findByGoodsInfoGuid")
     @PostMapping("/findByGoodsInfoGuid")
     public ResponseBase findByGoodsInfoGuid(@RequestParam("goodsInfoGuid") String goodsInfoGuid) {
         List<ProductInfo> productInfos = this.productInfoService.searchByGoodsInfoGuid(goodsInfoGuid);
@@ -150,6 +160,7 @@ public class ProductInfoController extends CarbonBaseController {
     }
 
     @ApiOperation("获取产品详细信息")
+    @PreAuthorize(hasPermi = "system:productInfo:findByProductInfoGuid")
     @GetMapping("/findByProductInfoGuid")
     public ResponseBase findByProductInfoGuid(@RequestParam("productGuid") String productGuid) {
         ProductInfo productInfos = this.productInfoService.findById(productGuid);

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

@@ -1,6 +1,7 @@
 package com.hcloud.microserver.system.bank.controller;
 
 import com.github.pagehelper.PageInfo;
+import com.hcloud.microserver.security.annotation.PreAuthorize;
 import com.hcloud.microserver.system.bank.bo.CarbonBaseController;
 import com.hcloud.microserver.system.bank.service.ProductTypeExpansionService;
 import com.hcloud.microserver.system.bank.service.ProductTypeService;
@@ -33,6 +34,7 @@ public class ProductTypeController extends CarbonBaseController {
     private ProductTypeExpansionService productTypeExpansionService;
 
     @ApiOperation("产品类型保存")
+    @PreAuthorize(hasPermi = "system:productType:save")
     @PostMapping("/save")
     public ResponseBase save(@RequestBody ProductTypeForm productTypeForm) {
         int success = this.productTypeService.add(productTypeForm);
@@ -40,6 +42,7 @@ public class ProductTypeController extends CarbonBaseController {
     }
 
     @ApiOperation("删除产品类型")
+    @PreAuthorize(hasPermi = "system:productType:delete")
     @PostMapping("/delete")
     public ResponseBase delete(@RequestBody ProductTypeForm productTypeForm) {
         int success = this.productTypeService.remove(productTypeForm);
@@ -47,6 +50,7 @@ public class ProductTypeController extends CarbonBaseController {
     }
 
     @ApiOperation("修改产品类型")
+    @PreAuthorize(hasPermi = "system:productType:update")
     @PostMapping("/update")
     public ResponseBase update(@RequestBody ProductTypeForm productTypeForm) {
         int success = this.productTypeService.modify(productTypeForm);
@@ -54,6 +58,7 @@ public class ProductTypeController extends CarbonBaseController {
     }
 
     @ApiOperation("分页获取产品类型")
+    @PreAuthorize(hasPermi = "system:productType:searchByPage")
     @PostMapping("/searchByPage")
     public ResponseBase searchByPage(@RequestBody ProductTypeForm productTypeForm) {
         PageInfo pageInfo = this.productTypeService.queryListByPage(productTypeForm);
@@ -61,6 +66,7 @@ public class ProductTypeController extends CarbonBaseController {
     }
 
     @ApiOperation("产品类型扩展")
+    @PreAuthorize(hasPermi = "system:productType:expansions")
     @PostMapping("/expansions")
     public ResponseBase expansions(@RequestParam(name = "guid") String guid) {
         log.info("web =====> guid: {}", guid);
@@ -69,12 +75,14 @@ public class ProductTypeController extends CarbonBaseController {
     }
 
     @ApiOperation("查询所有产品类型")
+    @PreAuthorize(hasPermi = "system:productType:all")
     @PostMapping("/all")
     public ResponseBase all(@RequestBody(required = false) ProductTypeForm productTypeForm) {
         List<ProductType> productTypes = this.productTypeService.queryAll(productTypeForm);
         return responseResultSuccess(productTypes);
     }
 
+    @PreAuthorize(hasPermi = "system:productType:checkTypeVal")
     @ApiOperation("校验产品类型值")
     @PostMapping("/checkTypeVal")
     public ResponseBase checkTypeVal(@RequestParam(name = "typeVal") String typeVal) {
@@ -86,6 +94,7 @@ public class ProductTypeController extends CarbonBaseController {
     }
 
     @ApiOperation("查询所有产品类型2")
+    @PreAuthorize(hasPermi = "system:productType:getAll")
     @GetMapping("/all")
     public ResponseBase getAll() {
         List<Map> list = this.productTypeService.getAll();

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

@@ -5,6 +5,7 @@ import com.hcloud.microserver.commoncore.base.BaseController;
 import com.hcloud.microserver.commoncore.base.ResponseBase;
 import com.hcloud.microserver.commoncore.enums.ResultEnum;
 import com.hcloud.microserver.commoncore.exception.GlobalException;
+import com.hcloud.microserver.security.annotation.PreAuthorize;
 import com.hcloud.microserver.system.bank.service.ProductTypePriceService;
 import com.hcloud.microserver.system.facade.carbon.entity.ProductTypePriceWithBLOBs;
 import com.hcloud.microserver.system.facade.carbon.forms.ProductTypePriceForm;
@@ -27,6 +28,7 @@ public class ProductTypePriceController extends BaseController {
             @ApiImplicitParam(name = "productTypePriceWithBLOBs",value = "类型定价信息",dataType = "ProductTypePriceWithBLOBs")
     })
     @ApiResponse(code = 0, message = "操作成功")
+    @PreAuthorize(hasPermi = "system:productTypePrice:save")
     @PostMapping("/save")
     private ResponseBase save(@RequestBody @Valid ProductTypePriceWithBLOBs productTypePriceWithBLOBs){
         int i = productTypePriceService.saveSelective(productTypePriceWithBLOBs);
@@ -40,6 +42,7 @@ public class ProductTypePriceController extends BaseController {
     @ApiImplicitParams({
             @ApiImplicitParam(name = "productTypePriceForm",value = "类型定价信息",dataType = "ProductTypePriceForm")
     })
+    @PreAuthorize(hasPermi = "system:productTypePrice:list")
     @ApiResponse(code = 0, message = "操作成功")
     @PostMapping("/list")
     private ResponseBase list(@RequestBody ProductTypePriceForm form){
@@ -51,6 +54,7 @@ public class ProductTypePriceController extends BaseController {
     @ApiImplicitParams({
             @ApiImplicitParam(name = "guid",value = "主键",dataType = "String")
     })
+    @PreAuthorize(hasPermi = "system:productTypePrice:delete")
     @ApiResponse(code = 0, message = "操作成功")
     @GetMapping("/delete")
     private ResponseBase delete(@RequestParam("guid") String guid){
@@ -65,6 +69,7 @@ public class ProductTypePriceController extends BaseController {
     @ApiImplicitParams({
             @ApiImplicitParam(name = "productTypePriceWithBLOBs",value = "类型定价信息",dataType = "ProductTypePriceWithBLOBs")
     })
+    @PreAuthorize(hasPermi = "system:productTypePrice:check")
     @ApiResponse(code = 0, message = "操作成功")
     @PostMapping("/check")
     private ResponseBase check(@RequestBody ProductTypePriceWithBLOBs productTypePriceWithBLOBs){

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

@@ -6,6 +6,7 @@ import com.hcloud.microserver.commoncore.base.BaseController;
 import com.hcloud.microserver.commoncore.base.ResponseBase;
 import com.hcloud.microserver.commoncore.web.domain.AjaxResult;
 import com.hcloud.microserver.commoncore.web.page.TableDataInfo;
+import com.hcloud.microserver.security.annotation.PreAuthorize;
 import com.hcloud.microserver.system.bank.service.ISubscriptionApplyService;
 import com.hcloud.microserver.system.facade.carbon.entity.SubscriptionApply;
 import io.swagger.annotations.Api;
@@ -36,7 +37,7 @@ public class SubscriptionApplyController extends BaseController
      */
     @ApiResponse(code =0,message = "查询成功")
     @GetMapping("/list")
-    @AuthCarbonValidate
+    @PreAuthorize(hasPermi = "system:subscriptionApply:list")
     @ApiOperation("查询认购申请列表")
     public ResponseBase<SubscriptionApply> list(SubscriptionApply subscriptionApply)
     {
@@ -49,7 +50,7 @@ public class SubscriptionApplyController extends BaseController
      * 获取碳汇认购申请详细信息
      */
     @GetMapping(value = "/{guid}")
-    @AuthCarbonValidate
+    @PreAuthorize(hasPermi = "system:subscriptionApply:info")
     @ApiOperation("获取认购申请详情")
     public ResponseBase getInfo(@PathVariable("guid") String guid)
     {
@@ -62,7 +63,7 @@ public class SubscriptionApplyController extends BaseController
      */
 
 	@DeleteMapping("/{guids}")
-    @AuthCarbonValidate
+    @PreAuthorize(hasPermi = "system:subscriptionApply:remove")
     @ApiOperation("逻辑删除认购申请")
     public ResponseBase remove(@PathVariable String[] guids)
     {

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

@@ -0,0 +1,79 @@
+package com.hcloud.microserver.system.bank.controller;
+
+import com.github.pagehelper.PageInfo;
+import com.hcloud.microserver.commoncore.base.BaseController;
+import com.hcloud.microserver.commoncore.base.ResponseBase;
+import com.hcloud.microserver.mbg.modul.TCarbonProblem;
+import com.hcloud.microserver.system.bank.service.TCarbonProblemService;
+import com.hcloud.microserver.system.facade.carbon.forms.TCarbonProblemForm;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+@Slf4j
+@Api(tags = "常见问题管理接口")
+@RestController
+@RequestMapping("/carbon/problem")
+public class TCarbonProblemController extends BaseController {
+
+    @Autowired
+    private TCarbonProblemService service;
+
+    @ApiOperation("常见问题添加")
+    @PutMapping
+    public ResponseBase add(@RequestBody TCarbonProblem problem){
+        Long aLong = service.addProblem(problem);
+        if (aLong != null){
+            return responseResultSuccess(aLong);
+        }
+        return responseResultFailure();
+    }
+
+    @ApiOperation("常见问题修改")
+    @PostMapping("update")
+    public ResponseBase update(@RequestBody TCarbonProblem problem){
+        Integer update = service.update(problem);
+        if (update != null){
+            return responseResultSuccess();
+        }
+        return responseResultFailure();
+    }
+
+    @ApiOperation("常见问题查询")
+    @PostMapping("list")
+    public ResponseBase<List<TCarbonProblem>> list(@RequestBody TCarbonProblemForm form){
+        PageInfo<TCarbonProblem> list = service.list(form);
+        if (list != null){
+            return responseSuccess(list);
+        }
+        return responseResultFailure();
+    }
+
+    @ApiOperation("常见问题详细信息")
+    @GetMapping("info")
+    public ResponseBase<TCarbonProblem> info(@RequestParam(value = "guid",required = true)Long guid){
+        TCarbonProblem info = service.info(guid);
+        if (info != null){
+            return responseResultSuccess(info);
+        }
+        return responseResultFailure();
+    }
+
+    @ApiOperation("常见问题详细信息")
+    @GetMapping("disen")
+    public ResponseBase disable(@RequestParam(value = "guid",required = true)Long guid,
+                                                @RequestParam(value = "state")Integer state){
+        Integer integer = service.disableOrEnable(guid, state);
+        if (integer != null&&integer>0){
+            return responseResultSuccess();
+        }
+        return responseResultFailure();
+    }
+
+
+
+}

carbon-back/carbon-back-service/src/main/java/com/hcloud/microserver/system/bank/events/CustomerCarbonValEvent.java

@@ -0,0 +1,21 @@
+package com.hcloud.microserver.system.bank.events;
+
+import lombok.Getter;
+import org.springframework.context.ApplicationEvent;
+
+/**
+ * 个人购碳数据
+ */
+@Getter
+public class CustomerCarbonValEvent extends ApplicationEvent {
+    /**
+     * 订单id
+     */
+    private String orderId;
+
+
+    public CustomerCarbonValEvent(Object source, String orderId) {
+        super(source);
+        this.orderId = orderId;
+    }
+}

carbon-back/carbon-back-service/src/main/java/com/hcloud/microserver/system/bank/listens/CustomerCarbonValListener.java

@@ -0,0 +1,67 @@
+package com.hcloud.microserver.system.bank.listens;
+
+import com.hcloud.microserver.commoncore.util.GetUUID;
+import com.hcloud.microserver.mbg.mapper.TCustomerCarbonValMapper;
+import com.hcloud.microserver.mbg.mapper.TGoodsOrderInfoMapper;
+import com.hcloud.microserver.mbg.modul.TCustomerCarbonVal;
+import com.hcloud.microserver.mbg.modul.TGoodsOrderInfo;
+import com.hcloud.microserver.system.bank.events.CustomerCarbonValEvent;
+import com.hcloud.microserver.system.facade.carbon.entity.GoodsOrderInfo;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.event.EventListener;
+import org.springframework.scheduling.annotation.Async;
+import org.springframework.stereotype.Component;
+
+import java.util.Calendar;
+import java.util.Date;
+
+@Slf4j
+@Component
+public class CustomerCarbonValListener {
+
+    @Autowired
+    TCustomerCarbonValMapper customerCarbonValMapper;
+
+    @Autowired
+    TGoodsOrderInfoMapper goodsOrderInfoMapper;
+
+    @Async
+    @EventListener
+    public void generateCredentialInfo(CustomerCarbonValEvent credentialInfoEvent) {
+        String orderId = credentialInfoEvent.getOrderId();
+
+        TGoodsOrderInfo goodsOrderInfo = goodsOrderInfoMapper.selectByPrimaryKey(orderId);
+        TCustomerCarbonVal record = new TCustomerCarbonVal();
+        record.setGuid(GetUUID.getUUID());
+        //购买的碳汇量
+        record.setCarbonVal(goodsOrderInfo.getOrderCarbonAmount());
+        //创建时间
+        record.setCreateTime(new Date());
+        //数据来源表id
+        record.setTbGuid(orderId);
+        //数据来源表名称
+        record.setTbName("t_goods_order_info");
+        //
+        record.settCustomerId(goodsOrderInfo.getFkCustomerGuid());
+
+        record.settCustomerName(goodsOrderInfo.getCustomerName());
+        //类型 1购买碳汇 2企业碳中和 3大型活动碳中和 4碳履约
+        record.setType(1);
+        //状态 1 新增 0 减去
+        record.setStatus(1);
+        //
+        record.setRemarks("购买碳汇数据");
+        //获取年份
+        record.setYearTime(getYear());
+        //创建人
+        record.setCreateUser(goodsOrderInfo.getFkCustomerGuid());
+        customerCarbonValMapper.insertSelective(record);
+    }
+
+    public Integer getYear(){
+        Calendar calendar = Calendar.getInstance();
+        calendar.setTime(new Date());
+        return calendar.get(Calendar.YEAR);
+    }
+}

carbon-back/carbon-back-service/src/main/java/com/hcloud/microserver/system/bank/service/TCarbonProblemService.java

@@ -0,0 +1,53 @@
+package com.hcloud.microserver.system.bank.service;
+
+import com.github.pagehelper.PageInfo;
+import com.hcloud.microserver.mbg.modul.TCarbonProblem;
+import com.hcloud.microserver.system.facade.carbon.forms.TCarbonProblemForm;
+
+public interface TCarbonProblemService {
+    /**
+     * 添加常见问题
+     * @param tCarbonProblem
+     * @return
+     */
+    public Long addProblem(TCarbonProblem tCarbonProblem);
+
+    /**
+     * 分页查询常见问题
+     * @param form
+     * @return
+     */
+    public PageInfo<TCarbonProblem> list(TCarbonProblemForm form);
+
+    /**
+     * 查询常见问题详细信息
+     * @param guid
+     * @return
+     */
+    public TCarbonProblem info(Long guid);
+
+
+    /**
+     * 禁用常见问题 state=1禁用  state = 0 启用
+     * @param guid
+     * @Param state
+     * @return
+     */
+    public Integer disableOrEnable(Long guid,Integer state);
+
+
+
+    /**
+     * 删除常见问题
+     * @param guid
+     * @return
+     */
+    public Integer delete(Long guid);
+
+    /**
+     * 修改常见问题
+     * @param tCarbonProblem
+     * @return
+     */
+    public Integer update(TCarbonProblem tCarbonProblem);
+}

carbon-back/carbon-back-service/src/main/java/com/hcloud/microserver/system/bank/service/impl/BasePositionServiceImpl.java

@@ -3,9 +3,10 @@ package com.hcloud.microserver.system.bank.service.impl;
 import com.hcloud.microserver.system.bank.dao.BasePositionMapper;
 import com.hcloud.microserver.system.bank.service.BasePositionService;
 import com.hcloud.microserver.system.facade.carbon.entity.BasePosition;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
-import javax.annotation.Resource;
+
 import java.util.List;
 
 /**
@@ -14,7 +15,7 @@ import java.util.List;
 @Service
 public class BasePositionServiceImpl implements BasePositionService {
 
-    @Resource
+    @Autowired
     private BasePositionMapper basePositionMapper;
 
     @Override

carbon-back/carbon-back-service/src/main/java/com/hcloud/microserver/system/bank/service/impl/CompanyServiceImpl.java

@@ -38,7 +38,11 @@ public class CompanyServiceImpl implements CompanyService {
         customerInfo.setIsCompany(1);
         customerInfo.setCreateTime(new Date());
         customerInfo.setModifiedTime(new Date());
-
+        customerInfo.setCustomerName(customerCompanyInfo.getCompanyName());
+        /**
+         * 客户类型先设置为2表示企业客户 ，企业客户部分类  可改
+         */
+        customerInfo.setCustomerType(2);
         customerCompanyInfo.setGuid(UUIDUtils.randomUUID());
         customerCompanyInfo.setFkCustomerId(customerGuid);
         customerCompanyInfo.setCreateTime(new Date());

carbon-back/carbon-back-service/src/main/java/com/hcloud/microserver/system/bank/service/impl/CredentialInfoServiceImpl.java

@@ -2,6 +2,7 @@ package com.hcloud.microserver.system.bank.service.impl;
 
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
+import com.hcloud.microserver.commoncore.util.UUIDUtils;
 import com.hcloud.microserver.system.bank.bo.CredentialInfoBO;
 import com.hcloud.microserver.system.bank.dao.GoodsCredentialInfoMapper;
 import com.hcloud.microserver.system.bank.dao.GoodsOrderInfoMapper;
@@ -80,6 +81,8 @@ public class CredentialInfoServiceImpl implements CredentialInfoService {
                 goodsCredentialInfoForm.setState(1);
                 goodsCredentialInfoForm.setCreateTime(new Date());
             }
+            goodsCredentialInfoForm.setGuid(UUIDUtils.randomUUID());
+            goodsCredentialInfoForm.setCertType(2);
             return this.saveSelective(goodsCredentialInfoForm);
         }
         return 0;

carbon-back/carbon-back-service/src/main/java/com/hcloud/microserver/system/bank/service/impl/OrderInfoServiceImpl.java

@@ -12,6 +12,7 @@ import com.hcloud.microserver.commoncore.base.PageBean;
 import com.hcloud.microserver.commoncore.util.BeanCopyUtil;
 import com.hcloud.microserver.commoncore.util.GeneratorIdUtils;
 import com.hcloud.microserver.commoncore.util.GetUUID;
+import com.hcloud.microserver.system.bank.events.CustomerCarbonValEvent;
 import com.hcloud.microserver.system.bank.service.*;
 import com.hcloud.microserver.system.facade.carbon.entity.*;
 import com.hcloud.microserver.system.facade.carbon.forms.*;
@@ -390,6 +391,7 @@ public class OrderInfoServiceImpl implements OrderInfoService {
         CustomerBO customer = customerInfoService.queryCustomerInfoByGuid(createOrderBO.getApplyCostomerId());
         //保存主订单
         GoodsOrderInfo order = new GoodsOrderInfo();
+
         order.setCustomerName(customer.getCompanyName());
         order.setFkCustomerGuid(customer.getGuid());
         order.setCustomerType(customer.getCustomerType().toString());
@@ -522,7 +524,10 @@ public class OrderInfoServiceImpl implements OrderInfoService {
     @Transactional
     public int collectMoneyDeal(OfflineOrderPayVoucherForm payVoucher) {
         //更新订单状态
-        String payNo = UUIDUtils.randomUUID();
+
+        GeneratorIdUtils generatorIdUtils = new GeneratorIdUtils();
+        String payNo = generatorIdUtils.nextId();
+//        String payNo = UUIDUtils.randomUUID();
         GoodsOrderInfo order = goodsOrderInfoMapper.selectByPrimaryKey(payVoucher.getOrderId());
         order.setGuid(payVoucher.getOrderId());
         order.setPayNo(payNo);
@@ -535,6 +540,8 @@ public class OrderInfoServiceImpl implements OrderInfoService {
         int result = orderPayVoucherService.newSavePayVoucher(payVoucher);
         //保存证书
         applicationContext.publishEvent(new CredentialInfoEvent(new Object(),payVoucher.getOrderId()));
+        applicationContext.publishEvent(new CustomerCarbonValEvent(this, order.getGuid()));
+
         //保存支付订单
         GoodsPayOrderForm form = new GoodsPayOrderForm();
         form.setFkCustomerId(payVoucher.getCustomerId());

carbon-back/carbon-back-service/src/main/java/com/hcloud/microserver/system/bank/service/impl/TCarbonProblemServiceImpl.java

@@ -0,0 +1,85 @@
+package com.hcloud.microserver.system.bank.service.impl;
+
+import com.github.pagehelper.PageHelper;
+import com.github.pagehelper.PageInfo;
+import com.hcloud.microserver.mbg.mapper.TCarbonProblemMapper;
+import com.hcloud.microserver.mbg.modul.TCarbonProblem;
+import com.hcloud.microserver.mbg.modul.TCarbonProblemExample;
+import com.hcloud.microserver.security.service.TokenService;
+import com.hcloud.microserver.system.bank.service.TCarbonProblemService;
+import com.hcloud.microserver.system.facade.carbon.forms.TCarbonProblemForm;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.Date;
+import java.util.List;
+
+@Service
+public class TCarbonProblemServiceImpl implements TCarbonProblemService {
+    @Autowired
+    private TCarbonProblemMapper carbonProblemMapper;
+
+    @Autowired
+    private TokenService tokenService;
+
+    @Override
+    public Long addProblem(TCarbonProblem tCarbonProblem) {
+        if (tCarbonProblem != null){
+
+            tCarbonProblem.setState(0);
+            tCarbonProblem.setCreateId(tokenService.getLoginUser().getUserid());
+            tCarbonProblem.setCreateName(tokenService.getLoginUser().getUsername());
+            carbonProblemMapper.insert(tCarbonProblem);
+            tCarbonProblem.setCreateTime(new Date());
+            return tCarbonProblem.getGuid();
+        }
+        return null;
+    }
+
+    @Override
+    public PageInfo<TCarbonProblem> list(TCarbonProblemForm form) {
+        PageHelper.startPage(form.getPageNo(),form.getPageSize());
+        TCarbonProblemExample example = new TCarbonProblemExample();
+
+        if (form != null){
+            example = form.example();
+        }
+        List<TCarbonProblem> tCarbonProblems = carbonProblemMapper.selectByExampleWithBLOBs(example);
+        return new PageInfo<>(tCarbonProblems);
+    }
+
+    @Override
+    public TCarbonProblem info(Long guid) {
+        if (guid != null){
+            return carbonProblemMapper.selectByPrimaryKey(guid);
+        }
+        return null;
+    }
+
+    @Override
+    public Integer disableOrEnable(Long guid, Integer state) {
+        if (guid == null|| state ==null){
+            return 0;
+        }
+        TCarbonProblem tCarbonProblem = new TCarbonProblem();
+        tCarbonProblem.setGuid(guid);
+        tCarbonProblem.setState(state);
+        return carbonProblemMapper.updateByPrimaryKeySelective(tCarbonProblem);
+    }
+
+    @Override
+    public Integer delete(Long guid) {
+        if (guid != null){
+            return carbonProblemMapper.deleteByPrimaryKey(guid);
+        }
+        return 0;
+    }
+
+    @Override
+    public Integer update(TCarbonProblem tCarbonProblem) {
+        if (tCarbonProblem != null&& tCarbonProblem.getGuid() != null){
+            return carbonProblemMapper.updateByPrimaryKeySelective(tCarbonProblem);
+        }
+        return 0;
+    }
+}

carbon-back/carbon-back-service/src/main/resources/carbon/GoodsCredentialInfoMapper.xml

@@ -16,15 +16,16 @@
     <result column="state" jdbcType="INTEGER" property="state" />
     <result column="create_user" jdbcType="CHAR" property="createUser" />
     <result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
+    <result column="cert_type" jdbcType="INTEGER" property="certType"/>
     <association property="customerInfo" column="fk_customer_id" select="CustomerInfoMapper.selectByPrimaryKey"/>
     <association property="goodsOrderInfo" column="fk_order_id" select="GoodsOrderInfoMapper.selectByPrimaryKey"/>
   </resultMap>
   <sql id="Base_Column_List">
     guid,fk_customer_id,fk_order_id, fk_order_detail_id, credential_no,buy_date, carbon_amount, product_address,
-    farmer_count, farmer_names, cre_images, state, create_user, create_time
+    farmer_count, farmer_names, cre_images, state, create_user, create_time,cert_type
   </sql>
   <select id="selectByPrimaryKey" parameterType="java.lang.String" resultMap="BaseResultMap">
-    select 
+    select
     <include refid="Base_Column_List" />
     from t_goods_credential_info
     where guid = #{guid,jdbcType=CHAR}
@@ -49,10 +50,11 @@
         DATE_FORMAT(aa.buy_date,'%Y年%m月%d日') AS buyDate,
         aa.carbon_amount AS carbonAmount,
         aa.credential_no AS credentialNo,
-        bb.customer_name AS customerName,
+        IFNUll(bb.customer_name,bb.nick_name) AS customerName,
         bb.nick_name AS nickName,
         cc.company_name AS companyName,
-        dd.order_amount AS OrderAmount
+        dd.order_amount AS OrderAmount,
+        aa.cert_type
     FROM
         t_goods_credential_info aa
     LEFT JOIN t_goods_order_info dd ON aa.fk_order_id = dd.guid
@@ -77,13 +79,13 @@
   <insert id="insert" parameterType="GoodsCredentialInfo">
     insert into t_goods_credential_info (guid,fk_customer_id ,fk_order_id, fk_order_detail_id,
       credential_no,buy_date, carbon_amount, product_address,
-      farmer_count, farmer_names, cre_images, 
-      state, create_user, create_time
+      farmer_count, farmer_names, cre_images,
+      state, create_user, create_time,cert_type
       )
     values (#{guid,jdbcType=CHAR},#{fkCustomerId,jdbcType=CHAR} ,#{fkOrderId,jdbcType=CHAR}, #{fkOrderDetailId,jdbcType=CHAR},
       #{credentialNo,jdbcType=VARCHAR},#{buyDate,jdbcType=DATE}, #{carbonAmount,jdbcType=DECIMAL}, #{productAddress,jdbcType=VARCHAR},
-      #{farmerCount,jdbcType=INTEGER}, #{farmerNames,jdbcType=VARCHAR}, #{creImages,jdbcType=VARCHAR}, 
-      #{state,jdbcType=INTEGER}, #{createUser,jdbcType=CHAR}, #{createTime,jdbcType=TIMESTAMP}
+      #{farmerCount,jdbcType=INTEGER}, #{farmerNames,jdbcType=VARCHAR}, #{creImages,jdbcType=VARCHAR},
+      #{state,jdbcType=INTEGER}, #{createUser,jdbcType=CHAR}, #{createTime,jdbcType=TIMESTAMP},#{certType,jdbcType=INTEGER}
       )
   </insert>
   <insert id="insertSelective" parameterType="GoodsCredentialInfo">
@@ -131,6 +133,9 @@
       <if test="createTime != null">
         create_time,
       </if>
+      <if test="certType != null">
+        cert_type,
+      </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides=",">
       <if test="guid != null">
@@ -175,6 +180,9 @@
       <if test="createTime != null">
         #{createTime,jdbcType=TIMESTAMP},
       </if>
+      <if test="certType != null">
+        #{certType,jdbcType=INTEGER},
+      </if>
     </trim>
   </insert>
   <update id="updateByPrimaryKeySelective" parameterType="GoodsCredentialInfo">
@@ -219,6 +227,9 @@
       <if test="createTime != null">
         create_time = #{createTime,jdbcType=TIMESTAMP},
       </if>
+      <if test="certType != null">
+        cert_type = #{certType,jdbcType=INTEGER}
+      </if>
     </set>
     where guid = #{guid,jdbcType=CHAR}
   </update>
@@ -236,7 +247,9 @@
       cre_images = #{creImages,jdbcType=VARCHAR},
       state = #{state,jdbcType=INTEGER},
       create_user = #{createUser,jdbcType=CHAR},
-      create_time = #{createTime,jdbcType=TIMESTAMP}
+      create_time = #{createTime,jdbcType=TIMESTAMP},
+      cert_type = #{certType,jdbcType=INTEGER}
+
     where guid = #{guid,jdbcType=CHAR}
   </update>
-</mapper>
+</mapper>

carbon-back/carbon-back-service/src/main/resources/carbon/GoodsOrderInfoMapper.xml

@@ -24,7 +24,7 @@
      modified_time,pay_no,order_type
   </sql>
   <select id="selectByPrimaryKey" parameterType="java.lang.String" resultMap="BaseResultMap">
-    select 
+    select
     <include refid="Base_Column_List" />
     from t_goods_order_info
     where guid = #{guid,jdbcType=CHAR}
@@ -131,14 +131,14 @@
     where guid = #{guid,jdbcType=CHAR}
   </delete>
   <insert id="insert" parameterType="com.hcloud.microserver.system.facade.carbon.entity.GoodsOrderInfo">
-    insert into t_goods_order_info (guid, fk_customer_guid, order_no, 
+    insert into t_goods_order_info (guid, fk_customer_guid, order_no,
       customer_name,customer_type,order_amount, order_carbon_amount, order_status,
-      state, create_user, create_time, 
+      state, create_user, create_time,
       modified_user, modified_time,pay_no,order_type)
-    values (#{guid,jdbcType=CHAR}, #{fkCustomerGuid,jdbcType=CHAR}, #{orderNo,jdbcType=CHAR}, 
+    values (#{guid,jdbcType=CHAR}, #{fkCustomerGuid,jdbcType=CHAR}, #{orderNo,jdbcType=CHAR},
       #{customerName,jdbcType=VARCHAR},#{customerType,jdbcType=VARCHAR},#{orderAmount,jdbcType=DECIMAL},
       #{orderCarbonAmount,jdbcType=DECIMAL}, #{orderStatus,jdbcType=INTEGER},
-      #{state,jdbcType=INTEGER}, #{createUser,jdbcType=CHAR}, #{createTime,jdbcType=TIMESTAMP}, 
+      #{state,jdbcType=INTEGER}, #{createUser,jdbcType=CHAR}, #{createTime,jdbcType=TIMESTAMP},
       #{modifiedUser,jdbcType=CHAR}, #{modifiedTime,jdbcType=TIMESTAMP},#{payNo,jdbcType=VARCHAR},#{orderType,jdbcType=INTEGER})
   </insert>
   <insert id="insertSelective" parameterType="com.hcloud.microserver.system.facade.carbon.entity.GoodsOrderInfo">
@@ -418,11 +418,12 @@
             DATE_FORMAT(aa.buy_date,'%Y年%m月%d日') AS buyDate,
             aa.carbon_amount AS carbonAmount,
             aa.credential_no AS credentialNo,
-            bb.customer_name AS customerName,
+            IFNULL(bb.customer_name,bb.nick_name) AS customerName,
             bb.nick_name AS nickName,
             cc.company_name AS companyName,
             dd.order_amount AS OrderAmount,
             aa.farmer_names AS farmerName,
+            aa.cert_type as certType,
             YEAR(aa.buy_date) AS year
         FROM
             t_goods_credential_info aa
@@ -432,4 +433,4 @@
         WHERE
         aa.fk_order_id = #{guid}
     </select>
-</mapper>
+</mapper>

carbon-back/carbon-back-service/src/main/resources/carbon/GoodsPayOrderMapper.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="GoodsPayOrderMapper">
+<mapper namespace="com.hcloud.microserver.system.bank.dao.GoodsPayOrderMapper">
   <resultMap id="BaseResultMap" type="GoodsPayOrder">
     <id column="guid" jdbcType="CHAR" property="guid" />
     <result column="fk_customer_id" jdbcType="CHAR" property="fkCustomerId" />
@@ -15,11 +15,11 @@
     <result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
   </resultMap>
   <sql id="Base_Column_List">
-    guid, fk_customer_id, fk_order_id, order_no, pay_no, pay_amount, pay_channel, pay_time, 
+    guid, fk_customer_id, fk_order_id, order_no, pay_no, pay_amount, pay_channel, pay_time,
     pay_status, state, create_time
   </sql>
   <select id="selectByPrimaryKey" parameterType="java.lang.String" resultMap="BaseResultMap">
-    select 
+    select
     <include refid="Base_Column_List" />
     from t_goods_pay_order
     where guid = #{guid,jdbcType=CHAR}
@@ -41,13 +41,13 @@
     where guid = #{guid,jdbcType=CHAR}
   </delete>
   <insert id="insert" parameterType="GoodsPayOrder">
-    insert into t_goods_pay_order (guid, fk_customer_id, fk_order_id, 
-      order_no, pay_no, pay_amount, 
-      pay_channel, pay_time, pay_status, 
+    insert into t_goods_pay_order (guid, fk_customer_id, fk_order_id,
+      order_no, pay_no, pay_amount,
+      pay_channel, pay_time, pay_status,
       state, create_time)
-    values (#{guid,jdbcType=CHAR}, #{fkCustomerId,jdbcType=CHAR}, #{fkOrderId,jdbcType=CHAR}, 
-      #{orderNo,jdbcType=VARCHAR}, #{payNo,jdbcType=VARCHAR}, #{payAmount,jdbcType=DECIMAL}, 
-      #{payChannel,jdbcType=INTEGER}, #{payTime,jdbcType=TIMESTAMP}, #{payStatus,jdbcType=INTEGER}, 
+    values (#{guid,jdbcType=CHAR}, #{fkCustomerId,jdbcType=CHAR}, #{fkOrderId,jdbcType=CHAR},
+      #{orderNo,jdbcType=VARCHAR}, #{payNo,jdbcType=VARCHAR}, #{payAmount,jdbcType=DECIMAL},
+      #{payChannel,jdbcType=INTEGER}, #{payTime,jdbcType=TIMESTAMP}, #{payStatus,jdbcType=INTEGER},
       #{state,jdbcType=INTEGER}, #{createTime,jdbcType=TIMESTAMP})
   </insert>
   <insert id="insertSelective" parameterType="GoodsPayOrder">
@@ -216,4 +216,4 @@
     </where>
   </select>
 
-</mapper>
+</mapper>

carbon-h5/carbon-h5-common/carbon-h5-common.iml

@@ -30,11 +30,20 @@
     <orderEntry type="library" scope="RUNTIME" name="Maven: org.yaml:snakeyaml:1.23" level="project" />
     <orderEntry type="library" name="Maven: org.mybatis.spring.boot:mybatis-spring-boot-starter:1.3.2" level="project" />
     <orderEntry type="library" name="Maven: org.mybatis.spring.boot:mybatis-spring-boot-autoconfigure:1.3.2" level="project" />
-    <orderEntry type="library" name="Maven: org.mybatis:mybatis:3.4.6" level="project" />
     <orderEntry type="library" name="Maven: org.mybatis:mybatis-spring:1.3.2" level="project" />
     <orderEntry type="library" name="Maven: com.github.pagehelper:pagehelper-spring-boot-autoconfigure:1.2.10" level="project" />
     <orderEntry type="library" name="Maven: com.github.pagehelper:pagehelper:5.1.8" level="project" />
     <orderEntry type="library" name="Maven: com.github.jsqlparser:jsqlparser:1.2" level="project" />
+    <orderEntry type="module" module-name="carbon-api-mbg" />
+    <orderEntry type="library" name="Maven: com.alibaba:druid-spring-boot-starter:1.1.10" level="project" />
+    <orderEntry type="library" name="Maven: com.alibaba:druid:1.1.10" level="project" />
+    <orderEntry type="library" name="Maven: org.slf4j:slf4j-api:1.7.30" level="project" />
+    <orderEntry type="library" name="Maven: org.mybatis.generator:mybatis-generator-core:1.3.7" level="project" />
+    <orderEntry type="library" name="Maven: mysql:mysql-connector-java:8.0.16" level="project" />
+    <orderEntry type="library" name="Maven: com.google.protobuf:protobuf-java:3.6.1" level="project" />
+    <orderEntry type="library" name="Maven: javax.validation:validation-api:2.0.1.Final" level="project" />
+    <orderEntry type="library" name="Maven: org.mybatis:mybatis:3.4.6" level="project" />
+    <orderEntry type="library" name="Maven: io.github.openfeign:feign-core:10.1.0" level="project" />
     <orderEntry type="module" module-name="common-core" />
     <orderEntry type="library" name="Maven: io.springfox:springfox-swagger2:2.9.2" level="project" />
     <orderEntry type="library" name="Maven: io.swagger:swagger-annotations:1.6.0" level="project" />
@@ -52,7 +61,6 @@
     <orderEntry type="library" name="Maven: com.google.j2objc:j2objc-annotations:1.1" level="project" />
     <orderEntry type="library" name="Maven: org.codehaus.mojo:animal-sniffer-annotations:1.14" level="project" />
     <orderEntry type="library" name="Maven: com.fasterxml:classmate:1.4.0" level="project" />
-    <orderEntry type="library" name="Maven: org.slf4j:slf4j-api:1.7.30" level="project" />
     <orderEntry type="library" name="Maven: org.springframework.plugin:spring-plugin-core:1.2.0.RELEASE" level="project" />
     <orderEntry type="library" name="Maven: org.springframework.plugin:spring-plugin-metadata:1.2.0.RELEASE" level="project" />
     <orderEntry type="library" name="Maven: org.mapstruct:mapstruct:1.2.0.Final" level="project" />
@@ -131,7 +139,6 @@
     <orderEntry type="library" name="Maven: log4j:log4j:1.2.14" level="project" />
     <orderEntry type="library" name="Maven: com.squareup.okhttp:okhttp:2.7.5" level="project" />
     <orderEntry type="library" name="Maven: com.squareup.okio:okio:1.6.0" level="project" />
-    <orderEntry type="library" name="Maven: javax.validation:validation-api:2.0.1.Final" level="project" />
     <orderEntry type="library" name="Maven: com.qiniu:qiniu-java-sdk:7.2.28" level="project" />
     <orderEntry type="library" scope="RUNTIME" name="Maven: com.squareup.okhttp3:okhttp:3.8.1" level="project" />
     <orderEntry type="library" name="Maven: com.github.anji-plus:captcha-spring-boot-starter:1.2.4" level="project" />
@@ -151,7 +158,6 @@
     <orderEntry type="library" name="Maven: commons-fileupload:commons-fileupload:1.3.3" level="project" />
     <orderEntry type="library" name="Maven: org.springframework.cloud:spring-cloud-commons:2.1.0.RELEASE" level="project" />
     <orderEntry type="library" name="Maven: org.springframework.security:spring-security-crypto:5.1.8.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: io.github.openfeign:feign-core:10.1.0" level="project" />
     <orderEntry type="library" name="Maven: io.github.openfeign:feign-slf4j:10.1.0" level="project" />
     <orderEntry type="library" name="Maven: io.github.openfeign:feign-hystrix:10.1.0" level="project" />
     <orderEntry type="library" name="Maven: com.netflix.archaius:archaius-core:0.7.6" level="project" />

carbon-h5/carbon-h5-common/pom.xml

@@ -20,5 +20,10 @@
             <groupId>com.github.pagehelper</groupId>
             <artifactId>pagehelper-spring-boot-starter</artifactId>
         </dependency>
+        <dependency>
+            <groupId>com.hcloud.microserver</groupId>
+            <artifactId>carbon-api-mbg</artifactId>
+            <version>0.0.1-SNAPSHOT</version>
+        </dependency>
     </dependencies>
 </project>

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

@@ -35,6 +35,16 @@ public class GoodsCredentialInfo {
 
     private String createUser;
 
+    private Integer certType;
+
+    public Integer getCertType() {
+        return certType;
+    }
+
+    public void setCertType(Integer certType) {
+        this.certType = certType;
+    }
+
     @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss", timezone="GMT+8")
     private Date createTime;
 
@@ -169,4 +179,4 @@ public class GoodsCredentialInfo {
     public void setGoodsOrderInfo(GoodsOrderInfo goodsOrderInfo) {
         this.goodsOrderInfo = goodsOrderInfo;
     }
-}
+}

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

@@ -33,5 +33,9 @@ public class GoodsCredentialInfoForm extends BaseForm {
     private String farmerNames;
 
     private String creImages;
+    /**
+     * 证书类型
+     */
+    private Integer certType;
 
 }

carbon-h5/carbon-h5-common/src/main/java/com/hcloud/microserver/h5/facade/carbon/forms/TCarbonProblemForm.java

@@ -0,0 +1,61 @@
+package com.hcloud.microserver.h5.facade.carbon.forms;
+
+import com.hcloud.microserver.commoncore.base.CarbonBaseForm;
+import com.hcloud.microserver.commoncore.util.reflect.DateUtils;
+import com.hcloud.microserver.commoncore.util.string.StringUtils;
+import com.hcloud.microserver.mbg.modul.TCarbonProblemExample;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.Date;
+
+@Data
+@ApiModel("碳汇常见问题Form")
+public class TCarbonProblemForm extends CarbonBaseForm {
+
+    @ApiModelProperty(value = "序列号")
+    private Long guid;
+
+    @ApiModelProperty(value = "问题名称")
+    private String problemName;
+
+    @ApiModelProperty(value = "问题类型")
+    private Integer problemType;
+
+    @ApiModelProperty(value = "问题状态：1-禁用 0-非禁用")
+    private Integer state;
+
+    @ApiModelProperty(value = "开始创建创建时间")
+    private Date createTimeStart;
+
+    @ApiModelProperty(value = "结束创建时间")
+    private Date createTimeEnd;
+
+
+    public TCarbonProblemExample example(){
+        TCarbonProblemExample example = new TCarbonProblemExample();
+        TCarbonProblemExample.Criteria criteria = example.createCriteria();
+        if (this.guid != null){
+            criteria.andGuidEqualTo(this.guid);
+        }
+
+        if (StringUtils.isNotEmpty(this.problemName)){
+            criteria.andProblemNameLike("%"+this.problemName+"%");
+        }
+        if (this.state != null){
+            criteria.andStateEqualTo(this.state);
+        }
+        if (this.problemType != null){
+            criteria.andProblemTypeEqualTo(this.problemType);
+        }
+        if (this.createTimeStart != null){
+            criteria.andCreateTimeGreaterThanOrEqualTo(DateUtils.getTodayStartTime(this.createTimeStart));
+        }
+
+        if (this.createTimeEnd != null){
+            criteria.andCreateTimeLessThanOrEqualTo(DateUtils.getTodayEndTime(this.createTimeEnd));
+        }
+        return example;
+    }
+}

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

@@ -58,4 +58,10 @@ public class CredentialInfoBO {
      * 年度
      */
     private String year;
+
+    /**
+     * 证书类型
+     */
+    private Integer certType;
+
 }

carbon-h5/carbon-h5-service/src/main/java/com/hcloud/microserver/h5/common/NormalController.java

@@ -45,7 +45,7 @@ public class NormalController extends CarbonBaseController {
             @ApiImplicitParam(name = "file",value = "上传内容",dataType = "MultipartFile")
     })
     @ApiResponse(code = 0,message = "操作成功")
-    @AuthCarbonValidate
+
     @PostMapping("/uploadPics")
     public ResponseBase uploadPics(@RequestParam("file") MultipartFile file, HttpServletRequest request){
         ResultVO resultVO = this.uploadImageFiles(file,TARGET_IMAGE_DIC_NAME);
@@ -57,7 +57,7 @@ public class NormalController extends CarbonBaseController {
             @ApiImplicitParam(name = "file",value = "上传内容",dataType = "MultipartFile")
     })
     @ApiResponse(code = 0,message = "操作成功")
-    @AuthCarbonValidate
+
     @PostMapping("/uploadFiles")
     public ResponseBase uploadFiles(@RequestParam("file") MultipartFile file, HttpServletRequest request){
         log.info("==================>{}",file);
@@ -70,7 +70,7 @@ public class NormalController extends CarbonBaseController {
 //            @ApiImplicitParam(name = "imageSign",value = "微信图片密文",dataType = "String",paramType = "query")
 //    })
 //    @ApiResponse(code = 0,message = "操作成功")
-//    @AuthCarbonValidate
+//
 //    @GetMapping("/uploadWeChatImg")
 //    public ResponseBase uploadFilesForWeChat(@RequestParam("imageSign") String signImageStr){
 //        StringBuffer stb = new StringBuffer(DOWNLOAD_IMAGES_FOR_WX);
@@ -102,7 +102,7 @@ public class NormalController extends CarbonBaseController {
             @ApiImplicitParam(name = "phone",value = "手机号码",dataType = "String",paramType = "query")
     })
     @ApiResponse(code = 0,message = "操作成功")
-    @AuthCarbonValidate
+
     @GetMapping("/sendPhoneMsg")
     public ResponseBase sendPhoneMsg(@RequestParam("phone") String phone){
         ResultVO resultVO = smsComponent.sendPhoneMsm(phone, SMSEnum.AUTHENTICATION);
@@ -114,7 +114,7 @@ public class NormalController extends CarbonBaseController {
             @ApiImplicitParam(name = "phone",value = "手机号码",dataType = "String",paramType = "query")
     })
     @ApiResponse(code = 0,message = "操作成功")
-    @AuthCarbonValidate
+
     @GetMapping("/sendUpdatePasswdMsg")
     public ResponseBase sendUpdatePasswdMsg(@RequestParam("phone") String phone){
         ResultVO resultVO = smsComponent.sendPhoneMsm(phone, SMSEnum.CHANGE_PASSWORD);

carbon-h5/carbon-h5-service/src/main/java/com/hcloud/microserver/h5/config/MyBatisConfig.java

@@ -10,6 +10,6 @@ import org.springframework.transaction.annotation.EnableTransactionManagement;
  */
 @Configuration
 @EnableTransactionManagement
-@MapperScan({"com.hcloud.microserver.h5.dao","com.hcloud.microserver.h5.mbg.mapper"})
+@MapperScan({"com.hcloud.microserver.h5.dao","com.hcloud.microserver.mbg.mapper"})
 public class MyBatisConfig {
 }

carbon-h5/carbon-h5-service/src/main/java/com/hcloud/microserver/h5/controller/web/CustomerController.java

@@ -86,7 +86,7 @@ public class CustomerController extends BaseController {
     @ApiOperation(value = "获取爱心用户登录信息", notes = "获取爱心用户登录信息,通过token")
     @ApiResponse(code = 0, message = "查询成功")
     @GetMapping("/getCustomerByToken")
-    @AuthCarbonValidate
+
     public ResponseBase getCustomerInfoByToken(Principal principal) {
         if (principal == null) {
             responseError(new ResultVO(ResultEnum.UNAUTHORIZED));
@@ -104,7 +104,7 @@ public class CustomerController extends BaseController {
     })
     @ApiResponse(code = 0, message = "查询成功")
     @GetMapping("/getCustomerById")
-    @AuthCarbonValidate
+
     public ResponseBase getCustomAnalysisInfo(@RequestParam("userId") String customerId) {
         CustomerInfoForm customerInfoById = customerInfoService.getCustomerInfoById(customerId);
         if (customerInfoById != null) {
@@ -120,7 +120,7 @@ public class CustomerController extends BaseController {
     })
     @ApiResponse(code = 0, message = "查询成功")
     @PostMapping("/updateBaseInfo")
-    @AuthCarbonValidate
+
     public ResponseBase modifiedCustomerInfo(@RequestBody SmallCustomer smallCustomer) {
         CustomerInfoForm customerInfo = customerService.getCurrentMember();
         if (Objects.isNull(customerInfo)) {
@@ -144,7 +144,7 @@ public class CustomerController extends BaseController {
     })
     @ApiResponse(code = 0, message = "查询成功")
     @PostMapping("/validateCustomer")
-    @AuthCarbonValidate
+
     public ResponseBase validateCustomerInfo(@RequestBody PersonValidateForm personValidateForm) {
         CustomerInfoForm customerInfoForm = new CustomerInfoForm();
         customerInfoForm.setGuid(personValidateForm.getCustomerId());
@@ -165,7 +165,7 @@ public class CustomerController extends BaseController {
     })
     @ApiResponse(code = 0, message = "查询成功")
     @GetMapping("/getValidateInfo")
-    @AuthCarbonValidate
+
     public ResponseBase getCustomerValidateInfo(Principal principal) {
         if (principal == null) {
             Asserts.fail("token过期！");
@@ -181,7 +181,7 @@ public class CustomerController extends BaseController {
     })
     @ApiResponse(code = 0, message = "查询成功")
     @PostMapping("/validateCompany")
-    @AuthCarbonValidate
+
     public ResponseBase validateCompanyInfo(@RequestBody CompanyValidateForm companyValidateForm) {
         CustomerCompanyInfoForm companyInfoForm = BeanCopyUtil.convertBean(companyValidateForm, CustomerCompanyInfoForm.class);
         int i = customerCompanyInfoService.validateCompanyInfo(companyInfoForm);
@@ -197,7 +197,7 @@ public class CustomerController extends BaseController {
     })
     @ApiResponse(code = 0, message = "查询成功")
     @GetMapping("/getCompanyInfo")
-    @AuthCarbonValidate
+
     public ResponseBase getCompanyInfoByCid(Principal principal) {
         if (principal == null) {
             return responseEnum(ResultEnum.UNAUTHORIZED);
@@ -218,7 +218,7 @@ public class CustomerController extends BaseController {
     })
     @ApiResponse(code = 0, message = "操作成功")
     @PostMapping("/updatePhone")
-    @AuthCarbonValidate
+
     public ResponseBase updateCustomerPhone(@RequestBody CustomerInfoForm customerInfoForm) {
         CustomerInfoForm member = customerService.getCurrentMember();
         ValueOperations<String, Object> operations = redisTemplate.opsForValue();

carbon-h5/carbon-h5-service/src/main/java/com/hcloud/microserver/h5/controller/web/FarmerManagerController.java

@@ -49,7 +49,7 @@ public class FarmerManagerController extends CarbonBaseController {
     })
     @ApiResponse(code =0,message = "查询成功")
     @PostMapping("/searchAreaByPage")
-    @AuthCarbonValidate
+
     public ResponseBase searchPovertyArea(@RequestBody PovertyAreaForm povertyAreaForm){
         String cacheKey = POVERTY_AREA_KEY+povertyAreaForm.getPageNo();
         ResultVO resultVO = (ResultVO) redisUtils.getValue(cacheKey);
@@ -72,7 +72,7 @@ public class FarmerManagerController extends CarbonBaseController {
     })
     @ApiResponse(code =0,message = "查询成功")
     @GetMapping("/getPovertyAreaById")
-    @AuthCarbonValidate
+
     public ResponseBase getPovertyAreaInfoById(@RequestParam("areaId") String areaId){
         PovertyAreaForm id = povertyAreaService.getFullPovertyAreaInfoById(areaId);
         if(id!=null){
@@ -87,7 +87,7 @@ public class FarmerManagerController extends CarbonBaseController {
     })
     @ApiResponse(code =0,message = "查询成功")
     @PostMapping("/getPovertyAreaList")
-    @AuthCarbonValidate
+
     public ResponseBase getPovertyAreaListById(@RequestBody FarmerInfoForm farmerInfoForm){
         String cacheKey = FARMER_LIST_KEY+farmerInfoForm.getPageNo();
         ResultVO resultVO = (ResultVO) redisUtils.getValue(cacheKey);
@@ -111,7 +111,7 @@ public class FarmerManagerController extends CarbonBaseController {
     })
     @ApiResponse(code =0,message = "查询成功")
     @GetMapping("/getById")
-    @AuthCarbonValidate
+
     public ResponseBase getFarmerInfoById(@RequestParam("guid") String farmerId){
         FarmerInfo farmerInfo = farmerInfoService.queryByPrimaryKey(farmerId);
         if(farmerInfo != null){

carbon-h5/carbon-h5-service/src/main/java/com/hcloud/microserver/h5/controller/web/GoodsManageTwoController.java

@@ -39,7 +39,7 @@ public class GoodsManageTwoController extends BaseController {
     })
     @ApiResponse(code =0,message = "查询成功")
     @PostMapping("/searchByPage")
-    @AuthCarbonValidate
+
     public ResponseBase searchByPage(@RequestBody GoodsManageQueryForm goodsManageQueryForm){
         PageInfo pageInfo = goodsManageService.searchGoodsInfoByPage(goodsManageQueryForm);
         return responseSuccess(pageInfo);
@@ -51,7 +51,7 @@ public class GoodsManageTwoController extends BaseController {
     })
     @ApiResponse(code =0,message = "查询成功")
     @GetMapping("/getGoodsInfoByCarbonNum")
-    @AuthCarbonValidate
+
     public ResponseBase getGoodsInfoByCarbonNum(@RequestParam("carbonNum") Integer carbonNum){
         if (carbonNum == null){
             throw new GlobalException(ResultEnum.FAILURE.getCode(),"请输入购碳量");
@@ -71,7 +71,7 @@ public class GoodsManageTwoController extends BaseController {
     })
     @ApiResponse(code =0,message = "查询成功")
     @PostMapping("/pushGoods")
-    @AuthCarbonValidate
+
     public ResponseBase pushGoods(@RequestBody GoodsManageQueryForm goodsManageQueryForm){
         PageInfo pageInfo = goodsManageService.pushGoods(goodsManageQueryForm);
         return responseSuccess(pageInfo);

carbon-h5/carbon-h5-service/src/main/java/com/hcloud/microserver/h5/controller/web/GoodsManagerController.java

@@ -95,7 +95,7 @@ public class GoodsManagerController extends CarbonBaseController {
     })
     @ApiResponse(code =0,message = "查询成功")
     @PostMapping("/searchForIndex")
-    @AuthCarbonValidate
+
     public ResponseBase searchByPageForIndex(@RequestBody GoodsQueryForm goodsQueryForm){
         String cacheKey = INDEX_GOODS_TYPE_THREE_LIST;
         ResultVO cachePageInfo=null;
@@ -137,7 +137,7 @@ public class GoodsManagerController extends CarbonBaseController {
     })
     @ApiResponse(code =0,message = "查询成功")
     @PostMapping("/searchByPage")
-    @AuthCarbonValidate
+
     public ResponseBase searchByPage(@RequestBody GoodsQueryForm goodsQueryForm){
         String cacheKey = INDEX_GOODS_TYPE_All_LIST;
         ResultVO cachePageInfo=null;
@@ -178,7 +178,7 @@ public class GoodsManagerController extends CarbonBaseController {
     })
     @ApiResponse(code =0,message = "查询成功")
     @GetMapping("/getById")
-    @AuthCarbonValidate
+
     public ResponseBase getGoodsInfoById(@RequestParam("goodsId") String goodsId){
         GoodsInfoBO byGuid = goodsInfoClient.getGoodsInfoByGuid(goodsId);
         if (byGuid ==null){
@@ -192,7 +192,7 @@ public class GoodsManagerController extends CarbonBaseController {
     @ApiOperation(value = "查询购物车列表",notes = "查询购物列表")
     @ApiResponse(code =0,message = "操作成功")
     @GetMapping("/getGoodsCarInfo")
-    @AuthCarbonValidate
+
     public ResponseBase getGoodsCarInfo(){
        BaseInfoDO baseInfoDO =  this.initiSaveObject();
        if(baseInfoDO==null){return responseError(new ResultVO(ResultEnum.TOKEN_EXPIRED));}
@@ -207,7 +207,7 @@ public class GoodsManagerController extends CarbonBaseController {
     })
     @ApiResponse(code =0,message = "修改成功")
     @PostMapping("/addCar")
-    @AuthCarbonValidate
+
     public ResponseBase addGoodsCar(@RequestBody GoodsCarForm goodsCarForm){
         String customerId = goodsCarForm.getCustomerId();
         String userId = getUserId();
@@ -266,7 +266,7 @@ public class GoodsManagerController extends CarbonBaseController {
     })
     @ApiResponse(code =0,message = "修改成功")
     @PostMapping("/modifiedCar")
-    @AuthCarbonValidate
+
     public ResponseBase modifiedGoodsCar(@RequestBody GoodsCarForm goodsCarForm){
         String customerId = goodsCarForm.getCustomerId();
 
@@ -305,7 +305,7 @@ public class GoodsManagerController extends CarbonBaseController {
     })
     @ApiResponse(code =0,message = "操作成")
     @PostMapping("/delGoodsCar")
-    @AuthCarbonValidate
+
     public ResponseBase delGoodsCar(@RequestBody GoodsCarForm goodsCarForm){
         List<GoodsInfoForm> delList = goodsCarForm.getGoodsList();
         BaseInfoDO baseInfoDO = this.initiSaveObject();
@@ -341,7 +341,7 @@ public class GoodsManagerController extends CarbonBaseController {
     })
     @ApiResponse(code =0,message = "查询成功")
     @GetMapping("/getGoodsInfoList")
-    @AuthCarbonValidate
+
     public ResponseBase getGoodsInfoListByCarbon(@RequestParam("carbonSkin") String carbonSkin){
         List<GoodsInfoForm> goodsInfoByCarbon = goodsInfoClient.getGoodsInfoByCarbon(carbonSkin);
         return responseResultSuccess(goodsInfoByCarbon);
@@ -354,7 +354,7 @@ public class GoodsManagerController extends CarbonBaseController {
     })
     @ApiResponse(code =0,message = "查询成功")
     @PostMapping("/getGoodsTypeList")
-    @AuthCarbonValidate
+
     public ResponseBase getGoodsTypeList(@RequestBody ProductTypeForm productTypeForm){
         List<ProductType> productTypes = productTypeClient.queryAll(productTypeForm);
         return responseResultSuccess(productTypes);
@@ -367,7 +367,7 @@ public class GoodsManagerController extends CarbonBaseController {
     })
     @ApiResponse(code =0,message = "查询成功")
     @PostMapping("/getGoodsByFarmerId")
-    @AuthCarbonValidate
+
     public ResponseBase getGoodsInfoByFarmerId(@RequestBody FarmerQueryForm farmerQueryForm){
         FarmerInfoForm farmerInfoForm = BeanCopyUtil.convertBean(farmerQueryForm, FarmerInfoForm.class);
         PageInfo pageInfo = goodsInfoClient.searchGoodsInfoByFarmerId(farmerInfoForm);

carbon-h5/carbon-h5-service/src/main/java/com/hcloud/microserver/h5/controller/web/H5CarbonProblemController.java

@@ -0,0 +1,41 @@
+package com.hcloud.microserver.h5.controller.web;
+
+import com.github.pagehelper.PageInfo;
+import com.hcloud.microserver.commoncore.base.BaseController;
+import com.hcloud.microserver.commoncore.base.ResponseBase;
+import com.hcloud.microserver.h5.facade.carbon.forms.TCarbonProblemForm;
+import com.hcloud.microserver.h5.service.H5CarbonProblemService;
+import com.hcloud.microserver.mbg.modul.TCarbonProblem;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+@Slf4j
+@Api(tags = "移动端常见问题")
+@RestController
+@RequestMapping("/carbon/problem")
+public class H5CarbonProblemController extends BaseController {
+    @Autowired
+    private H5CarbonProblemService service;
+
+    @ApiOperation("常见问题列表")
+    @PostMapping("list")
+    public ResponseBase<List<TCarbonProblem>> list(@RequestBody  TCarbonProblemForm form){
+        PageInfo<TCarbonProblem> list = service.list(form);
+        return responseSuccess(list);
+    }
+
+    @ApiOperation("常见问题详细信息")
+    @GetMapping("/info")
+    public ResponseBase<TCarbonProblem> info(@RequestParam("guid") Long guid){
+        TCarbonProblem info = service.info(guid);
+        if (info != null){
+            return responseResultSuccess(info);
+        }
+        return responseResultFailure();
+    }
+}

carbon-h5/carbon-h5-service/src/main/java/com/hcloud/microserver/h5/controller/web/OrderManagerController.java

@@ -1,5 +1,6 @@
 package com.hcloud.microserver.h5.controller.web;
 
+import com.alibaba.fastjson.JSONObject;
 import com.github.pagehelper.PageInfo;
 import com.google.common.collect.Lists;
 import com.hcloud.microserver.h5.facade.carbon.entity.GoodsOrderInfo;
@@ -61,7 +62,7 @@ public class OrderManagerController extends CarbonBaseController {
 
     @ApiOperation(value = "生成订单信息", notes = "生成订单信息")
     @PostMapping("/createOrder")
-    @AuthCarbonValidate
+
     public ResponseBase<GoodsOrderInfo> createOrder(@RequestBody CreateOrderFrom createOrderFrom) {
 
         GoodsOrderInfo goodsOrderInfo = orderInfoService.createOrder(createOrderFrom);
@@ -72,7 +73,7 @@ public class OrderManagerController extends CarbonBaseController {
 
     @ApiOperation(value = "生成订单信息", notes = "生成订单信息")
     @PostMapping("/payOrder/{orderId}")
-    @AuthCarbonValidate
+
     public ResponseBase<GoodsOrderInfo> payOrder(@PathVariable String orderId) {
 
         orderInfoService.payOrder(orderId);
@@ -85,7 +86,7 @@ public class OrderManagerController extends CarbonBaseController {
             @ApiImplicitParam(name = "orderType", value = "爱心用户信息", dataType = "Integer", paramType = "query")
     })
     @PostMapping("/searchByPage")
-    @AuthCarbonValidate
+
     public ResponseBase<GoodsOrderInfoForm> searchCustomerOrderByClass(@RequestBody OrderQueryForm queryForm) {
         CustomerInfoForm customerInfo = customerService.getCurrentMember();
         GoodsOrderInfoForm goodsOrderInfoForm = new GoodsOrderInfoForm();
@@ -99,7 +100,7 @@ public class OrderManagerController extends CarbonBaseController {
 
     @ApiOperation(value = "查询爱心用户订单信息", notes = "分类查询爱心用户订单")
     @GetMapping("/info")
-    @AuthCarbonValidate
+
     public ResponseBase<GoodsOrderInfoVo> info(@RequestParam String orderId) {
         GoodsOrderInfoForm orderInfoBO = orderDetailInfoService.info(orderId);
         return resultVOSuccess(orderInfoBO);
@@ -125,7 +126,7 @@ public class OrderManagerController extends CarbonBaseController {
 
     @ApiOperation(value = "查询爱心用户证书信息", notes = "分类查询爱心用户证书")
     @PostMapping("/searchCredentialList")
-    @AuthCarbonValidate
+
     public ResponseBase searchCredentialInfo(@RequestBody GoodsCredentialInfoForm goodsCredentialInfoForm) {
         CustomerInfoForm customerInfo = customerService.getCurrentMember();
         if (customerInfo == null) {
@@ -140,7 +141,7 @@ public class OrderManagerController extends CarbonBaseController {
 
     @ApiOperation(value = "生成订单信息", notes = "生成订单信息")
     @PostMapping("/saveOrderInfo")
-    @AuthCarbonValidate
+
     public ResponseBase saveOrderInfo(@RequestBody GoodsOrderInfoForm goodsOrderInfoForm) {
         CustomerInfoForm member = customerService.getCurrentMember();
         if (member == null) {
@@ -179,7 +180,7 @@ public class OrderManagerController extends CarbonBaseController {
     })
     @ApiResponse(code = 0, message = "操作成功")
     @PostMapping("/cancelOrderInfo")
-    @AuthCarbonValidate
+
     public ResponseBase cancelOrderInfo(@RequestParam("orderId") String orderId) {
         int i = orderInfoService.rollbackOrderInfo(orderId);
         if (i > 0) {
@@ -194,7 +195,7 @@ public class OrderManagerController extends CarbonBaseController {
     })
     @ApiResponse(code = 0, message = "操作成功")
     @GetMapping("/delOrderInfo")
-    @AuthCarbonValidate
+
     public ResponseBase delOrderInfo(@RequestParam("orderId") String orderId) {
         ResultVO resultVO = delOrderInfoClient(orderId);
         if (resultVO.getCode() == 0) {
@@ -229,7 +230,7 @@ public class OrderManagerController extends CarbonBaseController {
     })
     @ApiResponse(code = 0, message = "操作成功")
     @PostMapping("/saveOffLineApply")
-    @AuthCarbonValidate
+
     public ResponseBase saveOffLienPayApply(@RequestBody GoodsOrderInfoForm goodsOrderInfoForm) {
         ResultVO resultVO = savePayApplyInfo(goodsOrderInfoForm);
         if (resultVO.getCode() == 0) {
@@ -265,7 +266,7 @@ public class OrderManagerController extends CarbonBaseController {
     })
     @ApiResponse(code = 0, message = "操作成功")
     @PostMapping("/saveOffLineVoucher")
-    @AuthCarbonValidate
+
     public ResponseBase saveOffLienPayVoucher(@RequestBody OrderPayVoucherForm orderPayVoucherForm) {
         int i = orderPayVoucherService.savePayVoucherInfoAndOrderInfo(orderPayVoucherForm);
         if (i > 0) {
@@ -281,7 +282,7 @@ public class OrderManagerController extends CarbonBaseController {
     })
     @ApiResponse(code = 0, message = "操作成功")
     @PostMapping("/saveOrderForFarmer")
-    @AuthCarbonValidate
+
     public ResponseBase insertOrderInfoByFarmerId(@RequestBody OrderQueryForm orderQueryForm) {
         BaseInfoDO baseInfoDO = this.initiSaveObject();
         if (baseInfoDO == null) {
@@ -296,7 +297,7 @@ public class OrderManagerController extends CarbonBaseController {
     })
     @ApiResponse(code = 0, message = "操作成功")
     @GetMapping("/getCredential")
-    @AuthCarbonValidate
+
     public ResponseBase getCredentialInfo(@RequestParam(name = "guid") String guid) {
         GoodsCredentialInfoForm goodsCredentialInfoForm = credentialInfoService.queryByPrimaryKey(guid);
 
@@ -309,9 +310,10 @@ public class OrderManagerController extends CarbonBaseController {
     })
     @ApiResponse(code = 0, message = "操作成功")
     @GetMapping("/getCredentialByOrderId")
-    @AuthCarbonValidate
+
     public ResponseBase getCredentialByOrderId(@RequestParam(name = "orderId") String orderId) {
         CredentialInfoBO credentialInfoBO = credentialInfoService.queryByOrderId(orderId);
+        log.info("返回前端证书信息数据："+ JSONObject.toJSONString(credentialInfoBO));
         return responseResultSuccess(credentialInfoBO);
     }
 

carbon-h5/carbon-h5-service/src/main/java/com/hcloud/microserver/h5/controller/web/SubscriptionApplyController.java

@@ -36,7 +36,7 @@ public class SubscriptionApplyController extends BaseController
      */
     @ApiResponse(code =0,message = "查询成功")
     @GetMapping("/list")
-    @AuthCarbonValidate
+
     @ApiOperation("查询认购申请列表")
     public ResponseBase<SubscriptionApply> list()
     {
@@ -49,7 +49,7 @@ public class SubscriptionApplyController extends BaseController
      * 获取碳汇认购申请详细信息
      */
     @GetMapping(value = "/{guid}")
-    @AuthCarbonValidate
+
     @ApiOperation("获取认购申请详情")
     public ResponseBase getInfo(@PathVariable("guid") String guid)
     {
@@ -60,9 +60,9 @@ public class SubscriptionApplyController extends BaseController
      * 新增碳汇认购申请
      */
     @PostMapping
-    @AuthCarbonValidate
+
     @ApiOperation("保存碳汇认购申请")
-    public ResponseBase add(@RequestBody SubscriptionApplyForm applyForm)
+    public ResponseBase<String> add(@RequestBody SubscriptionApplyForm applyForm)
     {
         return responseResultSuccess(subscriptionApplyService.insertSubscriptionApply(applyForm));
     }
@@ -72,7 +72,7 @@ public class SubscriptionApplyController extends BaseController
      */
 
     @PutMapping
-    @AuthCarbonValidate
+
     @ApiOperation(value = "更新申请状态为认购成功",hidden = true)
     public ResponseBase edit(String guid)
     {
@@ -84,7 +84,7 @@ public class SubscriptionApplyController extends BaseController
      */
 
 	@DeleteMapping("/{guids}")
-    @AuthCarbonValidate
+
     @ApiOperation(value = "逻辑删除认购申请",hidden = true)
     public ResponseBase remove(@PathVariable String[] guids)
     {

carbon-h5/carbon-h5-service/src/main/java/com/hcloud/microserver/h5/controller/web/WechatAppController.java

@@ -198,7 +198,7 @@ public class WechatAppController extends BaseController {
 //
 //
 //    @PostMapping("/pay")
-//    @AuthCarbonValidate
+//
 //    @ResponseBody
 //    public ResponseBase pay(HttpServletRequest request) {
 ////        String orderId = wxPayFrom.getOrderId();

carbon-h5/carbon-h5-service/src/main/java/com/hcloud/microserver/h5/controller/web/WechatAppPayController.java

@@ -53,7 +53,7 @@ public class WechatAppPayController extends BaseController {
 
     @ApiOperation(value = "微信支付接口（二次支付）", notes = "微信支付接口请勿随意调用(二次支付)")
     @ApiResponse(code = 500, message = "请求的配置参数有问题")
-    @AuthCarbonValidate
+
     @PostMapping
     @ResponseBody
     public ResponseBase pay(@RequestBody WxPayFrom wxPayFrom, HttpServletRequest request) {
@@ -121,7 +121,7 @@ public class WechatAppPayController extends BaseController {
 
 
     @ApiOperation(value = "微信支付结果回调", notes = "微信支付结果回调请勿直接调用")
-    @AuthCarbonValidate
+
     @PostMapping("/payResultNotified")
     public void payOrderResultNotify(HttpServletRequest request, HttpServletResponse response) throws IOException {
         log.info("微信支付返回通知函数开始---------------------");
@@ -209,7 +209,7 @@ public class WechatAppPayController extends BaseController {
     @ApiResponses({
             @ApiResponse(code = 0, message = "成功")
     })
-    @AuthCarbonValidate
+
     @GetMapping("getJsapiTicket")
     public ResponseBase getJsapiTicket(String url) {
         WxJsapiSignature jsapiSignature = null;

carbon-h5/carbon-h5-service/src/main/java/com/hcloud/microserver/h5/controller/web/WechatManagerController.java

@@ -113,7 +113,7 @@ public class WechatManagerController extends CarbonBaseController {
     })
     @ApiResponse(code = 0, message = "查询成功")
     @GetMapping("/login")
-    @AuthCarbonValidate
+
     public void login(@RequestParam("furl") String furl,
                       Integer authScope,
                       String token) {
@@ -148,7 +148,7 @@ public class WechatManagerController extends CarbonBaseController {
     @ApiOperation(value = "获取微信用户基本信息", notes = "微信静默授权接口请勿随意调用")
     @ApiResponse(code = 500, message = "请求的配置参数有问题")
     @GetMapping("/baseLogin")
-    @AuthCarbonValidate
+
     public void baseLogin(@RequestParam("code") String code) {
         log.info("currentCustomerId======================>{}", currentCustomerId);
         log.info("global token==========================>{}", globalToken);
@@ -183,7 +183,7 @@ public class WechatManagerController extends CarbonBaseController {
     @ApiOperation(value = "获取微信用户信息", notes = "微信回调接口请勿直接请求")
     @ApiResponse(code = 500, message = "请求的配置参数有问题")
     @GetMapping("/doLogin")
-    @AuthCarbonValidate
+
     public void doLogin(@RequestParam("code") String code) {
         if (null != code && !"".equals(code)) {
             log.info("微信权限认证code是====================>{}", code);
@@ -215,7 +215,7 @@ public class WechatManagerController extends CarbonBaseController {
     @ApiOperation(value = "退出登录", notes = "退出登录,删除缓存信息")
     @ApiResponse(code = 500, message = "请求的配置参数有问题")
     @GetMapping("/logout")
-    @AuthCarbonValidate
+
     public ResponseBase logout() {
         BaseInfoDO baseInfoDO = this.initiSaveObject();
         if (baseInfoDO == null) {
@@ -233,7 +233,7 @@ public class WechatManagerController extends CarbonBaseController {
             @ApiImplicitParam(name = "tradeType", value = "交易方式(NATIVE,APP,JSAPI,MWEB)", dataType = "String", paramType = "query")
     })
     @ApiResponse(code = 500, message = "请求的配置参数有问题")
-    @AuthCarbonValidate
+
     @GetMapping("/pay")
     public ResponseBase pay(@RequestParam("orderId") String orderId,
                             @RequestParam("tradeType") String tradeType) {
@@ -296,7 +296,7 @@ public class WechatManagerController extends CarbonBaseController {
 
     @ApiOperation(value = "微信支付结果回调", notes = "微信支付结果回调请勿直接调用")
     @ApiResponse(code = 500, message = "请求的配置参数有问题")
-    @AuthCarbonValidate
+
     @PostMapping("/payResultNotified")
     public String payOrderResultNotify(HttpServletRequest request) {
         String xmlResult = HttpKit.readData(request);
@@ -344,7 +344,7 @@ public class WechatManagerController extends CarbonBaseController {
     @ApiResponses({
             @ApiResponse(code = 0, message = "成功")
     })
-    @AuthCarbonValidate
+
     @GetMapping("getJsapiTicket")
     public ResponseBase getJsapiTicket(String url) {
         WxJsapiSignature jsapiSignature = null;
@@ -366,7 +366,7 @@ public class WechatManagerController extends CarbonBaseController {
     @ApiResponses({
             @ApiResponse(code = 0, message = "微信已授权")
     })
-    @AuthCarbonValidate
+
     @GetMapping("/checkWxMap")
     public ResponseBase checkWxMap() {
         Map resultMap = new HashMap();

carbon-h5/carbon-h5-service/src/main/java/com/hcloud/microserver/h5/service/H5CarbonProblemService.java

@@ -0,0 +1,54 @@
+package com.hcloud.microserver.h5.service;
+
+import com.github.pagehelper.PageInfo;
+import com.hcloud.microserver.h5.facade.carbon.forms.TCarbonProblemForm;
+import com.hcloud.microserver.mbg.modul.TCarbonProblem;
+
+
+public interface H5CarbonProblemService {
+    /**
+     * 添加常见问题
+     * @param tCarbonProblem
+     * @return
+     */
+    public Long addProblem(TCarbonProblem tCarbonProblem);
+
+    /**
+     * 分页查询常见问题
+     * @param form
+     * @return
+     */
+    public PageInfo<TCarbonProblem> list(TCarbonProblemForm form);
+
+    /**
+     * 查询常见问题详细信息
+     * @param guid
+     * @return
+     */
+    public TCarbonProblem info(Long guid);
+
+
+    /**
+     * 禁用常见问题 state=1禁用  state = 0 启用
+     * @param guid
+     * @Param state
+     * @return
+     */
+    public Integer disableOrEnable(Long guid, Integer state);
+
+
+
+    /**
+     * 删除常见问题
+     * @param guid
+     * @return
+     */
+    public Integer delete(Long guid);
+
+    /**
+     * 修改常见问题
+     * @param tCarbonProblem
+     * @return
+     */
+    public Integer update(TCarbonProblem tCarbonProblem);
+}

carbon-h5/carbon-h5-service/src/main/java/com/hcloud/microserver/h5/service/ISubscriptionApplyService.java

@@ -36,7 +36,7 @@ public interface ISubscriptionApplyService
      * @param applyForm 碳汇认购申请
      * @return 结果
      */
-    public int insertSubscriptionApply(SubscriptionApplyForm applyForm);
+    public String insertSubscriptionApply(SubscriptionApplyForm applyForm);
 
     /**
      * 修改碳汇认购申请-更新为认购完成

carbon-h5/carbon-h5-service/src/main/java/com/hcloud/microserver/h5/service/impl/CredentialInfoServiceImpl.java

@@ -96,6 +96,7 @@ public class CredentialInfoServiceImpl implements CredentialInfoService {
                 goodsCredentialInfoForm.setState(1);
                 goodsCredentialInfoForm.setCreateTime(new Date());
             }
+            goodsCredentialInfoForm.setCertType(1);
             return this.saveSelective(goodsCredentialInfoForm);
         }
         return 0;

carbon-h5/carbon-h5-service/src/main/java/com/hcloud/microserver/h5/service/impl/H5CarbonProblemServiceImpl.java

@@ -0,0 +1,85 @@
+package com.hcloud.microserver.h5.service.impl;
+
+import com.github.pagehelper.PageHelper;
+import com.github.pagehelper.PageInfo;
+import com.hcloud.microserver.h5.facade.carbon.forms.TCarbonProblemForm;
+import com.hcloud.microserver.h5.service.H5CarbonProblemService;
+import com.hcloud.microserver.mbg.mapper.TCarbonProblemMapper;
+import com.hcloud.microserver.mbg.modul.TCarbonProblem;
+import com.hcloud.microserver.mbg.modul.TCarbonProblemExample;
+import com.hcloud.microserver.security.service.TokenService;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.Date;
+import java.util.List;
+
+@Service
+public class H5CarbonProblemServiceImpl implements H5CarbonProblemService {
+    @Autowired
+    private TCarbonProblemMapper carbonProblemMapper;
+
+    @Autowired
+    private TokenService tokenService;
+
+    @Override
+    public Long addProblem(TCarbonProblem tCarbonProblem) {
+        if (tCarbonProblem != null){
+
+            tCarbonProblem.setState(0);
+            tCarbonProblem.setCreateId(tokenService.getLoginUser().getUserid());
+            tCarbonProblem.setCreateName(tokenService.getLoginUser().getUsername());
+            tCarbonProblem.setCreateTime(new Date());
+            return tCarbonProblem.getGuid();
+        }
+        return null;
+    }
+
+    @Override
+    public PageInfo<TCarbonProblem> list(TCarbonProblemForm form) {
+        PageHelper.startPage(form.getPageNo(),form.getPageSize());
+        TCarbonProblemExample example = new TCarbonProblemExample();
+
+        if (form != null){
+            example = form.example();
+        }
+        List<TCarbonProblem> tCarbonProblems = carbonProblemMapper.selectByExampleWithBLOBs(example);
+        return new PageInfo<>(tCarbonProblems);
+    }
+
+    @Override
+    public TCarbonProblem info(Long guid) {
+        if (guid != null){
+            return carbonProblemMapper.selectByPrimaryKey(guid);
+        }
+        return null;
+    }
+
+    @Override
+    public Integer disableOrEnable(Long guid, Integer state) {
+        if (guid == null|| state ==null){
+            return 0;
+        }
+        TCarbonProblem tCarbonProblem = new TCarbonProblem();
+        tCarbonProblem.setGuid(guid);
+        tCarbonProblem.setState(state);
+        return carbonProblemMapper.updateByPrimaryKeySelective(tCarbonProblem);
+    }
+
+    @Override
+    public Integer delete(Long guid) {
+        if (guid != null){
+            return carbonProblemMapper.deleteByPrimaryKey(guid);
+        }
+        return 0;
+    }
+
+    @Override
+    public Integer update(TCarbonProblem tCarbonProblem) {
+        if (tCarbonProblem != null&& tCarbonProblem.getGuid() != null){
+            return carbonProblemMapper.updateByPrimaryKeySelective(tCarbonProblem);
+        }
+        return 0;
+    }
+}

carbon-h5/carbon-h5-service/src/main/java/com/hcloud/microserver/h5/service/impl/SubscriptionApplyServiceImpl.java

@@ -60,10 +60,11 @@ public class SubscriptionApplyServiceImpl implements ISubscriptionApplyService
      * @return 结果
      */
     @Override
-    public int insertSubscriptionApply(SubscriptionApplyForm applyForm)
+    public String insertSubscriptionApply(SubscriptionApplyForm applyForm)
     {
         SubscriptionApply apply = new SubscriptionApply();
-        apply.setGuid(UUIDUtils.randomUUID());
+        String guid = UUIDUtils.randomUUID();
+        apply.setGuid(guid);
 
         apply.setAmount(applyForm.getAmount());
         apply.setRemark(applyForm.getRemark());
@@ -80,7 +81,11 @@ public class SubscriptionApplyServiceImpl implements ISubscriptionApplyService
 
         apply.setModifiedTime(DateUtils.getNowDate());
         apply.setCreateTime(DateUtils.getNowDate());
-        return subscriptionApplyMapper.insertSubscriptionApply(apply);
+        int i = subscriptionApplyMapper.insertSubscriptionApply(apply);
+        if (i>0){
+            return guid;
+        }
+        return null;
     }
 
     /**

carbon-h5/carbon-h5-service/src/main/resources/com/hcloud/microserver/h5/dao/GoodsCredentialInfoMapper.xml

@@ -16,15 +16,16 @@
     <result column="state" jdbcType="INTEGER" property="state" />
     <result column="create_user" jdbcType="CHAR" property="createUser" />
     <result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
+    <result column="cert_type" jdbcType="INTEGER" property="certType"/>
     <association property="customerInfo" column="fk_customer_id" select="com.hcloud.microserver.h5.dao.CustomerInfoMapper.selectByPrimaryKey"/>
     <association property="goodsOrderInfo" column="fk_order_id" select="com.hcloud.microserver.h5.dao.GoodsOrderInfoMapper.selectByPrimaryKey"/>
   </resultMap>
   <sql id="Base_Column_List">
     guid,fk_customer_id,fk_order_id, fk_order_detail_id, credential_no,buy_date, carbon_amount, product_address,
-    farmer_count, farmer_names, cre_images, state, create_user, create_time
+    farmer_count, farmer_names, cre_images, state, create_user, create_time,cert_type
   </sql>
   <select id="selectByPrimaryKey" parameterType="java.lang.String" resultMap="BaseResultMap">
-    select 
+    select
     <include refid="Base_Column_List" />
     from t_goods_credential_info
     where guid = #{guid,jdbcType=CHAR}
@@ -49,11 +50,12 @@
         DATE_FORMAT(aa.buy_date,'%Y年%m月%d日') AS buyDate,
         aa.carbon_amount AS carbonAmount,
         aa.credential_no AS credentialNo,
-        bb.customer_name AS customerName,
+        IFNULL(bb.customer_name,bb.nick_name) AS customerName,
         bb.nick_name AS nickName,
         cc.company_name AS companyName,
         dd.order_amount AS OrderAmount,
         aa.farmer_names AS farmerName,
+        aa.cert_type as certType,
         YEAR(aa.buy_date) AS year
     FROM
         t_goods_credential_info aa
@@ -80,12 +82,12 @@
   <insert id="insert" parameterType="com.hcloud.microserver.h5.facade.carbon.entity.GoodsCredentialInfo">
     insert into t_goods_credential_info (guid,fk_customer_id ,fk_order_id, fk_order_detail_id,
       credential_no,buy_date, carbon_amount, product_address,
-      farmer_count, farmer_names, cre_images, 
+      farmer_count, farmer_names, cre_images,
       state, create_user, create_time
       )
     values (#{guid,jdbcType=CHAR},#{fkCustomerId,jdbcType=CHAR} ,#{fkOrderId,jdbcType=CHAR}, #{fkOrderDetailId,jdbcType=CHAR},
       #{credentialNo,jdbcType=VARCHAR},#{buyDate,jdbcType=DATE}, #{carbonAmount,jdbcType=DECIMAL}, #{productAddress,jdbcType=VARCHAR},
-      #{farmerCount,jdbcType=INTEGER}, #{farmerNames,jdbcType=VARCHAR}, #{creImages,jdbcType=VARCHAR}, 
+      #{farmerCount,jdbcType=INTEGER}, #{farmerNames,jdbcType=VARCHAR}, #{creImages,jdbcType=VARCHAR},
       #{state,jdbcType=INTEGER}, #{createUser,jdbcType=CHAR}, #{createTime,jdbcType=TIMESTAMP}
       )
   </insert>
@@ -134,6 +136,9 @@
       <if test="createTime != null">
         create_time,
       </if>
+      <if test="certType != null">
+        cert_type,
+      </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides=",">
       <if test="guid != null">
@@ -178,6 +183,9 @@
       <if test="createTime != null">
         #{createTime,jdbcType=TIMESTAMP},
       </if>
+      <if test="certType != null">
+        #{certType,jdbcType=INTEGER}
+      </if>
     </trim>
   </insert>
   <update id="updateByPrimaryKeySelective" parameterType="com.hcloud.microserver.h5.facade.carbon.entity.GoodsCredentialInfo">
@@ -222,6 +230,9 @@
       <if test="createTime != null">
         create_time = #{createTime,jdbcType=TIMESTAMP},
       </if>
+      <if test="certType!= null">
+        cert_type = #{certType,jdbcType=INTEGER},
+      </if>
     </set>
     where guid = #{guid,jdbcType=CHAR}
   </update>
@@ -239,7 +250,8 @@
       cre_images = #{creImages,jdbcType=VARCHAR},
       state = #{state,jdbcType=INTEGER},
       create_user = #{createUser,jdbcType=CHAR},
-      create_time = #{createTime,jdbcType=TIMESTAMP}
+      create_time = #{createTime,jdbcType=TIMESTAMP},
+      cert_type = #{certType,jdbcType=INTEGER}
     where guid = #{guid,jdbcType=CHAR}
   </update>
-</mapper>
+</mapper>

carbon-monitor/src/main/resources/application.yml

@@ -12,6 +12,6 @@ spring:
   cloud:
     nacos:
       discovery:
-        server-addr: http://localhost:8898
+        server-addr: http://localhost:8892
 server:
   port: 9091

common-core/pom.xml

@@ -219,6 +219,13 @@
             <groupId>org.springframework.cloud</groupId>
             <artifactId>spring-cloud-starter-netflix-hystrix</artifactId>
         </dependency>
+        <!-- easyExcel -->
+        <dependency>
+            <groupId>com.alibaba</groupId>
+            <artifactId>easyexcel</artifactId>
+            <version>2.2.6</version>
+        </dependency>
+
 
     </dependencies>
 

common-core/src/main/java/com/hcloud/microserver/commoncore/base/CarbonBaseForm.java

@@ -14,10 +14,10 @@ import java.io.Serializable;
 public class CarbonBaseForm implements Serializable {
 
 
-    @ApiModelProperty(value = "分页页数,分页查询时使用")
+    @ApiModelProperty(value = "分页页数,分页查询时使用",required = true)
     protected Integer pageNo = 0;
 
-    @ApiModelProperty("分页每页条数,分页查询时使用")
+    @ApiModelProperty(value = "分页每页条数,分页查询时使用",required = true)
     protected Integer pageSize = 10;
 
 }

common-core/src/main/java/com/hcloud/microserver/commoncore/util/EasyExcelUtil.java

@@ -0,0 +1,173 @@
+package com.hcloud.microserver.commoncore.util;
+
+
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.util.ArrayList;
+import java.util.List;
+
+import com.alibaba.excel.ExcelReader;
+import com.alibaba.excel.ExcelWriter;
+import com.alibaba.excel.context.AnalysisContext;
+import com.alibaba.excel.event.AnalysisEventListener;
+import com.alibaba.excel.metadata.BaseRowModel;
+import com.alibaba.excel.metadata.Sheet;
+import com.alibaba.excel.metadata.Table;
+import com.alibaba.excel.support.ExcelTypeEnum;
+
+/**
+ * easyexcel工具类 -- Excel解析
+ *
+ * @author Lynch
+ */
+public class EasyExcelUtil {
+    /**
+     * StringList 解析监听器
+     */
+    private static class StringExcelListener extends AnalysisEventListener {
+        /**
+         * 自定义用于暂时存储data
+         * 可以通过实例获取该值
+         */
+        private List<List<String>> datas = new ArrayList<>();
+
+        /**
+         * 每解析一行都会回调invoke()方法
+         *
+         * @param object
+         * @param context
+         */
+        @Override
+        public void invoke(Object object, AnalysisContext context) {
+            List<String> stringList= (List<String>) object;
+            //数据存储到list，供批量处理，或后续自己业务逻辑处理。
+            datas.add(stringList);
+            //根据自己业务做处理
+        }
+
+        @Override
+        public void doAfterAllAnalysed(AnalysisContext context) {
+            //解析结束销毁不用的资源
+            //注意不要调用datas.clear(),否则getDatas为null
+        }
+
+        public List<List<String>> getDatas() {
+            return datas;
+        }
+        public void setDatas(List<List<String>> datas) {
+            this.datas = datas;
+        }
+    }
+
+    /**
+     * 使用 StringList 来读取Excel
+     * @param inputStream Excel的输入流
+     * @param excelTypeEnum Excel的格式(XLS或XLSX)
+     * @return 返回 StringList 的列表
+     */
+    public static List<List<String>> readExcelWithStringList(InputStream inputStream,ExcelTypeEnum excelTypeEnum) {
+        StringExcelListener listener = new StringExcelListener();
+        ExcelReader excelReader = new ExcelReader(inputStream, excelTypeEnum, null, listener);
+        excelReader.read();
+        return  listener.getDatas();
+    }
+
+    /**
+     * 使用 StringList 来写入Excel
+     * @param outputStream Excel的输出流
+     * @param data 要写入的以StringList为单位的数据
+     * @param table 配置Excel的表的属性
+     * @param excelTypeEnum Excel的格式(XLS或XLSX)
+     */
+    public static void writeExcelWithStringList(OutputStream outputStream, List<List<String>> data, Table table,ExcelTypeEnum excelTypeEnum) {
+        //这里指定不需要表头，因为String通常表头已被包含在data里
+        ExcelWriter writer = new ExcelWriter(outputStream, excelTypeEnum,false);
+        //写第一个sheet, sheet1  数据全是List<String> 无模型映射关系,无表头
+        Sheet sheet1 = new Sheet(0, 0);
+        writer.write0(data, sheet1,table);
+        writer.finish();
+    }
+
+    /**
+     * 模型解析监听器 -- 每解析一行会回调invoke()方法，整个excel解析结束会执行doAfterAllAnalysed()方法
+     */
+    private static class ModelExcelListener<E> extends AnalysisEventListener<E> {
+        private List<E> dataList = new ArrayList<E>();
+
+        @Override
+        public void invoke(E object, AnalysisContext context) {
+            dataList.add(object);
+        }
+
+        @Override
+        public void doAfterAllAnalysed(AnalysisContext context) {
+        }
+
+        public List<E> getDataList() {
+            return dataList;
+        }
+
+        @SuppressWarnings("unused")
+        public void setDataList(List<E> dataList) {
+            this.dataList = dataList;
+        }
+    }
+
+    /**
+     * 使用 模型 来读取Excel
+     *
+     * @param inputStream Excel的输入流
+     * @param clazz 模型的类
+     * @param excelTypeEnum Excel的格式(XLS或XLSX)
+     *
+     * @return 返回 模型 的列表
+     */
+    public static <E> List<E> readExcelWithModel(InputStream inputStream, Class<? extends BaseRowModel> clazz, ExcelTypeEnum excelTypeEnum) {
+        // 解析每行结果在listener中处理
+        ModelExcelListener<E> listener = new ModelExcelListener<E>();
+        ExcelReader excelReader = new ExcelReader(inputStream, excelTypeEnum, null, listener);
+        //默认只有一列表头
+        excelReader.read(new Sheet(1, 1, clazz));
+
+        return listener.getDataList();
+    }
+
+    /**
+     * 使用 模型 来读取Excel
+     *
+     * @param inputStream Excel的输入流
+     * @param clazz 模型的类
+     * @param excelTypeEnum Excel的格式(XLS或XLSX)
+     *
+     * @return 返回 模型 的列表
+     */
+    public static <E> List<E> readExcelWithModel(InputStream inputStream, Class<? extends BaseRowModel> clazz, ExcelTypeEnum excelTypeEnum,Integer sheetNo,Integer headNo) {
+        // 解析每行结果在listener中处理
+        ModelExcelListener<E> listener = new ModelExcelListener<E>();
+        ExcelReader excelReader = new ExcelReader(inputStream, excelTypeEnum, null, listener);
+        //默认只有一列表头
+        excelReader.read(new Sheet(sheetNo, headNo, clazz));
+
+        return listener.getDataList();
+    }
+
+    /**
+     * 使用 模型 来写入Excel
+     *
+     * @param outputStream Excel的输出流
+     * @param data 要写入的以 模型 为单位的数据
+     * @param table 配置Excel的表的属性
+     * @param clazz 模型的类
+     * @param excelTypeEnum Excel的格式(XLS或XLSX)
+     */
+    public static void writeExcelWithModel(OutputStream outputStream, List<? extends BaseRowModel> data,
+                                           Class<? extends BaseRowModel> clazz, ExcelTypeEnum excelTypeEnum)  {
+        //这里指定需要表头，因为model通常包含表头信息
+        ExcelWriter writer = new ExcelWriter(outputStream, excelTypeEnum,true);
+        //写第一个sheet, sheet1  数据全是List<String> 无模型映射关系
+        Sheet sheet1 = new Sheet(1, 0, clazz);
+        writer.write(data, sheet1);
+        writer.finish();
+    }
+
+}

nacos/conf/application.properties

@@ -6,7 +6,7 @@ server.port=8892
 spring.datasource.platform=mysql
 
 db.num=1
-db.url.0=jdbc:mysql://172.16.90.253:3306/cq-nacos-config?characterEncoding=utf8&connectTimeout=1000&socketTimeout=3000&autoReconnect=true
+db.url.0=jdbc:mysql://172.16.90.253:3306/cq-carbon-live-config?characterEncoding=utf8&connectTimeout=1000&socketTimeout=3000&autoReconnect=true
 db.user=root          
 db.password=123456  
 

read.md

@@ -1,4 +1,24 @@
 # 重庆碳汇平台
+## 使用工具
+|工具名称|工具路径|工具描述
+|----|----|----
+|Process On|https://www.processon.com/|一款在线作图工具，支持流程图、思维导图、原型图、UML、网络拓扑图、组织结构图等。平时文章中的流程图和思维导图，我都是用这个工具画的
+
+
+## 银行清分模块
+
+
+
+### 相关文件
+####1、部署
+1、阿里云服务器：    
+    地址：47.108.214.98  
+2、跳板机：  
+    联系人 ：陈果
+    
+![](doc/bank/bankbushutu.png)
+
+
 ### 字典表
 #### 性别字典表
 
@@ -90,4 +110,10 @@
         | ---- | ---- |
         |101|代发|
         |102|代报销|
+        
+        
+
+
+
+