Merge remote-tracking branch 'origin/dev' into dev

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

@@ -0,0 +1,34 @@
+package com.hcloud.microserver.system.bank.controller;
+
+import cn.hutool.core.util.RandomUtil;
+import com.hcloud.microserver.commoncore.base.BaseController;
+import com.hcloud.microserver.commoncore.base.ResponseBase;
+import com.hcloud.microserver.commoncore.util.OrderNo;
+import com.hcloud.microserver.commoncore.util.UploadFileUtil;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.multipart.MultipartFile;
+
+@Api(tags = "FileUploadController",description = "图片上传接口")
+@RestController
+@RequestMapping("/upload")
+public class FileUploadController extends BaseController {
+
+    @Autowired
+    private UploadFileUtil uploadFileUtil;
+
+    @ApiOperation("上传接口")
+    @PostMapping("/fileImg")
+    public ResponseBase uploadFile(@RequestParam(value = "file") MultipartFile file, String type){
+        type =1+ RandomUtil.randomNumbers(1);
+        String s = uploadFileUtil.uploadQiNiuFiles(file, "cqcarbon/0/" + type + "/" + OrderNo.NextOrderNo());
+        return responseResultSuccess(s);
+    }
+
+
+}

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

@@ -26,7 +26,7 @@ public class NormalController extends BaseController {
 
     private static final String TARGET_IMAGE_DIC_NAME="images/";
 
-    @Value("${img.location}")
+//    @Value("${img.location}")
     private String UPLOAD_FILE_PATH;
 
     @ApiOperation(value = "图片上传",notes = "上传问题图片，图片限制大小10MB")

carbon-bank/carbon-bank-common/src/main/java/com/hcloud/microserver/system/bank/carbon/entity/MakeClearingEntity.java

@@ -0,0 +1,43 @@
+package com.hcloud.microserver.system.bank.carbon.entity;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Date;
+
+@ApiModel("清分主体")
+@Data
+public class MakeClearingEntity implements Serializable {
+
+    private static final long serialVersionUID = -1738594126505229500L;
+
+    @ApiModelProperty("农户id")
+    private String fkFarmerGuid;
+
+    @ApiModelProperty("集体id")
+    private String fkCollectiveGuid;
+
+    @ApiModelProperty("归属类型：1-农户,2-集体")
+    private Integer belongType;
+
+    @ApiModelProperty("待清分金额")
+    private BigDecimal ammount;
+
+    @ApiModelProperty("清分开始时间")
+    private Date startTime;
+
+    @ApiModelProperty("清分结束时间")
+    private Date endTime;
+
+    @ApiModelProperty("清分人详细信息")
+    private MakeClearingFarmerInfoEntity farmerInfoEntity;
+
+
+
+
+
+
+}

carbon-bank/carbon-bank-common/src/main/java/com/hcloud/microserver/system/bank/carbon/entity/MakeClearingFarmerInfoEntity.java

@@ -0,0 +1,53 @@
+package com.hcloud.microserver.system.bank.carbon.entity;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+
+@Data
+@ApiModel("清分信息获取")
+public class MakeClearingFarmerInfoEntity implements Serializable {
+    private static final long serialVersionUID = -1;
+
+    @ApiModelProperty("清分主体id")
+    private String fkFcId;
+
+    @ApiModelProperty("清分对象名称")
+    private String name;
+
+    @ApiModelProperty("清分对象银行卡号")
+    private String bankNo;
+
+    @ApiModelProperty("开户行名称")
+    private String bankName;
+
+    @ApiModelProperty("开户行机构代码")
+    private String bankCode;
+
+    @ApiModelProperty("银行卡状态嘛")
+    private Integer bankStatus;
+
+    @ApiModelProperty("收款人名称")
+    private String transferName;
+
+
+    @ApiModelProperty("清分对象证件号")
+    private String pid;
+
+    @ApiModelProperty("市")
+    private String cityName;
+
+    @ApiModelProperty("县")
+    private String countyName;
+
+    @ApiModelProperty("镇")
+    private String townName;
+
+    @ApiModelProperty("村")
+    private String villageName;
+
+    @ApiModelProperty("详细地址")
+    private String address;
+}

carbon-bank/carbon-bank-common/src/main/java/com/hcloud/microserver/system/bank/carbon/form/ClearingForm.java

@@ -0,0 +1,13 @@
+package com.hcloud.microserver.system.bank.carbon.form;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+public class ClearingForm  extends MakeClearForm {
+    @ApiModelProperty("农户或者组id")
+    private String fcName;
+
+    @ApiModelProperty("归属类型")
+    private Integer belongType;
+}

carbon-bank/carbon-bank-common/src/main/java/com/hcloud/microserver/system/bank/carbon/form/MakeClearForm.java

@@ -0,0 +1,32 @@
+package com.hcloud.microserver.system.bank.carbon.form;
+
+import com.hcloud.microserver.commoncore.base.BaseForm;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import java.io.Serializable;
+import java.util.Date;
+import java.util.List;
+
+@Data
+@ApiModel("添加清分")
+public class MakeClearForm extends BaseForm implements Serializable {
+
+    @ApiModelProperty("开始时间")
+    private Date startTime;
+
+    @ApiModelProperty("结束时间")
+    private Date endTime;
+
+    @ApiModelProperty("订单类型")
+    private Integer orderType;
+
+    @ApiModelProperty("归属主体类型")
+    private Integer belongType;
+
+    @ApiModelProperty("清分主体")
+    private List<ClearingForm> clearings;
+
+
+
+}

carbon-bank/carbon-bank-common/src/main/java/com/hcloud/microserver/system/bank/carbon/form/RequestTransferForm.java

@@ -0,0 +1,22 @@
+package com.hcloud.microserver.system.bank.carbon.form;
+
+import com.hcloud.microserver.commoncore.base.BaseForm;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+@ApiModel("请求清分参数模型")
+public class RequestTransferForm extends BaseForm {
+    @ApiModelProperty("清分账户")
+    private String userId;
+
+    @ApiModelProperty("清分密码")
+    private String pwd;
+
+    @ApiModelProperty("清分类型")
+    private Integer clearType;
+
+    @ApiModelProperty("请求清分主体id")
+    private Long transferId;
+}

carbon-bank/carbon-bank-mbg/src/main/java/com/hcloud/microserver/bank/mbg/mapper/BTransferFarmerRequestMapper.java

@@ -10,13 +10,21 @@ public interface BTransferFarmerRequestMapper {
 
     int deleteByExample(BTransferFarmerRequestExample example);
 
+    int deleteByPrimaryKey(Long guid);
+
     int insert(BTransferFarmerRequest record);
 
     int insertSelective(BTransferFarmerRequest record);
 
     List<BTransferFarmerRequest> selectByExample(BTransferFarmerRequestExample example);
 
+    BTransferFarmerRequest selectByPrimaryKey(Long guid);
+
     int updateByExampleSelective(@Param("record") BTransferFarmerRequest record, @Param("example") BTransferFarmerRequestExample example);
 
     int updateByExample(@Param("record") BTransferFarmerRequest record, @Param("example") BTransferFarmerRequestExample example);
+
+    int updateByPrimaryKeySelective(BTransferFarmerRequest record);
+
+    int updateByPrimaryKey(BTransferFarmerRequest record);
 }

carbon-bank/carbon-bank-mbg/src/main/java/com/hcloud/microserver/bank/mbg/modul/BTransfer.java

@@ -21,23 +21,8 @@ public class BTransfer implements Serializable {
     @ApiModelProperty(value = "清分金额")
     private BigDecimal transferAmount;
 
-    @ApiModelProperty(value = "清分流水号")
-    private String serialNo;
-
-    @ApiModelProperty(value = "交易代码")
-    private String serviceId;
-
-    @ApiModelProperty(value = "清分使用的session_id")
-    private String sessionId;
-
-    @ApiModelProperty(value = "清分时间")
-    private String reqTime;
-
-    @ApiModelProperty(value = "响应代码")
-    private String retCode;
-
-    @ApiModelProperty(value = "错误消息")
-    private String errorMsg;
+    @ApiModelProperty(value = "清分人数")
+    private Integer transferNum;
 
     @ApiModelProperty(value = "创建人guid")
     private Long createId;
@@ -99,52 +84,12 @@ public class BTransfer implements Serializable {
         this.transferAmount = transferAmount;
     }
 
-    public String getSerialNo() {
-        return serialNo;
-    }
-
-    public void setSerialNo(String serialNo) {
-        this.serialNo = serialNo;
-    }
-
-    public String getServiceId() {
-        return serviceId;
-    }
-
-    public void setServiceId(String serviceId) {
-        this.serviceId = serviceId;
-    }
-
-    public String getSessionId() {
-        return sessionId;
-    }
-
-    public void setSessionId(String sessionId) {
-        this.sessionId = sessionId;
-    }
-
-    public String getReqTime() {
-        return reqTime;
-    }
-
-    public void setReqTime(String reqTime) {
-        this.reqTime = reqTime;
-    }
-
-    public String getRetCode() {
-        return retCode;
-    }
-
-    public void setRetCode(String retCode) {
-        this.retCode = retCode;
-    }
-
-    public String getErrorMsg() {
-        return errorMsg;
+    public Integer getTransferNum() {
+        return transferNum;
     }
 
-    public void setErrorMsg(String errorMsg) {
-        this.errorMsg = errorMsg;
+    public void setTransferNum(Integer transferNum) {
+        this.transferNum = transferNum;
     }
 
     public Long getCreateId() {
@@ -206,12 +151,7 @@ public class BTransfer implements Serializable {
         sb.append(", transferStatus=").append(transferStatus);
         sb.append(", transferTime=").append(transferTime);
         sb.append(", transferAmount=").append(transferAmount);
-        sb.append(", serialNo=").append(serialNo);
-        sb.append(", serviceId=").append(serviceId);
-        sb.append(", sessionId=").append(sessionId);
-        sb.append(", reqTime=").append(reqTime);
-        sb.append(", retCode=").append(retCode);
-        sb.append(", errorMsg=").append(errorMsg);
+        sb.append(", transferNum=").append(transferNum);
         sb.append(", createId=").append(createId);
         sb.append(", createName=").append(createName);
         sb.append(", createTime=").append(createTime);

carbon-bank/carbon-bank-mbg/src/main/java/com/hcloud/microserver/bank/mbg/modul/BTransferDetail.java

@@ -2,6 +2,7 @@ package com.hcloud.microserver.bank.mbg.modul;
 
 import io.swagger.annotations.ApiModelProperty;
 import java.io.Serializable;
+import java.math.BigDecimal;
 import java.util.Date;
 
 public class BTransferDetail implements Serializable {
@@ -14,8 +15,11 @@ public class BTransferDetail implements Serializable {
     @ApiModelProperty(value = "清分类型，0：农户清分，1:村组清分")
     private Integer transferType;
 
-    @ApiModelProperty(value = "农户或者村组id")
-    private String fkFcId;
+    @ApiModelProperty(value = "农户id")
+    private String fkFarmerId;
+
+    @ApiModelProperty(value = "村组id")
+    private String fkCollectiveId;
 
     @ApiModelProperty(value = "序列号")
     private String serilNo;
@@ -71,6 +75,18 @@ public class BTransferDetail implements Serializable {
     @ApiModelProperty(value = "清分状态0，删除，1，生成，2，已经退回到订单")
     private Integer state;
 
+    @ApiModelProperty(value = "收款银行名称")
+    private String bankName;
+
+    @ApiModelProperty(value = "收款银行机构编码")
+    private String bankCode;
+
+    @ApiModelProperty(value = "清分状态")
+    private Integer status;
+
+    @ApiModelProperty(value = "清分金额")
+    private BigDecimal transferAmount;
+
     private static final long serialVersionUID = 1L;
 
     public Long getGuid() {
@@ -97,12 +113,20 @@ public class BTransferDetail implements Serializable {
         this.transferType = transferType;
     }
 
-    public String getFkFcId() {
-        return fkFcId;
+    public String getFkFarmerId() {
+        return fkFarmerId;
+    }
+
+    public void setFkFarmerId(String fkFarmerId) {
+        this.fkFarmerId = fkFarmerId;
     }
 
-    public void setFkFcId(String fkFcId) {
-        this.fkFcId = fkFcId;
+    public String getFkCollectiveId() {
+        return fkCollectiveId;
+    }
+
+    public void setFkCollectiveId(String fkCollectiveId) {
+        this.fkCollectiveId = fkCollectiveId;
     }
 
     public String getSerilNo() {
@@ -249,6 +273,38 @@ public class BTransferDetail implements Serializable {
         this.state = state;
     }
 
+    public String getBankName() {
+        return bankName;
+    }
+
+    public void setBankName(String bankName) {
+        this.bankName = bankName;
+    }
+
+    public String getBankCode() {
+        return bankCode;
+    }
+
+    public void setBankCode(String bankCode) {
+        this.bankCode = bankCode;
+    }
+
+    public Integer getStatus() {
+        return status;
+    }
+
+    public void setStatus(Integer status) {
+        this.status = status;
+    }
+
+    public BigDecimal getTransferAmount() {
+        return transferAmount;
+    }
+
+    public void setTransferAmount(BigDecimal transferAmount) {
+        this.transferAmount = transferAmount;
+    }
+
     @Override
     public String toString() {
         StringBuilder sb = new StringBuilder();
@@ -258,7 +314,8 @@ public class BTransferDetail implements Serializable {
         sb.append(", guid=").append(guid);
         sb.append(", fkTransferId=").append(fkTransferId);
         sb.append(", transferType=").append(transferType);
-        sb.append(", fkFcId=").append(fkFcId);
+        sb.append(", fkFarmerId=").append(fkFarmerId);
+        sb.append(", fkCollectiveId=").append(fkCollectiveId);
         sb.append(", serilNo=").append(serilNo);
         sb.append(", name=").append(name);
         sb.append(", bankNo=").append(bankNo);
@@ -277,6 +334,10 @@ public class BTransferDetail implements Serializable {
         sb.append(", transferName=").append(transferName);
         sb.append(", transferTime=").append(transferTime);
         sb.append(", state=").append(state);
+        sb.append(", bankName=").append(bankName);
+        sb.append(", bankCode=").append(bankCode);
+        sb.append(", status=").append(status);
+        sb.append(", transferAmount=").append(transferAmount);
         sb.append(", serialVersionUID=").append(serialVersionUID);
         sb.append("]");
         return sb.toString();

carbon-bank/carbon-bank-mbg/src/main/java/com/hcloud/microserver/bank/mbg/modul/BTransferDetailExample.java

@@ -1,5 +1,6 @@
 package com.hcloud.microserver.bank.mbg.modul;
 
+import java.math.BigDecimal;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
@@ -285,73 +286,143 @@ public class BTransferDetailExample {
             return (Criteria) this;
         }
 
-        public Criteria andFkFcIdIsNull() {
-            addCriterion("fk_fc_id is null");
+        public Criteria andFkFarmerIdIsNull() {
+            addCriterion("fk_farmer_id is null");
             return (Criteria) this;
         }
 
-        public Criteria andFkFcIdIsNotNull() {
-            addCriterion("fk_fc_id is not null");
+        public Criteria andFkFarmerIdIsNotNull() {
+            addCriterion("fk_farmer_id is not null");
             return (Criteria) this;
         }
 
-        public Criteria andFkFcIdEqualTo(String value) {
-            addCriterion("fk_fc_id =", value, "fkFcId");
+        public Criteria andFkFarmerIdEqualTo(String value) {
+            addCriterion("fk_farmer_id =", value, "fkFarmerId");
             return (Criteria) this;
         }
 
-        public Criteria andFkFcIdNotEqualTo(String value) {
-            addCriterion("fk_fc_id <>", value, "fkFcId");
+        public Criteria andFkFarmerIdNotEqualTo(String value) {
+            addCriterion("fk_farmer_id <>", value, "fkFarmerId");
             return (Criteria) this;
         }
 
-        public Criteria andFkFcIdGreaterThan(String value) {
-            addCriterion("fk_fc_id >", value, "fkFcId");
+        public Criteria andFkFarmerIdGreaterThan(String value) {
+            addCriterion("fk_farmer_id >", value, "fkFarmerId");
             return (Criteria) this;
         }
 
-        public Criteria andFkFcIdGreaterThanOrEqualTo(String value) {
-            addCriterion("fk_fc_id >=", value, "fkFcId");
+        public Criteria andFkFarmerIdGreaterThanOrEqualTo(String value) {
+            addCriterion("fk_farmer_id >=", value, "fkFarmerId");
             return (Criteria) this;
         }
 
-        public Criteria andFkFcIdLessThan(String value) {
-            addCriterion("fk_fc_id <", value, "fkFcId");
+        public Criteria andFkFarmerIdLessThan(String value) {
+            addCriterion("fk_farmer_id <", value, "fkFarmerId");
             return (Criteria) this;
         }
 
-        public Criteria andFkFcIdLessThanOrEqualTo(String value) {
-            addCriterion("fk_fc_id <=", value, "fkFcId");
+        public Criteria andFkFarmerIdLessThanOrEqualTo(String value) {
+            addCriterion("fk_farmer_id <=", value, "fkFarmerId");
             return (Criteria) this;
         }
 
-        public Criteria andFkFcIdLike(String value) {
-            addCriterion("fk_fc_id like", value, "fkFcId");
+        public Criteria andFkFarmerIdLike(String value) {
+            addCriterion("fk_farmer_id like", value, "fkFarmerId");
             return (Criteria) this;
         }
 
-        public Criteria andFkFcIdNotLike(String value) {
-            addCriterion("fk_fc_id not like", value, "fkFcId");
+        public Criteria andFkFarmerIdNotLike(String value) {
+            addCriterion("fk_farmer_id not like", value, "fkFarmerId");
             return (Criteria) this;
         }
 
-        public Criteria andFkFcIdIn(List<String> values) {
-            addCriterion("fk_fc_id in", values, "fkFcId");
+        public Criteria andFkFarmerIdIn(List<String> values) {
+            addCriterion("fk_farmer_id in", values, "fkFarmerId");
             return (Criteria) this;
         }
 
-        public Criteria andFkFcIdNotIn(List<String> values) {
-            addCriterion("fk_fc_id not in", values, "fkFcId");
+        public Criteria andFkFarmerIdNotIn(List<String> values) {
+            addCriterion("fk_farmer_id not in", values, "fkFarmerId");
             return (Criteria) this;
         }
 
-        public Criteria andFkFcIdBetween(String value1, String value2) {
-            addCriterion("fk_fc_id between", value1, value2, "fkFcId");
+        public Criteria andFkFarmerIdBetween(String value1, String value2) {
+            addCriterion("fk_farmer_id between", value1, value2, "fkFarmerId");
             return (Criteria) this;
         }
 
-        public Criteria andFkFcIdNotBetween(String value1, String value2) {
-            addCriterion("fk_fc_id not between", value1, value2, "fkFcId");
+        public Criteria andFkFarmerIdNotBetween(String value1, String value2) {
+            addCriterion("fk_farmer_id not between", value1, value2, "fkFarmerId");
+            return (Criteria) this;
+        }
+
+        public Criteria andFkCollectiveIdIsNull() {
+            addCriterion("fk_collective_id is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andFkCollectiveIdIsNotNull() {
+            addCriterion("fk_collective_id is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andFkCollectiveIdEqualTo(String value) {
+            addCriterion("fk_collective_id =", value, "fkCollectiveId");
+            return (Criteria) this;
+        }
+
+        public Criteria andFkCollectiveIdNotEqualTo(String value) {
+            addCriterion("fk_collective_id <>", value, "fkCollectiveId");
+            return (Criteria) this;
+        }
+
+        public Criteria andFkCollectiveIdGreaterThan(String value) {
+            addCriterion("fk_collective_id >", value, "fkCollectiveId");
+            return (Criteria) this;
+        }
+
+        public Criteria andFkCollectiveIdGreaterThanOrEqualTo(String value) {
+            addCriterion("fk_collective_id >=", value, "fkCollectiveId");
+            return (Criteria) this;
+        }
+
+        public Criteria andFkCollectiveIdLessThan(String value) {
+            addCriterion("fk_collective_id <", value, "fkCollectiveId");
+            return (Criteria) this;
+        }
+
+        public Criteria andFkCollectiveIdLessThanOrEqualTo(String value) {
+            addCriterion("fk_collective_id <=", value, "fkCollectiveId");
+            return (Criteria) this;
+        }
+
+        public Criteria andFkCollectiveIdLike(String value) {
+            addCriterion("fk_collective_id like", value, "fkCollectiveId");
+            return (Criteria) this;
+        }
+
+        public Criteria andFkCollectiveIdNotLike(String value) {
+            addCriterion("fk_collective_id not like", value, "fkCollectiveId");
+            return (Criteria) this;
+        }
+
+        public Criteria andFkCollectiveIdIn(List<String> values) {
+            addCriterion("fk_collective_id in", values, "fkCollectiveId");
+            return (Criteria) this;
+        }
+
+        public Criteria andFkCollectiveIdNotIn(List<String> values) {
+            addCriterion("fk_collective_id not in", values, "fkCollectiveId");
+            return (Criteria) this;
+        }
+
+        public Criteria andFkCollectiveIdBetween(String value1, String value2) {
+            addCriterion("fk_collective_id between", value1, value2, "fkCollectiveId");
+            return (Criteria) this;
+        }
+
+        public Criteria andFkCollectiveIdNotBetween(String value1, String value2) {
+            addCriterion("fk_collective_id not between", value1, value2, "fkCollectiveId");
             return (Criteria) this;
         }
 
@@ -1544,6 +1615,266 @@ public class BTransferDetailExample {
             addCriterion("state not between", value1, value2, "state");
             return (Criteria) this;
         }
+
+        public Criteria andBankNameIsNull() {
+            addCriterion("bank_name is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andBankNameIsNotNull() {
+            addCriterion("bank_name is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andBankNameEqualTo(String value) {
+            addCriterion("bank_name =", value, "bankName");
+            return (Criteria) this;
+        }
+
+        public Criteria andBankNameNotEqualTo(String value) {
+            addCriterion("bank_name <>", value, "bankName");
+            return (Criteria) this;
+        }
+
+        public Criteria andBankNameGreaterThan(String value) {
+            addCriterion("bank_name >", value, "bankName");
+            return (Criteria) this;
+        }
+
+        public Criteria andBankNameGreaterThanOrEqualTo(String value) {
+            addCriterion("bank_name >=", value, "bankName");
+            return (Criteria) this;
+        }
+
+        public Criteria andBankNameLessThan(String value) {
+            addCriterion("bank_name <", value, "bankName");
+            return (Criteria) this;
+        }
+
+        public Criteria andBankNameLessThanOrEqualTo(String value) {
+            addCriterion("bank_name <=", value, "bankName");
+            return (Criteria) this;
+        }
+
+        public Criteria andBankNameLike(String value) {
+            addCriterion("bank_name like", value, "bankName");
+            return (Criteria) this;
+        }
+
+        public Criteria andBankNameNotLike(String value) {
+            addCriterion("bank_name not like", value, "bankName");
+            return (Criteria) this;
+        }
+
+        public Criteria andBankNameIn(List<String> values) {
+            addCriterion("bank_name in", values, "bankName");
+            return (Criteria) this;
+        }
+
+        public Criteria andBankNameNotIn(List<String> values) {
+            addCriterion("bank_name not in", values, "bankName");
+            return (Criteria) this;
+        }
+
+        public Criteria andBankNameBetween(String value1, String value2) {
+            addCriterion("bank_name between", value1, value2, "bankName");
+            return (Criteria) this;
+        }
+
+        public Criteria andBankNameNotBetween(String value1, String value2) {
+            addCriterion("bank_name not between", value1, value2, "bankName");
+            return (Criteria) this;
+        }
+
+        public Criteria andBankCodeIsNull() {
+            addCriterion("bank_code is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andBankCodeIsNotNull() {
+            addCriterion("bank_code is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andBankCodeEqualTo(String value) {
+            addCriterion("bank_code =", value, "bankCode");
+            return (Criteria) this;
+        }
+
+        public Criteria andBankCodeNotEqualTo(String value) {
+            addCriterion("bank_code <>", value, "bankCode");
+            return (Criteria) this;
+        }
+
+        public Criteria andBankCodeGreaterThan(String value) {
+            addCriterion("bank_code >", value, "bankCode");
+            return (Criteria) this;
+        }
+
+        public Criteria andBankCodeGreaterThanOrEqualTo(String value) {
+            addCriterion("bank_code >=", value, "bankCode");
+            return (Criteria) this;
+        }
+
+        public Criteria andBankCodeLessThan(String value) {
+            addCriterion("bank_code <", value, "bankCode");
+            return (Criteria) this;
+        }
+
+        public Criteria andBankCodeLessThanOrEqualTo(String value) {
+            addCriterion("bank_code <=", value, "bankCode");
+            return (Criteria) this;
+        }
+
+        public Criteria andBankCodeLike(String value) {
+            addCriterion("bank_code like", value, "bankCode");
+            return (Criteria) this;
+        }
+
+        public Criteria andBankCodeNotLike(String value) {
+            addCriterion("bank_code not like", value, "bankCode");
+            return (Criteria) this;
+        }
+
+        public Criteria andBankCodeIn(List<String> values) {
+            addCriterion("bank_code in", values, "bankCode");
+            return (Criteria) this;
+        }
+
+        public Criteria andBankCodeNotIn(List<String> values) {
+            addCriterion("bank_code not in", values, "bankCode");
+            return (Criteria) this;
+        }
+
+        public Criteria andBankCodeBetween(String value1, String value2) {
+            addCriterion("bank_code between", value1, value2, "bankCode");
+            return (Criteria) this;
+        }
+
+        public Criteria andBankCodeNotBetween(String value1, String value2) {
+            addCriterion("bank_code not between", value1, value2, "bankCode");
+            return (Criteria) this;
+        }
+
+        public Criteria andStatusIsNull() {
+            addCriterion("status is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andStatusIsNotNull() {
+            addCriterion("status is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andStatusEqualTo(Integer value) {
+            addCriterion("status =", value, "status");
+            return (Criteria) this;
+        }
+
+        public Criteria andStatusNotEqualTo(Integer value) {
+            addCriterion("status <>", value, "status");
+            return (Criteria) this;
+        }
+
+        public Criteria andStatusGreaterThan(Integer value) {
+            addCriterion("status >", value, "status");
+            return (Criteria) this;
+        }
+
+        public Criteria andStatusGreaterThanOrEqualTo(Integer value) {
+            addCriterion("status >=", value, "status");
+            return (Criteria) this;
+        }
+
+        public Criteria andStatusLessThan(Integer value) {
+            addCriterion("status <", value, "status");
+            return (Criteria) this;
+        }
+
+        public Criteria andStatusLessThanOrEqualTo(Integer value) {
+            addCriterion("status <=", value, "status");
+            return (Criteria) this;
+        }
+
+        public Criteria andStatusIn(List<Integer> values) {
+            addCriterion("status in", values, "status");
+            return (Criteria) this;
+        }
+
+        public Criteria andStatusNotIn(List<Integer> values) {
+            addCriterion("status not in", values, "status");
+            return (Criteria) this;
+        }
+
+        public Criteria andStatusBetween(Integer value1, Integer value2) {
+            addCriterion("status between", value1, value2, "status");
+            return (Criteria) this;
+        }
+
+        public Criteria andStatusNotBetween(Integer value1, Integer value2) {
+            addCriterion("status not between", value1, value2, "status");
+            return (Criteria) this;
+        }
+
+        public Criteria andTransferAmountIsNull() {
+            addCriterion("transfer_amount is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andTransferAmountIsNotNull() {
+            addCriterion("transfer_amount is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andTransferAmountEqualTo(BigDecimal value) {
+            addCriterion("transfer_amount =", value, "transferAmount");
+            return (Criteria) this;
+        }
+
+        public Criteria andTransferAmountNotEqualTo(BigDecimal value) {
+            addCriterion("transfer_amount <>", value, "transferAmount");
+            return (Criteria) this;
+        }
+
+        public Criteria andTransferAmountGreaterThan(BigDecimal value) {
+            addCriterion("transfer_amount >", value, "transferAmount");
+            return (Criteria) this;
+        }
+
+        public Criteria andTransferAmountGreaterThanOrEqualTo(BigDecimal value) {
+            addCriterion("transfer_amount >=", value, "transferAmount");
+            return (Criteria) this;
+        }
+
+        public Criteria andTransferAmountLessThan(BigDecimal value) {
+            addCriterion("transfer_amount <", value, "transferAmount");
+            return (Criteria) this;
+        }
+
+        public Criteria andTransferAmountLessThanOrEqualTo(BigDecimal value) {
+            addCriterion("transfer_amount <=", value, "transferAmount");
+            return (Criteria) this;
+        }
+
+        public Criteria andTransferAmountIn(List<BigDecimal> values) {
+            addCriterion("transfer_amount in", values, "transferAmount");
+            return (Criteria) this;
+        }
+
+        public Criteria andTransferAmountNotIn(List<BigDecimal> values) {
+            addCriterion("transfer_amount not in", values, "transferAmount");
+            return (Criteria) this;
+        }
+
+        public Criteria andTransferAmountBetween(BigDecimal value1, BigDecimal value2) {
+            addCriterion("transfer_amount between", value1, value2, "transferAmount");
+            return (Criteria) this;
+        }
+
+        public Criteria andTransferAmountNotBetween(BigDecimal value1, BigDecimal value2) {
+            addCriterion("transfer_amount not between", value1, value2, "transferAmount");
+            return (Criteria) this;
+        }
     }
 
     public static class Criteria extends GeneratedCriteria {

carbon-bank/carbon-bank-mbg/src/main/java/com/hcloud/microserver/bank/mbg/modul/BTransferExample.java

@@ -406,423 +406,63 @@ public class BTransferExample {
             return (Criteria) this;
         }
 
-        public Criteria andSerialNoIsNull() {
-            addCriterion("serial_no is null");
+        public Criteria andTransferNumIsNull() {
+            addCriterion("transfer_num is null");
             return (Criteria) this;
         }
 
-        public Criteria andSerialNoIsNotNull() {
-            addCriterion("serial_no is not null");
+        public Criteria andTransferNumIsNotNull() {
+            addCriterion("transfer_num is not null");
             return (Criteria) this;
         }
 
-        public Criteria andSerialNoEqualTo(String value) {
-            addCriterion("serial_no =", value, "serialNo");
+        public Criteria andTransferNumEqualTo(Integer value) {
+            addCriterion("transfer_num =", value, "transferNum");
             return (Criteria) this;
         }
 
-        public Criteria andSerialNoNotEqualTo(String value) {
-            addCriterion("serial_no <>", value, "serialNo");
+        public Criteria andTransferNumNotEqualTo(Integer value) {
+            addCriterion("transfer_num <>", value, "transferNum");
             return (Criteria) this;
         }
 
-        public Criteria andSerialNoGreaterThan(String value) {
-            addCriterion("serial_no >", value, "serialNo");
+        public Criteria andTransferNumGreaterThan(Integer value) {
+            addCriterion("transfer_num >", value, "transferNum");
             return (Criteria) this;
         }
 
-        public Criteria andSerialNoGreaterThanOrEqualTo(String value) {
-            addCriterion("serial_no >=", value, "serialNo");
+        public Criteria andTransferNumGreaterThanOrEqualTo(Integer value) {
+            addCriterion("transfer_num >=", value, "transferNum");
             return (Criteria) this;
         }
 
-        public Criteria andSerialNoLessThan(String value) {
-            addCriterion("serial_no <", value, "serialNo");
+        public Criteria andTransferNumLessThan(Integer value) {
+            addCriterion("transfer_num <", value, "transferNum");
             return (Criteria) this;
         }
 
-        public Criteria andSerialNoLessThanOrEqualTo(String value) {
-            addCriterion("serial_no <=", value, "serialNo");
+        public Criteria andTransferNumLessThanOrEqualTo(Integer value) {
+            addCriterion("transfer_num <=", value, "transferNum");
             return (Criteria) this;
         }
 
-        public Criteria andSerialNoLike(String value) {
-            addCriterion("serial_no like", value, "serialNo");
+        public Criteria andTransferNumIn(List<Integer> values) {
+            addCriterion("transfer_num in", values, "transferNum");
             return (Criteria) this;
         }
 
-        public Criteria andSerialNoNotLike(String value) {
-            addCriterion("serial_no not like", value, "serialNo");
+        public Criteria andTransferNumNotIn(List<Integer> values) {
+            addCriterion("transfer_num not in", values, "transferNum");
             return (Criteria) this;
         }
 
-        public Criteria andSerialNoIn(List<String> values) {
-            addCriterion("serial_no in", values, "serialNo");
+        public Criteria andTransferNumBetween(Integer value1, Integer value2) {
+            addCriterion("transfer_num between", value1, value2, "transferNum");
             return (Criteria) this;
         }
 
-        public Criteria andSerialNoNotIn(List<String> values) {
-            addCriterion("serial_no not in", values, "serialNo");
-            return (Criteria) this;
-        }
-
-        public Criteria andSerialNoBetween(String value1, String value2) {
-            addCriterion("serial_no between", value1, value2, "serialNo");
-            return (Criteria) this;
-        }
-
-        public Criteria andSerialNoNotBetween(String value1, String value2) {
-            addCriterion("serial_no not between", value1, value2, "serialNo");
-            return (Criteria) this;
-        }
-
-        public Criteria andServiceIdIsNull() {
-            addCriterion("service_id is null");
-            return (Criteria) this;
-        }
-
-        public Criteria andServiceIdIsNotNull() {
-            addCriterion("service_id is not null");
-            return (Criteria) this;
-        }
-
-        public Criteria andServiceIdEqualTo(String value) {
-            addCriterion("service_id =", value, "serviceId");
-            return (Criteria) this;
-        }
-
-        public Criteria andServiceIdNotEqualTo(String value) {
-            addCriterion("service_id <>", value, "serviceId");
-            return (Criteria) this;
-        }
-
-        public Criteria andServiceIdGreaterThan(String value) {
-            addCriterion("service_id >", value, "serviceId");
-            return (Criteria) this;
-        }
-
-        public Criteria andServiceIdGreaterThanOrEqualTo(String value) {
-            addCriterion("service_id >=", value, "serviceId");
-            return (Criteria) this;
-        }
-
-        public Criteria andServiceIdLessThan(String value) {
-            addCriterion("service_id <", value, "serviceId");
-            return (Criteria) this;
-        }
-
-        public Criteria andServiceIdLessThanOrEqualTo(String value) {
-            addCriterion("service_id <=", value, "serviceId");
-            return (Criteria) this;
-        }
-
-        public Criteria andServiceIdLike(String value) {
-            addCriterion("service_id like", value, "serviceId");
-            return (Criteria) this;
-        }
-
-        public Criteria andServiceIdNotLike(String value) {
-            addCriterion("service_id not like", value, "serviceId");
-            return (Criteria) this;
-        }
-
-        public Criteria andServiceIdIn(List<String> values) {
-            addCriterion("service_id in", values, "serviceId");
-            return (Criteria) this;
-        }
-
-        public Criteria andServiceIdNotIn(List<String> values) {
-            addCriterion("service_id not in", values, "serviceId");
-            return (Criteria) this;
-        }
-
-        public Criteria andServiceIdBetween(String value1, String value2) {
-            addCriterion("service_id between", value1, value2, "serviceId");
-            return (Criteria) this;
-        }
-
-        public Criteria andServiceIdNotBetween(String value1, String value2) {
-            addCriterion("service_id not between", value1, value2, "serviceId");
-            return (Criteria) this;
-        }
-
-        public Criteria andSessionIdIsNull() {
-            addCriterion("session_id is null");
-            return (Criteria) this;
-        }
-
-        public Criteria andSessionIdIsNotNull() {
-            addCriterion("session_id is not null");
-            return (Criteria) this;
-        }
-
-        public Criteria andSessionIdEqualTo(String value) {
-            addCriterion("session_id =", value, "sessionId");
-            return (Criteria) this;
-        }
-
-        public Criteria andSessionIdNotEqualTo(String value) {
-            addCriterion("session_id <>", value, "sessionId");
-            return (Criteria) this;
-        }
-
-        public Criteria andSessionIdGreaterThan(String value) {
-            addCriterion("session_id >", value, "sessionId");
-            return (Criteria) this;
-        }
-
-        public Criteria andSessionIdGreaterThanOrEqualTo(String value) {
-            addCriterion("session_id >=", value, "sessionId");
-            return (Criteria) this;
-        }
-
-        public Criteria andSessionIdLessThan(String value) {
-            addCriterion("session_id <", value, "sessionId");
-            return (Criteria) this;
-        }
-
-        public Criteria andSessionIdLessThanOrEqualTo(String value) {
-            addCriterion("session_id <=", value, "sessionId");
-            return (Criteria) this;
-        }
-
-        public Criteria andSessionIdLike(String value) {
-            addCriterion("session_id like", value, "sessionId");
-            return (Criteria) this;
-        }
-
-        public Criteria andSessionIdNotLike(String value) {
-            addCriterion("session_id not like", value, "sessionId");
-            return (Criteria) this;
-        }
-
-        public Criteria andSessionIdIn(List<String> values) {
-            addCriterion("session_id in", values, "sessionId");
-            return (Criteria) this;
-        }
-
-        public Criteria andSessionIdNotIn(List<String> values) {
-            addCriterion("session_id not in", values, "sessionId");
-            return (Criteria) this;
-        }
-
-        public Criteria andSessionIdBetween(String value1, String value2) {
-            addCriterion("session_id between", value1, value2, "sessionId");
-            return (Criteria) this;
-        }
-
-        public Criteria andSessionIdNotBetween(String value1, String value2) {
-            addCriterion("session_id not between", value1, value2, "sessionId");
-            return (Criteria) this;
-        }
-
-        public Criteria andReqTimeIsNull() {
-            addCriterion("req_time is null");
-            return (Criteria) this;
-        }
-
-        public Criteria andReqTimeIsNotNull() {
-            addCriterion("req_time is not null");
-            return (Criteria) this;
-        }
-
-        public Criteria andReqTimeEqualTo(String value) {
-            addCriterion("req_time =", value, "reqTime");
-            return (Criteria) this;
-        }
-
-        public Criteria andReqTimeNotEqualTo(String value) {
-            addCriterion("req_time <>", value, "reqTime");
-            return (Criteria) this;
-        }
-
-        public Criteria andReqTimeGreaterThan(String value) {
-            addCriterion("req_time >", value, "reqTime");
-            return (Criteria) this;
-        }
-
-        public Criteria andReqTimeGreaterThanOrEqualTo(String value) {
-            addCriterion("req_time >=", value, "reqTime");
-            return (Criteria) this;
-        }
-
-        public Criteria andReqTimeLessThan(String value) {
-            addCriterion("req_time <", value, "reqTime");
-            return (Criteria) this;
-        }
-
-        public Criteria andReqTimeLessThanOrEqualTo(String value) {
-            addCriterion("req_time <=", value, "reqTime");
-            return (Criteria) this;
-        }
-
-        public Criteria andReqTimeLike(String value) {
-            addCriterion("req_time like", value, "reqTime");
-            return (Criteria) this;
-        }
-
-        public Criteria andReqTimeNotLike(String value) {
-            addCriterion("req_time not like", value, "reqTime");
-            return (Criteria) this;
-        }
-
-        public Criteria andReqTimeIn(List<String> values) {
-            addCriterion("req_time in", values, "reqTime");
-            return (Criteria) this;
-        }
-
-        public Criteria andReqTimeNotIn(List<String> values) {
-            addCriterion("req_time not in", values, "reqTime");
-            return (Criteria) this;
-        }
-
-        public Criteria andReqTimeBetween(String value1, String value2) {
-            addCriterion("req_time between", value1, value2, "reqTime");
-            return (Criteria) this;
-        }
-
-        public Criteria andReqTimeNotBetween(String value1, String value2) {
-            addCriterion("req_time not between", value1, value2, "reqTime");
-            return (Criteria) this;
-        }
-
-        public Criteria andRetCodeIsNull() {
-            addCriterion("ret_code is null");
-            return (Criteria) this;
-        }
-
-        public Criteria andRetCodeIsNotNull() {
-            addCriterion("ret_code is not null");
-            return (Criteria) this;
-        }
-
-        public Criteria andRetCodeEqualTo(String value) {
-            addCriterion("ret_code =", value, "retCode");
-            return (Criteria) this;
-        }
-
-        public Criteria andRetCodeNotEqualTo(String value) {
-            addCriterion("ret_code <>", value, "retCode");
-            return (Criteria) this;
-        }
-
-        public Criteria andRetCodeGreaterThan(String value) {
-            addCriterion("ret_code >", value, "retCode");
-            return (Criteria) this;
-        }
-
-        public Criteria andRetCodeGreaterThanOrEqualTo(String value) {
-            addCriterion("ret_code >=", value, "retCode");
-            return (Criteria) this;
-        }
-
-        public Criteria andRetCodeLessThan(String value) {
-            addCriterion("ret_code <", value, "retCode");
-            return (Criteria) this;
-        }
-
-        public Criteria andRetCodeLessThanOrEqualTo(String value) {
-            addCriterion("ret_code <=", value, "retCode");
-            return (Criteria) this;
-        }
-
-        public Criteria andRetCodeLike(String value) {
-            addCriterion("ret_code like", value, "retCode");
-            return (Criteria) this;
-        }
-
-        public Criteria andRetCodeNotLike(String value) {
-            addCriterion("ret_code not like", value, "retCode");
-            return (Criteria) this;
-        }
-
-        public Criteria andRetCodeIn(List<String> values) {
-            addCriterion("ret_code in", values, "retCode");
-            return (Criteria) this;
-        }
-
-        public Criteria andRetCodeNotIn(List<String> values) {
-            addCriterion("ret_code not in", values, "retCode");
-            return (Criteria) this;
-        }
-
-        public Criteria andRetCodeBetween(String value1, String value2) {
-            addCriterion("ret_code between", value1, value2, "retCode");
-            return (Criteria) this;
-        }
-
-        public Criteria andRetCodeNotBetween(String value1, String value2) {
-            addCriterion("ret_code not between", value1, value2, "retCode");
-            return (Criteria) this;
-        }
-
-        public Criteria andErrorMsgIsNull() {
-            addCriterion("error_msg is null");
-            return (Criteria) this;
-        }
-
-        public Criteria andErrorMsgIsNotNull() {
-            addCriterion("error_msg is not null");
-            return (Criteria) this;
-        }
-
-        public Criteria andErrorMsgEqualTo(String value) {
-            addCriterion("error_msg =", value, "errorMsg");
-            return (Criteria) this;
-        }
-
-        public Criteria andErrorMsgNotEqualTo(String value) {
-            addCriterion("error_msg <>", value, "errorMsg");
-            return (Criteria) this;
-        }
-
-        public Criteria andErrorMsgGreaterThan(String value) {
-            addCriterion("error_msg >", value, "errorMsg");
-            return (Criteria) this;
-        }
-
-        public Criteria andErrorMsgGreaterThanOrEqualTo(String value) {
-            addCriterion("error_msg >=", value, "errorMsg");
-            return (Criteria) this;
-        }
-
-        public Criteria andErrorMsgLessThan(String value) {
-            addCriterion("error_msg <", value, "errorMsg");
-            return (Criteria) this;
-        }
-
-        public Criteria andErrorMsgLessThanOrEqualTo(String value) {
-            addCriterion("error_msg <=", value, "errorMsg");
-            return (Criteria) this;
-        }
-
-        public Criteria andErrorMsgLike(String value) {
-            addCriterion("error_msg like", value, "errorMsg");
-            return (Criteria) this;
-        }
-
-        public Criteria andErrorMsgNotLike(String value) {
-            addCriterion("error_msg not like", value, "errorMsg");
-            return (Criteria) this;
-        }
-
-        public Criteria andErrorMsgIn(List<String> values) {
-            addCriterion("error_msg in", values, "errorMsg");
-            return (Criteria) this;
-        }
-
-        public Criteria andErrorMsgNotIn(List<String> values) {
-            addCriterion("error_msg not in", values, "errorMsg");
-            return (Criteria) this;
-        }
-
-        public Criteria andErrorMsgBetween(String value1, String value2) {
-            addCriterion("error_msg between", value1, value2, "errorMsg");
-            return (Criteria) this;
-        }
-
-        public Criteria andErrorMsgNotBetween(String value1, String value2) {
-            addCriterion("error_msg not between", value1, value2, "errorMsg");
+        public Criteria andTransferNumNotBetween(Integer value1, Integer value2) {
+            addCriterion("transfer_num not between", value1, value2, "transferNum");
             return (Criteria) this;
         }
 

carbon-bank/carbon-bank-mbg/src/main/java/com/hcloud/microserver/bank/mbg/modul/BTransferFarmerRequest.java

@@ -72,6 +72,24 @@ public class BTransferFarmerRequest implements Serializable {
     @ApiModelProperty(value = "状态：1-可用 0-不用")
     private Integer status;
 
+    @ApiModelProperty(value = "清分流水号")
+    private String serialNo;
+
+    @ApiModelProperty(value = "交易代码")
+    private String serviceId;
+
+    @ApiModelProperty(value = "清分使用的session_id")
+    private String sessionId;
+
+    @ApiModelProperty(value = "清分时间")
+    private String reqTime;
+
+    @ApiModelProperty(value = "响应代码")
+    private String retCode;
+
+    @ApiModelProperty(value = "错误消息")
+    private String errorMsg;
+
     private static final long serialVersionUID = 1L;
 
     public Long getGuid() {
@@ -250,6 +268,54 @@ public class BTransferFarmerRequest implements Serializable {
         this.status = status;
     }
 
+    public String getSerialNo() {
+        return serialNo;
+    }
+
+    public void setSerialNo(String serialNo) {
+        this.serialNo = serialNo;
+    }
+
+    public String getServiceId() {
+        return serviceId;
+    }
+
+    public void setServiceId(String serviceId) {
+        this.serviceId = serviceId;
+    }
+
+    public String getSessionId() {
+        return sessionId;
+    }
+
+    public void setSessionId(String sessionId) {
+        this.sessionId = sessionId;
+    }
+
+    public String getReqTime() {
+        return reqTime;
+    }
+
+    public void setReqTime(String reqTime) {
+        this.reqTime = reqTime;
+    }
+
+    public String getRetCode() {
+        return retCode;
+    }
+
+    public void setRetCode(String retCode) {
+        this.retCode = retCode;
+    }
+
+    public String getErrorMsg() {
+        return errorMsg;
+    }
+
+    public void setErrorMsg(String errorMsg) {
+        this.errorMsg = errorMsg;
+    }
+
     @Override
     public String toString() {
         StringBuilder sb = new StringBuilder();
@@ -278,6 +344,12 @@ public class BTransferFarmerRequest implements Serializable {
         sb.append(", postFee=").append(postFee);
         sb.append(", createTime=").append(createTime);
         sb.append(", status=").append(status);
+        sb.append(", serialNo=").append(serialNo);
+        sb.append(", serviceId=").append(serviceId);
+        sb.append(", sessionId=").append(sessionId);
+        sb.append(", reqTime=").append(reqTime);
+        sb.append(", retCode=").append(retCode);
+        sb.append(", errorMsg=").append(errorMsg);
         sb.append(", serialVersionUID=").append(serialVersionUID);
         sb.append("]");
         return sb.toString();

carbon-bank/carbon-bank-mbg/src/main/java/com/hcloud/microserver/bank/mbg/modul/BTransferFarmerRequestExample.java

@@ -1565,6 +1565,426 @@ public class BTransferFarmerRequestExample {
             addCriterion("status not between", value1, value2, "status");
             return (Criteria) this;
         }
+
+        public Criteria andSerialNoIsNull() {
+            addCriterion("serial_no is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andSerialNoIsNotNull() {
+            addCriterion("serial_no is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andSerialNoEqualTo(String value) {
+            addCriterion("serial_no =", value, "serialNo");
+            return (Criteria) this;
+        }
+
+        public Criteria andSerialNoNotEqualTo(String value) {
+            addCriterion("serial_no <>", value, "serialNo");
+            return (Criteria) this;
+        }
+
+        public Criteria andSerialNoGreaterThan(String value) {
+            addCriterion("serial_no >", value, "serialNo");
+            return (Criteria) this;
+        }
+
+        public Criteria andSerialNoGreaterThanOrEqualTo(String value) {
+            addCriterion("serial_no >=", value, "serialNo");
+            return (Criteria) this;
+        }
+
+        public Criteria andSerialNoLessThan(String value) {
+            addCriterion("serial_no <", value, "serialNo");
+            return (Criteria) this;
+        }
+
+        public Criteria andSerialNoLessThanOrEqualTo(String value) {
+            addCriterion("serial_no <=", value, "serialNo");
+            return (Criteria) this;
+        }
+
+        public Criteria andSerialNoLike(String value) {
+            addCriterion("serial_no like", value, "serialNo");
+            return (Criteria) this;
+        }
+
+        public Criteria andSerialNoNotLike(String value) {
+            addCriterion("serial_no not like", value, "serialNo");
+            return (Criteria) this;
+        }
+
+        public Criteria andSerialNoIn(List<String> values) {
+            addCriterion("serial_no in", values, "serialNo");
+            return (Criteria) this;
+        }
+
+        public Criteria andSerialNoNotIn(List<String> values) {
+            addCriterion("serial_no not in", values, "serialNo");
+            return (Criteria) this;
+        }
+
+        public Criteria andSerialNoBetween(String value1, String value2) {
+            addCriterion("serial_no between", value1, value2, "serialNo");
+            return (Criteria) this;
+        }
+
+        public Criteria andSerialNoNotBetween(String value1, String value2) {
+            addCriterion("serial_no not between", value1, value2, "serialNo");
+            return (Criteria) this;
+        }
+
+        public Criteria andServiceIdIsNull() {
+            addCriterion("service_id is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andServiceIdIsNotNull() {
+            addCriterion("service_id is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andServiceIdEqualTo(String value) {
+            addCriterion("service_id =", value, "serviceId");
+            return (Criteria) this;
+        }
+
+        public Criteria andServiceIdNotEqualTo(String value) {
+            addCriterion("service_id <>", value, "serviceId");
+            return (Criteria) this;
+        }
+
+        public Criteria andServiceIdGreaterThan(String value) {
+            addCriterion("service_id >", value, "serviceId");
+            return (Criteria) this;
+        }
+
+        public Criteria andServiceIdGreaterThanOrEqualTo(String value) {
+            addCriterion("service_id >=", value, "serviceId");
+            return (Criteria) this;
+        }
+
+        public Criteria andServiceIdLessThan(String value) {
+            addCriterion("service_id <", value, "serviceId");
+            return (Criteria) this;
+        }
+
+        public Criteria andServiceIdLessThanOrEqualTo(String value) {
+            addCriterion("service_id <=", value, "serviceId");
+            return (Criteria) this;
+        }
+
+        public Criteria andServiceIdLike(String value) {
+            addCriterion("service_id like", value, "serviceId");
+            return (Criteria) this;
+        }
+
+        public Criteria andServiceIdNotLike(String value) {
+            addCriterion("service_id not like", value, "serviceId");
+            return (Criteria) this;
+        }
+
+        public Criteria andServiceIdIn(List<String> values) {
+            addCriterion("service_id in", values, "serviceId");
+            return (Criteria) this;
+        }
+
+        public Criteria andServiceIdNotIn(List<String> values) {
+            addCriterion("service_id not in", values, "serviceId");
+            return (Criteria) this;
+        }
+
+        public Criteria andServiceIdBetween(String value1, String value2) {
+            addCriterion("service_id between", value1, value2, "serviceId");
+            return (Criteria) this;
+        }
+
+        public Criteria andServiceIdNotBetween(String value1, String value2) {
+            addCriterion("service_id not between", value1, value2, "serviceId");
+            return (Criteria) this;
+        }
+
+        public Criteria andSessionIdIsNull() {
+            addCriterion("session_id is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andSessionIdIsNotNull() {
+            addCriterion("session_id is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andSessionIdEqualTo(String value) {
+            addCriterion("session_id =", value, "sessionId");
+            return (Criteria) this;
+        }
+
+        public Criteria andSessionIdNotEqualTo(String value) {
+            addCriterion("session_id <>", value, "sessionId");
+            return (Criteria) this;
+        }
+
+        public Criteria andSessionIdGreaterThan(String value) {
+            addCriterion("session_id >", value, "sessionId");
+            return (Criteria) this;
+        }
+
+        public Criteria andSessionIdGreaterThanOrEqualTo(String value) {
+            addCriterion("session_id >=", value, "sessionId");
+            return (Criteria) this;
+        }
+
+        public Criteria andSessionIdLessThan(String value) {
+            addCriterion("session_id <", value, "sessionId");
+            return (Criteria) this;
+        }
+
+        public Criteria andSessionIdLessThanOrEqualTo(String value) {
+            addCriterion("session_id <=", value, "sessionId");
+            return (Criteria) this;
+        }
+
+        public Criteria andSessionIdLike(String value) {
+            addCriterion("session_id like", value, "sessionId");
+            return (Criteria) this;
+        }
+
+        public Criteria andSessionIdNotLike(String value) {
+            addCriterion("session_id not like", value, "sessionId");
+            return (Criteria) this;
+        }
+
+        public Criteria andSessionIdIn(List<String> values) {
+            addCriterion("session_id in", values, "sessionId");
+            return (Criteria) this;
+        }
+
+        public Criteria andSessionIdNotIn(List<String> values) {
+            addCriterion("session_id not in", values, "sessionId");
+            return (Criteria) this;
+        }
+
+        public Criteria andSessionIdBetween(String value1, String value2) {
+            addCriterion("session_id between", value1, value2, "sessionId");
+            return (Criteria) this;
+        }
+
+        public Criteria andSessionIdNotBetween(String value1, String value2) {
+            addCriterion("session_id not between", value1, value2, "sessionId");
+            return (Criteria) this;
+        }
+
+        public Criteria andReqTimeIsNull() {
+            addCriterion("req_time is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andReqTimeIsNotNull() {
+            addCriterion("req_time is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andReqTimeEqualTo(String value) {
+            addCriterion("req_time =", value, "reqTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andReqTimeNotEqualTo(String value) {
+            addCriterion("req_time <>", value, "reqTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andReqTimeGreaterThan(String value) {
+            addCriterion("req_time >", value, "reqTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andReqTimeGreaterThanOrEqualTo(String value) {
+            addCriterion("req_time >=", value, "reqTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andReqTimeLessThan(String value) {
+            addCriterion("req_time <", value, "reqTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andReqTimeLessThanOrEqualTo(String value) {
+            addCriterion("req_time <=", value, "reqTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andReqTimeLike(String value) {
+            addCriterion("req_time like", value, "reqTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andReqTimeNotLike(String value) {
+            addCriterion("req_time not like", value, "reqTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andReqTimeIn(List<String> values) {
+            addCriterion("req_time in", values, "reqTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andReqTimeNotIn(List<String> values) {
+            addCriterion("req_time not in", values, "reqTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andReqTimeBetween(String value1, String value2) {
+            addCriterion("req_time between", value1, value2, "reqTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andReqTimeNotBetween(String value1, String value2) {
+            addCriterion("req_time not between", value1, value2, "reqTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andRetCodeIsNull() {
+            addCriterion("ret_code is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andRetCodeIsNotNull() {
+            addCriterion("ret_code is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andRetCodeEqualTo(String value) {
+            addCriterion("ret_code =", value, "retCode");
+            return (Criteria) this;
+        }
+
+        public Criteria andRetCodeNotEqualTo(String value) {
+            addCriterion("ret_code <>", value, "retCode");
+            return (Criteria) this;
+        }
+
+        public Criteria andRetCodeGreaterThan(String value) {
+            addCriterion("ret_code >", value, "retCode");
+            return (Criteria) this;
+        }
+
+        public Criteria andRetCodeGreaterThanOrEqualTo(String value) {
+            addCriterion("ret_code >=", value, "retCode");
+            return (Criteria) this;
+        }
+
+        public Criteria andRetCodeLessThan(String value) {
+            addCriterion("ret_code <", value, "retCode");
+            return (Criteria) this;
+        }
+
+        public Criteria andRetCodeLessThanOrEqualTo(String value) {
+            addCriterion("ret_code <=", value, "retCode");
+            return (Criteria) this;
+        }
+
+        public Criteria andRetCodeLike(String value) {
+            addCriterion("ret_code like", value, "retCode");
+            return (Criteria) this;
+        }
+
+        public Criteria andRetCodeNotLike(String value) {
+            addCriterion("ret_code not like", value, "retCode");
+            return (Criteria) this;
+        }
+
+        public Criteria andRetCodeIn(List<String> values) {
+            addCriterion("ret_code in", values, "retCode");
+            return (Criteria) this;
+        }
+
+        public Criteria andRetCodeNotIn(List<String> values) {
+            addCriterion("ret_code not in", values, "retCode");
+            return (Criteria) this;
+        }
+
+        public Criteria andRetCodeBetween(String value1, String value2) {
+            addCriterion("ret_code between", value1, value2, "retCode");
+            return (Criteria) this;
+        }
+
+        public Criteria andRetCodeNotBetween(String value1, String value2) {
+            addCriterion("ret_code not between", value1, value2, "retCode");
+            return (Criteria) this;
+        }
+
+        public Criteria andErrorMsgIsNull() {
+            addCriterion("error_msg is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andErrorMsgIsNotNull() {
+            addCriterion("error_msg is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andErrorMsgEqualTo(String value) {
+            addCriterion("error_msg =", value, "errorMsg");
+            return (Criteria) this;
+        }
+
+        public Criteria andErrorMsgNotEqualTo(String value) {
+            addCriterion("error_msg <>", value, "errorMsg");
+            return (Criteria) this;
+        }
+
+        public Criteria andErrorMsgGreaterThan(String value) {
+            addCriterion("error_msg >", value, "errorMsg");
+            return (Criteria) this;
+        }
+
+        public Criteria andErrorMsgGreaterThanOrEqualTo(String value) {
+            addCriterion("error_msg >=", value, "errorMsg");
+            return (Criteria) this;
+        }
+
+        public Criteria andErrorMsgLessThan(String value) {
+            addCriterion("error_msg <", value, "errorMsg");
+            return (Criteria) this;
+        }
+
+        public Criteria andErrorMsgLessThanOrEqualTo(String value) {
+            addCriterion("error_msg <=", value, "errorMsg");
+            return (Criteria) this;
+        }
+
+        public Criteria andErrorMsgLike(String value) {
+            addCriterion("error_msg like", value, "errorMsg");
+            return (Criteria) this;
+        }
+
+        public Criteria andErrorMsgNotLike(String value) {
+            addCriterion("error_msg not like", value, "errorMsg");
+            return (Criteria) this;
+        }
+
+        public Criteria andErrorMsgIn(List<String> values) {
+            addCriterion("error_msg in", values, "errorMsg");
+            return (Criteria) this;
+        }
+
+        public Criteria andErrorMsgNotIn(List<String> values) {
+            addCriterion("error_msg not in", values, "errorMsg");
+            return (Criteria) this;
+        }
+
+        public Criteria andErrorMsgBetween(String value1, String value2) {
+            addCriterion("error_msg between", value1, value2, "errorMsg");
+            return (Criteria) this;
+        }
+
+        public Criteria andErrorMsgNotBetween(String value1, String value2) {
+            addCriterion("error_msg not between", value1, value2, "errorMsg");
+            return (Criteria) this;
+        }
     }
 
     public static class Criteria extends GeneratedCriteria {

carbon-bank/carbon-bank-mbg/src/main/java/com/hcloud/microserver/bank/mbg/modul/BUser.java

@@ -26,6 +26,18 @@ public class BUser implements Serializable {
     @ApiModelProperty(value = "创建人id")
     private Long createId;
 
+    @ApiModelProperty(value = "银行名称")
+    private String bankName;
+
+    @ApiModelProperty(value = "银行账号")
+    private String bankNo;
+
+    @ApiModelProperty(value = "银行机构编码")
+    private String bankCode;
+
+    @ApiModelProperty(value = "账户名")
+    private String accountName;
+
     private static final long serialVersionUID = 1L;
 
     public Long getGuid() {
@@ -84,6 +96,38 @@ public class BUser implements Serializable {
         this.createId = createId;
     }
 
+    public String getBankName() {
+        return bankName;
+    }
+
+    public void setBankName(String bankName) {
+        this.bankName = bankName;
+    }
+
+    public String getBankNo() {
+        return bankNo;
+    }
+
+    public void setBankNo(String bankNo) {
+        this.bankNo = bankNo;
+    }
+
+    public String getBankCode() {
+        return bankCode;
+    }
+
+    public void setBankCode(String bankCode) {
+        this.bankCode = bankCode;
+    }
+
+    public String getAccountName() {
+        return accountName;
+    }
+
+    public void setAccountName(String accountName) {
+        this.accountName = accountName;
+    }
+
     @Override
     public String toString() {
         StringBuilder sb = new StringBuilder();
@@ -97,6 +141,10 @@ public class BUser implements Serializable {
         sb.append(", password=").append(password);
         sb.append(", createTime=").append(createTime);
         sb.append(", createId=").append(createId);
+        sb.append(", bankName=").append(bankName);
+        sb.append(", bankNo=").append(bankNo);
+        sb.append(", bankCode=").append(bankCode);
+        sb.append(", accountName=").append(accountName);
         sb.append(", serialVersionUID=").append(serialVersionUID);
         sb.append("]");
         return sb.toString();

carbon-bank/carbon-bank-mbg/src/main/java/com/hcloud/microserver/bank/mbg/modul/BUserExample.java

@@ -564,6 +564,286 @@ public class BUserExample {
             addCriterion("create_id not between", value1, value2, "createId");
             return (Criteria) this;
         }
+
+        public Criteria andBankNameIsNull() {
+            addCriterion("bank_name is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andBankNameIsNotNull() {
+            addCriterion("bank_name is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andBankNameEqualTo(String value) {
+            addCriterion("bank_name =", value, "bankName");
+            return (Criteria) this;
+        }
+
+        public Criteria andBankNameNotEqualTo(String value) {
+            addCriterion("bank_name <>", value, "bankName");
+            return (Criteria) this;
+        }
+
+        public Criteria andBankNameGreaterThan(String value) {
+            addCriterion("bank_name >", value, "bankName");
+            return (Criteria) this;
+        }
+
+        public Criteria andBankNameGreaterThanOrEqualTo(String value) {
+            addCriterion("bank_name >=", value, "bankName");
+            return (Criteria) this;
+        }
+
+        public Criteria andBankNameLessThan(String value) {
+            addCriterion("bank_name <", value, "bankName");
+            return (Criteria) this;
+        }
+
+        public Criteria andBankNameLessThanOrEqualTo(String value) {
+            addCriterion("bank_name <=", value, "bankName");
+            return (Criteria) this;
+        }
+
+        public Criteria andBankNameLike(String value) {
+            addCriterion("bank_name like", value, "bankName");
+            return (Criteria) this;
+        }
+
+        public Criteria andBankNameNotLike(String value) {
+            addCriterion("bank_name not like", value, "bankName");
+            return (Criteria) this;
+        }
+
+        public Criteria andBankNameIn(List<String> values) {
+            addCriterion("bank_name in", values, "bankName");
+            return (Criteria) this;
+        }
+
+        public Criteria andBankNameNotIn(List<String> values) {
+            addCriterion("bank_name not in", values, "bankName");
+            return (Criteria) this;
+        }
+
+        public Criteria andBankNameBetween(String value1, String value2) {
+            addCriterion("bank_name between", value1, value2, "bankName");
+            return (Criteria) this;
+        }
+
+        public Criteria andBankNameNotBetween(String value1, String value2) {
+            addCriterion("bank_name not between", value1, value2, "bankName");
+            return (Criteria) this;
+        }
+
+        public Criteria andBankNoIsNull() {
+            addCriterion("bank_no is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andBankNoIsNotNull() {
+            addCriterion("bank_no is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andBankNoEqualTo(String value) {
+            addCriterion("bank_no =", value, "bankNo");
+            return (Criteria) this;
+        }
+
+        public Criteria andBankNoNotEqualTo(String value) {
+            addCriterion("bank_no <>", value, "bankNo");
+            return (Criteria) this;
+        }
+
+        public Criteria andBankNoGreaterThan(String value) {
+            addCriterion("bank_no >", value, "bankNo");
+            return (Criteria) this;
+        }
+
+        public Criteria andBankNoGreaterThanOrEqualTo(String value) {
+            addCriterion("bank_no >=", value, "bankNo");
+            return (Criteria) this;
+        }
+
+        public Criteria andBankNoLessThan(String value) {
+            addCriterion("bank_no <", value, "bankNo");
+            return (Criteria) this;
+        }
+
+        public Criteria andBankNoLessThanOrEqualTo(String value) {
+            addCriterion("bank_no <=", value, "bankNo");
+            return (Criteria) this;
+        }
+
+        public Criteria andBankNoLike(String value) {
+            addCriterion("bank_no like", value, "bankNo");
+            return (Criteria) this;
+        }
+
+        public Criteria andBankNoNotLike(String value) {
+            addCriterion("bank_no not like", value, "bankNo");
+            return (Criteria) this;
+        }
+
+        public Criteria andBankNoIn(List<String> values) {
+            addCriterion("bank_no in", values, "bankNo");
+            return (Criteria) this;
+        }
+
+        public Criteria andBankNoNotIn(List<String> values) {
+            addCriterion("bank_no not in", values, "bankNo");
+            return (Criteria) this;
+        }
+
+        public Criteria andBankNoBetween(String value1, String value2) {
+            addCriterion("bank_no between", value1, value2, "bankNo");
+            return (Criteria) this;
+        }
+
+        public Criteria andBankNoNotBetween(String value1, String value2) {
+            addCriterion("bank_no not between", value1, value2, "bankNo");
+            return (Criteria) this;
+        }
+
+        public Criteria andBankCodeIsNull() {
+            addCriterion("bank_code is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andBankCodeIsNotNull() {
+            addCriterion("bank_code is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andBankCodeEqualTo(String value) {
+            addCriterion("bank_code =", value, "bankCode");
+            return (Criteria) this;
+        }
+
+        public Criteria andBankCodeNotEqualTo(String value) {
+            addCriterion("bank_code <>", value, "bankCode");
+            return (Criteria) this;
+        }
+
+        public Criteria andBankCodeGreaterThan(String value) {
+            addCriterion("bank_code >", value, "bankCode");
+            return (Criteria) this;
+        }
+
+        public Criteria andBankCodeGreaterThanOrEqualTo(String value) {
+            addCriterion("bank_code >=", value, "bankCode");
+            return (Criteria) this;
+        }
+
+        public Criteria andBankCodeLessThan(String value) {
+            addCriterion("bank_code <", value, "bankCode");
+            return (Criteria) this;
+        }
+
+        public Criteria andBankCodeLessThanOrEqualTo(String value) {
+            addCriterion("bank_code <=", value, "bankCode");
+            return (Criteria) this;
+        }
+
+        public Criteria andBankCodeLike(String value) {
+            addCriterion("bank_code like", value, "bankCode");
+            return (Criteria) this;
+        }
+
+        public Criteria andBankCodeNotLike(String value) {
+            addCriterion("bank_code not like", value, "bankCode");
+            return (Criteria) this;
+        }
+
+        public Criteria andBankCodeIn(List<String> values) {
+            addCriterion("bank_code in", values, "bankCode");
+            return (Criteria) this;
+        }
+
+        public Criteria andBankCodeNotIn(List<String> values) {
+            addCriterion("bank_code not in", values, "bankCode");
+            return (Criteria) this;
+        }
+
+        public Criteria andBankCodeBetween(String value1, String value2) {
+            addCriterion("bank_code between", value1, value2, "bankCode");
+            return (Criteria) this;
+        }
+
+        public Criteria andBankCodeNotBetween(String value1, String value2) {
+            addCriterion("bank_code not between", value1, value2, "bankCode");
+            return (Criteria) this;
+        }
+
+        public Criteria andAccountNameIsNull() {
+            addCriterion("account_name is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andAccountNameIsNotNull() {
+            addCriterion("account_name is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andAccountNameEqualTo(String value) {
+            addCriterion("account_name =", value, "accountName");
+            return (Criteria) this;
+        }
+
+        public Criteria andAccountNameNotEqualTo(String value) {
+            addCriterion("account_name <>", value, "accountName");
+            return (Criteria) this;
+        }
+
+        public Criteria andAccountNameGreaterThan(String value) {
+            addCriterion("account_name >", value, "accountName");
+            return (Criteria) this;
+        }
+
+        public Criteria andAccountNameGreaterThanOrEqualTo(String value) {
+            addCriterion("account_name >=", value, "accountName");
+            return (Criteria) this;
+        }
+
+        public Criteria andAccountNameLessThan(String value) {
+            addCriterion("account_name <", value, "accountName");
+            return (Criteria) this;
+        }
+
+        public Criteria andAccountNameLessThanOrEqualTo(String value) {
+            addCriterion("account_name <=", value, "accountName");
+            return (Criteria) this;
+        }
+
+        public Criteria andAccountNameLike(String value) {
+            addCriterion("account_name like", value, "accountName");
+            return (Criteria) this;
+        }
+
+        public Criteria andAccountNameNotLike(String value) {
+            addCriterion("account_name not like", value, "accountName");
+            return (Criteria) this;
+        }
+
+        public Criteria andAccountNameIn(List<String> values) {
+            addCriterion("account_name in", values, "accountName");
+            return (Criteria) this;
+        }
+
+        public Criteria andAccountNameNotIn(List<String> values) {
+            addCriterion("account_name not in", values, "accountName");
+            return (Criteria) this;
+        }
+
+        public Criteria andAccountNameBetween(String value1, String value2) {
+            addCriterion("account_name between", value1, value2, "accountName");
+            return (Criteria) this;
+        }
+
+        public Criteria andAccountNameNotBetween(String value1, String value2) {
+            addCriterion("account_name not between", value1, value2, "accountName");
+            return (Criteria) this;
+        }
     }
 
     public static class Criteria extends GeneratedCriteria {

carbon-bank/carbon-bank-mbg/src/main/resources/com/hcloud/microserver/bank/mbg/mapper/BTransferDetailMapper.xml

@@ -5,7 +5,8 @@
     <id column="guid" jdbcType="BIGINT" property="guid" />
     <result column="fk_transfer_id" jdbcType="BIGINT" property="fkTransferId" />
     <result column="transfer_type" jdbcType="INTEGER" property="transferType" />
-    <result column="fk_fc_id" jdbcType="VARCHAR" property="fkFcId" />
+    <result column="fk_farmer_id" jdbcType="VARCHAR" property="fkFarmerId" />
+    <result column="fk_collective_id" jdbcType="VARCHAR" property="fkCollectiveId" />
     <result column="seril_no" jdbcType="VARCHAR" property="serilNo" />
     <result column="name" jdbcType="VARCHAR" property="name" />
     <result column="bank_no" jdbcType="VARCHAR" property="bankNo" />
@@ -24,6 +25,10 @@
     <result column="transfer_name" jdbcType="VARCHAR" property="transferName" />
     <result column="transfer_time" jdbcType="TIMESTAMP" property="transferTime" />
     <result column="state" jdbcType="INTEGER" property="state" />
+    <result column="bank_name" jdbcType="VARCHAR" property="bankName" />
+    <result column="bank_code" jdbcType="VARCHAR" property="bankCode" />
+    <result column="status" jdbcType="INTEGER" property="status" />
+    <result column="transfer_amount" jdbcType="DECIMAL" property="transferAmount" />
   </resultMap>
   <sql id="Example_Where_Clause">
     <where>
@@ -84,9 +89,10 @@
     </where>
   </sql>
   <sql id="Base_Column_List">
-    guid, fk_transfer_id, transfer_type, fk_fc_id, seril_no, name, bank_no, account_pid, 
-    transfer_status, code, msg, date, time, transfer_nation, nation_id, create_time, 
-    create_id, create_name, transfer_id, transfer_name, transfer_time, state
+    guid, fk_transfer_id, transfer_type, fk_farmer_id, fk_collective_id, seril_no, name, 
+    bank_no, account_pid, transfer_status, code, msg, date, time, transfer_nation, nation_id, 
+    create_time, create_id, create_name, transfer_id, transfer_name, transfer_time, state, 
+    bank_name, bank_code, status, transfer_amount
   </sql>
   <select id="selectByExample" parameterType="com.hcloud.microserver.bank.mbg.modul.BTransferDetailExample" resultMap="BaseResultMap">
     select
@@ -120,20 +126,24 @@
   </delete>
   <insert id="insert" parameterType="com.hcloud.microserver.bank.mbg.modul.BTransferDetail">
     insert into b_transfer_detail (guid, fk_transfer_id, transfer_type, 
-      fk_fc_id, seril_no, name, 
-      bank_no, account_pid, transfer_status, 
-      code, msg, date, time, 
-      transfer_nation, nation_id, create_time, 
-      create_id, create_name, transfer_id, 
-      transfer_name, transfer_time, state
+      fk_farmer_id, fk_collective_id, seril_no, 
+      name, bank_no, account_pid, 
+      transfer_status, code, msg, 
+      date, time, transfer_nation, 
+      nation_id, create_time, create_id, 
+      create_name, transfer_id, transfer_name, 
+      transfer_time, state, bank_name, 
+      bank_code, status, transfer_amount
       )
     values (#{guid,jdbcType=BIGINT}, #{fkTransferId,jdbcType=BIGINT}, #{transferType,jdbcType=INTEGER}, 
-      #{fkFcId,jdbcType=VARCHAR}, #{serilNo,jdbcType=VARCHAR}, #{name,jdbcType=VARCHAR}, 
-      #{bankNo,jdbcType=VARCHAR}, #{accountPid,jdbcType=VARCHAR}, #{transferStatus,jdbcType=VARCHAR}, 
-      #{code,jdbcType=VARCHAR}, #{msg,jdbcType=VARCHAR}, #{date,jdbcType=VARCHAR}, #{time,jdbcType=TIMESTAMP}, 
-      #{transferNation,jdbcType=VARCHAR}, #{nationId,jdbcType=INTEGER}, #{createTime,jdbcType=TIMESTAMP}, 
-      #{createId,jdbcType=BIGINT}, #{createName,jdbcType=VARCHAR}, #{transferId,jdbcType=BIGINT}, 
-      #{transferName,jdbcType=VARCHAR}, #{transferTime,jdbcType=TIMESTAMP}, #{state,jdbcType=INTEGER}
+      #{fkFarmerId,jdbcType=VARCHAR}, #{fkCollectiveId,jdbcType=VARCHAR}, #{serilNo,jdbcType=VARCHAR}, 
+      #{name,jdbcType=VARCHAR}, #{bankNo,jdbcType=VARCHAR}, #{accountPid,jdbcType=VARCHAR}, 
+      #{transferStatus,jdbcType=VARCHAR}, #{code,jdbcType=VARCHAR}, #{msg,jdbcType=VARCHAR}, 
+      #{date,jdbcType=VARCHAR}, #{time,jdbcType=TIMESTAMP}, #{transferNation,jdbcType=VARCHAR}, 
+      #{nationId,jdbcType=INTEGER}, #{createTime,jdbcType=TIMESTAMP}, #{createId,jdbcType=BIGINT}, 
+      #{createName,jdbcType=VARCHAR}, #{transferId,jdbcType=BIGINT}, #{transferName,jdbcType=VARCHAR}, 
+      #{transferTime,jdbcType=TIMESTAMP}, #{state,jdbcType=INTEGER}, #{bankName,jdbcType=VARCHAR}, 
+      #{bankCode,jdbcType=VARCHAR}, #{status,jdbcType=INTEGER}, #{transferAmount,jdbcType=DECIMAL}
       )
   </insert>
   <insert id="insertSelective" parameterType="com.hcloud.microserver.bank.mbg.modul.BTransferDetail">
@@ -148,8 +158,11 @@
       <if test="transferType != null">
         transfer_type,
       </if>
-      <if test="fkFcId != null">
-        fk_fc_id,
+      <if test="fkFarmerId != null">
+        fk_farmer_id,
+      </if>
+      <if test="fkCollectiveId != null">
+        fk_collective_id,
       </if>
       <if test="serilNo != null">
         seril_no,
@@ -205,6 +218,18 @@
       <if test="state != null">
         state,
       </if>
+      <if test="bankName != null">
+        bank_name,
+      </if>
+      <if test="bankCode != null">
+        bank_code,
+      </if>
+      <if test="status != null">
+        status,
+      </if>
+      <if test="transferAmount != null">
+        transfer_amount,
+      </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides=",">
       <if test="guid != null">
@@ -216,8 +241,11 @@
       <if test="transferType != null">
         #{transferType,jdbcType=INTEGER},
       </if>
-      <if test="fkFcId != null">
-        #{fkFcId,jdbcType=VARCHAR},
+      <if test="fkFarmerId != null">
+        #{fkFarmerId,jdbcType=VARCHAR},
+      </if>
+      <if test="fkCollectiveId != null">
+        #{fkCollectiveId,jdbcType=VARCHAR},
       </if>
       <if test="serilNo != null">
         #{serilNo,jdbcType=VARCHAR},
@@ -273,6 +301,18 @@
       <if test="state != null">
         #{state,jdbcType=INTEGER},
       </if>
+      <if test="bankName != null">
+        #{bankName,jdbcType=VARCHAR},
+      </if>
+      <if test="bankCode != null">
+        #{bankCode,jdbcType=VARCHAR},
+      </if>
+      <if test="status != null">
+        #{status,jdbcType=INTEGER},
+      </if>
+      <if test="transferAmount != null">
+        #{transferAmount,jdbcType=DECIMAL},
+      </if>
     </trim>
   </insert>
   <select id="countByExample" parameterType="com.hcloud.microserver.bank.mbg.modul.BTransferDetailExample" resultType="java.lang.Long">
@@ -293,8 +333,11 @@
       <if test="record.transferType != null">
         transfer_type = #{record.transferType,jdbcType=INTEGER},
       </if>
-      <if test="record.fkFcId != null">
-        fk_fc_id = #{record.fkFcId,jdbcType=VARCHAR},
+      <if test="record.fkFarmerId != null">
+        fk_farmer_id = #{record.fkFarmerId,jdbcType=VARCHAR},
+      </if>
+      <if test="record.fkCollectiveId != null">
+        fk_collective_id = #{record.fkCollectiveId,jdbcType=VARCHAR},
       </if>
       <if test="record.serilNo != null">
         seril_no = #{record.serilNo,jdbcType=VARCHAR},
@@ -350,6 +393,18 @@
       <if test="record.state != null">
         state = #{record.state,jdbcType=INTEGER},
       </if>
+      <if test="record.bankName != null">
+        bank_name = #{record.bankName,jdbcType=VARCHAR},
+      </if>
+      <if test="record.bankCode != null">
+        bank_code = #{record.bankCode,jdbcType=VARCHAR},
+      </if>
+      <if test="record.status != null">
+        status = #{record.status,jdbcType=INTEGER},
+      </if>
+      <if test="record.transferAmount != null">
+        transfer_amount = #{record.transferAmount,jdbcType=DECIMAL},
+      </if>
     </set>
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
@@ -360,7 +415,8 @@
     set guid = #{record.guid,jdbcType=BIGINT},
       fk_transfer_id = #{record.fkTransferId,jdbcType=BIGINT},
       transfer_type = #{record.transferType,jdbcType=INTEGER},
-      fk_fc_id = #{record.fkFcId,jdbcType=VARCHAR},
+      fk_farmer_id = #{record.fkFarmerId,jdbcType=VARCHAR},
+      fk_collective_id = #{record.fkCollectiveId,jdbcType=VARCHAR},
       seril_no = #{record.serilNo,jdbcType=VARCHAR},
       name = #{record.name,jdbcType=VARCHAR},
       bank_no = #{record.bankNo,jdbcType=VARCHAR},
@@ -378,7 +434,11 @@
       transfer_id = #{record.transferId,jdbcType=BIGINT},
       transfer_name = #{record.transferName,jdbcType=VARCHAR},
       transfer_time = #{record.transferTime,jdbcType=TIMESTAMP},
-      state = #{record.state,jdbcType=INTEGER}
+      state = #{record.state,jdbcType=INTEGER},
+      bank_name = #{record.bankName,jdbcType=VARCHAR},
+      bank_code = #{record.bankCode,jdbcType=VARCHAR},
+      status = #{record.status,jdbcType=INTEGER},
+      transfer_amount = #{record.transferAmount,jdbcType=DECIMAL}
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
     </if>
@@ -392,8 +452,11 @@
       <if test="transferType != null">
         transfer_type = #{transferType,jdbcType=INTEGER},
       </if>
-      <if test="fkFcId != null">
-        fk_fc_id = #{fkFcId,jdbcType=VARCHAR},
+      <if test="fkFarmerId != null">
+        fk_farmer_id = #{fkFarmerId,jdbcType=VARCHAR},
+      </if>
+      <if test="fkCollectiveId != null">
+        fk_collective_id = #{fkCollectiveId,jdbcType=VARCHAR},
       </if>
       <if test="serilNo != null">
         seril_no = #{serilNo,jdbcType=VARCHAR},
@@ -449,6 +512,18 @@
       <if test="state != null">
         state = #{state,jdbcType=INTEGER},
       </if>
+      <if test="bankName != null">
+        bank_name = #{bankName,jdbcType=VARCHAR},
+      </if>
+      <if test="bankCode != null">
+        bank_code = #{bankCode,jdbcType=VARCHAR},
+      </if>
+      <if test="status != null">
+        status = #{status,jdbcType=INTEGER},
+      </if>
+      <if test="transferAmount != null">
+        transfer_amount = #{transferAmount,jdbcType=DECIMAL},
+      </if>
     </set>
     where guid = #{guid,jdbcType=BIGINT}
   </update>
@@ -456,7 +531,8 @@
     update b_transfer_detail
     set fk_transfer_id = #{fkTransferId,jdbcType=BIGINT},
       transfer_type = #{transferType,jdbcType=INTEGER},
-      fk_fc_id = #{fkFcId,jdbcType=VARCHAR},
+      fk_farmer_id = #{fkFarmerId,jdbcType=VARCHAR},
+      fk_collective_id = #{fkCollectiveId,jdbcType=VARCHAR},
       seril_no = #{serilNo,jdbcType=VARCHAR},
       name = #{name,jdbcType=VARCHAR},
       bank_no = #{bankNo,jdbcType=VARCHAR},
@@ -474,7 +550,11 @@
       transfer_id = #{transferId,jdbcType=BIGINT},
       transfer_name = #{transferName,jdbcType=VARCHAR},
       transfer_time = #{transferTime,jdbcType=TIMESTAMP},
-      state = #{state,jdbcType=INTEGER}
+      state = #{state,jdbcType=INTEGER},
+      bank_name = #{bankName,jdbcType=VARCHAR},
+      bank_code = #{bankCode,jdbcType=VARCHAR},
+      status = #{status,jdbcType=INTEGER},
+      transfer_amount = #{transferAmount,jdbcType=DECIMAL}
     where guid = #{guid,jdbcType=BIGINT}
   </update>
 </mapper>

carbon-bank/carbon-bank-mbg/src/main/resources/com/hcloud/microserver/bank/mbg/mapper/BTransferFarmerRequestMapper.xml

@@ -2,7 +2,7 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.hcloud.microserver.bank.mbg.mapper.BTransferFarmerRequestMapper">
   <resultMap id="BaseResultMap" type="com.hcloud.microserver.bank.mbg.modul.BTransferFarmerRequest">
-    <result column="guid" jdbcType="BIGINT" property="guid" />
+    <id column="guid" jdbcType="BIGINT" property="guid" />
     <result column="seril_no" jdbcType="VARCHAR" property="serilNo" />
     <result column="currency" jdbcType="VARCHAR" property="currency" />
     <result column="submitter" jdbcType="VARCHAR" property="submitter" />
@@ -24,6 +24,12 @@
     <result column="post_fee" jdbcType="DECIMAL" property="postFee" />
     <result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
     <result column="status" jdbcType="INTEGER" property="status" />
+    <result column="serial_no" jdbcType="VARCHAR" property="serialNo" />
+    <result column="service_id" jdbcType="VARCHAR" property="serviceId" />
+    <result column="session_id" jdbcType="VARCHAR" property="sessionId" />
+    <result column="req_time" jdbcType="VARCHAR" property="reqTime" />
+    <result column="ret_code" jdbcType="VARCHAR" property="retCode" />
+    <result column="error_msg" jdbcType="VARCHAR" property="errorMsg" />
   </resultMap>
   <sql id="Example_Where_Clause">
     <where>
@@ -86,7 +92,8 @@
   <sql id="Base_Column_List">
     guid, seril_no, currency, submitter, authorizer, fk_transfer_id, pay_amount, pay_bank_name, 
     pay_account, pay_name, pay_date, pay_seril, hand_fee_type, pay_status, pay_msg, pay_response_code, 
-    fail_reson, account_money, hand_fee, post_fee, create_time, status
+    fail_reson, account_money, hand_fee, post_fee, create_time, status, serial_no, service_id, 
+    session_id, req_time, ret_code, error_msg
   </sql>
   <select id="selectByExample" parameterType="com.hcloud.microserver.bank.mbg.modul.BTransferFarmerRequestExample" resultMap="BaseResultMap">
     select
@@ -102,6 +109,16 @@
       order by ${orderByClause}
     </if>
   </select>
+  <select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="BaseResultMap">
+    select 
+    <include refid="Base_Column_List" />
+    from b_transfer_farmer_request
+    where guid = #{guid,jdbcType=BIGINT}
+  </select>
+  <delete id="deleteByPrimaryKey" parameterType="java.lang.Long">
+    delete from b_transfer_farmer_request
+    where guid = #{guid,jdbcType=BIGINT}
+  </delete>
   <delete id="deleteByExample" parameterType="com.hcloud.microserver.bank.mbg.modul.BTransferFarmerRequestExample">
     delete from b_transfer_farmer_request
     <if test="_parameter != null">
@@ -116,7 +133,9 @@
       hand_fee_type, pay_status, pay_msg, 
       pay_response_code, fail_reson, account_money, 
       hand_fee, post_fee, create_time, 
-      status)
+      status, serial_no, service_id, 
+      session_id, req_time, ret_code, 
+      error_msg)
     values (#{guid,jdbcType=BIGINT}, #{serilNo,jdbcType=VARCHAR}, #{currency,jdbcType=VARCHAR}, 
       #{submitter,jdbcType=VARCHAR}, #{authorizer,jdbcType=VARCHAR}, #{fkTransferId,jdbcType=BIGINT}, 
       #{payAmount,jdbcType=DECIMAL}, #{payBankName,jdbcType=VARCHAR}, #{payAccount,jdbcType=VARCHAR}, 
@@ -124,7 +143,9 @@
       #{handFeeType,jdbcType=VARCHAR}, #{payStatus,jdbcType=VARCHAR}, #{payMsg,jdbcType=VARCHAR}, 
       #{payResponseCode,jdbcType=VARCHAR}, #{failReson,jdbcType=VARCHAR}, #{accountMoney,jdbcType=DECIMAL}, 
       #{handFee,jdbcType=DECIMAL}, #{postFee,jdbcType=DECIMAL}, #{createTime,jdbcType=TIMESTAMP}, 
-      #{status,jdbcType=INTEGER})
+      #{status,jdbcType=INTEGER}, #{serialNo,jdbcType=VARCHAR}, #{serviceId,jdbcType=VARCHAR}, 
+      #{sessionId,jdbcType=VARCHAR}, #{reqTime,jdbcType=VARCHAR}, #{retCode,jdbcType=VARCHAR}, 
+      #{errorMsg,jdbcType=VARCHAR})
   </insert>
   <insert id="insertSelective" parameterType="com.hcloud.microserver.bank.mbg.modul.BTransferFarmerRequest">
     insert into b_transfer_farmer_request
@@ -195,6 +216,24 @@
       <if test="status != null">
         status,
       </if>
+      <if test="serialNo != null">
+        serial_no,
+      </if>
+      <if test="serviceId != null">
+        service_id,
+      </if>
+      <if test="sessionId != null">
+        session_id,
+      </if>
+      <if test="reqTime != null">
+        req_time,
+      </if>
+      <if test="retCode != null">
+        ret_code,
+      </if>
+      <if test="errorMsg != null">
+        error_msg,
+      </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides=",">
       <if test="guid != null">
@@ -263,6 +302,24 @@
       <if test="status != null">
         #{status,jdbcType=INTEGER},
       </if>
+      <if test="serialNo != null">
+        #{serialNo,jdbcType=VARCHAR},
+      </if>
+      <if test="serviceId != null">
+        #{serviceId,jdbcType=VARCHAR},
+      </if>
+      <if test="sessionId != null">
+        #{sessionId,jdbcType=VARCHAR},
+      </if>
+      <if test="reqTime != null">
+        #{reqTime,jdbcType=VARCHAR},
+      </if>
+      <if test="retCode != null">
+        #{retCode,jdbcType=VARCHAR},
+      </if>
+      <if test="errorMsg != null">
+        #{errorMsg,jdbcType=VARCHAR},
+      </if>
     </trim>
   </insert>
   <select id="countByExample" parameterType="com.hcloud.microserver.bank.mbg.modul.BTransferFarmerRequestExample" resultType="java.lang.Long">
@@ -340,6 +397,24 @@
       <if test="record.status != null">
         status = #{record.status,jdbcType=INTEGER},
       </if>
+      <if test="record.serialNo != null">
+        serial_no = #{record.serialNo,jdbcType=VARCHAR},
+      </if>
+      <if test="record.serviceId != null">
+        service_id = #{record.serviceId,jdbcType=VARCHAR},
+      </if>
+      <if test="record.sessionId != null">
+        session_id = #{record.sessionId,jdbcType=VARCHAR},
+      </if>
+      <if test="record.reqTime != null">
+        req_time = #{record.reqTime,jdbcType=VARCHAR},
+      </if>
+      <if test="record.retCode != null">
+        ret_code = #{record.retCode,jdbcType=VARCHAR},
+      </if>
+      <if test="record.errorMsg != null">
+        error_msg = #{record.errorMsg,jdbcType=VARCHAR},
+      </if>
     </set>
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
@@ -368,9 +443,133 @@
       hand_fee = #{record.handFee,jdbcType=DECIMAL},
       post_fee = #{record.postFee,jdbcType=DECIMAL},
       create_time = #{record.createTime,jdbcType=TIMESTAMP},
-      status = #{record.status,jdbcType=INTEGER}
+      status = #{record.status,jdbcType=INTEGER},
+      serial_no = #{record.serialNo,jdbcType=VARCHAR},
+      service_id = #{record.serviceId,jdbcType=VARCHAR},
+      session_id = #{record.sessionId,jdbcType=VARCHAR},
+      req_time = #{record.reqTime,jdbcType=VARCHAR},
+      ret_code = #{record.retCode,jdbcType=VARCHAR},
+      error_msg = #{record.errorMsg,jdbcType=VARCHAR}
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
     </if>
   </update>
+  <update id="updateByPrimaryKeySelective" parameterType="com.hcloud.microserver.bank.mbg.modul.BTransferFarmerRequest">
+    update b_transfer_farmer_request
+    <set>
+      <if test="serilNo != null">
+        seril_no = #{serilNo,jdbcType=VARCHAR},
+      </if>
+      <if test="currency != null">
+        currency = #{currency,jdbcType=VARCHAR},
+      </if>
+      <if test="submitter != null">
+        submitter = #{submitter,jdbcType=VARCHAR},
+      </if>
+      <if test="authorizer != null">
+        authorizer = #{authorizer,jdbcType=VARCHAR},
+      </if>
+      <if test="fkTransferId != null">
+        fk_transfer_id = #{fkTransferId,jdbcType=BIGINT},
+      </if>
+      <if test="payAmount != null">
+        pay_amount = #{payAmount,jdbcType=DECIMAL},
+      </if>
+      <if test="payBankName != null">
+        pay_bank_name = #{payBankName,jdbcType=VARCHAR},
+      </if>
+      <if test="payAccount != null">
+        pay_account = #{payAccount,jdbcType=VARCHAR},
+      </if>
+      <if test="payName != null">
+        pay_name = #{payName,jdbcType=VARCHAR},
+      </if>
+      <if test="payDate != null">
+        pay_date = #{payDate,jdbcType=VARCHAR},
+      </if>
+      <if test="paySeril != null">
+        pay_seril = #{paySeril,jdbcType=VARCHAR},
+      </if>
+      <if test="handFeeType != null">
+        hand_fee_type = #{handFeeType,jdbcType=VARCHAR},
+      </if>
+      <if test="payStatus != null">
+        pay_status = #{payStatus,jdbcType=VARCHAR},
+      </if>
+      <if test="payMsg != null">
+        pay_msg = #{payMsg,jdbcType=VARCHAR},
+      </if>
+      <if test="payResponseCode != null">
+        pay_response_code = #{payResponseCode,jdbcType=VARCHAR},
+      </if>
+      <if test="failReson != null">
+        fail_reson = #{failReson,jdbcType=VARCHAR},
+      </if>
+      <if test="accountMoney != null">
+        account_money = #{accountMoney,jdbcType=DECIMAL},
+      </if>
+      <if test="handFee != null">
+        hand_fee = #{handFee,jdbcType=DECIMAL},
+      </if>
+      <if test="postFee != null">
+        post_fee = #{postFee,jdbcType=DECIMAL},
+      </if>
+      <if test="createTime != null">
+        create_time = #{createTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="status != null">
+        status = #{status,jdbcType=INTEGER},
+      </if>
+      <if test="serialNo != null">
+        serial_no = #{serialNo,jdbcType=VARCHAR},
+      </if>
+      <if test="serviceId != null">
+        service_id = #{serviceId,jdbcType=VARCHAR},
+      </if>
+      <if test="sessionId != null">
+        session_id = #{sessionId,jdbcType=VARCHAR},
+      </if>
+      <if test="reqTime != null">
+        req_time = #{reqTime,jdbcType=VARCHAR},
+      </if>
+      <if test="retCode != null">
+        ret_code = #{retCode,jdbcType=VARCHAR},
+      </if>
+      <if test="errorMsg != null">
+        error_msg = #{errorMsg,jdbcType=VARCHAR},
+      </if>
+    </set>
+    where guid = #{guid,jdbcType=BIGINT}
+  </update>
+  <update id="updateByPrimaryKey" parameterType="com.hcloud.microserver.bank.mbg.modul.BTransferFarmerRequest">
+    update b_transfer_farmer_request
+    set seril_no = #{serilNo,jdbcType=VARCHAR},
+      currency = #{currency,jdbcType=VARCHAR},
+      submitter = #{submitter,jdbcType=VARCHAR},
+      authorizer = #{authorizer,jdbcType=VARCHAR},
+      fk_transfer_id = #{fkTransferId,jdbcType=BIGINT},
+      pay_amount = #{payAmount,jdbcType=DECIMAL},
+      pay_bank_name = #{payBankName,jdbcType=VARCHAR},
+      pay_account = #{payAccount,jdbcType=VARCHAR},
+      pay_name = #{payName,jdbcType=VARCHAR},
+      pay_date = #{payDate,jdbcType=VARCHAR},
+      pay_seril = #{paySeril,jdbcType=VARCHAR},
+      hand_fee_type = #{handFeeType,jdbcType=VARCHAR},
+      pay_status = #{payStatus,jdbcType=VARCHAR},
+      pay_msg = #{payMsg,jdbcType=VARCHAR},
+      pay_response_code = #{payResponseCode,jdbcType=VARCHAR},
+      fail_reson = #{failReson,jdbcType=VARCHAR},
+      account_money = #{accountMoney,jdbcType=DECIMAL},
+      hand_fee = #{handFee,jdbcType=DECIMAL},
+      post_fee = #{postFee,jdbcType=DECIMAL},
+      create_time = #{createTime,jdbcType=TIMESTAMP},
+      status = #{status,jdbcType=INTEGER},
+      serial_no = #{serialNo,jdbcType=VARCHAR},
+      service_id = #{serviceId,jdbcType=VARCHAR},
+      session_id = #{sessionId,jdbcType=VARCHAR},
+      req_time = #{reqTime,jdbcType=VARCHAR},
+      ret_code = #{retCode,jdbcType=VARCHAR},
+      error_msg = #{errorMsg,jdbcType=VARCHAR}
+    where guid = #{guid,jdbcType=BIGINT}
+  </update>
 </mapper>

carbon-bank/carbon-bank-mbg/src/main/resources/com/hcloud/microserver/bank/mbg/mapper/BTransferMapper.xml

@@ -7,12 +7,7 @@
     <result column="transfer_status" jdbcType="INTEGER" property="transferStatus" />
     <result column="transfer_time" jdbcType="TIMESTAMP" property="transferTime" />
     <result column="transfer_amount" jdbcType="DECIMAL" property="transferAmount" />
-    <result column="serial_no" jdbcType="VARCHAR" property="serialNo" />
-    <result column="service_id" jdbcType="VARCHAR" property="serviceId" />
-    <result column="session_id" jdbcType="VARCHAR" property="sessionId" />
-    <result column="req_time" jdbcType="VARCHAR" property="reqTime" />
-    <result column="ret_code" jdbcType="VARCHAR" property="retCode" />
-    <result column="error_msg" jdbcType="VARCHAR" property="errorMsg" />
+    <result column="transfer_num" jdbcType="INTEGER" property="transferNum" />
     <result column="create_id" jdbcType="BIGINT" property="createId" />
     <result column="create_name" jdbcType="VARCHAR" property="createName" />
     <result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
@@ -79,9 +74,8 @@
     </where>
   </sql>
   <sql id="Base_Column_List">
-    guid, transfer_type, transfer_status, transfer_time, transfer_amount, serial_no, 
-    service_id, session_id, req_time, ret_code, error_msg, create_id, create_name, create_time, 
-    transfer_id, transfer_name, state
+    guid, transfer_type, transfer_status, transfer_time, transfer_amount, transfer_num, 
+    create_id, create_name, create_time, transfer_id, transfer_name, state
   </sql>
   <select id="selectByExample" parameterType="com.hcloud.microserver.bank.mbg.modul.BTransferExample" resultMap="BaseResultMap">
     select
@@ -115,17 +109,15 @@
   </delete>
   <insert id="insert" parameterType="com.hcloud.microserver.bank.mbg.modul.BTransfer">
     insert into b_transfer (guid, transfer_type, transfer_status, 
-      transfer_time, transfer_amount, serial_no, 
-      service_id, session_id, req_time, 
-      ret_code, error_msg, create_id, 
-      create_name, create_time, transfer_id, 
-      transfer_name, state)
+      transfer_time, transfer_amount, transfer_num, 
+      create_id, create_name, create_time, 
+      transfer_id, transfer_name, state
+      )
     values (#{guid,jdbcType=BIGINT}, #{transferType,jdbcType=INTEGER}, #{transferStatus,jdbcType=INTEGER}, 
-      #{transferTime,jdbcType=TIMESTAMP}, #{transferAmount,jdbcType=DECIMAL}, #{serialNo,jdbcType=VARCHAR}, 
-      #{serviceId,jdbcType=VARCHAR}, #{sessionId,jdbcType=VARCHAR}, #{reqTime,jdbcType=VARCHAR}, 
-      #{retCode,jdbcType=VARCHAR}, #{errorMsg,jdbcType=VARCHAR}, #{createId,jdbcType=BIGINT}, 
-      #{createName,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP}, #{transferId,jdbcType=BIGINT}, 
-      #{transferName,jdbcType=VARCHAR}, #{state,jdbcType=INTEGER})
+      #{transferTime,jdbcType=TIMESTAMP}, #{transferAmount,jdbcType=DECIMAL}, #{transferNum,jdbcType=INTEGER}, 
+      #{createId,jdbcType=BIGINT}, #{createName,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP}, 
+      #{transferId,jdbcType=BIGINT}, #{transferName,jdbcType=VARCHAR}, #{state,jdbcType=INTEGER}
+      )
   </insert>
   <insert id="insertSelective" parameterType="com.hcloud.microserver.bank.mbg.modul.BTransfer">
     insert into b_transfer
@@ -145,23 +137,8 @@
       <if test="transferAmount != null">
         transfer_amount,
       </if>
-      <if test="serialNo != null">
-        serial_no,
-      </if>
-      <if test="serviceId != null">
-        service_id,
-      </if>
-      <if test="sessionId != null">
-        session_id,
-      </if>
-      <if test="reqTime != null">
-        req_time,
-      </if>
-      <if test="retCode != null">
-        ret_code,
-      </if>
-      <if test="errorMsg != null">
-        error_msg,
+      <if test="transferNum != null">
+        transfer_num,
       </if>
       <if test="createId != null">
         create_id,
@@ -198,23 +175,8 @@
       <if test="transferAmount != null">
         #{transferAmount,jdbcType=DECIMAL},
       </if>
-      <if test="serialNo != null">
-        #{serialNo,jdbcType=VARCHAR},
-      </if>
-      <if test="serviceId != null">
-        #{serviceId,jdbcType=VARCHAR},
-      </if>
-      <if test="sessionId != null">
-        #{sessionId,jdbcType=VARCHAR},
-      </if>
-      <if test="reqTime != null">
-        #{reqTime,jdbcType=VARCHAR},
-      </if>
-      <if test="retCode != null">
-        #{retCode,jdbcType=VARCHAR},
-      </if>
-      <if test="errorMsg != null">
-        #{errorMsg,jdbcType=VARCHAR},
+      <if test="transferNum != null">
+        #{transferNum,jdbcType=INTEGER},
       </if>
       <if test="createId != null">
         #{createId,jdbcType=BIGINT},
@@ -260,23 +222,8 @@
       <if test="record.transferAmount != null">
         transfer_amount = #{record.transferAmount,jdbcType=DECIMAL},
       </if>
-      <if test="record.serialNo != null">
-        serial_no = #{record.serialNo,jdbcType=VARCHAR},
-      </if>
-      <if test="record.serviceId != null">
-        service_id = #{record.serviceId,jdbcType=VARCHAR},
-      </if>
-      <if test="record.sessionId != null">
-        session_id = #{record.sessionId,jdbcType=VARCHAR},
-      </if>
-      <if test="record.reqTime != null">
-        req_time = #{record.reqTime,jdbcType=VARCHAR},
-      </if>
-      <if test="record.retCode != null">
-        ret_code = #{record.retCode,jdbcType=VARCHAR},
-      </if>
-      <if test="record.errorMsg != null">
-        error_msg = #{record.errorMsg,jdbcType=VARCHAR},
+      <if test="record.transferNum != null">
+        transfer_num = #{record.transferNum,jdbcType=INTEGER},
       </if>
       <if test="record.createId != null">
         create_id = #{record.createId,jdbcType=BIGINT},
@@ -308,12 +255,7 @@
       transfer_status = #{record.transferStatus,jdbcType=INTEGER},
       transfer_time = #{record.transferTime,jdbcType=TIMESTAMP},
       transfer_amount = #{record.transferAmount,jdbcType=DECIMAL},
-      serial_no = #{record.serialNo,jdbcType=VARCHAR},
-      service_id = #{record.serviceId,jdbcType=VARCHAR},
-      session_id = #{record.sessionId,jdbcType=VARCHAR},
-      req_time = #{record.reqTime,jdbcType=VARCHAR},
-      ret_code = #{record.retCode,jdbcType=VARCHAR},
-      error_msg = #{record.errorMsg,jdbcType=VARCHAR},
+      transfer_num = #{record.transferNum,jdbcType=INTEGER},
       create_id = #{record.createId,jdbcType=BIGINT},
       create_name = #{record.createName,jdbcType=VARCHAR},
       create_time = #{record.createTime,jdbcType=TIMESTAMP},
@@ -339,23 +281,8 @@
       <if test="transferAmount != null">
         transfer_amount = #{transferAmount,jdbcType=DECIMAL},
       </if>
-      <if test="serialNo != null">
-        serial_no = #{serialNo,jdbcType=VARCHAR},
-      </if>
-      <if test="serviceId != null">
-        service_id = #{serviceId,jdbcType=VARCHAR},
-      </if>
-      <if test="sessionId != null">
-        session_id = #{sessionId,jdbcType=VARCHAR},
-      </if>
-      <if test="reqTime != null">
-        req_time = #{reqTime,jdbcType=VARCHAR},
-      </if>
-      <if test="retCode != null">
-        ret_code = #{retCode,jdbcType=VARCHAR},
-      </if>
-      <if test="errorMsg != null">
-        error_msg = #{errorMsg,jdbcType=VARCHAR},
+      <if test="transferNum != null">
+        transfer_num = #{transferNum,jdbcType=INTEGER},
       </if>
       <if test="createId != null">
         create_id = #{createId,jdbcType=BIGINT},
@@ -384,12 +311,7 @@
       transfer_status = #{transferStatus,jdbcType=INTEGER},
       transfer_time = #{transferTime,jdbcType=TIMESTAMP},
       transfer_amount = #{transferAmount,jdbcType=DECIMAL},
-      serial_no = #{serialNo,jdbcType=VARCHAR},
-      service_id = #{serviceId,jdbcType=VARCHAR},
-      session_id = #{sessionId,jdbcType=VARCHAR},
-      req_time = #{reqTime,jdbcType=VARCHAR},
-      ret_code = #{retCode,jdbcType=VARCHAR},
-      error_msg = #{errorMsg,jdbcType=VARCHAR},
+      transfer_num = #{transferNum,jdbcType=INTEGER},
       create_id = #{createId,jdbcType=BIGINT},
       create_name = #{createName,jdbcType=VARCHAR},
       create_time = #{createTime,jdbcType=TIMESTAMP},

carbon-bank/carbon-bank-mbg/src/main/resources/com/hcloud/microserver/bank/mbg/mapper/BUserMapper.xml

@@ -9,6 +9,10 @@
     <result column="password" jdbcType="VARCHAR" property="password" />
     <result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
     <result column="create_id" jdbcType="BIGINT" property="createId" />
+    <result column="bank_name" jdbcType="VARCHAR" property="bankName" />
+    <result column="bank_no" jdbcType="VARCHAR" property="bankNo" />
+    <result column="bank_code" jdbcType="VARCHAR" property="bankCode" />
+    <result column="account_name" jdbcType="VARCHAR" property="accountName" />
   </resultMap>
   <sql id="Example_Where_Clause">
     <where>
@@ -69,7 +73,8 @@
     </where>
   </sql>
   <sql id="Base_Column_List">
-    guid, userID, userPWD, systemId, password, create_time, create_id
+    guid, userID, userPWD, systemId, password, create_time, create_id, bank_name, bank_no, 
+    bank_code, account_name
   </sql>
   <select id="selectByExample" parameterType="com.hcloud.microserver.bank.mbg.modul.BUserExample" resultMap="BaseResultMap">
     select
@@ -104,10 +109,12 @@
   <insert id="insert" parameterType="com.hcloud.microserver.bank.mbg.modul.BUser">
     insert into b_user (guid, userID, userPWD, 
       systemId, password, create_time, 
-      create_id)
+      create_id, bank_name, bank_no, 
+      bank_code, account_name)
     values (#{guid,jdbcType=BIGINT}, #{userid,jdbcType=VARCHAR}, #{userpwd,jdbcType=VARCHAR}, 
       #{systemid,jdbcType=VARCHAR}, #{password,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP}, 
-      #{createId,jdbcType=BIGINT})
+      #{createId,jdbcType=BIGINT}, #{bankName,jdbcType=VARCHAR}, #{bankNo,jdbcType=VARCHAR}, 
+      #{bankCode,jdbcType=VARCHAR}, #{accountName,jdbcType=VARCHAR})
   </insert>
   <insert id="insertSelective" parameterType="com.hcloud.microserver.bank.mbg.modul.BUser">
     insert into b_user
@@ -133,6 +140,18 @@
       <if test="createId != null">
         create_id,
       </if>
+      <if test="bankName != null">
+        bank_name,
+      </if>
+      <if test="bankNo != null">
+        bank_no,
+      </if>
+      <if test="bankCode != null">
+        bank_code,
+      </if>
+      <if test="accountName != null">
+        account_name,
+      </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides=",">
       <if test="guid != null">
@@ -156,6 +175,18 @@
       <if test="createId != null">
         #{createId,jdbcType=BIGINT},
       </if>
+      <if test="bankName != null">
+        #{bankName,jdbcType=VARCHAR},
+      </if>
+      <if test="bankNo != null">
+        #{bankNo,jdbcType=VARCHAR},
+      </if>
+      <if test="bankCode != null">
+        #{bankCode,jdbcType=VARCHAR},
+      </if>
+      <if test="accountName != null">
+        #{accountName,jdbcType=VARCHAR},
+      </if>
     </trim>
   </insert>
   <select id="countByExample" parameterType="com.hcloud.microserver.bank.mbg.modul.BUserExample" resultType="java.lang.Long">
@@ -188,6 +219,18 @@
       <if test="record.createId != null">
         create_id = #{record.createId,jdbcType=BIGINT},
       </if>
+      <if test="record.bankName != null">
+        bank_name = #{record.bankName,jdbcType=VARCHAR},
+      </if>
+      <if test="record.bankNo != null">
+        bank_no = #{record.bankNo,jdbcType=VARCHAR},
+      </if>
+      <if test="record.bankCode != null">
+        bank_code = #{record.bankCode,jdbcType=VARCHAR},
+      </if>
+      <if test="record.accountName != null">
+        account_name = #{record.accountName,jdbcType=VARCHAR},
+      </if>
     </set>
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
@@ -201,7 +244,11 @@
       systemId = #{record.systemid,jdbcType=VARCHAR},
       password = #{record.password,jdbcType=VARCHAR},
       create_time = #{record.createTime,jdbcType=TIMESTAMP},
-      create_id = #{record.createId,jdbcType=BIGINT}
+      create_id = #{record.createId,jdbcType=BIGINT},
+      bank_name = #{record.bankName,jdbcType=VARCHAR},
+      bank_no = #{record.bankNo,jdbcType=VARCHAR},
+      bank_code = #{record.bankCode,jdbcType=VARCHAR},
+      account_name = #{record.accountName,jdbcType=VARCHAR}
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
     </if>
@@ -227,6 +274,18 @@
       <if test="createId != null">
         create_id = #{createId,jdbcType=BIGINT},
       </if>
+      <if test="bankName != null">
+        bank_name = #{bankName,jdbcType=VARCHAR},
+      </if>
+      <if test="bankNo != null">
+        bank_no = #{bankNo,jdbcType=VARCHAR},
+      </if>
+      <if test="bankCode != null">
+        bank_code = #{bankCode,jdbcType=VARCHAR},
+      </if>
+      <if test="accountName != null">
+        account_name = #{accountName,jdbcType=VARCHAR},
+      </if>
     </set>
     where guid = #{guid,jdbcType=BIGINT}
   </update>
@@ -237,7 +296,11 @@
       systemId = #{systemid,jdbcType=VARCHAR},
       password = #{password,jdbcType=VARCHAR},
       create_time = #{createTime,jdbcType=TIMESTAMP},
-      create_id = #{createId,jdbcType=BIGINT}
+      create_id = #{createId,jdbcType=BIGINT},
+      bank_name = #{bankName,jdbcType=VARCHAR},
+      bank_no = #{bankNo,jdbcType=VARCHAR},
+      bank_code = #{bankCode,jdbcType=VARCHAR},
+      account_name = #{accountName,jdbcType=VARCHAR}
     where guid = #{guid,jdbcType=BIGINT}
   </update>
 </mapper>

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

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

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

@@ -36,10 +36,10 @@ public class IntrabankTransferParam {
     private BigDecimal I1TRAM;
     /**币种;必输域(固定值01);2A;*/
     @JSONField(name = "I1TRCY")
-    private BigDecimal I1TRCY;
+    private String I1TRCY;
     /**用途;必输域;30*O;*/
     @JSONField(name = "I1PUPS")
-    private BigDecimal I1PUPS;
+    private String I1PUPS;
     /**备注;null;150*O;*/
     @JSONField(name = "I1REM")
     private String I1REM;

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

@@ -0,0 +1,61 @@
+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.system.bank.carbon.entity.MakeClearingEntity;
+import com.hcloud.microserver.system.bank.carbon.form.MakeClearForm;
+import com.hcloud.microserver.system.bank.carbon.form.RequestTransferForm;
+import com.hcloud.microserver.system.bank.service.MakeClearingService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.List;
+
+@Slf4j
+@RestController
+@Api(tags = "农户清分管理")
+@RequestMapping("/bank/clear")
+public class MakeClearingController extends BaseController {
+    @Autowired
+    private MakeClearingService makeClearingService;
+
+
+
+
+
+
+    @ApiOperation("获取需要清分的农户信息")
+    @PostMapping("get")
+    public ResponseBase<List<MakeClearingEntity>> get(@RequestBody MakeClearForm form){
+        PageInfo<MakeClearingEntity> pageInfo = makeClearingService.makeClearing(form);
+        return responseSuccess(pageInfo);
+    }
+
+    @ApiOperation("生成清分订单信息")
+    @PostMapping("create")
+    public ResponseBase<List<MakeClearingEntity>> create(@RequestBody MakeClearForm form){
+        int i = makeClearingService.makeTransfer(form);
+        if (i>0){
+            return responseResultSuccess();
+        }
+        return responseResultFailure();
+    }
+
+
+    @ApiOperation("生成清分订单信息")
+    @PostMapping("clearing")
+    public ResponseBase create(@RequestBody RequestTransferForm form){
+        int i = makeClearingService.Clearing(form);
+        if (i>0){
+            return responseResultSuccess();
+        }
+        return responseResultFailure();
+    }
+}

carbon-bank/carbon-bank-service/src/main/java/com/hcloud/microserver/system/bank/dao/MakeClearingMapper.java

@@ -0,0 +1,32 @@
+package com.hcloud.microserver.system.bank.dao;
+
+import com.hcloud.microserver.bank.mbg.modul.BTransfer;
+import com.hcloud.microserver.bank.mbg.modul.BTransferDetail;
+import com.hcloud.microserver.system.bank.carbon.entity.MakeClearingEntity;
+import com.hcloud.microserver.system.bank.carbon.entity.MakeClearingFarmerInfoEntity;
+import com.hcloud.microserver.system.bank.carbon.form.MakeClearForm;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+public interface MakeClearingMapper {
+
+    public List<MakeClearingEntity> makeClearing(MakeClearForm form);
+
+    public List<MakeClearingEntity> makeFarmerClearing(MakeClearForm form);
+
+    public List<MakeClearingEntity> makeCollectiveClearing(MakeClearForm form);
+
+    public int insertTransDetailList(@Param("list") List<BTransferDetail> list);
+
+    public int insertTrans(BTransfer record);
+
+
+    public int updateByFarmerId(@Param("transfers") List<BTransferDetail> transfers,@Param("form") MakeClearForm form);
+
+    public int updateByCollectiveId(@Param("transfers") List<BTransferDetail> transfers,@Param("form") MakeClearForm form);
+
+
+
+    public List<MakeClearingFarmerInfoEntity> getFarmerInfo(@Param("belongType")Integer belongType,@Param("farmerId")String farmerId,@Param("collectiveId")String collectiveId);
+}

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

@@ -3,6 +3,7 @@ package com.hcloud.microserver.system.bank.service;
 import com.github.pagehelper.PageInfo;
 import com.hcloud.microserver.bank.mbg.modul.BTransfer;
 import com.hcloud.microserver.bank.mbg.modul.BTransferDetail;
+import com.hcloud.microserver.bank.mbg.modul.BTransferDetailRequest;
 import com.hcloud.microserver.system.bank.carbon.form.BTransferDetailForm;
 
 import java.util.List;
@@ -52,6 +53,11 @@ public interface BTransferDetailService {
      */
     public PageInfo<BTransferDetail> getBTransferDetailListByFkTransferId(Long fkTransferId,int pageNo,int pageSize);
 
+    public List<BTransferDetail>  getBTransferDetailByFkTransferId(Long fkTransferId);
+
+
+    public int insertRequest(BTransferDetailRequest request);
+
 
 
 }

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

@@ -44,6 +44,12 @@ public interface BTransferService {
      */
     public BTransfer detail(Long guid);
 
+    /**
+     * 校验Btransfer是否符合发送清分请求状态
+     * @return
+     */
+    public BTransfer getCheckTransfer(Long guid,Integer status);
+
 
 
 

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

@@ -25,6 +25,13 @@ public interface BankTransactionService {
      * @return
      */
     public IntrabankTransferResp intrabankTransfer(IntrabankTransferParam param);
+
+    /**
+     * 2.6.	转账：行内转账CL0005（需签名）
+     * @param param
+     * @return
+     */
+    public IntrabankTransferResp intrabankTransfer(BankQueryBaseParam<IntrabankTransferParam> param);
     /**
      * 2.14.	账务支付：代发/代报销指令详细查询CL0032
      * @param param

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

@@ -0,0 +1,32 @@
+package com.hcloud.microserver.system.bank.service;
+
+import com.github.pagehelper.PageInfo;
+import com.hcloud.microserver.bank.mbg.modul.BTransfer;
+import com.hcloud.microserver.bank.mbg.modul.BTransferDetail;
+import com.hcloud.microserver.bank.mbg.modul.BUser;
+import com.hcloud.microserver.system.bank.carbon.entity.MakeClearingEntity;
+import com.hcloud.microserver.system.bank.carbon.form.MakeClearForm;
+import com.hcloud.microserver.system.bank.carbon.form.RequestTransferForm;
+
+import java.util.List;
+
+/**
+ * 清分
+ */
+public interface MakeClearingService {
+
+    /**
+     * 获取未清分订单
+     * @param form
+     * @return
+     */
+    public PageInfo<MakeClearingEntity> makeClearing(MakeClearForm form);
+
+
+    public int Clearing(RequestTransferForm form);
+
+    public int makeTransfer(MakeClearForm form);
+
+
+    public int transferDetailToCqBank(BUser user, BTransfer total, List<BTransferDetail> details, String sessionId);
+}

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

@@ -3,9 +3,11 @@ package com.hcloud.microserver.system.bank.service.impl;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
 import com.hcloud.microserver.bank.mbg.mapper.BTransferDetailMapper;
+import com.hcloud.microserver.bank.mbg.mapper.BTransferDetailRequestMapper;
 import com.hcloud.microserver.bank.mbg.modul.BTransfer;
 import com.hcloud.microserver.bank.mbg.modul.BTransferDetail;
 import com.hcloud.microserver.bank.mbg.modul.BTransferDetailExample;
+import com.hcloud.microserver.bank.mbg.modul.BTransferDetailRequest;
 import com.hcloud.microserver.commoncore.domain.LoginUser;
 import com.hcloud.microserver.commoncore.domain.SysUser;
 import com.hcloud.microserver.commoncore.util.string.StringUtils;
@@ -26,6 +28,9 @@ public class BTransferDetailServiceImpl implements BTransferDetailService {
     private BTransferDetailMapper bTransferDetailMapper;
     @Autowired
     private TokenService tokenService;
+
+    @Autowired
+    private BTransferDetailRequestMapper requestMapper;
     @Override
     public int add(BTransferDetail bTransferDetail) {
         if (bTransferDetail != null){
@@ -52,9 +57,6 @@ public class BTransferDetailServiceImpl implements BTransferDetailService {
         if (StringUtils.isNotNull(form.getFkTransferId())){
             criteria.andFkTransferIdEqualTo(form.getFkTransferId());
         }
-        if (StringUtils.isNotNull(form.getFkFcId())){
-            criteria.andFkFcIdEqualTo(form.getFkFcId());
-        }
         if (StringUtils.isNotEmpty(form.getName())){
             criteria.andNameLike("%"+form.getName()+"%");
         }
@@ -110,4 +112,24 @@ public class BTransferDetailServiceImpl implements BTransferDetailService {
         }
         return new PageInfo<>();
     }
+
+    @Override
+    public List<BTransferDetail> getBTransferDetailByFkTransferId(Long fkTransferId) {
+        if (fkTransferId != null){
+            BTransferDetailExample example = new BTransferDetailExample();
+            BTransferDetailExample.Criteria criteria = example.createCriteria();
+            criteria.andFkTransferIdEqualTo(fkTransferId);
+            List<BTransferDetail> list = bTransferDetailMapper.selectByExample(example);
+            return list;
+        }
+        return null;
+    }
+
+    @Override
+    public int insertRequest(BTransferDetailRequest request) {
+        if (request != null){
+            return requestMapper.insert(request);
+        }
+        return 0;
+    }
 }

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

@@ -69,12 +69,6 @@ public class BTransferServiceImpl implements BTransferService {
         if (StringUtils.isNotNull(form.getGuid())){
             criteria.andGuidEqualTo(form.getGuid());
         }
-        if (StringUtils.isNotEmpty(form.getRetCode())){
-            criteria.andRetCodeLike("%"+form.getRetCode()+"%");
-        }
-        if (StringUtils.isNotEmpty(form.getServiceId())){
-            criteria.andServiceIdLike("%"+form.getServiceId()+"%");
-        }
         if (StringUtils.isNotNull(form.getTransferType())){
             criteria.andTransferTypeEqualTo(form.getTransferType());
         }
@@ -99,4 +93,22 @@ public class BTransferServiceImpl implements BTransferService {
         }
         return null;
     }
+
+    @Override
+    public BTransfer getCheckTransfer(Long guid,Integer status) {
+        if (guid == null){
+            return null;
+        }
+        BTransferExample example = new BTransferExample();
+        BTransferExample.Criteria criteria = example.createCriteria();
+        if (status != null){
+            criteria.andTransferStatusEqualTo(status);
+        }
+        criteria.andGuidEqualTo(guid);
+        List<BTransfer> bTransfers = bTransferMapper.selectByExample(example);
+        if (bTransfers != null && bTransfers.size()>0){
+            return bTransfers.get(0);
+        }
+        return null;
+    }
 }

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

@@ -12,6 +12,7 @@ import com.hcloud.microserver.system.bank.carbon.form.BUserForm;
 import com.hcloud.microserver.system.bank.service.BUserService;
 import com.hcloud.microserver.system.bank.util.SHAEncrytp;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.crypto.password.PasswordEncoder;
 import org.springframework.stereotype.Service;
 import java.util.Date;
 import java.util.List;
@@ -19,6 +20,9 @@ import java.util.List;
 @Service
 public class BUserServiceImpl implements BUserService {
 
+    @Autowired
+    private PasswordEncoder passwordEncoder;
+
     @Autowired
     private BUserMapper bUserMapper;
 
@@ -38,6 +42,7 @@ public class BUserServiceImpl implements BUserService {
             String digestOfString = shaEncrytp.getDigestOfString(origin.getBytes());
             bUser.setUserpwd(digestOfString);
             bUser.setCreateTime(new Date());
+            bUser.setPassword(passwordEncoder.encode(bUser.getPassword()));
             bUser.setCreateId(loginUser.getSysUser().getUserId());
             return bUserMapper.insert(bUser);
 

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

@@ -88,6 +88,12 @@ public class BankTransactionServiceImpl implements BankTransactionService {
 
     }
 
+    @Override
+    public IntrabankTransferResp intrabankTransfer(BankQueryBaseParam<IntrabankTransferParam> param) {
+        IntrabankTransferResp intrabankTransferResp =(IntrabankTransferResp) bankUtil.bankRequst(param, 1, IntrabankTransferResp.class);
+        log.info(JSONObject.toJSONString(intrabankTransferResp));
+        return intrabankTransferResp;    }
+
     @Override
     public ReimbursementInstructionsDetailQueryResp reimbursementInstructionsDetailQuery(ReimbursementInstructionsDetailQueryParam param) {
         return null;

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

@@ -0,0 +1,392 @@
+package com.hcloud.microserver.system.bank.service.impl;
+
+import com.github.pagehelper.PageHelper;
+import com.github.pagehelper.PageInfo;
+import com.hcloud.microserver.bank.mbg.mapper.BUserMapper;
+import com.hcloud.microserver.bank.mbg.modul.*;
+import com.hcloud.microserver.commoncore.enums.ResultEnum;
+import com.hcloud.microserver.commoncore.exception.GlobalException;
+import com.hcloud.microserver.commoncore.util.BeanCopyUtil;
+import com.hcloud.microserver.commoncore.util.string.StringUtils;
+import com.hcloud.microserver.system.bank.bo.*;
+import com.hcloud.microserver.system.bank.carbon.entity.MakeClearingEntity;
+import com.hcloud.microserver.system.bank.carbon.entity.MakeClearingFarmerInfoEntity;
+import com.hcloud.microserver.system.bank.carbon.form.ClearingForm;
+import com.hcloud.microserver.system.bank.carbon.form.MakeClearForm;
+import com.hcloud.microserver.system.bank.carbon.form.RequestTransferForm;
+import com.hcloud.microserver.system.bank.dao.MakeClearingMapper;
+import com.hcloud.microserver.system.bank.service.*;
+import com.hcloud.microserver.system.bank.util.BankNoUtial;
+import com.hcloud.microserver.system.bank.util.BankUtil;
+import com.hcloud.microserver.system.bank.util.UserInfoUtil;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.data.redis.core.RedisTemplate;
+import org.springframework.security.crypto.password.PasswordEncoder;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.math.BigDecimal;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
+import java.util.concurrent.TimeUnit;
+import java.util.stream.Collectors;
+
+@Slf4j
+@Service
+public class MakeClearingServiceImpl implements MakeClearingService {
+    @Autowired
+    private MakeClearingMapper makeClearingMapper;
+
+    @Autowired
+    private BUserMapper bUserMapper;
+
+    @Autowired
+    private PasswordEncoder passwordEncoder;
+
+    @Autowired
+    private BankUserService bankUserService;
+
+    @Autowired
+    private BankUtil bankUtil;
+
+    @Autowired
+    private RedisTemplate redisTemplate;
+
+    @Autowired
+    private BTransferService bTransferService;
+
+    @Autowired
+    private BTransferDetailService bTransferDetailService;
+
+
+    @Autowired
+    private BankTransactionService bankTransactionService;
+
+    @Value("${redis.clearing.key}")
+    private String clearingKey;
+
+    @Value("${redis.clearing.expire}")
+    private Long expire;
+
+    @Autowired
+    private UserInfoUtil userInfoUtil;
+    @Override
+    public PageInfo<MakeClearingEntity> makeClearing(MakeClearForm form) {
+        log.info(">>>>>>获取需要清分的信息{}",form);
+        PageHelper.startPage(form.getPageNo(),form.getPageSize());
+        List<MakeClearingEntity> list = makeClearingMapper.makeClearing(form);
+        return new PageInfo<>(list);
+    }
+
+    @Override
+    public int Clearing(RequestTransferForm form) {
+        /**
+         * 校验是否错误
+         */
+
+        int i = cacheMakeClearing(form.getTransferId());
+        if (i==0){
+            throw new GlobalException("错误操作");
+        }
+        if (i==1){
+            throw new GlobalException("错误操作");
+        }
+        String pwd = form.getPwd();
+        String userId = form.getUserId();
+        BUser user = getBUserByUserId(userId);
+
+        if (user == null){
+            throw new GlobalException("用户或密码错误");
+        }
+        if (!passwordEncoder.matches(pwd,user.getPassword())){
+            throw new GlobalException("用户或密码错误");
+        }
+
+        BankLoginUserRespBO userRespBO = getSessionId(user);
+        if (userRespBO == null || StringUtils.isEmpty(userRespBO.getSessionId())){
+            throw new GlobalException(ResultEnum.SYS_ERROR);
+        }
+        String sessionId = userRespBO.getSessionId();
+        BTransfer checkTransfer = bTransferService.getCheckTransfer(form.getTransferId(), 0);
+        if (checkTransfer==null){
+            throw new GlobalException("没有可用的清分订单");
+        }
+        List<BTransferDetail> transferId = bTransferDetailService.getBTransferDetailByFkTransferId(form.getTransferId());
+        if (transferId == null || transferId.size()<1){
+            throw new GlobalException("没有可用的清分订单");
+        }
+
+        return transferDetailToCqBank(user,checkTransfer, transferId,sessionId);
+
+    }
+
+    @Transactional(rollbackFor = Exception.class)
+    @Override
+    public int makeTransfer(MakeClearForm form) {
+
+        List<ClearingForm> clearings = form.getClearings();
+        if (clearings ==null|| clearings.size()<1){
+            throw new GlobalException("操作不规范");
+        }
+        /**
+         * 给清分分类  一种是农户清分  一种是村组清分
+         */
+        Map<Integer, List<ClearingForm>> collect = clearings.stream().collect(Collectors.groupingBy(ClearingForm::getBelongType));
+        List<MakeClearingEntity> listAll = new ArrayList<>();
+
+        if (collect.containsKey(1)){
+            List<ClearingForm> clearingForms = collect.get(1);
+            MakeClearForm farmerFomer = new MakeClearForm();
+            BeanCopyUtil.copyBean(form,farmerFomer);
+            farmerFomer.setClearings(clearingForms);
+            List<MakeClearingEntity> list = makeClearingMapper.makeFarmerClearing(form);
+            listAll.addAll(list);
+        }
+
+        if (collect.containsKey(2)){
+            List<ClearingForm> clearingForms = collect.get(2);
+            MakeClearForm farmerFomer = new MakeClearForm();
+            BeanCopyUtil.copyBean(form,farmerFomer);
+            farmerFomer.setClearings(clearingForms);
+            List<MakeClearingEntity> list = makeClearingMapper.makeCollectiveClearing(form);
+            listAll.addAll(list);
+        }
+        if (listAll!= null&&listAll.size()>0){
+            List<BTransferDetail> list = clearingLogin(listAll);
+            Map<Integer, List<BTransferDetail>> listMap = list.stream().collect(Collectors.groupingBy(BTransferDetail::getTransferType));
+            if (listMap.containsKey(1)){
+                List<BTransferDetail> details = listMap.get(1);
+                makeClearingMapper.updateByFarmerId(details,form);
+            }
+            if (listMap.containsKey(2)){
+                List<BTransferDetail> details = listMap.get(2);
+               makeClearingMapper.updateByCollectiveId(details,form);
+            }
+
+        }
+        return 1;
+    }
+
+    @Transactional(rollbackFor = Exception.class)
+    @Override
+    public int transferDetailToCqBank(BUser user,BTransfer total, List<BTransferDetail> details, String sessionId) {
+
+        /**
+         * 修改 detail 并制作  请求体
+         */
+        String serviceId = "CL0005";
+        details.stream().forEach(b->{
+            //CL0005 需要签名 行内转账
+
+            //行外转账CL0006（需签名）
+            //第一版先
+            String no = BankNoUtial.NextOrderNo();
+            b.setSerilNo(no);
+            String time = bankUtil.getTime(new Date());
+            IntrabankTransferParam intr = getIntrabankTransferParam(b, user, no);
+            b.setTransferTime(new Date());
+            b.setTransferName(userInfoUtil.getUserName());
+            b.setTransferId(userInfoUtil.getUserId());
+
+            BankQueryBaseParam<IntrabankTransferParam> param = new BankQueryBaseParam<>();
+            param.setSessionId(sessionId);
+            param.setServiceId(serviceId);
+            param.setReqTime(time);
+            param.setSerialNo(no);
+            param.setData(intr);
+            IntrabankTransferResp intrResp = bankTransactionService.intrabankTransfer(param);
+
+            BTransferDetailRequest body = getRequestBody(b, param, intrResp, user);
+            bTransferDetailService.insertRequest(body);
+            bTransferDetailService.updateByGuid(b);
+
+
+        });
+        /**
+         * 修改总的
+         */
+        BTransfer fer = new BTransfer();
+        fer.setTransferStatus(1);
+        fer.setGuid(total.getGuid());
+        return bTransferService.updateByBTransfer(fer);
+    }
+
+    public BUser getBUserByUserId(String userId){
+        if (StringUtils.isEmpty(userId)){
+            return null;
+        }
+        BUserExample example = new BUserExample();
+        BUserExample.Criteria criteria = example.createCriteria();
+        criteria.andUseridEqualTo(userId);
+        List<BUser> bUsers = bUserMapper.selectByExample(example);
+        if (bUsers != null&&bUsers.size()>0){
+            return bUsers.get(0);
+        }
+
+        return null;
+    }
+
+    public BankLoginUserRespBO getSessionId(BUser bUser){
+        BankLoginUserRespBO loginSession = bankUtil.getLoginSession(bUser.getUserid());
+        if (loginSession != null){
+            return loginSession;
+        }
+        BankLoginUserReqParam param = new BankLoginUserReqParam();
+        param.setUserID(bUser.getUserid());
+        param.setUserPWD(bUser.getUserpwd());
+        param.setSystemId(bUser.getSystemid());
+        BankLoginUserRespBO respBO = bankUserService.loginUser(param);
+        return respBO;
+
+    }
+
+    public List<BTransferDetail> clearingLogin(List<MakeClearingEntity> list){
+        if (list == null&& list.size()>0){
+            return null;
+        }
+        Long userId = userInfoUtil.getUserId();
+        String userName = userInfoUtil.getUserName();
+        BTransfer bTransfer = new BTransfer();
+
+        bTransfer.setCreateId(userId);
+        bTransfer.setCreateName(userName);
+        bTransfer.setCreateTime(new Date());
+        bTransfer.setTransferStatus(0);
+        bTransfer.setState(1);
+        BigDecimal result2 = list.stream()
+                // 将user对象的age取出来map为Bigdecimal
+                .map(MakeClearingEntity::getAmmount)
+                // 使用reduce()聚合函数,实现累加器
+                .reduce(BigDecimal.ZERO,BigDecimal::add);
+        bTransfer.setTransferAmount(result2);
+        bTransfer.setTransferNum(list.size());
+        List<BTransferDetail> bTransferDetails = new ArrayList<>();
+        makeClearingMapper.insertTrans(bTransfer);
+        for (MakeClearingEntity b:list
+             ) {
+
+            BTransferDetail detail = new BTransferDetail();
+            detail.setState(1);
+            detail.setCreateName(userName);
+            detail.setCreateId(userId);
+            detail.setStatus(0);
+            MakeClearingFarmerInfoEntity entity = b.getFarmerInfoEntity();
+            detail.setAccountPid(b.getFarmerInfoEntity().getPid());
+            detail.setBankNo(b.getFarmerInfoEntity().getBankNo());
+            detail.setBankCode(b.getFarmerInfoEntity().getBankCode());
+            detail.setBankName(b.getFarmerInfoEntity().getBankName());
+            if (1==b.getBelongType()){
+                detail.setFkFarmerId(entity.getFkFcId());
+            }
+            if (2==b.getBelongType()){
+                detail.setFkCollectiveId(entity.getFkFcId());
+            }
+            detail.setTransferAmount(b.getAmmount());
+            detail.setName(entity.getName());
+            detail.setTransferName(entity.getTransferName());
+            detail.setTransferType(b.getBelongType());
+            detail.setFkTransferId(bTransfer.getGuid());
+            bTransferDetails.add(detail);
+        }
+
+        if (bTransferDetails != null){
+            makeClearingMapper.insertTransDetailList(bTransferDetails);
+
+        }
+        return bTransferDetails;
+    }
+
+    public int cacheMakeClearing(Long guid){
+        if (guid == null){
+            return 0;
+        }
+        String key = clearingKey+":"+guid;
+        Object o = redisTemplate.opsForValue().get(key);
+        if (o == null){
+            redisTemplate.opsForValue().set(key,guid,expire, TimeUnit.SECONDS);
+            return 2;
+        }else {
+            return 1;
+        }
+    }
+
+
+    public IntrabankTransferParam getIntrabankTransferParam(BTransferDetail b,BUser user,String no){
+        IntrabankTransferParam intr = new IntrabankTransferParam();
+        //企业流水号
+        intr.setI1QYLS(no);
+//        //提交人
+//        intr.setI1SMID("");
+//        //最后审核人
+//        intr.setI1ATID("");
+        //付款方账账号
+        intr.setI1FKAC(user.getBankNo());
+        //付款方账户名
+        intr.setI1FKNM(user.getAccountName());
+        //收款方账号
+        intr.setI1SKAC(b.getBankNo());
+        //收款方户名
+        intr.setI1CUNM(b.getTransferName());
+        //金额
+        intr.setI1TRAM(b.getTransferAmount());
+
+        //币种
+        intr.setI1TRCY("01");
+
+        //用途
+        intr.setI1PUPS("生态清分"+b.getGuid());
+
+        intr.setI1REM("生态清分"+b.getGuid());
+        //0,1 1集团账号转账
+        intr.setIJYLX("1");
+//        //企业指令内部编号
+//        intr.setI1NBBH("");
+        //校验标志
+        intr.setI1JYBZ("0");
+//        //原明细序号
+//        intr.setI1MXXH("");
+//        //账号1
+//        intr.setI1AC1("");
+//        //账户户名1
+//        intr.setI1NM1("");
+//        //业务种类
+//        intr.setI1YWZL("");
+//        //记录信息
+//        intr.setI1JLXX("");
+
+        return intr;
+    }
+
+
+    public BTransferDetailRequest getRequestBody(BTransferDetail b,BankQueryBaseParam<IntrabankTransferParam> param,IntrabankTransferResp intrResp,BUser user){
+        BTransferDetailRequest request = new BTransferDetailRequest();
+        request.setFkTransferDetailId(b.getGuid());
+        request.setSerialNo(param.getSerialNo());
+        request.setReqTime(param.getReqTime());
+        request.setSessionId(param.getSessionId());
+        request.setServiceId(param.getServiceId());
+
+        request.setRetCode(intrResp.getRetCode());
+        request.setErrorMsg(intrResp.getErrorMsg());
+        request.setCreateTime(new Date());
+        request.setAccountMoney(intrResp.getO1ZHYE());
+        request.setPostFee(intrResp.getO1PSTF());
+        request.setHandFee(intrResp.getO1PCDF());
+        request.setFailReson(intrResp.getO1SBYY());
+        request.setRetCode(intrResp.getO1JYYD());
+        request.setPayStatus(intrResp.getO1JYZT());
+        request.setPayMsg(intrResp.getO1ZTMS());
+        request.setPaySeril(intrResp.getO1TLSQ());
+        request.setPayResponseCode(intrResp.getO1JYYD());
+        request.setPayBankName(user.getAccountName());
+        request.setPayBankName(user.getBankName());
+        request.setPayAccount(user.getBankNo());
+        request.setPayAmount(b.getTransferAmount());
+        request.setStatus(0);
+        return request;
+    }
+}

carbon-bank/carbon-bank-service/src/main/java/com/hcloud/microserver/system/bank/util/UserInfoUtil.java

@@ -0,0 +1,28 @@
+package com.hcloud.microserver.system.bank.util;
+
+import com.hcloud.microserver.commoncore.domain.LoginUser;
+import com.hcloud.microserver.security.service.TokenService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+@Component
+public class UserInfoUtil {
+    @Autowired
+    private TokenService tokenService;
+
+    public Long getUserId(){
+        LoginUser loginUser = tokenService.getLoginUser();
+        if (loginUser != null&& loginUser.getSysUser() != null){
+            return loginUser.getSysUser().getUserId();
+        }
+        return null;
+    }
+
+    public String getUserName(){
+        LoginUser loginUser = tokenService.getLoginUser();
+        if (loginUser != null&& loginUser.getSysUser() != null){
+            return loginUser.getSysUser().getUserName();
+        }
+        return null;
+    }
+}

carbon-bank/carbon-bank-service/src/main/resources/bank/MakeClearingMapper.xml

@@ -0,0 +1,348 @@
+<?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.system.bank.dao.MakeClearingMapper">
+
+	<resultMap type="com.hcloud.microserver.system.bank.carbon.entity.MakeClearingEntity" id="SysUserResult">
+		<result property="fkFarmerGuid"       column="fk_farmer_guid"      />
+		<result property="fkCollectiveGuid"     column="fk_collective_guid"    />
+		<result property="belongType"     column="belong_type"    />
+		<result property="ammount"        column="amount"        />
+		<result property="startTime"  column="startTime"  />
+		<result property="endTime"          column="endTime"          />
+		<association property="farmerInfoEntity" column="{belongType=belong_type,farmerId=fk_farmer_guid,collectiveId=fk_collective_guid}"
+					 javaType="com.hcloud.microserver.system.bank.carbon.entity.MakeClearingFarmerInfoEntity"
+					 select="getFarmerInfo"/>
+	</resultMap>
+
+	<select id="makeClearing" resultMap="SysUserResult" parameterType="com.hcloud.microserver.system.bank.carbon.form.MakeClearForm">
+		SELECT
+			gd.fk_farmer_guid,
+			gd.fk_collective_guid,
+			gd.belong_type,
+			SUM( od.amount ) AS amount,
+			#{startTime} as startTime,
+			#{endTime} as endTime
+		FROM
+			t_goods_order_detail od
+			INNER JOIN t_goods_order_info oi ON od.fk_order_guid = oi.guid
+			INNER JOIN (
+			SELECT
+				ttd.fk_goods_guid,
+				tpb.fk_farmer_guid,
+				tpb.fk_collective_guid,
+				tpb.farmer_name,
+				tpb.belong_type
+			FROM
+				t_goods_detail ttd
+				INNER JOIN t_product_belong tpb ON ttd.fk_product_guid = tpb.fk_product_guid
+			) gd ON od.fk_goods_guid = gd.fk_goods_guid
+		WHERE
+			oi.order_status = 2
+			AND oi.state = 1
+		and ifNull(od.transfer_status,0)=0
+			<if test="startTime != null">
+				and oi.create_time<![CDATA[ >= ]]>#{startTime}
+			</if>
+			<if test="endTime != null">
+				and oi.create_time<![CDATA[ <= ]]>#{endTime}
+			</if>
+			<if test="orderType != null">
+				and oi.order_no = #{orderType}
+			</if>
+			<if test="belongType != null">
+				and gd.belong_type = #{belongType}
+			</if>
+
+		GROUP BY
+			gd.fk_farmer_guid,
+			gd.belong_type
+	</select>
+	<select id="getFarmerInfo" resultType="com.hcloud.microserver.system.bank.carbon.entity.MakeClearingFarmerInfoEntity" >
+		<choose>
+			<when test="belongType==1">
+				<if test="farmerId != null">
+					SELECT
+					f.guid AS fkFcId,
+					f.farmer_name AS NAME,
+					f.bank_card_no bankNo,
+					f.pid,
+					f.farmer_name as transferName,
+					f.bank_name AS bankName,
+					f.bank_code AS bankCode,
+					f.bank_status AS bankStatus,
+					a.area_address as address
+					FROM
+					t_farmer_info f
+					LEFT JOIN t_poverty_area a ON f.fk_poverty_area_id = a.guid
+					where f.guid = #{farmerId}
+				</if>
+
+			</when>
+			<when test="belongType==2">
+				<if test="collectiveId != null">
+					SELECT
+					f.guid AS fkFcId,
+					f.collective_name AS name,
+					f.bank_card_no bankNo,
+					null as pid,
+					f.org_unit as transferName,
+					f.bank_name AS bankName,
+					f.bank_code AS bankCode,
+					f.bank_status AS bankStatus,
+					a.area_address as address
+					FROM
+					t_collective_farmer f
+					LEFT JOIN t_poverty_area a ON f.fk_poverty_area_id = a.guid
+					where f.guid = #{collectiveId}
+				</if>
+
+			</when>
+		</choose>
+	</select>
+	<select id="makeFarmerClearing" resultMap="SysUserResult" parameterType="com.hcloud.microserver.system.bank.carbon.form.MakeClearForm">
+		SELECT
+		gd.fk_farmer_guid,
+		gd.fk_collective_guid,
+		gd.belong_type,
+		SUM( od.amount ) AS amount,
+		#{startTime} as startTime,
+		#{endTime} as endTime
+		FROM
+		t_goods_order_detail od
+		INNER JOIN t_goods_order_info oi ON od.fk_order_guid = oi.guid
+		INNER JOIN (
+		SELECT
+		ttd.fk_goods_guid,
+		tpb.fk_farmer_guid,
+		tpb.fk_collective_guid,
+		tpb.farmer_name,
+		tpb.belong_type
+		FROM
+		t_goods_detail ttd
+		INNER JOIN t_product_belong tpb ON ttd.fk_product_guid = tpb.fk_product_guid
+		) gd ON od.fk_goods_guid = gd.fk_goods_guid
+		WHERE
+		oi.order_status = 2
+		AND oi.state = 1
+		and ifNull(od.transfer_status,0)=0
+		<if test="startTime != null">
+			and oi.create_time<![CDATA[ >= ]]>#{startTime}
+		</if>
+		<if test="endTime != null">
+			and oi.create_time<![CDATA[ <= ]]>#{endTime}
+		</if>
+		<if test="orderType != null">
+			and oi.order_no = #{orderType}
+		</if>
+		<if test="belongType != null">
+			and gd.belong_type = #{belongType}
+		</if>
+		<if test="clearings != null">
+			and gd.fk_farmer_guid in
+			<foreach collection="clearings" item="item" open="(" close=")" separator=",">
+				#{item.fcName}
+			</foreach>
+		</if>
+		GROUP BY
+		gd.fk_farmer_guid,
+		gd.belong_type
+	</select>
+
+	<select id="makeCollectiveClearing" resultMap="SysUserResult" parameterType="com.hcloud.microserver.system.bank.carbon.form.MakeClearForm">
+		SELECT
+		gd.fk_farmer_guid,
+		gd.fk_collective_guid,
+		gd.belong_type,
+		SUM( od.amount ) AS amount,
+		#{startTime} as startTime,
+		#{endTime} as endTime
+		FROM
+		t_goods_order_detail od
+		INNER JOIN t_goods_order_info oi ON od.fk_order_guid = oi.guid
+		INNER JOIN (
+		SELECT
+		ttd.fk_goods_guid,
+		tpb.fk_farmer_guid,
+		tpb.fk_collective_guid,
+		tpb.farmer_name,
+		tpb.belong_type
+		FROM
+		t_goods_detail ttd
+		INNER JOIN t_product_belong tpb ON ttd.fk_product_guid = tpb.fk_product_guid
+		) gd ON od.fk_goods_guid = gd.fk_goods_guid
+		WHERE
+		oi.order_status = 2
+		AND oi.state = 1
+		and ifNull(od.transfer_status,0)=0
+		<if test="startTime != null">
+			and oi.create_time<![CDATA[ >= ]]>#{startTime}
+		</if>
+		<if test="endTime != null">
+			and oi.create_time<![CDATA[ <= ]]>#{endTime}
+		</if>
+		<if test="orderType != null">
+			and oi.order_no = #{orderType}
+		</if>
+		<if test="belongType != null">
+			and gd.belong_type = #{belongType}
+		</if>
+		<if test="clearings != null">
+			and gd.fk_collective_guid in
+			<foreach collection="clearings" item="item" open="(" close=")" separator=",">
+				#{item.fcName}
+			</foreach>
+		</if>
+		GROUP BY
+		gd.fk_farmer_guid,
+		gd.belong_type
+	</select>
+	<insert id="insertTransDetailList" parameterType="com.hcloud.microserver.bank.mbg.modul.BTransferDetail" useGeneratedKeys="true" keyColumn="guid" keyProperty="guid">
+		insert into b_transfer_detail (guid, fk_transfer_id, transfer_type,
+		fk_farmer_id, fk_collective_id, seril_no,
+		name, bank_no, account_pid,
+		transfer_status, code, msg,
+		date, time, transfer_nation,
+		nation_id, create_time, create_id,
+		create_name, transfer_id, transfer_name,
+		transfer_time, state, bank_name,
+		bank_code, status, transfer_amount
+		)
+		values
+      <foreach collection="list" item="item" separator=",">
+		  (#{item.guid,jdbcType=BIGINT}, #{item.fkTransferId,jdbcType=BIGINT}, #{item.transferType,jdbcType=INTEGER},
+		  #{item.fkFarmerId,jdbcType=VARCHAR}, #{item.fkCollectiveId,jdbcType=VARCHAR}, #{item.serilNo,jdbcType=VARCHAR},
+		  #{item.name,jdbcType=VARCHAR}, #{item.bankNo,jdbcType=VARCHAR}, #{item.accountPid,jdbcType=VARCHAR},
+		  #{item.transferStatus,jdbcType=VARCHAR}, #{item.code,jdbcType=VARCHAR}, #{item.msg,jdbcType=VARCHAR},
+		  #{item.date,jdbcType=VARCHAR}, #{item.time,jdbcType=TIMESTAMP}, #{item.transferNation,jdbcType=VARCHAR},
+		  #{item.nationId,jdbcType=INTEGER}, #{item.createTime,jdbcType=TIMESTAMP}, #{item.createId,jdbcType=BIGINT},
+		  #{item.createName,jdbcType=VARCHAR}, #{item.transferId,jdbcType=BIGINT}, #{item.transferName,jdbcType=VARCHAR},
+		  #{item.transferTime,jdbcType=TIMESTAMP}, #{item.state,jdbcType=INTEGER}, #{item.bankName,jdbcType=VARCHAR},
+		  #{item.bankCode,jdbcType=VARCHAR}, #{item.status,jdbcType=INTEGER}, #{item.transferAmount,jdbcType=DECIMAL}
+		  )
+
+	  </foreach>
+
+
+
+  </insert>
+
+
+	<insert id="insertTrans" parameterType="com.hcloud.microserver.bank.mbg.modul.BTransfer"  useGeneratedKeys="true" keyColumn="guid" keyProperty="guid">
+    insert into b_transfer (guid, transfer_type, transfer_status,
+      transfer_time, transfer_amount, transfer_num,
+      create_id, create_name, create_time,
+      transfer_id, transfer_name, state
+      )
+    values (#{guid,jdbcType=BIGINT}, #{transferType,jdbcType=INTEGER}, #{transferStatus,jdbcType=INTEGER},
+      #{transferTime,jdbcType=TIMESTAMP}, #{transferAmount,jdbcType=DECIMAL}, #{transferNum,jdbcType=INTEGER},
+      #{createId,jdbcType=BIGINT}, #{createName,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP},
+      #{transferId,jdbcType=BIGINT}, #{transferName,jdbcType=VARCHAR}, #{state,jdbcType=INTEGER}
+      )
+  </insert>
+
+
+	<update id="updateByFarmerId" >
+		update
+		t_goods_order_detail od
+		INNER JOIN t_goods_order_info oi ON od.fk_order_guid = oi.guid
+		INNER JOIN (
+		SELECT
+		ttd.fk_goods_guid,
+		tpb.fk_farmer_guid,
+		tpb.fk_collective_guid,
+		tpb.farmer_name,
+		tpb.belong_type
+		FROM
+		t_goods_detail ttd
+		INNER JOIN t_product_belong tpb ON ttd.fk_product_guid = tpb.fk_product_guid
+		) gd ON od.fk_goods_guid = gd.fk_goods_guid
+		<trim prefix="set" suffixOverrides=",">
+			<trim prefix="od.fk_transfer_detail_id = case" suffix="end,">
+				<foreach collection="transfers" item="item" index="index">
+					when gd.fk_farmer_guid=#{item.fkFarmerId} then #{item.guid}
+				</foreach>
+			</trim>
+			<trim prefix="od.transfer_status = case" suffix="end,">
+				<foreach collection="transfers" item="item" index="index">
+					when gd.fk_farmer_guid=#{item.fkFarmerId} then 1
+
+				</foreach>
+			</trim>
+		</trim>
+		where gd.fk_farmer_guid in
+		<foreach collection="transfers" index="index" item="item" separator="," open="(" close=")">
+			#{item.fkFarmerId}
+		</foreach>
+		 and oi.order_status = 2
+		AND oi.state = 1
+		and ifNull(od.transfer_status,0)=0
+		<if test="form.startTime != null">
+			and oi.create_time<![CDATA[ >= ]]>#{form.startTime}
+		</if>
+		<if test="form.endTime != null">
+			and oi.create_time<![CDATA[ <= ]]>#{form.endTime}
+		</if>
+		<if test="form.orderType != null">
+			and oi.order_no = #{form.orderType}
+		</if>
+		<if test="form.belongType != null">
+			and gd.belong_type = #{form.belongType}
+		</if>
+
+	</update>
+
+
+	<update id="updateByCollectiveId" >
+		update
+		t_goods_order_detail od
+		INNER JOIN t_goods_order_info oi ON od.fk_order_guid = oi.guid
+		INNER JOIN (
+		SELECT
+		ttd.fk_goods_guid,
+		tpb.fk_farmer_guid,
+		tpb.fk_collective_guid,
+		tpb.farmer_name,
+		tpb.belong_type
+		FROM
+		t_goods_detail ttd
+		INNER JOIN t_product_belong tpb ON ttd.fk_product_guid = tpb.fk_product_guid
+		) gd ON od.fk_goods_guid = gd.fk_goods_guid
+		<trim prefix="set" suffixOverrides=",">
+			<trim prefix="od.fk_transfer_detail_id = case" suffix="end,">
+				<foreach collection="transfers" item="item" index="index">
+					when gd.fk_collective_guid=#{item.fkCollectiveId} then #{item.guid}
+				</foreach>
+			</trim>
+			<trim prefix="od.transfer_status = case" suffix="end,">
+				<foreach collection="transfers" item="item" index="index">
+					when gd.fk_collective_guid=#{item.fkCollectiveId} then 1
+
+				</foreach>
+			</trim>
+		</trim>
+		where gd.fk_collective_guid in
+		<foreach collection="transfers" index="index" item="item" separator="," open="(" close=")">
+			#{item.fkCollectiveId}
+		</foreach>
+		 and oi.order_status = 2
+		AND oi.state = 1
+		and ifNull(od.transfer_status,0)=0
+		<if test="form.startTime != null">
+			and oi.create_time<![CDATA[ >= ]]>#{form.startTime}
+		</if>
+		<if test="form.endTime != null">
+			and oi.create_time<![CDATA[ <= ]]>#{form.endTime}
+		</if>
+		<if test="form.orderType != null">
+			and oi.order_no = #{form.orderType}
+		</if>
+		<if test="form.belongType != null">
+			and gd.belong_type = #{form.belongType}
+		</if>
+
+	</update>
+
+
+</mapper> 

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

@@ -153,6 +153,8 @@
     <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: org.springframework.boot:spring-boot-starter-actuator:2.1.13.RELEASE" level="project" />
     <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-actuator-autoconfigure:2.1.13.RELEASE" level="project" />
     <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-actuator:2.1.13.RELEASE" level="project" />

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

@@ -111,4 +111,9 @@ public class GoodsOrderInfoForm extends BaseForm {
      * 订单商品用途
      */
     private String goodsUse;
+
+    /**
+     * 0无效 1有效
+     */
+    private Integer state;
 }

carbon-h5/carbon-h5-common/src/main/java/com/hcloud/microserver/h5/facade/carbon/vo/GoodsOrderInfoVo.java

@@ -0,0 +1,32 @@
+package com.hcloud.microserver.h5.facade.carbon.vo;
+
+import com.hcloud.microserver.h5.facade.carbon.entity.GoodsOrderInfo;
+import com.hcloud.microserver.h5.facade.carbon.forms.GoodsInfoForm;
+import com.hcloud.microserver.h5.facade.carbon.forms.GoodsOrderDetailForm;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+@Api("详情实体")
+public class GoodsOrderInfoVo extends GoodsOrderInfo {
+
+    /**
+     * 交易方式
+     */
+    @ApiModelProperty("交易方式(1.微信,2.支付宝,3,银联,4.线下支付)")
+    private Integer payChannel;
+
+    /**
+     * 商品订单详情
+     */
+    @ApiModelProperty("商品订单详情")
+    private List<GoodsOrderDetailForm> goodsOrderDetailForm;
+
+    /**
+     * 商品列表
+     */
+    private List<GoodsInfoForm> goodsList;
+}

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

@@ -77,4 +77,9 @@ public class OrderInfoBO {
      * 商品用途
      */
     private String goodsUse;
+
+    /**
+     * 0无效 1有效
+     */
+    private Integer state;
 }

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

@@ -32,7 +32,7 @@ public class CarbonBaseController extends BaseController {
 
     private static final String WECHAT_USER_INFO="wechatUserInfo";
 
-    @Value("${img.location}")
+//    @Value("${img.location}")
     private String UPLOAD_FILE_PATH;
 
 

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

@@ -28,7 +28,7 @@ public class NormalController extends CarbonBaseController {
     private static final String TARGET_IMAGE_DIC_NAME="images/";
     private static final String TARGET_FILE_DIC_NAME="files/";
 
-    @Value("${img.location}")
+//    @Value("${img.location}")
     private String UPLOAD_FILE_PATH;
     /**
      * 微信下载图片远端地址

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

@@ -1,4 +1,4 @@
-package com.hcloud.microserver.h5.entity;
+package com.hcloud.microserver.h5.config.wx.entity;
 
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;

carbon-h5/carbon-h5-service/src/main/java/com/hcloud/microserver/h5/config/wx/entity/MyWxMpUser.java

@@ -0,0 +1,12 @@
+package com.hcloud.microserver.h5.config.wx.entity;
+
+import lombok.Data;
+import me.chanjar.weixin.mp.bean.result.WxMpUser;
+
+@Data
+public class MyWxMpUser extends WxMpUser {
+
+    private String code;
+
+    private String phone;
+}

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

@@ -1,4 +1,4 @@
-package com.hcloud.microserver.h5.entity;
+package com.hcloud.microserver.h5.config.wx.entity;
 
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;

carbon-h5/carbon-h5-service/src/main/java/com/hcloud/microserver/h5/config/wx/util/WxUtils.java

@@ -0,0 +1,55 @@
+package com.hcloud.microserver.h5.config.wx.util;
+
+import org.apache.commons.net.util.Base64;
+
+import javax.crypto.Cipher;
+import javax.crypto.spec.IvParameterSpec;
+import javax.crypto.spec.SecretKeySpec;
+import java.security.spec.AlgorithmParameterSpec;
+
+/**
+ * by zdd
+ */
+public class WxUtils {
+
+    private static String APP_ID = "小程序APPID";
+    private static String SECRET = "小程序SECRET";
+
+    String openId = "";
+
+
+
+    public static String url = "https://api.weixin.qq.com/sns/jscode2session?appid=" + APP_ID + "&secret=" + SECRET + "&js_code=";
+    public static String url0 = "&grant_type=authorization_code";
+
+    // 步数转卡路里
+    public static float getDistanceByStep(long steps) {
+        return steps * 0.6f / 1000;
+    }
+
+    /**
+     * 微信解密运动步数
+     *
+     * @param sessionKey
+     * @param encryptedData
+     * @param iv
+     * @return
+     */
+    public static String decryptWeChatRunInfo(String sessionKey, String encryptedData, String iv) {
+        String result = null;
+        byte[] encrypData = Base64.decodeBase64(encryptedData);
+        byte[] ivData = Base64.decodeBase64(iv);
+        byte[] sessionKeyB = Base64.decodeBase64(sessionKey);
+        try {
+            AlgorithmParameterSpec ivSpec = new IvParameterSpec(ivData);
+            Cipher cipher = Cipher.getInstance("AES/CBC/PKCS5Padding");
+            SecretKeySpec keySpec = new SecretKeySpec(sessionKeyB, "AES");
+            cipher.init(Cipher.DECRYPT_MODE, keySpec, ivSpec);
+            byte[] doFinal = cipher.doFinal(encrypData);
+            result = new String(doFinal);
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        return result;
+    }
+}

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

@@ -0,0 +1,34 @@
+package com.hcloud.microserver.h5.controller.web;
+
+import cn.hutool.core.util.RandomUtil;
+import com.hcloud.microserver.commoncore.base.BaseController;
+import com.hcloud.microserver.commoncore.base.ResponseBase;
+import com.hcloud.microserver.commoncore.util.OrderNo;
+import com.hcloud.microserver.commoncore.util.UploadFileUtil;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.multipart.MultipartFile;
+
+@Api(tags = "FileUploadController",description = "图片上传接口")
+@RestController
+@RequestMapping("/upload")
+public class FileUploadController extends BaseController {
+
+    @Autowired
+    private UploadFileUtil uploadFileUtil;
+
+    @ApiOperation("上传接口")
+    @PostMapping("/fileImg")
+    public ResponseBase uploadFile(@RequestParam(value = "file") MultipartFile file, String type){
+        type =1+ RandomUtil.randomNumbers(1);
+        String s = uploadFileUtil.uploadQiNiuFiles(file, "cqcarbon/0/" + type + "/" + OrderNo.NextOrderNo());
+        return responseResultSuccess(s);
+    }
+
+
+}

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

@@ -7,6 +7,7 @@ import com.hcloud.microserver.h5.facade.carbon.entity.from.CreateOrderFrom;
 import com.hcloud.microserver.h5.bo.CredentialInfoBO;
 import com.hcloud.microserver.h5.common.BaseInfoDO;
 import com.hcloud.microserver.h5.common.CarbonBaseController;
+import com.hcloud.microserver.h5.facade.carbon.vo.GoodsOrderInfoVo;
 import com.hcloud.microserver.h5.forms.OrderQueryForm;
 import com.hcloud.microserver.h5.service.*;
 import com.hcloud.microserver.commoncore.annotation.AuthCarbonValidate;
@@ -98,8 +99,8 @@ public class OrderManagerController extends CarbonBaseController {
     @ApiOperation(value = "查询爱心用户订单信息", notes = "分类查询爱心用户订单")
     @GetMapping("/info")
     @AuthCarbonValidate
-    public ResponseBase info(@RequestParam String orderId) {
-        GoodsOrderInfoForm orderInfoBO = orderDetailInfoService.info(orderId);
+    public ResponseBase<GoodsOrderInfoVo> info(@RequestParam String orderId) {
+        GoodsOrderInfoVo orderInfoBO = orderDetailInfoService.info(orderId);
         return resultVOSuccess(orderInfoBO);
     }
 

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

@@ -6,28 +6,18 @@ import cn.binarywang.wx.miniapp.bean.WxMaPhoneNumberInfo;
 import cn.binarywang.wx.miniapp.bean.WxMaUserInfo;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
-import com.github.binarywang.wxpay.bean.notify.WxPayOrderNotifyResult;
-import com.github.binarywang.wxpay.bean.request.WxPayUnifiedOrderRequest;
-import com.github.binarywang.wxpay.constant.WxPayConstants;
-import com.github.binarywang.wxpay.exception.WxPayException;
-import com.github.binarywang.wxpay.service.WxPayService;
-import com.hcloud.microserver.h5.entity.LoginRequest;
-import com.hcloud.microserver.h5.service.CustomerInfoService;
-import com.hcloud.microserver.commoncore.annotation.AuthCarbonValidate;
+import com.alibaba.fastjson.JSONObject;
 import com.hcloud.microserver.commoncore.base.BaseController;
 import com.hcloud.microserver.commoncore.base.ResponseBase;
 import com.hcloud.microserver.commoncore.base.ResultVO;
-import com.hcloud.microserver.commoncore.base.Token;
-import com.hcloud.microserver.commoncore.constant.GlobleConstant;
-import com.hcloud.microserver.commoncore.enums.ResultEnum;
-import com.hcloud.microserver.commoncore.util.*;
+import com.hcloud.microserver.h5.config.wx.util.WxUtils;
+import com.hcloud.microserver.h5.config.wx.entity.LoginRequest;
 import com.hcloud.microserver.h5.facade.carbon.entity.CustomerInfo;
 import com.hcloud.microserver.h5.facade.carbon.forms.CustomerInfoForm;
 import com.hcloud.microserver.h5.facade.carbon.vo.MyWxMpUser;
+import com.hcloud.microserver.h5.service.CustomerInfoService;
 import com.hcloud.microserver.h5.service.CustomerService;
 import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiImplicitParam;
-import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
 import me.chanjar.weixin.common.error.WxErrorException;
@@ -35,22 +25,14 @@ import org.apache.commons.lang.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.data.redis.core.RedisTemplate;
-import org.springframework.data.redis.core.ValueOperations;
 import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.ResponseBody;
 
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.PrintWriter;
-import java.security.GeneralSecurityException;
-import java.util.HashMap;
 import java.util.Map;
-import java.util.concurrent.TimeUnit;
+import java.util.Objects;
 
 @Slf4j
 @Controller
@@ -84,7 +66,7 @@ public class WechatAppController extends BaseController {
             if (null == session) {
                 throw new RuntimeException("login handler error");
             }
-            WxMaUserInfo wxUserInfo = JSON.parseObject(request.getRawData(),WxMaUserInfo.class);
+            WxMaUserInfo wxUserInfo = JSON.parseObject(request.getRawData(), WxMaUserInfo.class);
             if (null == wxUserInfo) {
                 throw new RuntimeException("wxUser not exist");
             }
@@ -133,6 +115,37 @@ public class WechatAppController extends BaseController {
         return resultVOSuccess();
     }
 
+    /**
+     * 登陆接口
+     */
+    @ApiOperation(value = "小程序获取微信步数", notes = "小程序获取微信步数")
+    @PostMapping("/steps")
+    @ResponseBody
+    public ResponseBase steps(@RequestBody LoginRequest request) throws WxErrorException {
+        // 获取微信用户session
+        WxMaJscode2SessionResult session = wxMaService.getUserService().getSessionInfo(request.getCode());
+        String decrypt = null;
+        //解密
+        try {
+            decrypt = WxUtils.decryptWeChatRunInfo(session.getSessionKey(), request.getEncryptedData(), request.getIv());
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+
+        if (decrypt == null) {
+            log.info("解密失败");
+        } else {
+            log.info("解析成功");
+        }
+        JSONObject stepInfoListJson = JSON.parseObject(decrypt);
+        //解析json，获取stepInfoList下面的步数
+        JSONArray stepInfoList = JSON.parseArray(stepInfoListJson.getString("stepInfoList"));
+        //获取今天的步数
+        JSONObject today = Objects.requireNonNull(stepInfoList).getJSONObject(0);
+        //登录系统获取本地
+        return resultVOSuccess(today);
+    }
+
 //    private Map<String, Object> getStringObjectMap(String customerId) {
 //        CustomerInfoForm customerInfoForm = customerInfoService.queryByPrimaryKey(customerId);
 //        CustomerInfo data = BeanCopyUtil.convertBean(customerInfoForm, CustomerInfo.class);

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

@@ -10,7 +10,7 @@ import com.hcloud.microserver.commoncore.base.BaseController;
 import com.hcloud.microserver.commoncore.base.ResponseBase;
 import com.hcloud.microserver.commoncore.util.GeneratorIdUtils;
 import com.hcloud.microserver.commoncore.util.UUIDUtils;
-import com.hcloud.microserver.h5.entity.WxPayFrom;
+import com.hcloud.microserver.h5.config.wx.entity.WxPayFrom;
 import com.hcloud.microserver.h5.facade.carbon.entity.GoodsOrderInfo;
 import com.hcloud.microserver.h5.service.OrderInfoService;
 import io.swagger.annotations.*;

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

@@ -46,4 +46,6 @@ public interface GoodsOrderInfoMapper extends BaseMapper<GoodsOrderInfo,String>
     int updateOrderBelongInfo(@Param("oldId") String oldCustomerId ,@Param("newId") String newCustomerId);
 
     OrderInfoBO info(@Param("guid")String guid);
+
+    Integer payChannel(@Param("guid")String guid);
 }

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

@@ -53,6 +53,8 @@ public class CustomerCarbonValListener {
         record.setRemarks("购买碳汇数据");
         //获取年份
         record.setYearTime(getYear());
+        //创建人
+        record.setCreateUser(goodsOrderInfo.getFkCustomerGuid());
         customerCarbonValMapper.insertSelective(record);
     }
 

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

@@ -4,6 +4,7 @@ import com.hcloud.microserver.commoncore.base.BaseServie;
 import com.hcloud.microserver.h5.facade.carbon.entity.GoodsOrderDetail;
 import com.hcloud.microserver.h5.facade.carbon.forms.GoodsOrderDetailForm;
 import com.hcloud.microserver.h5.facade.carbon.forms.GoodsOrderInfoForm;
+import com.hcloud.microserver.h5.facade.carbon.vo.GoodsOrderInfoVo;
 
 import java.util.List;
 
@@ -27,5 +28,5 @@ public interface OrderDetailInfoService extends BaseServie<GoodsOrderDetailForm,
 
     List<GoodsOrderDetail> findByGoodsOrderInfoGuid(String goodsOrderInfoGuid);
 
-    GoodsOrderInfoForm info(String guid);
+    GoodsOrderInfoVo info(String guid);
 }

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

@@ -5,14 +5,17 @@ import com.hcloud.microserver.h5.bo.OrderDetailInfoBO;
 import com.hcloud.microserver.h5.bo.OrderInfoBO;
 import com.hcloud.microserver.h5.dao.GoodsOrderDetailMapper;
 import com.hcloud.microserver.h5.dao.GoodsOrderInfoMapper;
+import com.hcloud.microserver.h5.facade.carbon.vo.GoodsOrderInfoVo;
 import com.hcloud.microserver.h5.service.OrderDetailInfoService;
 import com.hcloud.microserver.commoncore.util.BeanCopyUtil;
 import com.hcloud.microserver.commoncore.util.GetUUID;
 import com.hcloud.microserver.h5.facade.carbon.entity.GoodsOrderDetail;
 import com.hcloud.microserver.h5.facade.carbon.forms.GoodsOrderDetailForm;
+import io.swagger.models.auth.In;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.util.StringUtils;
 
 import javax.annotation.Resource;
 import java.util.List;
@@ -113,12 +116,16 @@ public class OrderDetailInfoServiceImpl implements OrderDetailInfoService {
 
 
     @Override
-    public GoodsOrderInfoForm info(String guid) {
+    public GoodsOrderInfoVo info(String guid) {
+        GoodsOrderInfoVo goodsOrderInfoForm=new GoodsOrderInfoVo();
         OrderInfoBO info = goodsOrderInfoMapper.info(guid);
-        GoodsOrderInfoForm goodsOrderInfoForm=new GoodsOrderInfoForm();
-        BeanUtils.copyProperties(info,goodsOrderInfoForm);
-        List<GoodsOrderDetailForm> detailFormList = orderDetailInfoService.getOrderDetailListByOrderId(guid);
-        goodsOrderInfoForm.setGoodsOrderDetailForm(detailFormList);
+        if(!StringUtils.isEmpty(info)){
+            BeanUtils.copyProperties(info,goodsOrderInfoForm);
+            List<GoodsOrderDetailForm> detailFormList = orderDetailInfoService.getOrderDetailListByOrderId(guid);
+            goodsOrderInfoForm.setGoodsOrderDetailForm(detailFormList);
+        }
+        Integer payChannel  = goodsOrderInfoMapper.payChannel(guid);
+        goodsOrderInfoForm.setPayChannel(payChannel);
         return goodsOrderInfoForm;
     }
 

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

@@ -105,7 +105,8 @@
             aa.order_status AS orderStatus,
             aa.order_amount AS orderAmount,
             aa.order_carbon_amount AS orderCarbonAmount,
-            aa.pay_no AS payNo
+            aa.pay_no AS payNo,
+            aa.state
         FROM
             t_goods_order_info aa
         WHERE
@@ -114,9 +115,11 @@
         <if test="orderStatus!=null and orderStatus!=-1">
             <choose>
                 <when test="orderStatus == 1">
+                    AND aa.state = 1
                     AND aa.order_status=1
                 </when>
                 <otherwise>
+                    AND aa.state = 1
                     AND aa.order_status!=1
                 </otherwise>
             </choose>
@@ -314,11 +317,22 @@
         aa.order_status AS orderStatus,
         aa.order_amount AS orderAmount,
         aa.order_carbon_amount AS orderCarbonAmount,
-        aa.pay_no AS payNo
+        aa.pay_no AS payNo,
+        aa.state AS state
         FROM
         t_goods_order_info aa
         WHERE
         1=1
         AND aa.guid = #{guid}
     </select>
+    <select id="payChannel" resultType="java.lang.Integer">
+        SELECT
+            a.pay_channel
+        FROM
+            t_goods_pay_order a
+        WHERE
+            a.pay_status = '2'
+        AND a.fk_order_id = #{guid}
+        LIMIT 1
+    </select>
 </mapper>

common-core/pom.xml

@@ -207,6 +207,11 @@
             <artifactId>validation-api</artifactId>
             <version>2.0.1.Final</version>
         </dependency>
+        <dependency>
+            <groupId>com.qiniu</groupId>
+            <artifactId>qiniu-java-sdk</artifactId>
+            <version>7.2.28</version>
+        </dependency>
 
 
     </dependencies>

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

@@ -0,0 +1,47 @@
+package com.hcloud.microserver.commoncore.util;
+
+import java.text.DateFormat;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+
+public class OrderNo {
+    private static int sn = 0;
+
+    public static String NextOrderNo(){
+        if(sn == 999999999)
+            sn = 0;
+        else
+            sn++;
+        DateFormat df = new SimpleDateFormat("yyyyMMddHHmmss");
+        return df.format(new Date()) + padRight(String.valueOf(sn),9, '0');
+    }
+    public static String padLeft(String src, int len, char ch) {
+        int diff = len - src.length();
+        if (diff <= 0) {
+            return src;
+        }
+
+        char[] charr = new char[len];
+        System.arraycopy(src.toCharArray(), 0, charr, 0, src.length());
+        for (int i = src.length(); i < len; i++) {
+            charr[i] = ch;
+        }
+        return new String(charr);
+    }
+    public static String padRight(String src, int len, char ch) {
+        int diff = len - src.length();
+        if (diff <= 0) {
+            return src;
+        }
+
+        char[] charr = new char[len];
+        System.arraycopy(src.toCharArray(), 0, charr, diff, src.length());
+        for (int i = 0; i < diff; i++) {
+            charr[i] = ch;
+        }
+        return new String(charr);
+    }
+    // 防止创建类的实例
+    private OrderNo(){}
+
+}

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

@@ -0,0 +1,103 @@
+package com.hcloud.microserver.commoncore.util;
+
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
+import com.google.gson.Gson;
+import com.hcloud.microserver.commoncore.exception.GlobalException;
+import com.qiniu.common.QiniuException;
+import com.qiniu.common.Zone;
+import com.qiniu.http.Response;
+import com.qiniu.storage.Configuration;
+import com.qiniu.storage.UploadManager;
+import com.qiniu.storage.model.DefaultPutRet;
+import com.qiniu.util.Auth;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.stereotype.Component;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.multipart.MultipartFile;
+
+import java.io.IOException;
+
+@Slf4j
+@Component
+public class UploadFileUtil {
+    @Value("${qiniu.accessKey}")
+    private String accessKey;
+
+    @Value("${qiniu.secretKey}")
+    private String secretKey;
+
+    @Value("${qiniu.bucket}")
+    private String bucket;
+
+    @Value("${qiniu.path}")
+    private String url;
+
+    public String uploadQiNiuFiles(@RequestParam("file") MultipartFile file, String path){
+        String contentType = file.getContentType();
+        String[] split = null;
+        try{
+            split = contentType.split("/");
+        }catch (Exception e){
+            throw new GlobalException("获取文件后缀出错!=======>"+split);
+        }
+        path = path+"."+split[split.length-1];
+        //构建一个带指定对象的配置类
+        Configuration cof = new Configuration(Zone.autoZone());
+        UploadManager uploadManager = new UploadManager(cof);
+        String uploadToken = getUploadToken();
+        DefaultPutRet defaultPutRet = null;
+        try{
+            Response response = uploadManager.put(file.getInputStream(), path, uploadToken, null, null);
+            defaultPutRet = JSON.parseObject(response.bodyString(), DefaultPutRet.class);
+            log.info(JSONObject.toJSONString(defaultPutRet));
+            return path;
+        }catch (QiniuException ex){
+            Response r = ex.response;
+            log.error(""+r.toString());
+            try {
+                log.error(r.bodyString());
+            } catch (QiniuException ex2) {
+                //ignore
+            }
+        } catch (IOException e) {
+            e.printStackTrace();
+           return null;
+        }
+        return null;
+    }
+    /**
+     * @MethodName getUploadToken
+     * @Param []
+     * @Return java.lang.String
+     * @Author qiubo
+     * @Date 2020/5/11
+     * @Description 获取七牛云上传图片的token
+     */
+    public String getUploadToken(){
+        Auth auth = Auth.create(accessKey, secretKey);
+        return auth.uploadToken(bucket);
+    }
+
+    public String uploadLocalFile(String path,String url){
+        Configuration cof = new Configuration(Zone.autoZone());
+        UploadManager uploadManager = new UploadManager(cof);
+        try {
+            Response response = uploadManager.put(path, url, getUploadToken());
+            //解析上传成功的结果
+            DefaultPutRet putRet = new Gson().fromJson(response.bodyString(), DefaultPutRet.class);
+            System.out.println(putRet.key);
+            return putRet.key;
+        } catch (QiniuException ex) {
+            Response r = ex.response;
+            System.err.println(r.toString());
+            try {
+                System.err.println(r.bodyString());
+            } catch (QiniuException ex2) {
+                //ignore
+            }
+        }
+        return null;
+    }
+}

sql/表结构变化语句/更新sql.sql

@@ -62,3 +62,17 @@ CREATE TABLE `t_customer_carbon_val` (
 
 #证书表新增唯一索引
 ALTER TABLE t_goods_credential_info ADD UNIQUE (fk_order_id);
+
+
+
+
+#修改农户的银行卡记录
+ALTER TABLE `cq-carbon-platform-dev`.`t_farmer_info`
+ADD COLUMN `bank_name` varchar(500) NULL COMMENT '开户行名称' AFTER `actual_money`,
+ADD COLUMN `bank_status` int(2) NULL COMMENT '银行卡状态：1-禁用，0-能用' AFTER `bank_name`,
+ADD COLUMN `bank_code` varchar(300) NULL COMMENT '开户行机构代码' AFTER `bank_status`;
+
+#修改村组的银行卡记录
+ALTER TABLE `cq-carbon-platform-dev`.`t_collective_farmer`
+ADD COLUMN `bank_code` varchar(300) NULL COMMENT '银行机构代码' AFTER `phone`,
+ADD COLUMN `bank_status` int(2) NULL COMMENT '银行卡状态0-启用，1-禁用' AFTER `bank_code`;