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

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

@@ -1,7 +1,7 @@
 package com.hcloud.microserver.system.bank.dao;
 
 import com.github.pagehelper.Page;
-import com.hcloud.microserver.system.bank.bo.FarmerInfoBO;
+import com.hcloud.microserver.system.bank.bo.*;
 import com.hcloud.microserver.commoncore.base.BaseMapper;
 import com.hcloud.microserver.system.facade.carbon.entity.FarmerInfo;
 import com.hcloud.microserver.system.facade.carbon.forms.FarmerInfoForm;

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

@@ -1,5 +1,7 @@
 package com.hcloud.microserver.system.facade.carbon.entity;
 
+import com.hcloud.microserver.system.facade.carbon.forms.FarmerInfoForm;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.ToString;
 
 import java.io.Serializable;
@@ -11,44 +13,84 @@ import java.util.List;
 public class CollectiveFarmer implements Serializable {
 
     private static final long serialVersionUID = -5328351127753129451L;
+    @ApiModelProperty("序列")
     private String guid;
 
+    @ApiModelProperty("区域id")
     private String fkPovertyAreaId;
 
+    @ApiModelProperty("集体户编码")
     private String collectiveCode;
-
+    @ApiModelProperty("集体户名称")
     private String collectiveName;
 
+    @ApiModelProperty("集体户人员个数")
     private Integer collectivePersonNum;
 
-    private String orgUnit;
+    @ApiModelProperty("集体户单位")
+    private  String orgUnit;
 
+    @ApiModelProperty("备注信息")
     private String remark;
 
+    @ApiModelProperty("集体户图片")
     private String collectiveImages;
 
+    @ApiModelProperty("集体户银行名称")
     private String bankName;
 
+    @ApiModelProperty("集体户银行卡号 ")
     private String bankCardNo;
 
+    @ApiModelProperty("是否激活 ")
     private Integer isEnable;
 
+    @ApiModelProperty("记录状态")
     private Integer state;
 
+    @ApiModelProperty("创建人")
     private String createUser;
 
+    @ApiModelProperty("创建时间")
     private Date createTime;
 
+    @ApiModelProperty("修改人")
     private String modifiedUser;
 
+    @ApiModelProperty("修改时间")
     private Date modifiedTime;
 
+    @ApiModelProperty("累计应收金额")
     private BigDecimal recieveMoney;
 
+    @ApiModelProperty("累计实收金额")
     private BigDecimal actualMoney;
 
+    @ApiModelProperty("联系电话")
     private String phone;
 
+    @ApiModelProperty("银行机构码")
+    private String bankCode;
+
+    @ApiModelProperty("银行卡状态")
+    private Integer bankStatus;
+
+    public String getBankCode() {
+        return bankCode;
+    }
+
+    public void setBankCode(String bankCode) {
+        this.bankCode = bankCode;
+    }
+
+    public Integer getBankStatus() {
+        return bankStatus;
+    }
+
+    public void setBankStatus(Integer bankStatus) {
+        this.bankStatus = bankStatus;
+    }
+
     private List<FarmerInfo> farmerInfos;
 
     public String getGuid() {

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

@@ -1,5 +1,7 @@
 package com.hcloud.microserver.system.facade.carbon.entity;
 
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.ToString;
 
 import java.io.Serializable;
@@ -7,63 +9,124 @@ import java.math.BigDecimal;
 import java.util.Date;
 
 @ToString
+@ApiModel("农户info")
 public class FarmerInfo implements Serializable {
 
     private static final long serialVersionUID = 764011447211904341L;
+    @ApiModelProperty("序列")
     private String guid;
 
+    @ApiModelProperty("扶贫区域信息")
     private String fkPovertyAreaId;
 
+    @ApiModelProperty("贫困集体信息")
     private String fkCollectiveId;
 
+    @ApiModelProperty("贫困户编号")
     private String farmerCode;
 
+    @ApiModelProperty("贫困户姓名")
     private String farmerName;
 
+    @ApiModelProperty("家庭人数")
     private Integer familyNum;
 
+    @ApiModelProperty("性别")
     private Integer sex;
 
+    @ApiModelProperty("身份证号")
     private String pid;
 
+    @ApiModelProperty("民族")
     private String nation;
 
+    @ApiModelProperty("文化程度")
     private String education;
 
+    @ApiModelProperty("联系电话")
     private String phone;
 
+    @ApiModelProperty("银行卡号")
     private String bankCardNo;
 
+    @ApiModelProperty("年平均收入")
     private BigDecimal incomeVal;
 
+    @ApiModelProperty("贫困户类型")
     private String farmerType;
 
+    @ApiModelProperty("贫困户描述")
     private String farmerRemark;
 
+    @ApiModelProperty("贫困户照片")
     private String farmerImages;
 
+    @ApiModelProperty("所属村民组")
     private String villageOrg;
 
+    @ApiModelProperty("是否启用")
     private Integer isEnable;
 
+    @ApiModelProperty("记录状态")
     private Integer state;
 
+    @ApiModelProperty("创建人")
     private String createUser;
 
+    @ApiModelProperty("创建时间")
     private Date createTime;
 
+    @ApiModelProperty("修改人")
     private String modifiedUser;
 
+    @ApiModelProperty("修改时间")
     private Date modifiedTime;
 
+    @ApiModelProperty("银行打款信息")
     private String bankClearingMsg;
 
+    @ApiModelProperty("累计应收金额")
     private BigDecimal recieveMoney;
 
+    @ApiModelProperty("累计实收金额")
     private BigDecimal actualMoney;
 
+    @ApiModelProperty("银行名称")
+    private String bankName;
+
+    @ApiModelProperty("银行机构代码")
+    private String bankCode;
+
+    @ApiModelProperty("银行卡状态1-禁用0-能用")
+    private Integer bankStatus;
+
+    @ApiModelProperty("区域信息")
     private PovertyArea povertyArea;
 
+    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 getBankStatus() {
+        return bankStatus;
+    }
+
+    public void setBankStatus(Integer bankStatus) {
+        this.bankStatus = bankStatus;
+    }
+
     public String getGuid() {
         return guid;
     }

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

@@ -32,6 +32,8 @@ public class GoodsOrderInfo {
 
     private String payNo;
 
+    private Integer orderType;
+
     public String getGuid() {
         return guid;
     }
@@ -143,4 +145,12 @@ public class GoodsOrderInfo {
     public void setPayNo(String payNo) {
         this.payNo = payNo==null?null:payNo.trim();
     }
+
+    public Integer getOrderType() {
+        return orderType;
+    }
+
+    public void setOrderType(Integer orderType) {
+        this.orderType = orderType;
+    }
 }

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

@@ -0,0 +1,16 @@
+package com.hcloud.microserver.system.facade.carbon.entity;
+
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+/**
+ * 后台生成订单查询的商品信息
+ * @Author liql
+ * @Date 2020-11-27
+ */
+@Data
+public class QueryGoodsInfoBO {
+    private String goodsId;
+    private String goodsName;
+}

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

@@ -27,7 +27,7 @@ public class SubscriptionApply extends BaseEntity
     /** 申请客户id */
     @Excel(name = "申请客户id")
     @ApiModelProperty(value = "申请客户id")
-    private Long applyCustomerId;
+    private String applyCustomerId;
 
     /** 申请客户名称 */
     @Excel(name = "申请客户名称")
@@ -54,6 +54,9 @@ public class SubscriptionApply extends BaseEntity
     @ApiModelProperty(value = "申请时间")
     private String applyDate;
 
+    @ApiModelProperty(value = "订单id")
+    private String orderGuid;
+
     /** 修改时间  */
     @JsonFormat(pattern = "yyyy-MM-dd")
     @Excel(name = "修改时间 ", width = 30, dateFormat = "yyyy-MM-dd")
@@ -69,15 +72,15 @@ public class SubscriptionApply extends BaseEntity
     {
         return guid;
     }
-    public void setApplyCustomerId(Long applyCustomerId)
-    {
-        this.applyCustomerId = applyCustomerId;
-    }
 
-    public Long getApplyCustomerId()
-    {
+    public String getApplyCustomerId() {
         return applyCustomerId;
     }
+
+    public void setApplyCustomerId(String applyCustomerId) {
+        this.applyCustomerId = applyCustomerId;
+    }
+
     public void setApplyCustomName(String applyCustomName)
     {
         this.applyCustomName = applyCustomName;
@@ -133,6 +136,14 @@ public class SubscriptionApply extends BaseEntity
         return modifiedTime;
     }
 
+    public String getOrderGuid() {
+        return orderGuid;
+    }
+
+    public void setOrderGuid(String orderGuid) {
+        this.orderGuid = orderGuid;
+    }
+
     @Override
     public String toString() {
         return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)

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

@@ -1,6 +1,8 @@
 package com.hcloud.microserver.system.facade.carbon.forms;
 
 import com.hcloud.microserver.commoncore.base.BaseForm;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.math.BigDecimal;
@@ -8,57 +10,89 @@ import java.util.Date;
 import java.util.List;
 
 @Data
+@ApiModel("集体form")
 public class CollectiveFarmerForm extends BaseForm {
+    @ApiModelProperty("序列")
     private String guid;
 
+    @ApiModelProperty("区域id")
     private String fkPovertyAreaId;
 
+    @ApiModelProperty("集体户编码")
     private String collectiveCode;
-
+    @ApiModelProperty("集体户名称")
     private String collectiveName;
 
+    @ApiModelProperty("集体户人员个数")
     private Integer collectivePersonNum;
 
-    private String orgUnit;
+    @ApiModelProperty("集体户单位")
+    private  String orgUnit;
 
+    @ApiModelProperty("备注信息")
     private String remark;
 
+    @ApiModelProperty("集体户图片")
     private String collectiveImages;
 
+    @ApiModelProperty("集体户银行名称")
     private String bankName;
 
+    @ApiModelProperty("集体户银行卡号 ")
     private String bankCardNo;
 
+    @ApiModelProperty("是否激活 ")
     private Integer isEnable;
 
+    @ApiModelProperty("记录状态")
     private Integer state;
 
+    @ApiModelProperty("创建人")
     private String createUser;
 
+    @ApiModelProperty("创建时间")
     private Date createTime;
 
+    @ApiModelProperty("修改人")
     private String modifiedUser;
 
+    @ApiModelProperty("修改时间")
     private Date modifiedTime;
 
+    @ApiModelProperty("累计应收金额")
     private BigDecimal recieveMoney;
 
+    @ApiModelProperty("累计实收金额")
     private BigDecimal actualMoney;
 
+    @ApiModelProperty("联系电话")
     private String phone;
 
+    @ApiModelProperty("状况")
     private String condition;
 
+    @ApiModelProperty("关联贫困户")
     private List<FarmerInfoForm> farmerInfoForms;
 
+    @ApiModelProperty("省")
     private String provinceId;
 
+    @ApiModelProperty("市")
     private String cityId;
 
+    @ApiModelProperty("县")
     private String townId;
 
+    @ApiModelProperty("镇")
     private String countyId;
 
+    @ApiModelProperty("村")
     private String villageId;
 
+    @ApiModelProperty("银行机构码")
+    private String bankCode;
+
+    @ApiModelProperty("银行卡状态")
+    private String bankStatus;
+
 }

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

@@ -1,6 +1,8 @@
 package com.hcloud.microserver.system.facade.carbon.forms;
 
 import com.hcloud.microserver.commoncore.base.BaseForm;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.math.BigDecimal;
@@ -10,71 +12,114 @@ import java.util.Date;
  * @author xiezt
  */
 @Data
+@ApiModel("农户form")
 public class FarmerInfoForm extends BaseForm {
 
+    @ApiModelProperty("序列")
     private String guid;
 
+    @ApiModelProperty("扶贫区域信息")
     private String fkPovertyAreaId;
 
+    @ApiModelProperty("贫困集体信息")
     private String fkCollectiveId;
 
+    @ApiModelProperty("贫困户编号")
     private String farmerCode;
 
+    @ApiModelProperty("贫困户姓名")
     private String farmerName;
 
+    @ApiModelProperty("家庭人数")
     private Integer familyNum;
 
+    @ApiModelProperty("性别")
     private Integer sex;
 
+    @ApiModelProperty("身份证号")
     private String pid;
 
+    @ApiModelProperty("民族")
     private String nation;
 
+    @ApiModelProperty("文化程度")
     private String education;
 
+    @ApiModelProperty("联系电话")
     private String phone;
 
+    @ApiModelProperty("银行卡号")
     private String bankCardNo;
 
+    @ApiModelProperty("年平均收入")
     private BigDecimal incomeVal;
 
+    @ApiModelProperty("贫困户类型")
     private String farmerType;
 
+    @ApiModelProperty("贫困户描述")
     private String farmerRemark;
 
+    @ApiModelProperty("贫困户照片")
     private String farmerImages;
 
+    @ApiModelProperty("所属村民组")
     private String villageOrg;
 
+    @ApiModelProperty("是否启用")
     private Integer isEnable;
 
+    @ApiModelProperty("记录状态")
     private Integer state;
 
+    @ApiModelProperty("创建人")
     private String createUser;
 
+    @ApiModelProperty("创建时间")
     private Date createTime;
 
+    @ApiModelProperty("修改人")
     private String modifiedUser;
 
+    @ApiModelProperty("修改时间")
     private Date modifiedTime;
 
+    @ApiModelProperty("银行打款信息")
     private String bankClearingMsg;
 
+    @ApiModelProperty("累计应收金额")
     private BigDecimal recieveMoney;
 
+    @ApiModelProperty("累计实收金额")
     private BigDecimal actualMoney;
 
+    @ApiModelProperty("主键")
     private String condition;
 
+    @ApiModelProperty("省")
     private String provinceId;
 
+    @ApiModelProperty("市")
     private String cityId;
 
+    @ApiModelProperty("镇")
     private String townId;
 
+    @ApiModelProperty("县")
     private String countyId;
 
+    @ApiModelProperty("村")
     private String villageId;
 
+    @ApiModelProperty("查询标志")
     private Integer queryFlag;
+
+    @ApiModelProperty("银行名称")
+    private String bankName;
+
+    @ApiModelProperty("银行机构代码")
+    private String bankCode;
+
+    @ApiModelProperty("银行卡状态1-禁用0-能用")
+    private Integer bankStatus;
 }

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

@@ -0,0 +1,29 @@
+package com.hcloud.microserver.system.facade.carbon.forms;
+
+import com.hcloud.microserver.commoncore.base.BaseForm;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * 线下订单查询搜索条件
+ * @author liql
+ * @Date 2020-11-29
+ */
+@Data
+@ApiModel(value = "线下订单查询搜索条件")
+public class OfflineOrderCondidtionForm extends BaseForm {
+    @ApiModelProperty("订单号")
+    private String orderNo;
+    @ApiModelProperty("企业名称")
+    private String customerName;
+    @ApiModelProperty("订单状态")
+    private Integer orderStatus;
+    @ApiModelProperty("企业账号")
+    private String account;
+
+}

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

@@ -0,0 +1,34 @@
+package com.hcloud.microserver.system.facade.carbon.forms;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ * @Author liql
+ * @Date 2020-11-30
+ */
+@Data
+@ApiModel("离线订单支付凭证")
+public class OfflineOrderPayVoucherForm implements Serializable {
+    @ApiModelProperty("订单id")
+    private String orderId;
+    @ApiModelProperty("客户id")
+    private String customerId;
+    @ApiModelProperty("付款人姓名")
+    private String payUserName;
+    @ApiModelProperty("付款银行")
+    private String payBank;
+    @ApiModelProperty("付款银行卡号")
+    private String payCardNo;
+    @ApiModelProperty("付款金额")
+    private BigDecimal payAmount;
+    @ApiModelProperty("付款时间")
+    private String payTime;
+    @ApiModelProperty("转账凭证图片地址;分隔")
+    private String voucherImages;
+}

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

@@ -1,13 +1,15 @@
 package com.hcloud.microserver.system.facade.carbon.forms;
 
 import com.hcloud.microserver.commoncore.base.BaseForm;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.math.BigDecimal;
 import java.util.Date;
 
 /**
- * @author xiezt
+ *
  */
 @Data
 public class OrderPayVoucherForm extends BaseForm {

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

@@ -29,6 +29,6 @@ public class CarbonSystemApplication
     public static void main(String[] args)
     {
         SpringApplication.run(CarbonSystemApplication.class, args);
-        System.out.println("---------------------h5启动成功!---------------------");
+        System.out.println("---------------------后台启动成功!---------------------");
     }
 }

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

@@ -0,0 +1,32 @@
+package com.hcloud.microserver.system.bank.bo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+/**
+ * @Author liql
+ * @Date 2020-11-29
+ */
+@Data
+@ApiModel("创建订单信息实体")
+public class CreateOrderBO {
+    @ApiModelProperty(value = "线下认购申请id",required = true)
+    private String guid;
+    @ApiModelProperty(value = "购买碳汇数量",required = true)
+    private BigDecimal orderCarbonAmount;
+    @ApiModelProperty(value = "订单类型：1认购订单，2后台订单",required = true)
+    private Integer orderType;
+    @ApiModelProperty(value = "客户id",required = true)
+    private String applyCostomerId;
+    @ApiModelProperty(value = "产品类型id",required = true)
+    private String productTypeGuid;
+    private String provinceId;
+    private String cityId;
+    private String countyId;
+    private String townId;
+    @ApiModelProperty(value = "村庄id",required = true)
+    private String villageId;
+}

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

@@ -0,0 +1,84 @@
+package com.hcloud.microserver.system.bank.bo;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ * @Author liql
+ * @Date 2020-11-29
+ */
+@Data
+@ApiModel("订单列表实体")
+public class OfflineOrderBO {
+
+    /**
+     * 订单数据唯一主键
+     */
+    @ApiModelProperty("订单数据唯一主键")
+    private String guid;
+
+    /**
+     * 订单编号
+     */
+    @ApiModelProperty("订单编号")
+    private String orderNo;
+
+    @ApiModelProperty("客户id")
+    private String customerId;
+
+    @ApiModelProperty("客户账号")
+    private String account;
+    /**
+     * 客户名称
+     */
+    @ApiModelProperty("客户名称")
+    private String customerName;
+    /**
+     * 支付金额
+     */
+    @ApiModelProperty("支付金额")
+    private BigDecimal payAmount;
+    /**
+     * 购买碳汇量
+     */
+    @ApiModelProperty("购买碳汇量")
+    private BigDecimal orderCarbonAmount;
+    /**
+     * 订单状态
+     */
+    @ApiModelProperty("订单状态")
+    private String orderStatus;
+    /**
+     * 购买时间
+     */
+    @ApiModelProperty("购买时间")
+    private Date createTime;
+    /**
+     * 证书编号
+     */
+    @ApiModelProperty("证书编号")
+    private String credentialNo;
+    /**
+     * 支付流水号
+     */
+    @ApiModelProperty("支付流水号")
+    private String payNo;
+
+    /**
+     * 订单金额
+     */
+    @ApiModelProperty("订单金额")
+    private BigDecimal orderAmount;
+
+    /**
+     * 订单类型
+     */
+    @ApiModelProperty("订单类型")
+    private String orderType;
+
+}

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

@@ -0,0 +1,52 @@
+package com.hcloud.microserver.system.bank.bo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * @Author liql
+ * @Date 2020-11-29
+ */
+@Data
+@ApiModel("线下订单详情实体")
+public class OfflineOrderDetailBO {
+    @ApiModelProperty("订单数据唯一主键")
+    private String guid;
+    @ApiModelProperty("订单编号")
+    private String orderNo;
+    @ApiModelProperty("客户账号")
+    private String account;
+    @ApiModelProperty("客户名称")
+    private String customerName;
+    @ApiModelProperty("支付金额")
+    private BigDecimal payAmount;
+    @ApiModelProperty("购买碳汇量")
+    private BigDecimal orderCarbonAmount;
+    @ApiModelProperty("订单状态")
+    private String orderStatus;
+    @ApiModelProperty("购买时间")
+    private Date createTime;
+    @ApiModelProperty("证书编号")
+    private String credentialNo;
+    @ApiModelProperty("支付流水号")
+    private String payNo;
+    @ApiModelProperty("订单金额")
+    private BigDecimal orderAmount;
+    @ApiModelProperty("订单类型")
+    private String orderType;
+    @ApiModelProperty("支付方式")
+    private String payChannel;
+    @ApiModelProperty("联系电话")
+    private String phone;
+    @ApiModelProperty("客户类型")
+    private String customerTypeName;
+    @ApiModelProperty("订单项列表")
+    List<OfflineOrderItemBO> items;
+
+
+}

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

@@ -0,0 +1,30 @@
+package com.hcloud.microserver.system.bank.bo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ * @Author liql
+ * @Date 2020-11-29
+ */
+@Data
+@ApiModel("线下订单项实体")
+public class OfflineOrderItemBO {
+    @ApiModelProperty("商品编码")
+    private String goodsCode;
+    @ApiModelProperty("商品类型")
+    private String goodsType;
+    @ApiModelProperty("商品名称")
+    private String goodsName;
+    @ApiModelProperty("单价")
+    private String goodsPrice;
+    @ApiModelProperty("碳汇量")
+    private BigDecimal saleNum;
+    @ApiModelProperty("金额")
+    private BigDecimal amount;
+
+}

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

@@ -1,18 +1,22 @@
 package com.hcloud.microserver.system.bank.controller;
 
 import com.github.pagehelper.PageInfo;
+import com.hcloud.microserver.commoncore.base.ResultVO;
+import com.hcloud.microserver.commoncore.enums.ResultEnum;
+import com.hcloud.microserver.system.bank.bo.CreateOrderBO;
+import com.hcloud.microserver.system.bank.bo.OfflineOrderDetailBO;
 import com.hcloud.microserver.system.bank.bo.OrderInfoBO;
 import com.hcloud.microserver.system.bank.service.OrderInfoService;
 import com.hcloud.microserver.commoncore.base.BaseController;
 import com.hcloud.microserver.commoncore.base.ResponseBase;
+import com.hcloud.microserver.system.facade.carbon.forms.GoodsInfoForm;
 import com.hcloud.microserver.system.facade.carbon.forms.GoodsOrderInfoForm;
+import com.hcloud.microserver.system.facade.carbon.forms.OfflineOrderCondidtionForm;
+import com.hcloud.microserver.system.facade.carbon.forms.OfflineOrderPayVoucherForm;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 @RestController
 @RequestMapping("/web/order")
@@ -29,4 +33,71 @@ public class OrderInfoController extends BaseController {
         return responseSuccess(pageInfo);
     }
 
+    /**
+     * 创建订单：
+     *  1、查询商品
+     *  2、查询客户信息
+     *  3、生成订单
+     *  4、生成订单项：（减碳汇量）
+     *
+     */
+    @ApiOperation("后台创建订单")
+    @PostMapping("/create-order")
+    public ResponseBase create(@RequestBody CreateOrderBO createOrderBO) {
+        int success = this.orderInfoService.createOrder(createOrderBO);
+        if (success>0){
+            return responseResultSuccess();
+        }
+        return responseResultFailure();
+    }
+
+    /**
+     * 订单列表：
+     * 条件：1、订单状态
+     *      2、企业账号
+     *      3、企业名称
+     *      4、订单号
+     */
+
+    @ApiOperation("查询线下订单列表")
+    @GetMapping("/offline-order-list")
+    public ResponseBase<OrderInfoBO> queryOfflineOrderList(@RequestBody OfflineOrderCondidtionForm condidtionForm) {
+        PageInfo pageInfo = orderInfoService.offlineOrderList(condidtionForm);
+        return responseSuccess(pageInfo);
+    }
+
+
+    /**
+     * 订单详情：
+     *  1、根据订单号查询主订单信息
+     *  2、根据订单号查询订单项
+     */
+
+    @ApiOperation("查询线下订单详情")
+    @GetMapping("/offline-order-detail")
+    public ResponseBase<OfflineOrderDetailBO> queryOrderDetail(String guid) {
+        OfflineOrderDetailBO order = orderInfoService.queryOfflineOrderDetial(guid);
+        ResultVO result =new ResultVO(ResultEnum.SUCCESS,order);
+        return responseSuccess(result);
+    }
+
+
+    /**
+     * 确认收款：
+     *  1、将订单状态改为已收款
+     *  2、保存收款凭证
+     *  3、生成证书
+     */
+
+    @ApiOperation("收款")
+    @PutMapping("/collect-money")
+    public ResponseBase collectMoney(@RequestBody OfflineOrderPayVoucherForm payVoucher) {
+        int success = this.orderInfoService.collectMoneyDeal(payVoucher);
+        if (success>0){
+            return responseResultSuccess();
+        }
+        return responseResultFailure();
+    }
+
+
 }

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

@@ -15,6 +15,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * @author xiezt
@@ -83,4 +84,11 @@ public class ProductTypeController extends CarbonBaseController {
         }
         return responseResultFailure();
     }
+
+    @ApiOperation("查询所有产品类型2")
+    @GetMapping("/getAll")
+    public ResponseBase getAll() {
+        List<Map> list = this.productTypeService.getAll();
+        return responseResultSuccess(list);
+    }
 }

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

@@ -61,9 +61,9 @@ public class SubscriptionApplyController extends BaseController
     @PutMapping
     @AuthCarbonValidate
     @ApiOperation("更新申请状态为认购成功")
-    public AjaxResult edit(String guid)
+    public AjaxResult edit(String guid,String orderGuid)
     {
-        return toAjax(subscriptionApplyService.updateSubscriptionApply(guid));
+        return toAjax(subscriptionApplyService.updateSubscriptionApply(guid,orderGuid));
     }
 
     /**

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

@@ -1,12 +1,11 @@
 package com.hcloud.microserver.system.bank.dao;
 
 import com.github.pagehelper.Page;
-import com.hcloud.microserver.system.bank.bo.FarmerInfoBO;
 import com.hcloud.microserver.commoncore.base.BaseMapper;
 import com.hcloud.microserver.system.facade.carbon.entity.FarmerInfo;
 import com.hcloud.microserver.system.facade.carbon.forms.FarmerInfoForm;
 import org.apache.ibatis.annotations.Param;
-
+import com.hcloud.microserver.system.bank.bo.*;
 import java.util.List;
 import java.util.Map;
 

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

@@ -4,11 +4,14 @@ import com.github.pagehelper.Page;
 import com.hcloud.microserver.system.bank.bo.GoodsInfoBO;
 import com.hcloud.microserver.commoncore.base.BaseMapper;
 import com.hcloud.microserver.commoncore.base.PageBean;
+import com.hcloud.microserver.system.bank.bo.OfflineOrderDetailBO;
 import com.hcloud.microserver.system.facade.carbon.entity.GoodsInfo;
+import com.hcloud.microserver.system.facade.carbon.entity.QueryGoodsInfoBO;
 import com.hcloud.microserver.system.facade.carbon.forms.GoodsInfoForm;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * @author xiezt
@@ -57,4 +60,12 @@ public interface GoodsInfoMapper extends BaseMapper<GoodsInfo,String> {
      * @return
      */
     List<GoodsInfo> selectGoodsInfoByProductGuid(@Param("productGuid") String productGuid);
+
+    /**
+     * 一次性查出商品信息 根据产品类型（productTypeId）和区域(村子)villageId
+     * @param queryParam
+     * @return
+     */
+    List<QueryGoodsInfoBO> queryGoodsInfoByProductTypeAndArea(Map queryParam);
+
 }

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

@@ -1,5 +1,6 @@
 package com.hcloud.microserver.system.bank.dao;
 
+import com.hcloud.microserver.system.bank.bo.OfflineOrderItemBO;
 import com.hcloud.microserver.system.bank.bo.OrderDetailInfoBO;
 import com.hcloud.microserver.commoncore.base.BaseMapper;
 import com.hcloud.microserver.system.facade.carbon.entity.GoodsOrderDetail;
@@ -26,4 +27,11 @@ public interface GoodsOrderDetailMapper extends BaseMapper<GoodsOrderDetail,Stri
     int batchSaveOrderDetailList(List<GoodsOrderDetail> list);
 
     List<GoodsOrderDetail> selectByGoodsOrderInfoGuid(@Param("goodsOrderInfoGuid") String goodsOrderInfoGuid);
+
+    /**
+     * 根据订单guid查询订单项
+     * @param orderGuid
+     * @return
+     */
+    List<OfflineOrderItemBO> queryOrderDetail(@Param("orderGuid") String orderGuid);
 }

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

@@ -1,13 +1,17 @@
 package com.hcloud.microserver.system.bank.dao;
 
+import com.hcloud.microserver.system.bank.bo.OfflineOrderBO;
+import com.hcloud.microserver.system.bank.bo.OfflineOrderDetailBO;
 import com.hcloud.microserver.system.bank.bo.OrderInfoBO;
 import com.hcloud.microserver.commoncore.base.BaseMapper;
 import com.hcloud.microserver.commoncore.base.PageBean;
 import com.hcloud.microserver.system.facade.carbon.entity.GoodsOrderInfo;
 import com.hcloud.microserver.system.facade.carbon.forms.GoodsOrderInfoForm;
+import com.hcloud.microserver.system.facade.carbon.forms.OfflineOrderCondidtionForm;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * @author xiezt
@@ -42,4 +46,17 @@ public interface GoodsOrderInfoMapper extends BaseMapper<GoodsOrderInfo,String>
      * @return
      */
     int updateOrderBelongInfo(@Param("oldId") String oldCustomerId, @Param("newId") String newCustomerId);
+
+    /**
+     * 查询线下订单list PageBean<OfflineOrderCondidtionForm> pageBean
+     * @return
+     */
+    List<OfflineOrderBO> offlineOrderList(PageBean<OfflineOrderCondidtionForm> pageBean);
+
+    /**
+     * 根据订单guid查询订单详情
+     * @param guid
+     * @return
+     */
+    OfflineOrderDetailBO queryOfflineOrderDetial(@Param("guid") String guid);
 }

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

@@ -20,4 +20,6 @@ public interface ProductTypeMapper extends BaseMapper<ProductType, String> {
     int checkTypeVal(@Param("typeVal") String typeVal);
 
     String getCurrentCode();
+
+    List<Map> getAll();
 }

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

@@ -1,6 +1,7 @@
 package com.hcloud.microserver.system.bank.dao;
 
 import com.hcloud.microserver.system.facade.carbon.entity.SubscriptionApply;
+import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 
@@ -35,7 +36,7 @@ public interface SubscriptionApplyMapper
      * @param guid 碳汇认购申请
      * @return 结果
      */
-    public int updateSubscriptionApply(String guid);
+    public int updateSubscriptionApply(@Param("guid") String guid,@Param("orderGuid") String orderGuid);
 
     /**
      * 删除碳汇认购申请

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

@@ -6,10 +6,12 @@ import com.hcloud.microserver.commoncore.base.BaseServie;
 import com.hcloud.microserver.system.facade.carbon.entity.GoodsInfo;
 import com.hcloud.microserver.system.facade.carbon.entity.GoodsSaleInfo;
 import com.hcloud.microserver.system.facade.carbon.entity.ProductInfo;
+import com.hcloud.microserver.system.facade.carbon.entity.QueryGoodsInfoBO;
 import com.hcloud.microserver.system.facade.carbon.forms.FarmerInfoForm;
 import com.hcloud.microserver.system.facade.carbon.forms.GoodsInfoForm;
 
 import java.util.List;
+import java.util.Map;
 
 public interface GoodsInfoService extends BaseServie<GoodsInfo, String> {
 
@@ -44,6 +46,13 @@ public interface GoodsInfoService extends BaseServie<GoodsInfo, String> {
      */
     PageInfo searchGoodsInfoByFarmerId(FarmerInfoForm farmerInfoForm);
 
+    /**
+     * 一次性查出商品信息 根据产品类型（productTypeId）和区域(村子)villageId
+     * @param queryParam
+     * @return
+     */
+    List<QueryGoodsInfoBO> queryGoodsInfoByProductTypeAndArea(Map queryParam);
+
 
 
 }

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

@@ -36,7 +36,7 @@ public interface ISubscriptionApplyService
      * @param guid 碳汇认购申请
      * @return 结果
      */
-    public int updateSubscriptionApply(String guid);
+    public int updateSubscriptionApply(String guid,String orderGuid);
 
     /**
      * 批量删除碳汇认购申请

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

@@ -2,7 +2,16 @@ package com.hcloud.microserver.system.bank.service;
 
 import com.github.pagehelper.PageInfo;
 import com.hcloud.microserver.commoncore.base.BaseServie;
+import com.hcloud.microserver.system.bank.bo.CreateOrderBO;
+import com.hcloud.microserver.system.bank.bo.OfflineOrderBO;
+import com.hcloud.microserver.system.bank.bo.OfflineOrderDetailBO;
 import com.hcloud.microserver.system.facade.carbon.forms.GoodsOrderInfoForm;
+import com.hcloud.microserver.system.facade.carbon.forms.OfflineOrderCondidtionForm;
+import com.hcloud.microserver.system.facade.carbon.forms.OfflineOrderPayVoucherForm;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+import java.util.Map;
 
 /**
  * @author xiezt
@@ -73,5 +82,32 @@ public interface OrderInfoService extends BaseServie<GoodsOrderInfoForm,String>
      */
     GoodsOrderInfoForm saveOrderInfoForOffline(GoodsOrderInfoForm goodsOrderInfoForm);
 
+    /**
+     * 后台生成订单
+     * @param createOrderBO
+     * @return
+     */
+    int createOrder(CreateOrderBO createOrderBO);
+
+    /**
+     * 查询线下订单
+     * @param condidtionForm
+     * @return
+     */
+    PageInfo offlineOrderList(OfflineOrderCondidtionForm condidtionForm);
+
+    /**
+     * 根据订单guid查询订单详情
+     * @param guid
+     * @return
+     */
+    OfflineOrderDetailBO queryOfflineOrderDetial(@Param("guid") String guid);
+
+    /**
+     * 收款处理
+     * @param payVoucher
+     * @return
+     */
+    int collectMoneyDeal(OfflineOrderPayVoucherForm payVoucher);
 
 }

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

@@ -2,6 +2,7 @@ package com.hcloud.microserver.system.bank.service;
 
 import com.github.pagehelper.PageInfo;
 import com.hcloud.microserver.commoncore.base.BaseServie;
+import com.hcloud.microserver.system.facade.carbon.forms.OfflineOrderPayVoucherForm;
 import com.hcloud.microserver.system.facade.carbon.forms.OrderPayVoucherForm;
 
 import java.util.List;
@@ -30,4 +31,11 @@ public interface OrderPayVoucherService extends BaseServie<OrderPayVoucherForm,S
      * @return
      */
     PageInfo queryListByPage(OrderPayVoucherForm orderPayVoucherForm);
+
+    /**
+     * 生成离线支付凭证信息
+     * @param payVoucher
+     * @return
+     */
+    int newSavePayVoucher(OfflineOrderPayVoucherForm payVoucher);
 }

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

@@ -31,4 +31,12 @@ public interface PovertyAreaService {
      * @return
      */
     PovertyAreaForm getFullPovertyAreaInfoById(String guid);
+
+    /**
+     * 条件查询
+     * @param povertyArea
+     * @return
+     */
+   // List<PovertyArea> findByFiveIds(PovertyArea povertyArea);
+
 }

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

@@ -22,4 +22,6 @@ public interface ProductTypeService extends BaseServie<ProductType, String> {
     List<ProductType> queryAll(ProductTypeForm productTypeForm);
 
     int checkTypeVal(String typeVal);
+
+    List<Map> getAll();
 }

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

@@ -130,8 +130,8 @@ public class CollectiveFarmerServiceImpl implements CollectiveFarmerService {
      * @author 朱修贤
      */
     @Override
-    @Transactional
-    public int save(CollectiveFarmerForm collectiveFarmerForm) {
+    @Transactional(rollbackFor = Exception.class)
+    public int  save(CollectiveFarmerForm collectiveFarmerForm) {
         int result = 0;
         if (Objects.nonNull(collectiveFarmerForm)) {
             CollectiveFarmer collectiveFarmer = BeanCopyUtil.convertBean(collectiveFarmerForm, CollectiveFarmer.class);

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

@@ -3,7 +3,6 @@ package com.hcloud.microserver.system.bank.service.impl;
 import com.github.pagehelper.Page;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
-import com.hcloud.microserver.system.bank.bo.FarmerInfoBO;
 import com.hcloud.microserver.system.bank.dao.CollectiveFarmerMapper;
 import com.hcloud.microserver.system.bank.dao.FarmerInfoMapper;
 import com.hcloud.microserver.system.bank.service.FarmerInfoService;
@@ -15,6 +14,7 @@ import com.hcloud.microserver.system.facade.carbon.entity.FarmerInfo;
 import com.hcloud.microserver.system.facade.carbon.forms.FarmerInfoForm;
 import com.hcloud.microserver.system.facade.carbon.forms.PovertyAreaForm;
 import lombok.extern.slf4j.Slf4j;
+import com.hcloud.microserver.system.bank.bo.*;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -188,6 +188,7 @@ public class FarmerInfoServiceImpl implements FarmerInfoService {
     @Override
     public int updateFarmerSaleInfoByGoodsId(BigDecimal saleAmount, String goodsId) {
         //查询商品归属农户
+
         List<FarmerInfoBO> list = farmerInfoMapper.getFarmerInfoByGoods(goodsId);
         log.info("List<FarmerInfoBO>====================>{}",list);
         if(null!=list && list.size()>0){

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

@@ -11,10 +11,7 @@ import com.hcloud.microserver.commoncore.base.PageBean;
 import com.hcloud.microserver.commoncore.util.BeanCopyUtil;
 import com.hcloud.microserver.commoncore.util.BusinessCodeRule;
 import com.hcloud.microserver.commoncore.util.UUIDUtils;
-import com.hcloud.microserver.system.facade.carbon.entity.GoodsDetail;
-import com.hcloud.microserver.system.facade.carbon.entity.GoodsInfo;
-import com.hcloud.microserver.system.facade.carbon.entity.GoodsSaleInfo;
-import com.hcloud.microserver.system.facade.carbon.entity.ProductInfo;
+import com.hcloud.microserver.system.facade.carbon.entity.*;
 import com.hcloud.microserver.system.facade.carbon.forms.FarmerInfoForm;
 import com.hcloud.microserver.system.facade.carbon.forms.GoodsDetailForm;
 import com.hcloud.microserver.system.facade.carbon.forms.GoodsInfoForm;
@@ -26,10 +23,7 @@ import org.springframework.transaction.annotation.Transactional;
 import javax.annotation.Resource;
 import java.math.BigDecimal;
 import java.text.SimpleDateFormat;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
-import java.util.Objects;
+import java.util.*;
 
 /**
  * @author zhuxx
@@ -425,4 +419,15 @@ public class GoodsInfoServiceImpl implements GoodsInfoService {
         List<GoodsInfoBO> list = goodsInfoMapper.searchGoodsInfoByFarmerId(farmerInfoForm.getGuid());
         return new PageInfo(list);
     }
+
+    /**
+     * 一次性查出商品信息 根据产品类型（productTypeId）和区域(村子)villageId
+     *
+     * @param queryParam
+     * @return
+     */
+    @Override
+    public List<QueryGoodsInfoBO> queryGoodsInfoByProductTypeAndArea(Map queryParam) {
+        return goodsInfoMapper.queryGoodsInfoByProductTypeAndArea(queryParam);
+    }
 }

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

@@ -2,16 +2,17 @@ package com.hcloud.microserver.system.bank.service.impl;
 
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
-import com.hcloud.microserver.system.bank.bo.OrderInfoBO;
-import com.hcloud.microserver.system.bank.dao.GoodsOrderInfoMapper;
+import com.hcloud.microserver.commoncore.util.UUIDUtils;
+import com.hcloud.microserver.security.util.SecurityUtils;
+import com.hcloud.microserver.system.bank.bo.*;
+import com.hcloud.microserver.system.bank.dao.*;
 import com.hcloud.microserver.system.bank.events.CredentialInfoEvent;
 import com.hcloud.microserver.commoncore.base.PageBean;
 import com.hcloud.microserver.commoncore.util.BeanCopyUtil;
 import com.hcloud.microserver.commoncore.util.GeneratorIdUtils;
 import com.hcloud.microserver.commoncore.util.GetUUID;
 import com.hcloud.microserver.system.bank.service.*;
-import com.hcloud.microserver.system.facade.carbon.entity.GoodsInfo;
-import com.hcloud.microserver.system.facade.carbon.entity.GoodsOrderInfo;
+import com.hcloud.microserver.system.facade.carbon.entity.*;
 import com.hcloud.microserver.system.facade.carbon.forms.*;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -20,10 +21,9 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import javax.annotation.Resource;
+import javax.security.auth.Subject;
 import java.math.BigDecimal;
-import java.util.Date;
-import java.util.List;
-import java.util.Objects;
+import java.util.*;
 
 /**
  * @author xiezt
@@ -35,35 +35,31 @@ public class OrderInfoServiceImpl implements OrderInfoService {
 
     @Resource
     private GoodsOrderInfoMapper goodsOrderInfoMapper;
-
     @Autowired
     private OrderDetailInfoService orderDetailInfoService;
-
+    @Resource
+    private GoodsOrderDetailMapper goodsOrderDetailMapper;
+    @Resource
+    private GoodsSaleInfoMapper goodsSaleInfoMapper;
+    @Resource
+    private SubscriptionApplyMapper subscriptionApplyMapper;
+    @Autowired
+    private OrderPayVoucherService orderPayVoucherService;
     @Autowired
     private OrderPayApplyService orderPayApplyService;
-
     @Autowired
     private OrderPayService orderPayService;
-
     @Autowired
     private CustomerInfoService customerInfoService;
-
     @Autowired
     private ApplicationContext applicationContext;
-
     @Autowired
     private OrderSaleInfoService orderSaleInfoService;
-
     @Autowired
     private FarmerInfoService farmerInfoService;
-
-    @Autowired
-    private CollectiveFarmerService collectiveFarmerService;
-
     @Autowired
     private GoodsInfoService goodsInfoService;
 
-
     /**
      * 分页查询订单信息
      *
@@ -369,6 +365,169 @@ public class OrderInfoServiceImpl implements OrderInfoService {
         return null;
     }
 
+    /**
+     * 后台生成订单
+     *
+     * @param createOrderBO
+     * @return
+     */
+    @Override
+    @Transactional
+    public int createOrder(CreateOrderBO createOrderBO) {
+        //查询商品信息
+        Map<String,String> queryParam = new HashMap<String,String>();
+        queryParam.put("productTypeId",createOrderBO.getProductTypeGuid());
+        queryParam.put("villageId",createOrderBO.getVillageId());
+        List<QueryGoodsInfoBO> goodsList = goodsInfoService.queryGoodsInfoByProductTypeAndArea(queryParam);
+        if(goodsList.size()==0){
+            throw new RuntimeException("没有满足要求的商品");
+        }
+
+        //查询客户信息
+        CustomerInfoForm customer = customerInfoService.getCustomerInfoById(createOrderBO.getApplyCostomerId());
+        //保存主订单
+        GoodsOrderInfo order = new GoodsOrderInfo();
+        order.setCustomerName(customer.getCustomerName());
+        order.setFkCustomerGuid(customer.getGuid());
+        order.setCustomerType(customer.getCustomerType().toString());
+
+        order.setOrderCarbonAmount(createOrderBO.getOrderCarbonAmount());
+        order.setOrderStatus(1);
+        order.setCreateUser(SecurityUtils.getUserId()==null?"1":SecurityUtils.getUserId().toString());
+        order.setOrderType(createOrderBO.getOrderType());
+
+        GeneratorIdUtils generatorIdUtils = new GeneratorIdUtils();
+        String orderNum = generatorIdUtils.nextId();
+        order.setOrderNo(orderNum);
+
+        order.setGuid(GetUUID.getUUID());
+        order.setState(1);
+        order.setCreateTime(new Date());
+        order.setModifiedTime(new Date());
+
+
+        //保存订单详情
+        BigDecimal difference = createOrderBO.getOrderCarbonAmount();
+        BigDecimal totalAmount = new BigDecimal(0);
+        for (QueryGoodsInfoBO goods:goodsList) {
+            GoodsSaleInfo saleInfo = goodsSaleInfoMapper.getGoodsSaleInfoByGoodsId(goods.getGoodsId());
+            GoodsOrderDetail orderDetail = new GoodsOrderDetail();
+            orderDetail.setGuid(GetUUID.getUUID());
+            orderDetail.setFkOrderGuid(order.getGuid());
+            orderDetail.setFkGoodsGuid(goods.getGoodsId());
+            orderDetail.setGoodsName(goods.getGoodsName());
+            BigDecimal salePrice = saleInfo.getSalePrice();
+            orderDetail.setGoodsPrice(salePrice);
+            orderDetail.setState(1);
+            orderDetail.setCreateUser(SecurityUtils.getUserId()==null?"1":SecurityUtils.getUserId().toString());
+            orderDetail.setCreateTime(new Date());
+
+            BigDecimal carbonVal = saleInfo.getUnsaledCarbonSkin();
+            BigDecimal subtractResult =  difference.subtract(carbonVal);
+            if(subtractResult.doubleValue()>=0){
+                difference = subtractResult;
+                orderDetail.setSaleNum(carbonVal);
+                BigDecimal amount = salePrice.multiply(carbonVal);
+                orderDetail.setAmount(amount);
+                totalAmount.add(amount);
+                goodsOrderDetailMapper.insertSelective(orderDetail);
+                //更新销售表
+                saleInfo.setUnsaledCarbonSkin(new BigDecimal(0));
+                BigDecimal saleCarbonSkin = saleInfo.getSaledCarbonSkin();
+                BigDecimal newSaleCarbonSkin =  saleCarbonSkin.add(carbonVal);
+                saleInfo.setSaledCarbonSkin(newSaleCarbonSkin);
+                goodsSaleInfoMapper.updateByPrimaryKeySelective(saleInfo);
+
+                continue;
+            }else{
+                orderDetail.setSaleNum(difference);
+                BigDecimal amount = salePrice.multiply(difference);
+                orderDetail.setAmount(amount);
+                totalAmount.add(amount);
+                goodsOrderDetailMapper.insertSelective(orderDetail);
+
+                //更新销售表
+                BigDecimal unsaledCarbonSkin = saleInfo.getUnsaledCarbonSkin();
+                BigDecimal newUnsaledCarbonSkin = unsaledCarbonSkin.subtract(difference);
+                saleInfo.setUnsaledCarbonSkin(newUnsaledCarbonSkin);
+                BigDecimal saleCarbonSkin = saleInfo.getSaledCarbonSkin();
+                BigDecimal newSaleCarbonSkin =  saleCarbonSkin.add(difference);
+                saleInfo.setSaledCarbonSkin(newSaleCarbonSkin);
+
+                goodsSaleInfoMapper.updateByPrimaryKeySelective(saleInfo);
+                difference = new BigDecimal(0);
+                break;
+            }
+        }
+
+        if(difference.intValue()>0){
+            throw new RuntimeException("满足的条件的商品的库存不足");
+        }
+
+        order.setOrderAmount(totalAmount);
+        //保存
+        int saveOrderResult =  goodsOrderInfoMapper.insertSelective(order);
+
+        //更新申请表
+        subscriptionApplyMapper.updateSubscriptionApply(createOrderBO.getGuid(),order.getOrderNo());
+
+        return saveOrderResult;
+    }
+
+    /**
+     * 查询线下订单
+     *
+     * @param condidtionForm
+     * @return
+     */
+    @Override
+    public PageInfo offlineOrderList(OfflineOrderCondidtionForm condidtionForm) {
+        PageBean pageBean = new PageBean(condidtionForm);
+        PageHelper.startPage(condidtionForm.getPageNo(),condidtionForm.getPageSize());
+        List<OfflineOrderBO> list =goodsOrderInfoMapper.offlineOrderList(pageBean);
+        return new PageInfo(list);
+    }
+
+    /**
+     * 根据订单guid查询订单详情
+     *
+     * @param guid
+     * @return
+     */
+    @Override
+    public OfflineOrderDetailBO queryOfflineOrderDetial(String guid) {
+        //获取主订单信息
+        OfflineOrderDetailBO order = goodsOrderInfoMapper.queryOfflineOrderDetial(guid);
+        //获取订单项
+        List<OfflineOrderItemBO> items = goodsOrderDetailMapper.queryOrderDetail(guid);
+        order.setItems(items);
+        return order;
+    }
+
+    /**
+     * 收款处理
+     *
+     * @param payVoucher
+     * @return
+     */
+    @Override
+    @Transactional
+    public int collectMoneyDeal(OfflineOrderPayVoucherForm payVoucher) {
+        //更新订单状态
+        String payNo = UUIDUtils.randomUUID();
+        GoodsOrderInfo order = new GoodsOrderInfo();
+        order.setGuid(payVoucher.getOrderId());
+        order.setPayNo(payNo);
+        order.setOrderAmount(payVoucher.getPayAmount());
+        order.setOrderStatus(2);
+        order.setModifiedTime(new Date());
+        order.setModifiedUser(SecurityUtils.getUserId()==null?"1":SecurityUtils.getUserId().toString());
+        goodsOrderInfoMapper.updateByPrimaryKeySelective(order);
+        //保存收款凭证
+        int result = orderPayVoucherService.newSavePayVoucher(payVoucher);
+        //保存证书 TODO
+        return result;
+    }
 
     @Override
     public int delByPrimaryKey(String guid) {

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

@@ -3,6 +3,7 @@ package com.hcloud.microserver.system.bank.service.impl;
 import com.github.pagehelper.Page;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
+import com.hcloud.microserver.commoncore.util.reflect.DateUtils;
 import com.hcloud.microserver.system.bank.dao.GoodsOrderInfoMapper;
 import com.hcloud.microserver.system.bank.dao.OrderPayVoucherMapper;
 import com.hcloud.microserver.system.bank.events.CredentialInfoEvent;
@@ -11,6 +12,7 @@ import com.hcloud.microserver.commoncore.util.BeanCopyUtil;
 import com.hcloud.microserver.commoncore.util.GetUUID;
 import com.hcloud.microserver.system.facade.carbon.entity.GoodsOrderInfo;
 import com.hcloud.microserver.system.facade.carbon.entity.OrderPayVoucher;
+import com.hcloud.microserver.system.facade.carbon.forms.OfflineOrderPayVoucherForm;
 import com.hcloud.microserver.system.facade.carbon.forms.OrderPayVoucherForm;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.ApplicationContext;
@@ -138,4 +140,31 @@ public class OrderPayVoucherServiceImpl implements OrderPayVoucherService {
         OrderPayVoucher orderPayVoucher = BeanCopyUtil.convertBean(record,OrderPayVoucher.class);
         return orderPayVoucherMapper.updateByPrimaryKey(orderPayVoucher);
     }
+
+    /**
+     * 生成离线支付凭证信息
+     *
+     * @param payVoucher
+     * @return
+     */
+    @Override
+    @Transactional
+    public int newSavePayVoucher(OfflineOrderPayVoucherForm payVoucher) {
+        OrderPayVoucher record = new OrderPayVoucher();
+        record.setGuid(GetUUID.getUUID());
+        record.setCreateTime(new Date());
+        record.setModifiedTime(new Date());
+        record.setState(1);
+
+        record.setFkOrderId(payVoucher.getOrderId());
+        record.setFkCustomerId(payVoucher.getCustomerId());
+        record.setPayAmount(payVoucher.getPayAmount());
+        record.setPayBank(payVoucher.getPayBank());
+        record.setPayCardNo(payVoucher.getPayCardNo());
+        record.setPayUserName(payVoucher.getPayUserName());
+        record.setVoucherImages(payVoucher.getVoucherImages());
+        Date payTime = DateUtils.dateTime(DateUtils.YYYY_MM_DD_HH_MM_SS,payVoucher.getPayTime());
+        record.setPayTime(payTime);
+        return orderPayVoucherMapper.insertSelective(record);
+    }
 }

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

@@ -246,6 +246,11 @@ public class ProductTypeServiceImpl implements ProductTypeService {
         return count;
     }
 
+    @Override
+    public List<Map> getAll() {
+        return this.productTypeMapper.getAll();
+    }
+
     private Integer getCurrentCode() {
         StringBuffer sbb = new StringBuffer();
         String maxCode = this.productTypeMapper.getCurrentCode();

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

@@ -54,9 +54,9 @@ public class SubscriptionApplyServiceImpl implements ISubscriptionApplyService
      * @return 结果
      */
     @Override
-    public int updateSubscriptionApply(String guid)
+    public int updateSubscriptionApply(String guid,String orderGuid)
     {
-        return subscriptionApplyMapper.updateSubscriptionApply(guid);
+        return subscriptionApplyMapper.updateSubscriptionApply(guid,orderGuid);
     }
 
     /**

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

@@ -21,13 +21,15 @@
         <result column="recieve_money" jdbcType="DECIMAL" property="recieveMoney"/>
         <result column="actual_money" jdbcType="DECIMAL" property="actualMoney"/>
         <result column="phone" jdbcType="VARCHAR" property="phone"/>
+        <result column="bank_code" jdbcType="VARCHAR" property="bankCode"/>
+        <result column="bank_status" jdbcType="INTEGER" property="bankStatus"/>
         <collection property="farmerInfos" column="guid" select="com.hcloud.microserver.system.bank.dao.FarmerInfoMapper.selectByCollectiveId" />
     </resultMap>
 
     <sql id="Base_Column_List">
         guid, fk_poverty_area_id, collective_code, collective_name, collective_person_num,
         org_unit, remark, collective_images, bank_name, bank_card_no, is_enable, state, create_user,
-        create_time, modified_user, modified_time, phone
+        create_time, modified_user, modified_time, phone,bank_code,bank_status
     </sql>
     <select id="selectByPrimaryKey" parameterType="java.lang.String" resultMap="BaseResultMap">
         select
@@ -45,13 +47,14 @@
         remark, collective_images, bank_name,
         bank_card_no, is_enable, state,
         create_user, create_time, modified_user,
-        modified_time, recieve_money, actual_money, phone)
+        modified_time, recieve_money, actual_money, phone,bank_code,bank_status)
     values (#{guid,jdbcType=CHAR}, #{fkPovertyAreaId,jdbcType=CHAR}, #{collectiveCode,jdbcType=VARCHAR},
         #{collectiveName,jdbcType=VARCHAR}, #{collectivePersonNum,jdbcType=INTEGER}, #{orgUnit,jdbcType=VARCHAR},
         #{remark,jdbcType=VARCHAR}, #{collectiveImages,jdbcType=VARCHAR}, #{bankName,jdbcType=VARCHAR},
         #{bankCardNo,jdbcType=VARCHAR}, #{isEnable,jdbcType=INTEGER}, #{state,jdbcType=INTEGER},
         #{createUser,jdbcType=CHAR}, #{createTime,jdbcType=TIMESTAMP}, #{modifiedUser,jdbcType=CHAR},
-        #{modifiedTime,jdbcType=TIMESTAMP}, #{recieveMoney,jdbcType=DECIMAL}, #{actualMoney,jdbcType=DECIMAL}, #{phone,jdbcType=VARCHAR})
+        #{modifiedTime,jdbcType=TIMESTAMP}, #{recieveMoney,jdbcType=DECIMAL}, #{actualMoney,jdbcType=DECIMAL}, #{phone,jdbcType=VARCHAR},
+        #{bankCode,jdbcType=VARCHAR},#{bankStatus,jdbcType=INTEGER})
     </insert>
     <insert id="insertSelective" parameterType="CollectiveFarmer">
         insert into t_collective_farmer
@@ -113,6 +116,12 @@
             <if test="phone != null and phone != ''">
                 phone,
             </if>
+            <if test="bankCode != null and bankCode != ''">
+                bank_code,
+            </if>
+            <if test="bankStatus != null ">
+                bank_status,
+            </if>
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="guid != null">
@@ -172,6 +181,12 @@
             <if test="phone != null and phone != ''">
                 #{phone,jdbcType=VARCHAR},
             </if>
+            <if test="bankCode != null and bankCode != ''">
+                #{bankCode,jdbcType=VARCHAR},
+            </if>
+            <if test="bankStatus != null">
+                #{bankStatus,jdbcType=INTEGER},
+            </if>
         </trim>
     </insert>
 
@@ -232,6 +247,12 @@
             <if test="phone != null and phone != ''">
                 phone = #{phone,jdbcType=VARCHAR},
             </if>
+            <if test="bankCode != null and bankCode != ''">
+                phone = #{bankCode,jdbcType=VARCHAR},
+            </if>
+            <if test="bankStatus != null and bankStatus != ''">
+                phone = #{bankStatus,jdbcType=INTEGER},
+            </if>
         </set>
         where guid = #{guid,jdbcType=CHAR}
     </update>
@@ -255,7 +276,9 @@
         modified_time = #{modifiedTime,jdbcType=TIMESTAMP},
         recieve_money = #{recieveMoney,jdbcType=DECIMAL},
         actual_money = #{actualMoney,jdbcType=DECIMAL},
-        phone = #{phone,jdbcType=VARCHAR}
+        phone = #{phone,jdbcType=VARCHAR},
+        bank_code = #{bankCode,jdbcType=VARCHAR},
+        bank_status = #{bankStatus,jdbcType=INTEGER}
         where guid = #{guid,jdbcType=CHAR}
     </update>
 

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

@@ -1,7 +1,7 @@
 <?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.CustomerInfoMapper">
-  <resultMap id="BaseResultMap" type="com.hcloud.microserver.system.facade.carbon.entity.CustomerInfo">
+  <resultMap id="BaseResultMap" type="CustomerInfo">
     <id column="guid" jdbcType="CHAR" property="guid" />
     <result column="account" jdbcType="VARCHAR" property="account" />
     <result column="passwd" jdbcType="VARCHAR" property="passwd" />

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

@@ -28,13 +28,16 @@
         <result column="bank_clearing_msg" jdbcType="VARCHAR" property="bankClearingMsg"/>
         <result column="recieve_money" jdbcType="DECIMAL" property="recieveMoney"/>
         <result column="actual_money" jdbcType="DECIMAL" property="actualMoney"/>
+        <result column="bank_name" jdbcType="VARCHAR" property="bank_name"/>
+        <result column="bank_code" jdbcType="VARCHAR" property="bank_code"/>
+        <result column="bank_status" jdbcType="INTEGER" property="bank_status"/>
         <association property="povertyArea" column="fk_poverty_area_id" select="com.hcloud.microserver.system.bank.dao.PovertyAreaMapper.selectByPrimaryKey"/>
     </resultMap>
     <sql id="Base_Column_List">
         guid, fk_poverty_area_id, fk_collective_id, farmer_code, farmer_name, family_num,
         sex, pid, nation, education, phone, bank_card_no, income_val, farmer_type, farmer_remark,
         farmer_images, village_org, is_enable, state, create_user, create_time, modified_user,
-        modified_time, bank_clearing_msg, recieve_money, actual_money
+        modified_time, bank_clearing_msg, recieve_money, actual_money,bank_name,bank_code,bank_status
     </sql>
     <select id="selectByPrimaryKey" parameterType="java.lang.String" resultMap="BaseResultMap">
         select
@@ -55,7 +58,7 @@
             farmer_type, farmer_remark, farmer_images,
             village_org, is_enable, state,
             create_user, create_time, modified_user,
-            modified_time, bank_clearing_msg, recieve_money, actual_money)
+            modified_time, bank_clearing_msg, recieve_money, actual_money,bank_name,bank_code,bank_status)
         values (#{guid,jdbcType=CHAR}, #{fkPovertyAreaId,jdbcType=CHAR}, #{fkCollectiveId,jdbcType=CHAR},
             #{farmerCode,jdbcType=VARCHAR}, #{farmerName,jdbcType=VARCHAR}, #{familyNum,jdbcType=INTEGER},
             #{sex,jdbcType=INTEGER}, #{pid,jdbcType=CHAR}, #{nation,jdbcType=VARCHAR}, #{education,jdbcType=VARCHAR},
@@ -63,7 +66,8 @@
             #{farmerType,jdbcType=VARCHAR}, #{farmerRemark,jdbcType=VARCHAR}, #{farmerImages,jdbcType=VARCHAR},
             #{villageOrg,jdbcType=CHAR}, #{isEnable,jdbcType=INTEGER}, #{state,jdbcType=INTEGER},
             #{createUser,jdbcType=CHAR}, #{createTime,jdbcType=TIMESTAMP}, #{modifiedUser,jdbcType=CHAR},
-            #{modifiedTime,jdbcType=TIMESTAMP}, #{bankClearingMsg,jdbcType=VARCHAR}, #{recieveMoney,jdbcType=DECIMAL}, #{actualMoney,jdbcType=DECIMAL})
+            #{modifiedTime,jdbcType=TIMESTAMP}, #{bankClearingMsg,jdbcType=VARCHAR},
+             #{recieveMoney,jdbcType=DECIMAL}, #{actualMoney,jdbcType=DECIMAL},{bankName,jdbcType=VARCHAR},{bankCode,jdbcType=VARCHAR},{bankStatus,jdbcType=INTEGER})
     </insert>
     <insert id="insertSelective" parameterType="FarmerInfo">
         insert into t_farmer_info
@@ -146,6 +150,15 @@
             <if test="actualMoney != null">
                 actual_money,
             </if>
+            <if test="bankName != null and bankName != ''">
+                bank_name,
+            </if>
+            <if test="bankCode != null and bankCode != ''">
+                bank_code,
+            </if>
+            <if test="bankStatus != null">
+                bank_status,
+            </if>
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="guid != null">
@@ -226,6 +239,15 @@
             <if test="actualMoney != null">
                 #{actualMoney,jdbcType=DECIMAL},
             </if>
+            <if test="bankName != null and bankName != ''">
+                #{bankName,jdbcType=VARCHAR},
+            </if>
+            <if test="bankCode != null and bankCode != ''">
+                #{bankCode,jdbcType=VARCHAR},
+            </if>
+            <if test="bankStatus != null">
+                {bankStatus,jdbcType=INTEGER},
+            </if>
         </trim>
     </insert>
     <update id="updateByPrimaryKeySelective" parameterType="FarmerInfo">
@@ -306,6 +328,15 @@
             <if test="actualMoney != null">
                 actual_money = #{actualMoney,jdbcType=DECIMAL},
             </if>
+            <if test="bankName != null and bankName != ''">
+                bank_name = #{bankName,jdbcType=VARCHAR},
+            </if>
+            <if test="bankCode != null and bankCode != ''">
+                bank_code = #{bankCode,jdbcType=VARCHAR},
+            </if>
+            <if test="bankStatus != null">
+                bank_status = {bankStatus,jdbcType=INTEGER},
+            </if>
         </set>
         where guid = #{guid,jdbcType=CHAR}
     </update>
@@ -335,7 +366,11 @@
           modified_time = #{modifiedTime,jdbcType=TIMESTAMP},
           bank_clearing_msg = #{bankClearingMsg,jdbcType=VARCHAR},
           recieve_money = #{recieveMoney,jdbcType=DECIMAL},
-          actual_money = #{actualMoney,jdbcType=DECIMAL}
+          actual_money = #{actualMoney,jdbcType=DECIMAL},
+          bank_name = #{bankName,jdbcType=VARCHAR},
+          bank_code = #{bankCode,jdbcType=VARCHAR},
+          bank_status = {bankStatus,jdbcType=INTEGER}
+
         where guid = #{guid,jdbcType=CHAR}
     </update>
 
@@ -410,7 +445,10 @@
             #{item.modifiedTime,jdbcType=TIMESTAMP},
             #{item.bankClearingMsg,jdbcType=VARCHAR},
             #{item.recieveMoney,jdbcType=DECIMAL},
-            #{item.actualMoney,jdbcType=DECIMAL})
+            #{item.actualMoney,jdbcType=DECIMAL},
+            {item.bankName,jdbcType=VARCHAR},
+            {item.bankCode,jdbcType=VARCHAR},
+            {item.bankStatus,jdbcType=INTEGER})
         </foreach>
     </insert>
 
@@ -492,6 +530,15 @@
             <if test="actualMoney != null">
                 actual_money = #{actualMoney,jdbcType=DECIMAL},
             </if>
+            <if test="bankName != null and bankName != ''">
+                bank_name = #{bankName,jdbcType=VARCHAR},
+            </if>
+            <if test="bankCode != null and bankCode != ''">
+                bank_code = #{bankCode,jdbcType=VARCHAR},
+            </if>
+            <if test="bankStatus != null">
+                bank_status = {bankStatus,jdbcType=INTEGER},
+            </if>
         </set>
         <where>
             fk_collective_id = #{collectiveId,jdbcType=VARCHAR}
@@ -577,6 +624,15 @@
                 <if test="farmerInfo.actualMoney != null">
                     actual_money = #{farmerInfo.actualMoney,jdbcType=DECIMAL},
                 </if>
+                <if test="bankName != null and bankName != ''">
+                    bank_name = #{farmerInfo.bankName,jdbcType=VARCHAR},
+                </if>
+                <if test="bankCode != null and bankCode != ''">
+                    bank_code = #{farmerInfo.bankCode,jdbcType=VARCHAR},
+                </if>
+                <if test="bankStatus != null">
+                    bank_status = {farmerInfo.bankStatus,jdbcType=INTEGER},
+                </if>
             </set>
             <where>
                 guid = #{farmerInfo.guid,jdbcType=VARCHAR}
@@ -611,7 +667,7 @@
         from t_farmer_info
         where fk_poverty_area_id = #{povertyId}
     </select>
-    <select id="getFarmerInfoByGoods" resultType="FarmerInfoBO">
+    <select id="getFarmerInfoByGoods" resultType="com.hcloud.microserver.system.bank.bo.FarmerInfoBO">
         SELECT
             ee.guid,
             ee.fk_collective_id AS collectiveId,

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

@@ -471,4 +471,13 @@
             product.state = 1 and detail.state = 1 and goods.state = 1 and product.guid = #{productGuid,jdbcType=VARCHAR}
         </where>
     </select>
+
+    <!-- 一次性查出商品信息 根据产品类型和区域(村子)id -->
+    <select id="queryGoodsInfoByProductTypeAndArea" parameterType="Map" resultType="QueryGoodsInfoBO">
+            SELECT g.guid AS goodsId,g.goods_name AS goodsName
+                FROM t_goods_detail d JOIN t_goods_info g ON d.fk_goods_guid=g.guid
+                                                            JOIN t_product_info p ON p.guid=d.fk_product_guid
+                                                            JOIN t_poverty_area a ON a.guid=p.fk_poverty_area
+                WHERE p.fk_product_type=#{productTypeId} and a.village_id=#{villageId}
+    </select>
 </mapper>

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

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="GoodsOrderDetailMapper">
+<mapper namespace="com.hcloud.microserver.system.bank.dao.GoodsOrderDetailMapper">
   <resultMap id="BaseResultMap" type="GoodsOrderDetail">
     <id column="guid" jdbcType="CHAR" property="guid" />
     <result column="fk_order_guid" jdbcType="CHAR" property="fkOrderGuid" />
@@ -194,4 +194,15 @@
     where state = 1
     and fk_order_guid = #{goodsOrderInfoGuid,jdbcType=VARCHAR}
   </select>
+  <!-- 根据订单guid查询订单项 -->
+  <select id="queryOrderDetail" parameterType="String" resultType="OfflineOrderItemBO">
+    SELECT g.goods_code AS goodsCode,
+			 g.goods_type AS goodsType,
+			 d.goods_name AS goodsName,
+			 d.goods_price AS goodsPrice,
+			 d.sale_num AS saleNum,
+			 d.amount
+    FROM t_goods_order_detail d LEFT JOIN t_goods_info g ON d.fk_goods_guid=g.guid
+    WHERE d.fk_order_guid=#{orderGuid}
+  </select>
 </mapper>

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

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="GoodsOrderInfoMapper">
+<mapper namespace="com.hcloud.microserver.system.bank.dao.GoodsOrderInfoMapper">
   <resultMap id="BaseResultMap" type="GoodsOrderInfo">
     <id column="guid" jdbcType="CHAR" property="guid" />
     <result column="fk_customer_guid" jdbcType="CHAR" property="fkCustomerGuid" />
@@ -16,11 +16,12 @@
     <result column="modified_user" jdbcType="CHAR" property="modifiedUser" />
     <result column="modified_time" jdbcType="TIMESTAMP" property="modifiedTime" />
     <result column="pay_no" jdbcType="VARCHAR" property="payNo" />
+    <result column="order_type" jdbcType="INTEGER" property="orderType" />
   </resultMap>
   <sql id="Base_Column_List">
     guid, fk_customer_guid, order_no,customer_name,customer_type, order_amount,
     order_carbon_amount, order_status,state, create_user, create_time, modified_user,
-     modified_time,pay_no
+     modified_time,pay_no,order_type
   </sql>
   <select id="selectByPrimaryKey" parameterType="java.lang.String" resultMap="BaseResultMap">
     select 
@@ -132,12 +133,12 @@
     insert into t_goods_order_info (guid, fk_customer_guid, order_no, 
       customer_name,customer_type,order_amount, order_carbon_amount, order_status,
       state, create_user, create_time, 
-      modified_user, modified_time,pay_no)
+      modified_user, modified_time,pay_no,order_type)
     values (#{guid,jdbcType=CHAR}, #{fkCustomerGuid,jdbcType=CHAR}, #{orderNo,jdbcType=CHAR}, 
       #{customerName,jdbcType=VARCHAR},#{customerType,jdbcType=VARCHAR},#{orderAmount,jdbcType=DECIMAL},
       #{orderCarbonAmount,jdbcType=DECIMAL}, #{orderStatus,jdbcType=INTEGER},
       #{state,jdbcType=INTEGER}, #{createUser,jdbcType=CHAR}, #{createTime,jdbcType=TIMESTAMP}, 
-      #{modifiedUser,jdbcType=CHAR}, #{modifiedTime,jdbcType=TIMESTAMP},#{payNo,jdbcType=VARCHAR})
+      #{modifiedUser,jdbcType=CHAR}, #{modifiedTime,jdbcType=TIMESTAMP},#{payNo,jdbcType=VARCHAR},#{orderType,jdbcType=INTEGER})
   </insert>
   <insert id="insertSelective" parameterType="GoodsOrderInfo">
     insert into t_goods_order_info
@@ -184,6 +185,9 @@
       <if test="payNo != null">
         pay_no,
       </if>
+      <if test="orderType != null">
+        order_type,
+      </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides=",">
       <if test="guid != null">
@@ -228,6 +232,9 @@
       <if test="payNo != null">
         #{payNo,jdbcType=VARCHAR},
       </if>
+      <if test="orderType != null">
+        #{orderType,jdbcType=INTEGER},
+      </if>
     </trim>
   </insert>
   <update id="updateByPrimaryKeySelective" parameterType="GoodsOrderInfo">
@@ -272,6 +279,9 @@
       <if test="payNo != null">
         pay_no = #{payNo,jdbcType=VARCHAR},
       </if>
+      <if test="orderType != null">
+        order_type = #{orderType,jdbcType=INTEGER},
+      </if>
     </set>
     where guid = #{guid,jdbcType=CHAR}
   </update>
@@ -290,6 +300,7 @@
       modified_user = #{modifiedUser,jdbcType=CHAR},
       modified_time = #{modifiedTime,jdbcType=TIMESTAMP},
       pay_no = #{payNo,jdbcType=VARCHAR}
+      order_type = #{orderType,jdbcType=INTEGER}
     where guid = #{guid,jdbcType=CHAR}
   </update>
     <update id="updateOrderBelongInfo">
@@ -297,4 +308,105 @@
           set fk_customer_guid = #{newId}
      where fk_customer_guid = #{oldId}
     </update>
+    <!-- 线下认购订单列表 -->
+    <select id="offlineOrderList" parameterType="com.hcloud.microserver.commoncore.base.PageBean" resultType="OfflineOrderBO">
+        SELECT 	o.guid,
+        o.order_no AS orderNo,
+        o.order_amount AS orderAmount,
+        o.order_carbon_amount AS orderCarbonAmount,
+        o.create_time AS createTime,
+        CASE o.order_type
+        WHEN 1 THEN
+        '线上订单'
+        WHEN 1 THEN
+        '认购订单'
+        ELSE
+        '后台订单'
+        END AS orderType,
+        CASE o.order_status
+        WHEN 1 THEN
+        '未付款'
+        WHEN 2 THEN
+        '已完成'
+        WHEN 3 THEN
+        '未审核'
+        WHEN 4 THEN
+        '等待打款'
+        ELSE
+        '等待再审核'
+        END AS orderStatus,
+        c.guid AS customerId
+        c.account,
+        c.customer_name AS customerName,
+        gc.guid AS credentialNo
+        FROM t_goods_order_info o LEFT JOIN t_customer_info c ON o.fk_customer_guid = c.guid
+        LEFT JOIN t_goods_credential_info gc ON gc.fk_order_id = o.guid
+        WHERE o.state=1 AND order_type!=0
+        <if test="data.customerName!=null and data.customerName!=''">
+            AND c.customer_name LIKE concat('%', #{data.customerName}, '%')
+        </if>
+        <if test="data.account!=null and data.account!=''">
+            AND c.account=#{data.account}
+        </if>
+        <if test="data.orderNo!=null and data.orderNo != ''">
+            AND o.order_no=#{data.orderNo}
+        </if>
+        <if test="data.orderStatus !=null and data.orderStatus != ''">
+            AND o.order_status=#{data.orderStatus};
+        </if>
+        ORDER BY o.create_time DESC
+    </select>
+    <!-- 查询线下认购订单详情-->
+    <select id="queryOfflineOrderDetial" parameterType="String" resultType="OfflineOrderDetailBO">
+        SELECT 	o.guid,
+				o.order_no AS orderNo,
+				o.order_amount AS orderAmount,
+				o.order_carbon_amount AS orderCarbonAmount,
+				o.create_time AS createTime,
+				CASE o.order_type
+				WHEN 1 THEN
+						'线上订单'
+				WHEN 1 THEN
+						'认购订单'
+				ELSE
+						'后台订单'
+				END AS orderType,
+				CASE o.order_status
+				WHEN 1 THEN
+						'未付款'
+				WHEN 2 THEN
+						'已完成'
+				WHEN 3 THEN
+						'未审核'
+				WHEN 4 THEN
+						'等待打款'
+				ELSE
+						'等待再审核'
+				END AS orderStatus,
+			  CASE p.pay_channel
+				WHEN 1 THEN
+						'微信支付'
+				WHEN 2 THEN
+						'支付宝'
+				WHEN 3 THEN
+						'银联支付'
+				ELSE
+						'线下支付'
+				END AS payChannel,
+				c.account,
+				c.customer_name AS customerName,
+				c.phone,
+				CASE c.customer_type
+				WHEN 1 THEN
+					'自然人'
+				WHEN 2 THEN
+					'履约企业'
+				ELSE
+					'非履约企业'
+				END AS customerTypeName,
+				o.pay_no AS payNo
+			FROM t_goods_order_info o LEFT JOIN t_customer_info c ON o.fk_customer_guid = c.guid
+									  LEFT JOIN t_goods_pay_order p ON p.fk_order_id = o.guid
+					WHERE o.guid= #{guid}
+    </select>
 </mapper>

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

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="OrderPayVoucherMapper">
+<mapper namespace="com.hcloud.microserver.system.bank.dao.OrderPayVoucherMapper">
     <resultMap id="BaseResultMap" type="OrderPayVoucher">
         <id column="guid" jdbcType="CHAR" property="guid"/>
         <result column="fk_order_id" jdbcType="CHAR" property="fkOrderId"/>

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

@@ -305,11 +305,12 @@
         select <include refid="Base_Column_List"></include> from t_poverty_area
         <where>
             state = 1
-            and province_id = #{provinceId,jdbcType=VARCHAR}
-            and city_id = #{cityId,jdbcType=VARCHAR}
-            and town_id = #{townId,jdbcType=VARCHAR}
-            and county_id = #{countyId,jdbcType=VARCHAR}
-            and village_id = #{villageId,jdbcType=VARCHAR}
+            <if test="provinceId != null "> and province_id = #{provinceId}</if>
+            <if test="cityId != null "> and city_id = #{cityId}</if>
+            <if test="townId != null "> and town_id = #{townId}</if>
+            <if test="countyId != null "> and county_id = #{countyId}</if>
+            <if test="villageId != null "> and village_id = #{villageId}</if>
         </where>
     </select>
+
 </mapper>

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

@@ -180,4 +180,8 @@
     <select id="getCurrentCode" resultType="string">
         select max(type_val) from t_product_type
     </select>
+
+    <select id="getAll" resultType="Map">
+        select guid,type_name,type_val from t_product_type where state=1
+    </select>
 </mapper>

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

@@ -12,13 +12,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="remark"             column="remark"    />
         <result property="applyStatus"        column="apply_status"    />
         <result property="recordStatus"       column="record_status"    />
+        <result property="orderGuid"            column="order_guid"    />
         <result property="applyDate"          column="apply_date"    />
         <result property="createTime"         column="create_time"    />
         <result property="modifiedTime"       column="modified_time"    />
     </resultMap>
 
     <sql id="selectSubscriptionApplyVo">
-        select guid, apply_customer_id, apply_custom_name, amount, remark, apply_status, record_status, apply_date, create_time, modified_time from t_subscription_apply
+        select guid, apply_customer_id, apply_custom_name, amount, remark, apply_status, record_status,order_guid,apply_date, create_time, modified_time from t_subscription_apply
     </sql>
 
     <select id="selectSubscriptionApplyList" parameterType="SubscriptionApply" resultMap="SubscriptionApplyResult">
@@ -28,6 +29,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="applyStatus != null "> and apply_status = #{applyStatus}</if>
             <if test="applyDate != null "> and apply_date = #{applyDate}</if>
         </where>
+        ORDER BY create_time DESC
     </select>
     
     <select id="selectSubscriptionApplyById" parameterType="String" resultMap="SubscriptionApplyResult">
@@ -39,6 +41,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <update id="updateSubscriptionApply" parameterType="SubscriptionApply">
         update t_subscription_apply
         <trim prefix="SET" suffixOverrides=",">
+            <if test="orderGuid != null ">order_guid = #{orderGuid},</if>
             <if test="applyStatus != null ">apply_status = #{applyStatus},</if>
             <if test="modifiedTime != null ">modified_time = #{modifiedTime},</if>
         </trim>

carbon-bank/carbon-bank-common/pom.xml

@@ -8,7 +8,10 @@
         <version>0.0.1-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
-
+    <groupId>com.hcloud.microserver</groupId>
+    <version>0.0.1-SNAPSHOT</version>
+    <name>carbon-bank-common</name>
+    <packaging>jar</packaging>
     <artifactId>carbon-bank-common</artifactId>
     <dependencies>
         <dependency>
@@ -19,11 +22,13 @@
             <groupId>org.springframework.cloud</groupId>
             <artifactId>spring-cloud-openfeign-core</artifactId>
         </dependency>
+        <dependency>
+            <artifactId>carbon-bank-mbg</artifactId>
+            <groupId>com.hcloud.microserver</groupId>
+            <version>0.0.1-SNAPSHOT</version>
+        </dependency>
     </dependencies>
-    <groupId>com.hcloud.microserver</groupId>
-    <version>0.0.1-SNAPSHOT</version>
-    <name>carbon-bank-common</name>
-    <packaging>jar</packaging>
+
 
 
 

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

@@ -1,4 +1,4 @@
-package com.hcloud.microserver.system.bank.bo;
+package com.hcloud.microserver.system.bank.carbon.bo;
 
 import lombok.Data;
 

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

@@ -1,4 +1,4 @@
-package com.hcloud.microserver.system.bank.bo;
+package com.hcloud.microserver.system.bank.carbon.bo;
 
 import lombok.Data;
 

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

@@ -1,4 +1,4 @@
-package com.hcloud.microserver.system.bank.bo;
+package com.hcloud.microserver.system.bank.carbon.bo;
 
 import lombok.Data;
 

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

@@ -1,4 +1,4 @@
-package com.hcloud.microserver.system.bank.bo;
+package com.hcloud.microserver.system.bank.carbon.bo;
 
 import lombok.Data;
 

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

@@ -1,4 +1,4 @@
-package com.hcloud.microserver.system.bank.bo;
+package com.hcloud.microserver.system.bank.carbon.bo;
 
 import lombok.Data;
 

carbon-bank/carbon-bank-common/src/main/java/com/hcloud/microserver/system/bank/carbon/bo/CurrentAccountDetailQueryParam.java

@@ -0,0 +1,84 @@
+package com.hcloud.microserver.system.bank.carbon.bo;
+
+import com.alibaba.fastjson.annotation.JSONField;
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.hcloud.microserver.commoncore.util.string.StringUtils;
+import com.hcloud.microserver.system.bank.carbon.form.CurrentAccountDetailQueryForm;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.text.SimpleDateFormat;
+
+/**
+ * 2.5.	账务查询：活期账户明细查询CL0004
+ */
+
+@Data
+public class CurrentAccountDetailQueryParam implements Serializable {
+    /**账户号	19A	必输*/
+    @JSONField(name = "I1ACNO")
+    private String  I1ACNO;
+    /**币种	3A	暂不使用*/
+    @JSONField(name = "I1CYTP")
+    private String  I1CYTP;
+    /**起始日期	8P0	必输*/
+    @JSONField(name = "I1STDT")
+    private String  I1STDT;
+    /**终止日期	8P0	必输*/
+    @JSONField(name = "I1EDDT")
+    private String  I1EDDT;
+    /**起始金额	15P2	非必输*/
+    @JSONField(name = "I1BGAT")
+    private BigDecimal I1BGAT;
+    /**终止金额	15P2	非必输*/
+    @JSONField(name = "I1EDAT")
+    private BigDecimal  I1EDAT;
+    /**借贷标志	1A	空：全部;0：支出;1：收入*/
+    @JSONField(name = "I1JDBZ")
+    private String  I1JDBZ;
+    /**查询标志	1A	0-顺查1-倒查*/
+    @JSONField(name = "I1QYFG")
+    private String  I1QYFG;
+    /**起始条数	5P0	可选*/
+    @JSONField(name = "Num")
+    private String  Num;
+    /**查询条数	4P0	可选(最大2000)*/
+    @JSONField(name = "QryNum")
+    private String  QryNum;
+
+    public CurrentAccountDetailQueryParam(CurrentAccountDetailQueryForm form){
+        SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyyMMdd");
+        this.I1ACNO=form.getAccountNumber();
+        this.I1CYTP=form.getCurrency();
+
+        /**起始日期	8P0	必输*/
+        if (form.getStartDate() != null){
+            this.I1STDT=simpleDateFormat.format(form.getStartDate());
+        }
+
+        /**终止日期	8P0	必输*/
+        if (form.getEndDate() != null){
+            this.I1EDDT=simpleDateFormat.format(form.getEndDate());
+        }
+
+        /**起始金额	15P2	非必输*/
+        this.I1BGAT=form.getBeginAmount();
+        /**终止金额	15P2	非必输*/
+        this.I1EDAT=form.getEndAmount();
+        /**借贷标志	1A	空：全部;0：支出;1：收入*/
+        this.I1JDBZ=form.getLoanSign();
+        /**查询标志	1A	0-顺查1-倒查*/
+        this.I1QYFG=form.getQueryFlag();
+        /**起始条数	5P0	可选*/
+        if (StringUtils.isNotNull(form.getNum())){
+            this.Num=String.valueOf(form.getNum());
+        }
+        /**查询条数	4P0	可选(最大2000)*/
+
+        if (form.getQryNum() != null){
+            this.QryNum = String.valueOf(form.getQryNum());
+        }
+
+    }
+}

carbon-bank/carbon-bank-common/src/main/java/com/hcloud/microserver/system/bank/carbon/bo/CurrentAccountHistoricalBalanceQueryParam.java

@@ -0,0 +1,24 @@
+package com.hcloud.microserver.system.bank.carbon.bo;
+
+import com.hcloud.microserver.system.bank.carbon.form.CurrentAccountHistoricalBalanceQueryForm;
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+/**
+ * 活期账户历史余额查询
+ */
+@Data
+public class CurrentAccountHistoricalBalanceQueryParam {
+    /**账户号;必输;32A;*/
+    private String accNo;
+    /**日期;必输;8P0;*/
+    private String  date;
+    public CurrentAccountHistoricalBalanceQueryParam(){
+    }
+
+    public CurrentAccountHistoricalBalanceQueryParam(CurrentAccountHistoricalBalanceQueryForm form){
+        this.accNo=form.getAccNo();
+        this.date= form.getDate();
+    }
+}

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

@@ -1,4 +1,4 @@
-package com.hcloud.microserver.system.bank.bo;
+package com.hcloud.microserver.system.bank.carbon.bo;
 
 import lombok.Data;
 
@@ -8,7 +8,7 @@ import java.math.BigDecimal;
  * 获取账户历史余额查询
  */
 @Data
-public class CurrentAccountHistoricalBalanceQueryResp {
+public class CurrentAccountHistoricalBalanceQueryResp extends BankResponseBase {
     /**账户名称;null;100*O;*/
     private String accName;
     /**账户余额;null;15P2;*/

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

@@ -1,5 +1,6 @@
-package com.hcloud.microserver.system.bank.bo;
+package com.hcloud.microserver.system.bank.carbon.bo;
 
+import com.hcloud.microserver.system.bank.carbon.entity.CurrentAccountQueryDetailEntityDetail;
 import lombok.Data;
 
 import java.math.BigDecimal;
@@ -50,4 +51,28 @@ public class CurrentAccountQueryDetailResp {
     /**记录信息	200*O	*/
     private String O2JLXX;
 
+    public CurrentAccountQueryDetailEntityDetail getEntity(CurrentAccountQueryDetailEntityDetail entity){
+        entity.setTransactionDate(this.O2TRDT);
+        entity.setTransactionHour(this.O2TRTM);
+        entity.setCurrency(this.O2CYTP);
+        entity.setCurrencyDescription(this.O2CYMS);
+        entity.setLoanSign(this.O2AMCD);
+        entity.setTransferAmount(this.O2NGAM);
+        entity.setAccountBalance(this.O2ACBL);
+        entity.setCoreSerialNumber(this.O2TLSQ);
+        entity.setSummary(this.O2SMCD);
+        entity.setRemark(this.O2DESC);
+        entity.setTradingChannel(this.O2CHAN);
+        entity.setOtherAccounts(this.O2REAC);
+        entity.setOtherAccountName(this.O2RENM);
+        entity.setCounterPartyBank(this.O2REKH);
+        entity.setHandFee(this.O2SHXF);
+        entity.setUserWay(this.O2YOTU);
+        entity.setAccount1(this.O2AC1);
+        entity.setAccountName1(this.O2NM1);
+        entity.setBusinessType(this.O2YWZL);
+        entity.setRecordInformation(this.O2JLXX);
+        return entity;
+    }
+
 }

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

@@ -1,4 +1,4 @@
-package com.hcloud.microserver.system.bank.bo;
+package com.hcloud.microserver.system.bank.carbon.bo;
 
 import lombok.Data;
 

carbon-bank/carbon-bank-common/src/main/java/com/hcloud/microserver/system/bank/carbon/bo/CurrentAccountQueryDetailTotalResp.java

@@ -0,0 +1,66 @@
+package com.hcloud.microserver.system.bank.carbon.bo;
+
+import com.hcloud.microserver.commoncore.util.string.StringUtils;
+import com.hcloud.microserver.system.bank.carbon.entity.CurrentAccountQueryDetailEntity;
+import com.hcloud.microserver.system.bank.carbon.entity.CurrentAccountQueryDetailEntityDetail;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.ArrayList;
+import java.util.List;
+
+@Data
+public class CurrentAccountQueryDetailTotalResp extends BankResponseBase implements Serializable {
+    /**总笔数	5P0*/
+    private String O1TLNM;
+    /**汇出总笔数	4P0*/
+    private String O1OTNM;
+    /**汇出总金额	15P2*/
+    private BigDecimal O1OTAT;
+    /**汇入总笔数	4P0*/
+    private String O1INNM;
+    /**汇入总金额	15P2*/
+    private BigDecimal O1INAT;
+    /**查询明细*/
+    private List<CurrentAccountQueryDetailRespRecord> list;
+
+    public CurrentAccountQueryDetailEntity getEntity(CurrentAccountQueryDetailEntity entity){
+        if (StringUtils.isNotEmpty(this.O1TLNM)){
+            entity.setTotalNumber(Integer.valueOf(this.O1TLNM));
+        }
+
+        if (StringUtils.isNotEmpty(this.O1OTNM)){
+            entity.setExportTotalNumber(Integer.valueOf(this.O1OTNM));
+        }
+
+        if (StringUtils.isNotEmpty(this.O1INNM)){
+            entity.setImportTotalNumber(Integer.valueOf(this.O1INNM));
+        }
+        entity.setExportTotalAmount(this.O1OTAT);
+        entity.setImportTotalAmount(this.O1INAT);
+        if (this.list != null){
+            entity.setDetails(getDetails(list));
+        }
+        return entity;
+
+    }
+
+    public List<CurrentAccountQueryDetailEntityDetail> getDetails(List<CurrentAccountQueryDetailRespRecord> list){
+        if (list == null||list.size()<0){
+            return null;
+        }
+        List<CurrentAccountQueryDetailEntityDetail> details = new ArrayList<>();
+        list.stream().forEach(b->{
+            CurrentAccountQueryDetailEntityDetail entity = new CurrentAccountQueryDetailEntityDetail();
+            details.add(b.getRECORD().getEntity(entity));
+        });
+        return details;
+
+    }
+
+
+
+
+
+}

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

@@ -1,4 +1,4 @@
-package com.hcloud.microserver.system.bank.bo;
+package com.hcloud.microserver.system.bank.carbon.bo;
 
 import com.alibaba.fastjson.annotation.JSONField;
 import com.fasterxml.jackson.annotation.JsonFilter;

carbon-bank/carbon-bank-common/src/main/java/com/hcloud/microserver/system/bank/carbon/bo/CurrentAccountQueryResp.java

@@ -0,0 +1,68 @@
+package com.hcloud.microserver.system.bank.carbon.bo;
+
+import com.hcloud.microserver.system.bank.carbon.entity.CurrentAccountQueryEntity;
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+/**
+ * 活期账户查询返回
+ */
+@Data
+public class CurrentAccountQueryResp extends BankResponseBase {
+    /**账户号                     	19A	*/
+    private String O1ACNO;
+    /**客户号                     	10A	*/
+    private String O1CUNO;
+    /**客户中文名	62*O	*/
+    private String O1CUNM;
+    /**保留余额 	15P2	*/
+    private BigDecimal O1HOBL;
+    /**可用余额 	15P2	*/
+    private BigDecimal O1KYYE;
+    /**账户余额 	15P2	*/
+    private BigDecimal O1ACBL;
+    /**开户日期 	8P0	*/
+    private String O1OPDT;
+    /**账务归属机构 	6A	*/
+    private String O1ACSB;
+    /**账户状态中文描述	10*O	*/
+    private String O1STCD;
+    /**币种	2A	*/
+    private String O1CRTP;
+    /**币种中文描述	10*O	*/
+    private String O1BZZW;
+    /**开户机构	6A	*/
+    private String O1OPOG;
+    /**开户机构名称	62*O	*/
+    private String O1OPPL;
+    /**协定存款标志	2*O	*/
+    private String O1XDFG;
+
+    /**
+     * 返回重庆碳汇需要的实体
+     * @param entity
+     * @return
+     */
+    public CurrentAccountQueryEntity getEntity(CurrentAccountQueryEntity entity){
+
+        if (entity == null){
+            return null;
+        }
+        entity.setAccountNumber(this.O1ACNO);
+        entity.setClientNumber(this.O1CUNO);
+        entity.setClientChineseName(this.O1CUNM);
+        entity.setKeepBalance(this.O1HOBL);
+        entity.setAvailableBalance(this.O1KYYE);
+        entity.setAccountBalance(this.O1ACBL);
+        entity.setAccountOpenDate(this.O1OPDT);
+        entity.setAccountAgency(this.O1ACSB);
+        entity.setAccountStatusDescription(this.O1STCD);
+        entity.setCurrency(this.O1CRTP);
+        entity.setCurrencyDescription(this.O1BZZW);
+        entity.setAccountOpenInstitution(this.O1OPOG);
+        entity.setInstitutionName(this.O1OPPL);
+        entity.setAgreeDepositSign(this.O1XDFG);
+        return entity;
+    }
+}

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

@@ -1,4 +1,4 @@
-package com.hcloud.microserver.system.bank.bo;
+package com.hcloud.microserver.system.bank.carbon.bo;
 
 import lombok.Data;
 

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

@@ -1,4 +1,4 @@
-package com.hcloud.microserver.system.bank.bo;
+package com.hcloud.microserver.system.bank.carbon.bo;
 
 import lombok.Data;
 

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

@@ -1,4 +1,4 @@
-package com.hcloud.microserver.system.bank.bo;
+package com.hcloud.microserver.system.bank.carbon.bo;
 
 import lombok.Data;
 

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

@@ -1,4 +1,4 @@
-package com.hcloud.microserver.system.bank.bo;
+package com.hcloud.microserver.system.bank.carbon.bo;
 
 import lombok.Data;
 

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

@@ -1,4 +1,4 @@
-package com.hcloud.microserver.system.bank.bo;
+package com.hcloud.microserver.system.bank.carbon.bo;
 
 import lombok.Data;
 

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

@@ -1,4 +1,4 @@
-package com.hcloud.microserver.system.bank.bo;
+package com.hcloud.microserver.system.bank.carbon.bo;
 
 import lombok.Data;
 

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

@@ -1,4 +1,4 @@
-package com.hcloud.microserver.system.bank.bo;
+package com.hcloud.microserver.system.bank.carbon.bo;
 
 import lombok.Data;
 

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

@@ -1,4 +1,4 @@
-package com.hcloud.microserver.system.bank.bo;
+package com.hcloud.microserver.system.bank.carbon.bo;
 
 import lombok.Data;
 

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

@@ -1,6 +1,8 @@
-package com.hcloud.microserver.system.bank.bo;
+package com.hcloud.microserver.system.bank.carbon.bo;
 
 import com.alibaba.fastjson.annotation.JSONField;
+import com.hcloud.microserver.bank.mbg.modul.BTransferDetail;
+import com.hcloud.microserver.bank.mbg.modul.BUser;
 import lombok.Data;
 
 import java.math.BigDecimal;
@@ -67,4 +69,50 @@ public class IntrabankTransferParam {
     /**记录信息;null;200*O;*/
     @JSONField(name = "I1JLXX")
     private String I1JLXX;
+
+    public IntrabankTransferParam param(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;
+
+    }
 }

carbon-bank/carbon-bank-common/src/main/java/com/hcloud/microserver/system/bank/carbon/bo/IntrabankTransferResp.java

@@ -0,0 +1,58 @@
+package com.hcloud.microserver.system.bank.carbon.bo;
+
+import com.hcloud.microserver.bank.mbg.modul.BTransferDetail;
+import com.hcloud.microserver.bank.mbg.modul.BTransferDetailRequest;
+import com.hcloud.microserver.bank.mbg.modul.BUser;
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+@Data
+public class IntrabankTransferResp extends BankResponseBase {
+
+    /**渠道流水号;null;15A;*/
+    private String O1TLSQ;
+    /**交易状态;见数据字典说明;2A;*/
+    private String O1JYZT;
+    /**状态描述;null;20*O;*/
+    private String O1ZTMS;
+    /**交易应答代码;null;20A;*/
+    private String O1JYYD;
+    /**失败原因;null;100*O;*/
+    private String O1SBYY;
+    /**付款账户余额;null;15P2;*/
+    private BigDecimal O1ZHYE;
+    /**手续费;null;15P2;*/
+    private BigDecimal O1PCDF;
+    /**邮电费;null;15P2;*/
+    private BigDecimal O1PSTF;
+
+    public BTransferDetailRequest transferDetailRequest (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/bo/MyX509Manager.java

@@ -1,4 +1,4 @@
-package com.hcloud.microserver.system.bank.bo;
+package com.hcloud.microserver.system.bank.carbon.bo;
 
 import javax.net.ssl.X509TrustManager;
 import java.security.cert.CertificateException;

carbon-bank/carbon-bank-common/src/main/java/com/hcloud/microserver/system/bank/carbon/bo/OutOfBankTransferParam.java

@@ -0,0 +1,140 @@
+package com.hcloud.microserver.system.bank.carbon.bo;
+
+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.commoncore.util.reflect.DateUtils;
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * 2.7.	转账：行外转账CL0006（需签名）
+ */
+@Data
+public class OutOfBankTransferParam {
+
+    /**企业流水号;必输域;20A;*/
+    private String I1QYLS;
+    /**提交人ID;null;30A;*/
+    private String I1SMID;
+    /**最后授权人ID;null;30A;*/
+    private String I1ATID;
+    /**货币符号;必输域币种表人民币01;2A;*/
+    private String CYNO;
+    /**付款金额;必输域;15P2;*/
+    private BigDecimal HBJE;
+    /**付款人开户行;必输域;12A;*/
+    private String FKKH;
+    /**付款人账号;必输域;32A;*/
+    private String FKZH;
+    /**付款人名称;必输域;60*O;*/
+    private String FKRM;
+    /**收款人开户行;当加急标志为0，1时必输;12A;*/
+    private String SKKH;
+    /**收款人开户行名;当加急标志为2时必输;100*O;*/
+    private String SKHM;
+    /**收款人账号;必输域;32A;*/
+    private String SKZH;
+    /**收款人名称;必输域;60*O;*/
+    private String SKRM;
+    /**付款用途;必输域;30*O;*/
+    private String FYAN;
+    /**付款人备注;null;30*O;*/
+    private String FKBZ;
+    /**加急标志;必输域0：普通（小额），1：加急（大额），2：支付平台;1A;*/
+    private String JJBZ;
+    /**交易类型;必输域0：集团账号转账1：普通转账;1A;*/
+    private String IJYLX;
+    /**核心流水号;null;15A;*/
+    private String I1TLSQ;
+    /**交易日期;null;8A;*/
+    private String I1TRDT;
+    /**交易序号;null;15A;*/
+    private String I1ZFXH;
+    /**企业指令内部编号;null;30A;*/
+    private String I1NBBH;
+    /**手续费支付方;0：付款人支付(默认);1A;*/
+    private String I1SXZF;
+    /**校验标志;0：无（默认）1：招标账户校验;1A;*/
+    private String I1JYBZ;
+    /**原明细序号;null;8A;*/
+    private String I1MXXH;
+    /**账号1;null;32A;*/
+    private String I1AC1;
+    /**账户户名1;null;100*O;*/
+    private String I1NM1;
+    /**业务种类;1-代理支付;1A;*/
+    private String I1YWZL;
+    /**记录信息;null;200*O;*/
+    private String I1JLXX;
+
+
+    public  OutOfBankTransferParam(){
+
+    }
+    /**
+     * 封装行内转账
+     * @return
+     */
+    public  OutOfBankTransferParam(BTransferDetail b, BUser user, String no){
+
+        /**企企业流水号      必输域*/
+        this.I1QYLS=no;
+        /**提交人ID*/
+//        this.I1SMID=;
+        /**最后授权人ID*/
+//        this.I1ATID=;
+        /**货币符号         必输域币种表*/
+        this.CYNO="01";
+        /**付款金额         必输域*/
+        this.HBJE=b.getTransferAmount();
+        /**付款人开户行      必输域*/
+        this.FKKH=user.getBankName();
+        /**付款人账号       必输域*/
+        this.FKZH=user.getBankNo();
+        /**付款人名称       必输域*/
+        this.FKRM=user.getAccountName();
+        /**收款人开户行      当加急标志为0，1时必输*/
+        this.SKKH=b.getBankName();
+        /**收款人开户行名    当加急标志为2时必输*/
+        this.SKHM=b.getBankName();
+        /**收款人账号       必输域*/
+        this.SKZH= b.getBankNo();
+        /**收款人名称       必输域*/
+        this.SKRM=b.getName();
+        /**付款用途         必输域*/
+        this.FYAN="碳汇清分"+b.getGuid();
+        /**付款人备注*/
+        this.FKBZ="付款人编号"+user.getGuid();
+        /**加急标志         必输域*/
+        this.JJBZ=2+"";
+        /**交易类型         必输域*/
+        this.IJYLX="0";
+        /**核心流水号*/
+        this.I1TLSQ=no;
+        /**交易日期*/
+        this.I1TRDT= DateUtils.dateTime(new Date());
+        /**交易序号*/
+        this.I1ZFXH=no;
+        /**企业指令内部编号*/
+        this.I1NBBH=no;
+        /**手续费支付方      0：付款人支付(默认)*/
+        this.I1SXZF="0";
+        /**校验标志         0：无（默认）*/
+        this.I1JYBZ="0";
+        /**原明细序号*/
+        this.I1MXXH=no;
+        /**账号1*/
+//        this.I1AC1=;
+        /**账户户名1*/
+//        this.I1NM1=;
+        /**业务种类         1-代理支付*/
+//        this.I1YWZL=;
+        /**记录信息*/
+//        this.I1JLXX=;
+
+    }
+}

carbon-bank/carbon-bank-common/src/main/java/com/hcloud/microserver/system/bank/carbon/bo/OutOfBankTransferResp.java

@@ -0,0 +1,60 @@
+package com.hcloud.microserver.system.bank.carbon.bo;
+
+import com.hcloud.microserver.bank.mbg.modul.BTransferDetail;
+import com.hcloud.microserver.bank.mbg.modul.BTransferDetailRequest;
+import com.hcloud.microserver.bank.mbg.modul.BUser;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ * 2.7.	转账：行外转账CL0006（需签名）
+ */
+@Data
+public class OutOfBankTransferResp extends BankResponseBase implements Serializable {
+    /**渠道流水号;null;15A;*/
+    private String O1TLSQ;
+    /**交易状态;见数据字典说明;2A;*/
+    private String O1JYZT;
+    /**状态描述;null;10*O;*/
+    private String O1ZTMS;
+    /**交易应答代码;null;7A;*/
+    private String O1JYYD;
+    /**失败原因;null;60*O;*/
+    private String O1SBYY;
+    /**付款账户余额;null;15P2;*/
+    private BigDecimal O1ZHYE;
+    /**手续费;null;15P2;*/
+    private BigDecimal O1PCDF;
+    /**邮电费;null;15P2;*/
+    private BigDecimal O1PSTF;
+    public BTransferDetailRequest transferDetailRequest (BTransferDetail b, BankQueryBaseParam<OutOfBankTransferParam> param, OutOfBankTransferResp 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-common/src/main/java/com/hcloud/microserver/system/bank/carbon/bo/PayWagesOrReimbursementDetail.java

@@ -0,0 +1,29 @@
+package com.hcloud.microserver.system.bank.carbon.bo;
+
+import com.hcloud.microserver.bank.mbg.modul.BTransfer;
+import com.hcloud.microserver.bank.mbg.modul.BTransferDetail;
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+@Data
+public class PayWagesOrReimbursementDetail {
+    /**收款人账号;必输域;19A;*/
+    private String O2SKZH;
+    /**收款人姓名;必输域;62*O;*/
+    private String O2SKXM;
+    /**金额;必输域;15P2;*/
+    private BigDecimal O2JYJE;
+    /**备注/用途;null;42*O;*/
+    private String O2JYBZ;
+
+    public PayWagesOrReimbursementDetail(){
+    }
+    public PayWagesOrReimbursementDetail(BTransferDetail detail){
+        this.O2SKZH = detail.getBankNo();
+        this.O2SKXM = detail.getName();
+        this.O2JYJE = detail.getTransferAmount();
+        this.O2JYBZ = "重庆碳汇清分"+detail.getSerilNo();
+    }
+
+}

carbon-bank/carbon-bank-common/src/main/java/com/hcloud/microserver/system/bank/carbon/bo/PayWagesOrReimbursementParam.java

@@ -0,0 +1,100 @@
+package com.hcloud.microserver.system.bank.carbon.bo;
+
+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.commoncore.util.reflect.DateUtils;
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * 2.12.	账务支付：代发工资/代报销CL0033（需签名）
+ */
+@Data
+public class PayWagesOrReimbursementParam {
+
+    /**企业流水号;必输域;20A;*/
+    private String I1QYLS;
+    /**提交人ID;null;30A;*/
+    private String I1SMID;
+    /**最后授权人ID;null;30A;*/
+    private String I1ATID;
+    /**业务类型;必输域;3A;*/
+    private String O1YWLX;
+    /**代发月份;必输域;6P0;*/
+    private String O1DFYF;
+    /**付款账号;必输域;19A;*/
+    private String O1FKAC;
+    /**总笔数;必输域;3P0;*/
+    private String O1TRCT;
+    /**总金额;必输域;15P2;*/
+    private BigDecimal O1TRAM;
+    /**批次备注;null;32*O;*/
+    private String O1PCBZ;
+    /**企业指令内部编号;null;30A;*/
+    private String I1NBBH;
+    /**操作方式;默认：0；0：账务处理1：数据校验;1A;*/
+    private String O1FLAG;
+    /**明细展示;0：隐藏明细；1：显示明细；默认：0;1A;*/
+    private String O1SHOW;
+    /**交易类型;0：集团账号转账；1：普通转账；默认：0;1A;*/
+    private String IJYLX;
+    /**明细组合*/
+    private List<PayWagesOrReimbursementRecord> list;
+
+    /**
+     * 实例化空构造方法
+     */
+    public PayWagesOrReimbursementParam(){
+    }
+
+    public PayWagesOrReimbursementParam(List<BTransferDetail> list, BUser user, String no, BTransfer transfer){
+
+        /**企业流水号;必输域;20A;*/
+        this.I1QYLS = no;
+        /**提交人ID;null;30A;*/
+//        this.I1SMID = ;
+        /**最后授权人ID;null;30A;*/
+//        this.I1ATID = ;
+        /**业务类型;必输域;3A;*/
+        this.O1YWLX = "101";
+        /**代发月份;必输域;6P0;*/
+        this.O1DFYF = DateUtils.getLastMonth();
+        /**付款账号;必输域;19A;*/
+        this.O1FKAC = user.getBankNo();
+        /**总笔数;必输域;3P0;*/
+        this.O1TRCT = transfer.getTransferNum()+"";
+        /**总金额;必输域;15P2;*/
+        this.O1TRAM = transfer.getTransferAmount();
+        /**批次备注;null;32*O;*/
+        this.O1PCBZ = no;
+        /**企业指令内部编号;null;30A;*/
+        this.I1NBBH = no;
+        /**操作方式;默认：0；0：账务处理1：数据校验;1A;*/
+        this.O1FLAG = "0";
+        /**明细展示;0：隐藏明细；1：显示明细；默认：0;1A;*/
+        this.O1SHOW = "1";
+        /**交易类型;0：集团账号转账；1：普通转账；默认：0;1A;*/
+        this.IJYLX = "0";
+        if (list != null&&list.size()>0){
+            List<PayWagesOrReimbursementRecord> details = new ArrayList<>();
+            list.stream().forEach(b->{
+                PayWagesOrReimbursementRecord record = new PayWagesOrReimbursementRecord();
+
+                PayWagesOrReimbursementDetail detail = new PayWagesOrReimbursementDetail(b);
+                record.setRECORD(detail);
+                details.add(record);
+
+            });
+            this.list = details;
+        }
+
+
+
+    }
+
+
+}

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

@@ -1,4 +1,4 @@
-package com.hcloud.microserver.system.bank.bo;
+package com.hcloud.microserver.system.bank.carbon.bo;
 
 import lombok.Data;
 

carbon-bank/carbon-bank-common/src/main/java/com/hcloud/microserver/system/bank/carbon/bo/PayWagesOrReimbursementResp.java

@@ -0,0 +1,49 @@
+package com.hcloud.microserver.system.bank.carbon.bo;
+
+import com.hcloud.microserver.bank.mbg.modul.*;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * 2.12.	账务支付：代发工资/代报销CL0033（需签名）
+ */
+@Data
+public class PayWagesOrReimbursementResp extends BankResponseBase{
+    /**渠道流水号;null;15A;*/
+    private String O1TLSQ;
+    /**交易状态;见数据字典说明;2A;*/
+    private String O1JYZT;
+    /**状态描述;null;20*O;*/
+    private String O1ZTMS;
+    /**交易应答代码;null;20A;*/
+    private String O1JYYD;
+    /**失败原因;null;100*O;*/
+    private String O1SBYY;
+    public BTransferFarmerRequest transferDetailRequest (BTransfer b, BankQueryBaseParam<PayWagesOrReimbursementParam> param, PayWagesOrReimbursementResp intrResp, BUser user) {
+        BTransferFarmerRequest request = new BTransferFarmerRequest();
+        request.setFkTransferId(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.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/bo/ReimbursementInstructionQureyParam.java

@@ -1,4 +1,4 @@
-package com.hcloud.microserver.system.bank.bo;
+package com.hcloud.microserver.system.bank.carbon.bo;
 
 import lombok.Data;
 

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

@@ -1,4 +1,4 @@
-package com.hcloud.microserver.system.bank.bo;
+package com.hcloud.microserver.system.bank.carbon.bo;
 
 import lombok.Data;
 

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

@@ -1,4 +1,4 @@
-package com.hcloud.microserver.system.bank.bo;
+package com.hcloud.microserver.system.bank.carbon.bo;
 
 import lombok.Data;
 

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

@@ -1,4 +1,4 @@
-package com.hcloud.microserver.system.bank.bo;
+package com.hcloud.microserver.system.bank.carbon.bo;
 
 import lombok.Data;
 

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

@@ -1,4 +1,4 @@
-package com.hcloud.microserver.system.bank.bo;
+package com.hcloud.microserver.system.bank.carbon.bo;
 
 import lombok.Data;
 

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

@@ -1,4 +1,4 @@
-package com.hcloud.microserver.system.bank.bo;
+package com.hcloud.microserver.system.bank.carbon.bo;
 
 import lombok.Data;
 

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

@@ -1,4 +1,4 @@
-package com.hcloud.microserver.system.bank.bo;
+package com.hcloud.microserver.system.bank.carbon.bo;
 
 import lombok.Data;
 

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

@@ -1,4 +1,4 @@
-package com.hcloud.microserver.system.bank.bo;
+package com.hcloud.microserver.system.bank.carbon.bo;
 
 import lombok.Data;
 

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

@@ -1,4 +1,4 @@
-package com.hcloud.microserver.system.bank.bo;
+package com.hcloud.microserver.system.bank.carbon.bo;
 
 import lombok.Data;
 

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

@@ -1,4 +1,4 @@
-package com.hcloud.microserver.system.bank.bo;
+package com.hcloud.microserver.system.bank.carbon.bo;
 
 import lombok.Data;
 

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

@@ -1,9 +1,9 @@
-package com.hcloud.microserver.system.bank.bo;
+package com.hcloud.microserver.system.bank.carbon.bo;
 
 import lombok.Data;
 
 @Data
-public class TransactionOrderStatusQueryResp {
+public class TransactionOrderStatusQueryResp extends BankResponseBase {
     /**交易状态;见数据字典说明;2A;*/
     private String O1JYZT;
     /**状态描述;状态中文描述;10*O;*/

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

@@ -1,4 +1,4 @@
-package com.hcloud.microserver.system.bank.bo;
+package com.hcloud.microserver.system.bank.carbon.bo;
 
 import lombok.Data;
 

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

@@ -1,4 +1,4 @@
-package com.hcloud.microserver.system.bank.bo;
+package com.hcloud.microserver.system.bank.carbon.bo;
 
 import lombok.Data;
 

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

@@ -1,4 +1,4 @@
-package com.hcloud.microserver.system.bank.bo;
+package com.hcloud.microserver.system.bank.carbon.bo;
 
 import lombok.Data;
 

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

@@ -0,0 +1,39 @@
+package com.hcloud.microserver.system.bank.carbon.entity;
+
+import com.hcloud.microserver.system.bank.carbon.bo.CurrentAccountHistoricalBalanceQueryResp;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+@Data
+@ApiModel("历史查询返回数据")
+public class CurrentAccountHistoricalBalanceQueryEntity {
+
+    /**账户名称;null;100*O;*/
+    @ApiModelProperty("账户名称")
+    private String accName;
+    /**账户余额;null;15P2;*/
+    @ApiModelProperty("账户余额")
+    private BigDecimal balance;
+
+    @ApiModelProperty("银行返回编码")
+    private String retCode;
+
+    @ApiModelProperty("序号")
+    private String serialNo;
+
+    public   CurrentAccountHistoricalBalanceQueryEntity(CurrentAccountHistoricalBalanceQueryResp resp){
+
+        this.accName = resp.getAccName();
+        this.balance = resp.getBalance();
+        this.retCode = resp.getRetCode();
+        this.serialNo = resp.getSerialNo();
+    }
+
+
+    public   CurrentAccountHistoricalBalanceQueryEntity(){
+
+    }
+}

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

@@ -0,0 +1,34 @@
+package com.hcloud.microserver.system.bank.carbon.entity;
+
+import com.hcloud.microserver.system.bank.carbon.bo.CurrentAccountQueryDetailRespRecord;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.util.List;
+
+@ApiModel("活期账户明细查询结果")
+@Data
+public class CurrentAccountQueryDetailEntity {
+
+    @ApiModelProperty("总笔数")
+    private Integer totalNumber;
+
+    @ApiModelProperty("汇出总笔数")
+    private Integer exportTotalNumber;
+
+    @ApiModelProperty("汇出总金额")
+    private BigDecimal exportTotalAmount;
+
+    @ApiModelProperty("汇出总笔数")
+    private Integer importTotalNumber;
+
+    @ApiModelProperty("汇出总金额")
+    private BigDecimal importTotalAmount;
+
+    @ApiModelProperty("明细")
+    private List<CurrentAccountQueryDetailEntityDetail> details;
+
+
+}

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

@@ -0,0 +1,74 @@
+package com.hcloud.microserver.system.bank.carbon.entity;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+@ApiModel("活期账户明细查询明细")
+@Data
+public class CurrentAccountQueryDetailEntityDetail {
+
+    @ApiModelProperty("交易日期")
+    private String transactionDate;
+
+    @ApiModelProperty("交易时间")
+    private String transactionHour;
+
+    @ApiModelProperty("币种")
+    private String currency;
+
+    @ApiModelProperty("币种中文描述")
+    private String currencyDescription;
+
+    @ApiModelProperty("借贷标记")
+    private String loanSign;
+
+    @ApiModelProperty("交易金额")
+    private BigDecimal transferAmount;
+
+    @ApiModelProperty("账户余额")
+    private BigDecimal accountBalance;
+
+    @ApiModelProperty("核心流水号")
+    private String coreSerialNumber;
+
+    @ApiModelProperty("摘要")
+    private String summary;
+
+    @ApiModelProperty("备注")
+    private String remark;
+
+    @ApiModelProperty("交易渠道")
+    private String tradingChannel;
+
+    @ApiModelProperty("对方账户号")
+    private String otherAccounts;
+
+    @ApiModelProperty("对方户名")
+    private String otherAccountName;
+
+    @ApiModelProperty("对方开户行")
+    private String counterPartyBank;
+
+    @ApiModelProperty("手续费")
+    private BigDecimal handFee;
+
+    @ApiModelProperty("用途")
+    private String userWay;
+
+    @ApiModelProperty("账号1")
+    private String account1;
+
+    @ApiModelProperty("账户户名1")
+    private String accountName1;
+
+    @ApiModelProperty("业务种类")
+    private String businessType;
+
+    @ApiModelProperty("记录信息")
+    private String recordInformation;
+
+    
+}

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

@@ -0,0 +1,59 @@
+package com.hcloud.microserver.system.bank.carbon.entity;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import org.springframework.beans.factory.annotation.Autowired;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+
+@ApiModel("活期账户查询返回体")
+@Data
+public class CurrentAccountQueryEntity implements Serializable {
+    @ApiModelProperty("账户号")
+    private String accountNumber;
+
+    @ApiModelProperty("客户号")
+    private String clientNumber;
+
+    @ApiModelProperty("客户号")
+    private String clientChineseName;
+
+    @ApiModelProperty("保留余额")
+    private BigDecimal KeepBalance;
+
+    @ApiModelProperty("可用余额")
+    private BigDecimal availableBalance;
+
+    @ApiModelProperty("账户余额")
+    private BigDecimal accountBalance;
+
+    @ApiModelProperty("开户日期")
+    private String accountOpenDate;
+
+    @ApiModelProperty("账务归属机构")
+    private String accountAgency;
+
+    @ApiModelProperty("账务状态中文描述")
+    private String accountStatusDescription;
+
+    @ApiModelProperty("币种")
+    private String currency;
+
+    @ApiModelProperty("币种中文描述")
+    private String currencyDescription;
+
+    @ApiModelProperty("开户机构")
+    private String accountOpenInstitution;
+
+    @ApiModelProperty("开户机构名称")
+    private String institutionName;
+
+    @ApiModelProperty("协定存款标志")
+    private String agreeDepositSign;
+
+
+
+
+}

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

@@ -0,0 +1,28 @@
+package com.hcloud.microserver.system.bank.carbon.entity;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@ApiModel("交易指令状态查询")
+@Data
+public class TransactionOrderStatusQueryEntity {
+
+    @ApiModelProperty("交易状态")
+    private String payStatus;
+
+    @ApiModelProperty("交易状态描述")
+    private String payMsg;
+
+    @ApiModelProperty("交易应答码")
+    private String payResponseCode;
+
+    @ApiModelProperty("失败原因")
+    private String failReason;
+
+    @ApiModelProperty("响应码")
+    private String retCode;
+
+    @ApiModelProperty("序号")
+    private String serialNo;
+}

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

@@ -1,5 +1,6 @@
 package com.hcloud.microserver.system.bank.carbon.form;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import com.hcloud.microserver.commoncore.base.BaseForm;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -21,10 +22,12 @@ public class BTransferForm extends BaseForm {
 
     @ApiModelProperty("清分类型")
     private Integer transferType;
-
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @ApiModelProperty("起始时间")
     private Date startTime;
 
+
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @ApiModelProperty("结束时间")
     private Date endTime;