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

# Conflicts:
#	carbon-back/carbon-back-service/src/main/java/com/hcloud/microserver/system/CarbonSystemApplication.java
#	carbon-back/carbon-back-service/src/main/resources/carbon/CustomerInfoMapper.xml

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/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-service/src/main/java/com/hcloud/microserver/system/CarbonSystemApplication.java

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

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/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/CompanyServiceImpl.java

@@ -28,7 +28,9 @@ public class CompanyServiceImpl implements CompanyService {
         int result = 0;
 
         String customerGuid = UUIDUtils.randomUUID();
+        //获取账号
         customerInfo.setAccount(TracedCodeUtils.generateShortUuid());
+
         customerInfo.setPasswd(Md5Util.toMD5("000000"));
         customerInfo.setState(1);
         customerInfo.setIsEnable(1);

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/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

@@ -41,7 +41,7 @@
     where guid = #{guid,jdbcType=CHAR}
   </select>
     <select id="searchCustomerByPage" parameterType="com.hcloud.microserver.commoncore.base.PageBean"
-            resultType="CustomerInfoBO">
+            resultType="com.hcloud.microserver.system.bank.bo.CustomerInfoBO">
       SELECT
           aa.guid,
           aa.account AS account,
@@ -111,7 +111,7 @@
       state =1
     and (account=#{queryStr,jdbcType=VARCHAR} or phone=#{queryStr,jdbcType=VARCHAR})
   </select>
-  <select id="getCustomerByThreeCode" resultType="CustomerInfoBO">
+  <select id="getCustomerByThreeCode" resultType="com.hcloud.microserver.system.bank.bo.CustomerInfoBO">
         SELECT
           aa.guid as guid,
           aa.account as account,
@@ -137,7 +137,7 @@
         AND bb.channel_type =#{channel}
         AND (bb.channel_keyword_one = #{code} or bb.channel_keyword_two=#{code})
   </select>
-  <select id="getCustomerStatisticalInfo" resultType="CustomerInfoBO">
+  <select id="getCustomerStatisticalInfo" resultType="com.hcloud.microserver.system.bank.bo.CustomerInfoBO">
     SELECT
         aa.fk_customer_guid AS customId,
         SUM(bb.sale_num) AS carbonAmount,
@@ -159,7 +159,7 @@
   delete from t_customer_info
   where guid = #{guid,jdbcType=CHAR}
   </delete>
-  <insert id="insert" parameterType="CustomerInfo">
+  <insert id="insert" parameterType="com.hcloud.microserver.system.facade.carbon.entity.CustomerInfo">
     insert into t_customer_info (guid, account, passwd, 
       customer_type, customer_name, nick_name, 
       pid, phone, sex, score, 
@@ -175,7 +175,7 @@
       #{createUser,jdbcType=CHAR}, #{createTime,jdbcType=TIMESTAMP}, #{modifiedUser,jdbcType=CHAR}, 
       #{modifiedTime,jdbcType=TIMESTAMP})
   </insert>
-  <insert id="insertSelective" parameterType="CustomerInfo">
+  <insert id="insertSelective" parameterType="com.hcloud.microserver.system.facade.carbon.entity.CustomerInfo">
     insert into t_customer_info
     <trim prefix="(" suffix=")" suffixOverrides=",">
       <if test="guid != null">
@@ -308,7 +308,7 @@
       </if>
     </trim>
   </insert>
-  <update id="updateByPrimaryKeySelective" parameterType="CustomerInfo">
+  <update id="updateByPrimaryKeySelective" parameterType="com.hcloud.microserver.system.facade.carbon.entity.CustomerInfo">
     update t_customer_info
     <set>
       <if test="account != null">
@@ -374,7 +374,7 @@
     </set>
     where guid = #{guid,jdbcType=CHAR}
   </update>
-  <update id="updateByPrimaryKey" parameterType="CustomerInfo">
+  <update id="updateByPrimaryKey" parameterType="com.hcloud.microserver.system.facade.carbon.entity.CustomerInfo">
     update t_customer_info
     set account = #{account,jdbcType=VARCHAR},
       passwd = #{passwd,jdbcType=VARCHAR},

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-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;
 

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

@@ -0,0 +1,12 @@
+package com.hcloud.microserver.system.bank.carbon.form;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@ApiModel("活期账户查询")
+@Data
+public class BankCurrentAccountForm extends RequestTransferForm {
+    @ApiModelProperty("账户属性")
+    private String bankAccount;
+}

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

@@ -0,0 +1,16 @@
+package com.hcloud.microserver.system.bank.carbon.form;
+
+import com.hcloud.microserver.bank.mbg.modul.BUser;
+import com.hcloud.microserver.system.bank.carbon.bo.BankQueryBaseParam;
+import lombok.Data;
+
+@Data
+public class BankUserAndParam {
+    private BUser user;
+
+    private BankQueryBaseParam param;
+
+    private String serviceId;
+
+
+}

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

@@ -0,0 +1,51 @@
+package com.hcloud.microserver.system.bank.carbon.form;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.hcloud.microserver.system.bank.carbon.bo.CurrentAccountDetailQueryParam;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+
+
+@Data
+@ApiModel("活期账户信息信息查询")
+public class CurrentAccountDetailQueryForm extends RequestTransferForm  {
+    @ApiModelProperty("账户号")
+    private String accountNumber;
+
+    @ApiModelProperty("币种")
+    private String currency;
+
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @ApiModelProperty("起始日期")
+    private Date startDate;
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @ApiModelProperty("终止日期")
+    private Date endDate;
+
+    @ApiModelProperty("起始金额")
+    private BigDecimal beginAmount;
+
+
+    @ApiModelProperty("终止金额")
+    private BigDecimal endAmount;
+
+    @ApiModelProperty("借贷标志")
+    private String loanSign;
+
+    @ApiModelProperty("查询标志")
+    private String queryFlag;
+
+    @ApiModelProperty("起始条数")
+    private Integer num;
+
+    @ApiModelProperty("查询条数")
+    private Integer qryNum;
+
+
+
+}

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

@@ -0,0 +1,18 @@
+package com.hcloud.microserver.system.bank.carbon.form;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+@ApiModel("历史账户查询余额")
+public class CurrentAccountHistoricalBalanceQueryForm extends RequestTransferForm {
+    /**账户号;必输;32A;*/
+    @ApiModelProperty("账户号")
+    private String accNo;
+    /**日期;必输;8P0;*/
+    @ApiModelProperty("日期")
+    private String date;
+
+
+}

carbon-bank/carbon-bank-common/src/main/java/com/hcloud/microserver/system/bank/carbon/form/MakeClearForm.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;
@@ -12,9 +13,11 @@ import java.util.List;
 @ApiModel("添加清分")
 public class MakeClearForm extends BaseForm implements Serializable {
 
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @ApiModelProperty("开始时间")
     private Date startTime;
 
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @ApiModelProperty("结束时间")
     private Date endTime;
 

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

@@ -7,16 +7,17 @@ import lombok.Data;
 
 @Data
 @ApiModel("请求清分参数模型")
-public class RequestTransferForm extends BaseForm {
+public class RequestTransferForm{
     @ApiModelProperty("清分账户")
-    private String userId;
+    private String account;
 
     @ApiModelProperty("清分密码")
-    private String pwd;
+    private String password;
 
     @ApiModelProperty("清分类型")
     private Integer clearType;
 
+
     @ApiModelProperty("请求清分主体id")
     private Long transferId;
 }

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

@@ -0,0 +1,24 @@
+package com.hcloud.microserver.system.bank.carbon.form;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+@ApiModel("交易指令状态查询Form")
+public class TransactionOrderStatusQueryForm  {
+    @ApiModelProperty("企业流水号")
+    private String entSerialNO;
+
+    @ApiModelProperty("渠道流水号")
+    private String chaSerialNo;
+
+    @ApiModelProperty("业务类型")
+    private String businessType;
+
+    @ApiModelProperty("清分类型")
+    private Integer type;
+
+    @ApiModelProperty("交易id")
+    private Long guid;
+}

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

@@ -87,6 +87,9 @@ public class BTransferDetail implements Serializable {
     @ApiModelProperty(value = "清分金额")
     private BigDecimal transferAmount;
 
+    @ApiModelProperty(value = "是否行内转账")
+    private Integer inLine;
+
     private static final long serialVersionUID = 1L;
 
     public Long getGuid() {
@@ -305,6 +308,14 @@ public class BTransferDetail implements Serializable {
         this.transferAmount = transferAmount;
     }
 
+    public Integer getInLine() {
+        return inLine;
+    }
+
+    public void setInLine(Integer inLine) {
+        this.inLine = inLine;
+    }
+
     @Override
     public String toString() {
         StringBuilder sb = new StringBuilder();
@@ -338,6 +349,7 @@ public class BTransferDetail implements Serializable {
         sb.append(", bankCode=").append(bankCode);
         sb.append(", status=").append(status);
         sb.append(", transferAmount=").append(transferAmount);
+        sb.append(", inLine=").append(inLine);
         sb.append(", serialVersionUID=").append(serialVersionUID);
         sb.append("]");
         return sb.toString();

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

@@ -1875,6 +1875,66 @@ public class BTransferDetailExample {
             addCriterion("transfer_amount not between", value1, value2, "transferAmount");
             return (Criteria) this;
         }
+
+        public Criteria andInLineIsNull() {
+            addCriterion("in_line is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andInLineIsNotNull() {
+            addCriterion("in_line is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andInLineEqualTo(Integer value) {
+            addCriterion("in_line =", value, "inLine");
+            return (Criteria) this;
+        }
+
+        public Criteria andInLineNotEqualTo(Integer value) {
+            addCriterion("in_line <>", value, "inLine");
+            return (Criteria) this;
+        }
+
+        public Criteria andInLineGreaterThan(Integer value) {
+            addCriterion("in_line >", value, "inLine");
+            return (Criteria) this;
+        }
+
+        public Criteria andInLineGreaterThanOrEqualTo(Integer value) {
+            addCriterion("in_line >=", value, "inLine");
+            return (Criteria) this;
+        }
+
+        public Criteria andInLineLessThan(Integer value) {
+            addCriterion("in_line <", value, "inLine");
+            return (Criteria) this;
+        }
+
+        public Criteria andInLineLessThanOrEqualTo(Integer value) {
+            addCriterion("in_line <=", value, "inLine");
+            return (Criteria) this;
+        }
+
+        public Criteria andInLineIn(List<Integer> values) {
+            addCriterion("in_line in", values, "inLine");
+            return (Criteria) this;
+        }
+
+        public Criteria andInLineNotIn(List<Integer> values) {
+            addCriterion("in_line not in", values, "inLine");
+            return (Criteria) this;
+        }
+
+        public Criteria andInLineBetween(Integer value1, Integer value2) {
+            addCriterion("in_line between", value1, value2, "inLine");
+            return (Criteria) this;
+        }
+
+        public Criteria andInLineNotBetween(Integer value1, Integer value2) {
+            addCriterion("in_line not between", value1, value2, "inLine");
+            return (Criteria) this;
+        }
     }
 
     public static class Criteria extends GeneratedCriteria {

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

@@ -18,6 +18,12 @@ public class BTransferFarmerRequest implements Serializable {
     @ApiModelProperty(value = "提交人")
     private String submitter;
 
+    @ApiModelProperty(value = "清分用户主键")
+    private Long fkUserId;
+
+    @ApiModelProperty(value = "银行用户账号")
+    private String userId;
+
     @ApiModelProperty(value = "最后授权人")
     private String authorizer;
 
@@ -57,15 +63,6 @@ public class BTransferFarmerRequest implements Serializable {
     @ApiModelProperty(value = "失败原因")
     private String failReson;
 
-    @ApiModelProperty(value = "账户余额")
-    private BigDecimal accountMoney;
-
-    @ApiModelProperty(value = "手续费")
-    private BigDecimal handFee;
-
-    @ApiModelProperty(value = "邮电费")
-    private BigDecimal postFee;
-
     @ApiModelProperty(value = "创建时间")
     private Date createTime;
 
@@ -124,6 +121,22 @@ public class BTransferFarmerRequest implements Serializable {
         this.submitter = submitter;
     }
 
+    public Long getFkUserId() {
+        return fkUserId;
+    }
+
+    public void setFkUserId(Long fkUserId) {
+        this.fkUserId = fkUserId;
+    }
+
+    public String getUserId() {
+        return userId;
+    }
+
+    public void setUserId(String userId) {
+        this.userId = userId;
+    }
+
     public String getAuthorizer() {
         return authorizer;
     }
@@ -228,30 +241,6 @@ public class BTransferFarmerRequest implements Serializable {
         this.failReson = failReson;
     }
 
-    public BigDecimal getAccountMoney() {
-        return accountMoney;
-    }
-
-    public void setAccountMoney(BigDecimal accountMoney) {
-        this.accountMoney = accountMoney;
-    }
-
-    public BigDecimal getHandFee() {
-        return handFee;
-    }
-
-    public void setHandFee(BigDecimal handFee) {
-        this.handFee = handFee;
-    }
-
-    public BigDecimal getPostFee() {
-        return postFee;
-    }
-
-    public void setPostFee(BigDecimal postFee) {
-        this.postFee = postFee;
-    }
-
     public Date getCreateTime() {
         return createTime;
     }
@@ -326,6 +315,8 @@ public class BTransferFarmerRequest implements Serializable {
         sb.append(", serilNo=").append(serilNo);
         sb.append(", currency=").append(currency);
         sb.append(", submitter=").append(submitter);
+        sb.append(", fkUserId=").append(fkUserId);
+        sb.append(", userId=").append(userId);
         sb.append(", authorizer=").append(authorizer);
         sb.append(", fkTransferId=").append(fkTransferId);
         sb.append(", payAmount=").append(payAmount);
@@ -339,9 +330,6 @@ public class BTransferFarmerRequest implements Serializable {
         sb.append(", payMsg=").append(payMsg);
         sb.append(", payResponseCode=").append(payResponseCode);
         sb.append(", failReson=").append(failReson);
-        sb.append(", accountMoney=").append(accountMoney);
-        sb.append(", handFee=").append(handFee);
-        sb.append(", postFee=").append(postFee);
         sb.append(", createTime=").append(createTime);
         sb.append(", status=").append(status);
         sb.append(", serialNo=").append(serialNo);

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

@@ -376,6 +376,136 @@ public class BTransferFarmerRequestExample {
             return (Criteria) this;
         }
 
+        public Criteria andFkUserIdIsNull() {
+            addCriterion("fk_user_id is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andFkUserIdIsNotNull() {
+            addCriterion("fk_user_id is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andFkUserIdEqualTo(Long value) {
+            addCriterion("fk_user_id =", value, "fkUserId");
+            return (Criteria) this;
+        }
+
+        public Criteria andFkUserIdNotEqualTo(Long value) {
+            addCriterion("fk_user_id <>", value, "fkUserId");
+            return (Criteria) this;
+        }
+
+        public Criteria andFkUserIdGreaterThan(Long value) {
+            addCriterion("fk_user_id >", value, "fkUserId");
+            return (Criteria) this;
+        }
+
+        public Criteria andFkUserIdGreaterThanOrEqualTo(Long value) {
+            addCriterion("fk_user_id >=", value, "fkUserId");
+            return (Criteria) this;
+        }
+
+        public Criteria andFkUserIdLessThan(Long value) {
+            addCriterion("fk_user_id <", value, "fkUserId");
+            return (Criteria) this;
+        }
+
+        public Criteria andFkUserIdLessThanOrEqualTo(Long value) {
+            addCriterion("fk_user_id <=", value, "fkUserId");
+            return (Criteria) this;
+        }
+
+        public Criteria andFkUserIdIn(List<Long> values) {
+            addCriterion("fk_user_id in", values, "fkUserId");
+            return (Criteria) this;
+        }
+
+        public Criteria andFkUserIdNotIn(List<Long> values) {
+            addCriterion("fk_user_id not in", values, "fkUserId");
+            return (Criteria) this;
+        }
+
+        public Criteria andFkUserIdBetween(Long value1, Long value2) {
+            addCriterion("fk_user_id between", value1, value2, "fkUserId");
+            return (Criteria) this;
+        }
+
+        public Criteria andFkUserIdNotBetween(Long value1, Long value2) {
+            addCriterion("fk_user_id not between", value1, value2, "fkUserId");
+            return (Criteria) this;
+        }
+
+        public Criteria andUserIdIsNull() {
+            addCriterion("user_id is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andUserIdIsNotNull() {
+            addCriterion("user_id is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andUserIdEqualTo(String value) {
+            addCriterion("user_id =", value, "userId");
+            return (Criteria) this;
+        }
+
+        public Criteria andUserIdNotEqualTo(String value) {
+            addCriterion("user_id <>", value, "userId");
+            return (Criteria) this;
+        }
+
+        public Criteria andUserIdGreaterThan(String value) {
+            addCriterion("user_id >", value, "userId");
+            return (Criteria) this;
+        }
+
+        public Criteria andUserIdGreaterThanOrEqualTo(String value) {
+            addCriterion("user_id >=", value, "userId");
+            return (Criteria) this;
+        }
+
+        public Criteria andUserIdLessThan(String value) {
+            addCriterion("user_id <", value, "userId");
+            return (Criteria) this;
+        }
+
+        public Criteria andUserIdLessThanOrEqualTo(String value) {
+            addCriterion("user_id <=", value, "userId");
+            return (Criteria) this;
+        }
+
+        public Criteria andUserIdLike(String value) {
+            addCriterion("user_id like", value, "userId");
+            return (Criteria) this;
+        }
+
+        public Criteria andUserIdNotLike(String value) {
+            addCriterion("user_id not like", value, "userId");
+            return (Criteria) this;
+        }
+
+        public Criteria andUserIdIn(List<String> values) {
+            addCriterion("user_id in", values, "userId");
+            return (Criteria) this;
+        }
+
+        public Criteria andUserIdNotIn(List<String> values) {
+            addCriterion("user_id not in", values, "userId");
+            return (Criteria) this;
+        }
+
+        public Criteria andUserIdBetween(String value1, String value2) {
+            addCriterion("user_id between", value1, value2, "userId");
+            return (Criteria) this;
+        }
+
+        public Criteria andUserIdNotBetween(String value1, String value2) {
+            addCriterion("user_id not between", value1, value2, "userId");
+            return (Criteria) this;
+        }
+
         public Criteria andAuthorizerIsNull() {
             addCriterion("authorizer is null");
             return (Criteria) this;
@@ -1266,186 +1396,6 @@ public class BTransferFarmerRequestExample {
             return (Criteria) this;
         }
 
-        public Criteria andAccountMoneyIsNull() {
-            addCriterion("account_money is null");
-            return (Criteria) this;
-        }
-
-        public Criteria andAccountMoneyIsNotNull() {
-            addCriterion("account_money is not null");
-            return (Criteria) this;
-        }
-
-        public Criteria andAccountMoneyEqualTo(BigDecimal value) {
-            addCriterion("account_money =", value, "accountMoney");
-            return (Criteria) this;
-        }
-
-        public Criteria andAccountMoneyNotEqualTo(BigDecimal value) {
-            addCriterion("account_money <>", value, "accountMoney");
-            return (Criteria) this;
-        }
-
-        public Criteria andAccountMoneyGreaterThan(BigDecimal value) {
-            addCriterion("account_money >", value, "accountMoney");
-            return (Criteria) this;
-        }
-
-        public Criteria andAccountMoneyGreaterThanOrEqualTo(BigDecimal value) {
-            addCriterion("account_money >=", value, "accountMoney");
-            return (Criteria) this;
-        }
-
-        public Criteria andAccountMoneyLessThan(BigDecimal value) {
-            addCriterion("account_money <", value, "accountMoney");
-            return (Criteria) this;
-        }
-
-        public Criteria andAccountMoneyLessThanOrEqualTo(BigDecimal value) {
-            addCriterion("account_money <=", value, "accountMoney");
-            return (Criteria) this;
-        }
-
-        public Criteria andAccountMoneyIn(List<BigDecimal> values) {
-            addCriterion("account_money in", values, "accountMoney");
-            return (Criteria) this;
-        }
-
-        public Criteria andAccountMoneyNotIn(List<BigDecimal> values) {
-            addCriterion("account_money not in", values, "accountMoney");
-            return (Criteria) this;
-        }
-
-        public Criteria andAccountMoneyBetween(BigDecimal value1, BigDecimal value2) {
-            addCriterion("account_money between", value1, value2, "accountMoney");
-            return (Criteria) this;
-        }
-
-        public Criteria andAccountMoneyNotBetween(BigDecimal value1, BigDecimal value2) {
-            addCriterion("account_money not between", value1, value2, "accountMoney");
-            return (Criteria) this;
-        }
-
-        public Criteria andHandFeeIsNull() {
-            addCriterion("hand_fee is null");
-            return (Criteria) this;
-        }
-
-        public Criteria andHandFeeIsNotNull() {
-            addCriterion("hand_fee is not null");
-            return (Criteria) this;
-        }
-
-        public Criteria andHandFeeEqualTo(BigDecimal value) {
-            addCriterion("hand_fee =", value, "handFee");
-            return (Criteria) this;
-        }
-
-        public Criteria andHandFeeNotEqualTo(BigDecimal value) {
-            addCriterion("hand_fee <>", value, "handFee");
-            return (Criteria) this;
-        }
-
-        public Criteria andHandFeeGreaterThan(BigDecimal value) {
-            addCriterion("hand_fee >", value, "handFee");
-            return (Criteria) this;
-        }
-
-        public Criteria andHandFeeGreaterThanOrEqualTo(BigDecimal value) {
-            addCriterion("hand_fee >=", value, "handFee");
-            return (Criteria) this;
-        }
-
-        public Criteria andHandFeeLessThan(BigDecimal value) {
-            addCriterion("hand_fee <", value, "handFee");
-            return (Criteria) this;
-        }
-
-        public Criteria andHandFeeLessThanOrEqualTo(BigDecimal value) {
-            addCriterion("hand_fee <=", value, "handFee");
-            return (Criteria) this;
-        }
-
-        public Criteria andHandFeeIn(List<BigDecimal> values) {
-            addCriterion("hand_fee in", values, "handFee");
-            return (Criteria) this;
-        }
-
-        public Criteria andHandFeeNotIn(List<BigDecimal> values) {
-            addCriterion("hand_fee not in", values, "handFee");
-            return (Criteria) this;
-        }
-
-        public Criteria andHandFeeBetween(BigDecimal value1, BigDecimal value2) {
-            addCriterion("hand_fee between", value1, value2, "handFee");
-            return (Criteria) this;
-        }
-
-        public Criteria andHandFeeNotBetween(BigDecimal value1, BigDecimal value2) {
-            addCriterion("hand_fee not between", value1, value2, "handFee");
-            return (Criteria) this;
-        }
-
-        public Criteria andPostFeeIsNull() {
-            addCriterion("post_fee is null");
-            return (Criteria) this;
-        }
-
-        public Criteria andPostFeeIsNotNull() {
-            addCriterion("post_fee is not null");
-            return (Criteria) this;
-        }
-
-        public Criteria andPostFeeEqualTo(BigDecimal value) {
-            addCriterion("post_fee =", value, "postFee");
-            return (Criteria) this;
-        }
-
-        public Criteria andPostFeeNotEqualTo(BigDecimal value) {
-            addCriterion("post_fee <>", value, "postFee");
-            return (Criteria) this;
-        }
-
-        public Criteria andPostFeeGreaterThan(BigDecimal value) {
-            addCriterion("post_fee >", value, "postFee");
-            return (Criteria) this;
-        }
-
-        public Criteria andPostFeeGreaterThanOrEqualTo(BigDecimal value) {
-            addCriterion("post_fee >=", value, "postFee");
-            return (Criteria) this;
-        }
-
-        public Criteria andPostFeeLessThan(BigDecimal value) {
-            addCriterion("post_fee <", value, "postFee");
-            return (Criteria) this;
-        }
-
-        public Criteria andPostFeeLessThanOrEqualTo(BigDecimal value) {
-            addCriterion("post_fee <=", value, "postFee");
-            return (Criteria) this;
-        }
-
-        public Criteria andPostFeeIn(List<BigDecimal> values) {
-            addCriterion("post_fee in", values, "postFee");
-            return (Criteria) this;
-        }
-
-        public Criteria andPostFeeNotIn(List<BigDecimal> values) {
-            addCriterion("post_fee not in", values, "postFee");
-            return (Criteria) this;
-        }
-
-        public Criteria andPostFeeBetween(BigDecimal value1, BigDecimal value2) {
-            addCriterion("post_fee between", value1, value2, "postFee");
-            return (Criteria) this;
-        }
-
-        public Criteria andPostFeeNotBetween(BigDecimal value1, BigDecimal value2) {
-            addCriterion("post_fee not between", value1, value2, "postFee");
-            return (Criteria) this;
-        }
-
         public Criteria andCreateTimeIsNull() {
             addCriterion("create_time is null");
             return (Criteria) this;

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

@@ -17,6 +17,9 @@ public class BUser implements Serializable {
     @ApiModelProperty(value = "系统编号")
     private String systemid;
 
+    @ApiModelProperty(value = "账户号")
+    private String account;
+
     @ApiModelProperty(value = "交易密码")
     private String password;
 
@@ -72,6 +75,14 @@ public class BUser implements Serializable {
         this.systemid = systemid;
     }
 
+    public String getAccount() {
+        return account;
+    }
+
+    public void setAccount(String account) {
+        this.account = account;
+    }
+
     public String getPassword() {
         return password;
     }
@@ -138,6 +149,7 @@ public class BUser implements Serializable {
         sb.append(", userid=").append(userid);
         sb.append(", userpwd=").append(userpwd);
         sb.append(", systemid=").append(systemid);
+        sb.append(", account=").append(account);
         sb.append(", password=").append(password);
         sb.append(", createTime=").append(createTime);
         sb.append(", createId=").append(createId);

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

@@ -375,6 +375,76 @@ public class BUserExample {
             return (Criteria) this;
         }
 
+        public Criteria andAccountIsNull() {
+            addCriterion("account is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andAccountIsNotNull() {
+            addCriterion("account is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andAccountEqualTo(String value) {
+            addCriterion("account =", value, "account");
+            return (Criteria) this;
+        }
+
+        public Criteria andAccountNotEqualTo(String value) {
+            addCriterion("account <>", value, "account");
+            return (Criteria) this;
+        }
+
+        public Criteria andAccountGreaterThan(String value) {
+            addCriterion("account >", value, "account");
+            return (Criteria) this;
+        }
+
+        public Criteria andAccountGreaterThanOrEqualTo(String value) {
+            addCriterion("account >=", value, "account");
+            return (Criteria) this;
+        }
+
+        public Criteria andAccountLessThan(String value) {
+            addCriterion("account <", value, "account");
+            return (Criteria) this;
+        }
+
+        public Criteria andAccountLessThanOrEqualTo(String value) {
+            addCriterion("account <=", value, "account");
+            return (Criteria) this;
+        }
+
+        public Criteria andAccountLike(String value) {
+            addCriterion("account like", value, "account");
+            return (Criteria) this;
+        }
+
+        public Criteria andAccountNotLike(String value) {
+            addCriterion("account not like", value, "account");
+            return (Criteria) this;
+        }
+
+        public Criteria andAccountIn(List<String> values) {
+            addCriterion("account in", values, "account");
+            return (Criteria) this;
+        }
+
+        public Criteria andAccountNotIn(List<String> values) {
+            addCriterion("account not in", values, "account");
+            return (Criteria) this;
+        }
+
+        public Criteria andAccountBetween(String value1, String value2) {
+            addCriterion("account between", value1, value2, "account");
+            return (Criteria) this;
+        }
+
+        public Criteria andAccountNotBetween(String value1, String value2) {
+            addCriterion("account not between", value1, value2, "account");
+            return (Criteria) this;
+        }
+
         public Criteria andPasswordIsNull() {
             addCriterion("password is null");
             return (Criteria) this;

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

@@ -29,6 +29,7 @@
     <result column="bank_code" jdbcType="VARCHAR" property="bankCode" />
     <result column="status" jdbcType="INTEGER" property="status" />
     <result column="transfer_amount" jdbcType="DECIMAL" property="transferAmount" />
+    <result column="in_line" jdbcType="INTEGER" property="inLine" />
   </resultMap>
   <sql id="Example_Where_Clause">
     <where>
@@ -92,7 +93,7 @@
     guid, fk_transfer_id, transfer_type, fk_farmer_id, fk_collective_id, seril_no, name, 
     bank_no, account_pid, transfer_status, code, msg, date, time, transfer_nation, nation_id, 
     create_time, create_id, create_name, transfer_id, transfer_name, transfer_time, state, 
-    bank_name, bank_code, status, transfer_amount
+    bank_name, bank_code, status, transfer_amount, in_line
   </sql>
   <select id="selectByExample" parameterType="com.hcloud.microserver.bank.mbg.modul.BTransferDetailExample" resultMap="BaseResultMap">
     select
@@ -133,8 +134,8 @@
       nation_id, create_time, create_id, 
       create_name, transfer_id, transfer_name, 
       transfer_time, state, bank_name, 
-      bank_code, status, transfer_amount
-      )
+      bank_code, status, transfer_amount, 
+      in_line)
     values (#{guid,jdbcType=BIGINT}, #{fkTransferId,jdbcType=BIGINT}, #{transferType,jdbcType=INTEGER}, 
       #{fkFarmerId,jdbcType=VARCHAR}, #{fkCollectiveId,jdbcType=VARCHAR}, #{serilNo,jdbcType=VARCHAR}, 
       #{name,jdbcType=VARCHAR}, #{bankNo,jdbcType=VARCHAR}, #{accountPid,jdbcType=VARCHAR}, 
@@ -143,8 +144,8 @@
       #{nationId,jdbcType=INTEGER}, #{createTime,jdbcType=TIMESTAMP}, #{createId,jdbcType=BIGINT}, 
       #{createName,jdbcType=VARCHAR}, #{transferId,jdbcType=BIGINT}, #{transferName,jdbcType=VARCHAR}, 
       #{transferTime,jdbcType=TIMESTAMP}, #{state,jdbcType=INTEGER}, #{bankName,jdbcType=VARCHAR}, 
-      #{bankCode,jdbcType=VARCHAR}, #{status,jdbcType=INTEGER}, #{transferAmount,jdbcType=DECIMAL}
-      )
+      #{bankCode,jdbcType=VARCHAR}, #{status,jdbcType=INTEGER}, #{transferAmount,jdbcType=DECIMAL}, 
+      #{inLine,jdbcType=INTEGER})
   </insert>
   <insert id="insertSelective" parameterType="com.hcloud.microserver.bank.mbg.modul.BTransferDetail">
     insert into b_transfer_detail
@@ -230,6 +231,9 @@
       <if test="transferAmount != null">
         transfer_amount,
       </if>
+      <if test="inLine != null">
+        in_line,
+      </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides=",">
       <if test="guid != null">
@@ -313,6 +317,9 @@
       <if test="transferAmount != null">
         #{transferAmount,jdbcType=DECIMAL},
       </if>
+      <if test="inLine != null">
+        #{inLine,jdbcType=INTEGER},
+      </if>
     </trim>
   </insert>
   <select id="countByExample" parameterType="com.hcloud.microserver.bank.mbg.modul.BTransferDetailExample" resultType="java.lang.Long">
@@ -405,6 +412,9 @@
       <if test="record.transferAmount != null">
         transfer_amount = #{record.transferAmount,jdbcType=DECIMAL},
       </if>
+      <if test="record.inLine != null">
+        in_line = #{record.inLine,jdbcType=INTEGER},
+      </if>
     </set>
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
@@ -438,7 +448,8 @@
       bank_name = #{record.bankName,jdbcType=VARCHAR},
       bank_code = #{record.bankCode,jdbcType=VARCHAR},
       status = #{record.status,jdbcType=INTEGER},
-      transfer_amount = #{record.transferAmount,jdbcType=DECIMAL}
+      transfer_amount = #{record.transferAmount,jdbcType=DECIMAL},
+      in_line = #{record.inLine,jdbcType=INTEGER}
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
     </if>
@@ -524,6 +535,9 @@
       <if test="transferAmount != null">
         transfer_amount = #{transferAmount,jdbcType=DECIMAL},
       </if>
+      <if test="inLine != null">
+        in_line = #{inLine,jdbcType=INTEGER},
+      </if>
     </set>
     where guid = #{guid,jdbcType=BIGINT}
   </update>
@@ -554,7 +568,8 @@
       bank_name = #{bankName,jdbcType=VARCHAR},
       bank_code = #{bankCode,jdbcType=VARCHAR},
       status = #{status,jdbcType=INTEGER},
-      transfer_amount = #{transferAmount,jdbcType=DECIMAL}
+      transfer_amount = #{transferAmount,jdbcType=DECIMAL},
+      in_line = #{inLine,jdbcType=INTEGER}
     where guid = #{guid,jdbcType=BIGINT}
   </update>
 </mapper>

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

@@ -6,6 +6,8 @@
     <result column="seril_no" jdbcType="VARCHAR" property="serilNo" />
     <result column="currency" jdbcType="VARCHAR" property="currency" />
     <result column="submitter" jdbcType="VARCHAR" property="submitter" />
+    <result column="fk_user_id" jdbcType="BIGINT" property="fkUserId" />
+    <result column="user_id" jdbcType="VARCHAR" property="userId" />
     <result column="authorizer" jdbcType="VARCHAR" property="authorizer" />
     <result column="fk_transfer_id" jdbcType="BIGINT" property="fkTransferId" />
     <result column="pay_amount" jdbcType="DECIMAL" property="payAmount" />
@@ -19,9 +21,6 @@
     <result column="pay_msg" jdbcType="VARCHAR" property="payMsg" />
     <result column="pay_response_code" jdbcType="VARCHAR" property="payResponseCode" />
     <result column="fail_reson" jdbcType="VARCHAR" property="failReson" />
-    <result column="account_money" jdbcType="DECIMAL" property="accountMoney" />
-    <result column="hand_fee" jdbcType="DECIMAL" property="handFee" />
-    <result column="post_fee" jdbcType="DECIMAL" property="postFee" />
     <result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
     <result column="status" jdbcType="INTEGER" property="status" />
     <result column="serial_no" jdbcType="VARCHAR" property="serialNo" />
@@ -90,10 +89,10 @@
     </where>
   </sql>
   <sql id="Base_Column_List">
-    guid, seril_no, currency, submitter, authorizer, fk_transfer_id, pay_amount, pay_bank_name, 
-    pay_account, pay_name, pay_date, pay_seril, hand_fee_type, pay_status, pay_msg, pay_response_code, 
-    fail_reson, account_money, hand_fee, post_fee, create_time, status, serial_no, service_id, 
-    session_id, req_time, ret_code, error_msg
+    guid, seril_no, currency, submitter, fk_user_id, user_id, authorizer, fk_transfer_id, 
+    pay_amount, pay_bank_name, pay_account, pay_name, pay_date, pay_seril, hand_fee_type, 
+    pay_status, pay_msg, pay_response_code, fail_reson, create_time, status, serial_no, 
+    service_id, session_id, req_time, ret_code, error_msg
   </sql>
   <select id="selectByExample" parameterType="com.hcloud.microserver.bank.mbg.modul.BTransferFarmerRequestExample" resultMap="BaseResultMap">
     select
@@ -127,25 +126,25 @@
   </delete>
   <insert id="insert" parameterType="com.hcloud.microserver.bank.mbg.modul.BTransferFarmerRequest">
     insert into b_transfer_farmer_request (guid, seril_no, currency, 
-      submitter, authorizer, fk_transfer_id, 
-      pay_amount, pay_bank_name, pay_account, 
-      pay_name, pay_date, pay_seril, 
-      hand_fee_type, pay_status, pay_msg, 
-      pay_response_code, fail_reson, account_money, 
-      hand_fee, post_fee, create_time, 
-      status, serial_no, service_id, 
-      session_id, req_time, ret_code, 
-      error_msg)
+      submitter, fk_user_id, user_id, 
+      authorizer, fk_transfer_id, pay_amount, 
+      pay_bank_name, pay_account, pay_name, 
+      pay_date, pay_seril, hand_fee_type, 
+      pay_status, pay_msg, pay_response_code, 
+      fail_reson, create_time, status, 
+      serial_no, service_id, session_id, 
+      req_time, ret_code, error_msg
+      )
     values (#{guid,jdbcType=BIGINT}, #{serilNo,jdbcType=VARCHAR}, #{currency,jdbcType=VARCHAR}, 
-      #{submitter,jdbcType=VARCHAR}, #{authorizer,jdbcType=VARCHAR}, #{fkTransferId,jdbcType=BIGINT}, 
-      #{payAmount,jdbcType=DECIMAL}, #{payBankName,jdbcType=VARCHAR}, #{payAccount,jdbcType=VARCHAR}, 
-      #{payName,jdbcType=VARCHAR}, #{payDate,jdbcType=VARCHAR}, #{paySeril,jdbcType=VARCHAR}, 
-      #{handFeeType,jdbcType=VARCHAR}, #{payStatus,jdbcType=VARCHAR}, #{payMsg,jdbcType=VARCHAR}, 
-      #{payResponseCode,jdbcType=VARCHAR}, #{failReson,jdbcType=VARCHAR}, #{accountMoney,jdbcType=DECIMAL}, 
-      #{handFee,jdbcType=DECIMAL}, #{postFee,jdbcType=DECIMAL}, #{createTime,jdbcType=TIMESTAMP}, 
-      #{status,jdbcType=INTEGER}, #{serialNo,jdbcType=VARCHAR}, #{serviceId,jdbcType=VARCHAR}, 
-      #{sessionId,jdbcType=VARCHAR}, #{reqTime,jdbcType=VARCHAR}, #{retCode,jdbcType=VARCHAR}, 
-      #{errorMsg,jdbcType=VARCHAR})
+      #{submitter,jdbcType=VARCHAR}, #{fkUserId,jdbcType=BIGINT}, #{userId,jdbcType=VARCHAR}, 
+      #{authorizer,jdbcType=VARCHAR}, #{fkTransferId,jdbcType=BIGINT}, #{payAmount,jdbcType=DECIMAL}, 
+      #{payBankName,jdbcType=VARCHAR}, #{payAccount,jdbcType=VARCHAR}, #{payName,jdbcType=VARCHAR}, 
+      #{payDate,jdbcType=VARCHAR}, #{paySeril,jdbcType=VARCHAR}, #{handFeeType,jdbcType=VARCHAR}, 
+      #{payStatus,jdbcType=VARCHAR}, #{payMsg,jdbcType=VARCHAR}, #{payResponseCode,jdbcType=VARCHAR}, 
+      #{failReson,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP}, #{status,jdbcType=INTEGER}, 
+      #{serialNo,jdbcType=VARCHAR}, #{serviceId,jdbcType=VARCHAR}, #{sessionId,jdbcType=VARCHAR}, 
+      #{reqTime,jdbcType=VARCHAR}, #{retCode,jdbcType=VARCHAR}, #{errorMsg,jdbcType=VARCHAR}
+      )
   </insert>
   <insert id="insertSelective" parameterType="com.hcloud.microserver.bank.mbg.modul.BTransferFarmerRequest">
     insert into b_transfer_farmer_request
@@ -162,6 +161,12 @@
       <if test="submitter != null">
         submitter,
       </if>
+      <if test="fkUserId != null">
+        fk_user_id,
+      </if>
+      <if test="userId != null">
+        user_id,
+      </if>
       <if test="authorizer != null">
         authorizer,
       </if>
@@ -201,15 +206,6 @@
       <if test="failReson != null">
         fail_reson,
       </if>
-      <if test="accountMoney != null">
-        account_money,
-      </if>
-      <if test="handFee != null">
-        hand_fee,
-      </if>
-      <if test="postFee != null">
-        post_fee,
-      </if>
       <if test="createTime != null">
         create_time,
       </if>
@@ -248,6 +244,12 @@
       <if test="submitter != null">
         #{submitter,jdbcType=VARCHAR},
       </if>
+      <if test="fkUserId != null">
+        #{fkUserId,jdbcType=BIGINT},
+      </if>
+      <if test="userId != null">
+        #{userId,jdbcType=VARCHAR},
+      </if>
       <if test="authorizer != null">
         #{authorizer,jdbcType=VARCHAR},
       </if>
@@ -287,15 +289,6 @@
       <if test="failReson != null">
         #{failReson,jdbcType=VARCHAR},
       </if>
-      <if test="accountMoney != null">
-        #{accountMoney,jdbcType=DECIMAL},
-      </if>
-      <if test="handFee != null">
-        #{handFee,jdbcType=DECIMAL},
-      </if>
-      <if test="postFee != null">
-        #{postFee,jdbcType=DECIMAL},
-      </if>
       <if test="createTime != null">
         #{createTime,jdbcType=TIMESTAMP},
       </if>
@@ -343,6 +336,12 @@
       <if test="record.submitter != null">
         submitter = #{record.submitter,jdbcType=VARCHAR},
       </if>
+      <if test="record.fkUserId != null">
+        fk_user_id = #{record.fkUserId,jdbcType=BIGINT},
+      </if>
+      <if test="record.userId != null">
+        user_id = #{record.userId,jdbcType=VARCHAR},
+      </if>
       <if test="record.authorizer != null">
         authorizer = #{record.authorizer,jdbcType=VARCHAR},
       </if>
@@ -382,15 +381,6 @@
       <if test="record.failReson != null">
         fail_reson = #{record.failReson,jdbcType=VARCHAR},
       </if>
-      <if test="record.accountMoney != null">
-        account_money = #{record.accountMoney,jdbcType=DECIMAL},
-      </if>
-      <if test="record.handFee != null">
-        hand_fee = #{record.handFee,jdbcType=DECIMAL},
-      </if>
-      <if test="record.postFee != null">
-        post_fee = #{record.postFee,jdbcType=DECIMAL},
-      </if>
       <if test="record.createTime != null">
         create_time = #{record.createTime,jdbcType=TIMESTAMP},
       </if>
@@ -426,6 +416,8 @@
       seril_no = #{record.serilNo,jdbcType=VARCHAR},
       currency = #{record.currency,jdbcType=VARCHAR},
       submitter = #{record.submitter,jdbcType=VARCHAR},
+      fk_user_id = #{record.fkUserId,jdbcType=BIGINT},
+      user_id = #{record.userId,jdbcType=VARCHAR},
       authorizer = #{record.authorizer,jdbcType=VARCHAR},
       fk_transfer_id = #{record.fkTransferId,jdbcType=BIGINT},
       pay_amount = #{record.payAmount,jdbcType=DECIMAL},
@@ -439,9 +431,6 @@
       pay_msg = #{record.payMsg,jdbcType=VARCHAR},
       pay_response_code = #{record.payResponseCode,jdbcType=VARCHAR},
       fail_reson = #{record.failReson,jdbcType=VARCHAR},
-      account_money = #{record.accountMoney,jdbcType=DECIMAL},
-      hand_fee = #{record.handFee,jdbcType=DECIMAL},
-      post_fee = #{record.postFee,jdbcType=DECIMAL},
       create_time = #{record.createTime,jdbcType=TIMESTAMP},
       status = #{record.status,jdbcType=INTEGER},
       serial_no = #{record.serialNo,jdbcType=VARCHAR},
@@ -466,6 +455,12 @@
       <if test="submitter != null">
         submitter = #{submitter,jdbcType=VARCHAR},
       </if>
+      <if test="fkUserId != null">
+        fk_user_id = #{fkUserId,jdbcType=BIGINT},
+      </if>
+      <if test="userId != null">
+        user_id = #{userId,jdbcType=VARCHAR},
+      </if>
       <if test="authorizer != null">
         authorizer = #{authorizer,jdbcType=VARCHAR},
       </if>
@@ -505,15 +500,6 @@
       <if test="failReson != null">
         fail_reson = #{failReson,jdbcType=VARCHAR},
       </if>
-      <if test="accountMoney != null">
-        account_money = #{accountMoney,jdbcType=DECIMAL},
-      </if>
-      <if test="handFee != null">
-        hand_fee = #{handFee,jdbcType=DECIMAL},
-      </if>
-      <if test="postFee != null">
-        post_fee = #{postFee,jdbcType=DECIMAL},
-      </if>
       <if test="createTime != null">
         create_time = #{createTime,jdbcType=TIMESTAMP},
       </if>
@@ -546,6 +532,8 @@
     set seril_no = #{serilNo,jdbcType=VARCHAR},
       currency = #{currency,jdbcType=VARCHAR},
       submitter = #{submitter,jdbcType=VARCHAR},
+      fk_user_id = #{fkUserId,jdbcType=BIGINT},
+      user_id = #{userId,jdbcType=VARCHAR},
       authorizer = #{authorizer,jdbcType=VARCHAR},
       fk_transfer_id = #{fkTransferId,jdbcType=BIGINT},
       pay_amount = #{payAmount,jdbcType=DECIMAL},
@@ -559,9 +547,6 @@
       pay_msg = #{payMsg,jdbcType=VARCHAR},
       pay_response_code = #{payResponseCode,jdbcType=VARCHAR},
       fail_reson = #{failReson,jdbcType=VARCHAR},
-      account_money = #{accountMoney,jdbcType=DECIMAL},
-      hand_fee = #{handFee,jdbcType=DECIMAL},
-      post_fee = #{postFee,jdbcType=DECIMAL},
       create_time = #{createTime,jdbcType=TIMESTAMP},
       status = #{status,jdbcType=INTEGER},
       serial_no = #{serialNo,jdbcType=VARCHAR},

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

@@ -6,6 +6,7 @@
     <result column="userID" jdbcType="VARCHAR" property="userid" />
     <result column="userPWD" jdbcType="VARCHAR" property="userpwd" />
     <result column="systemId" jdbcType="VARCHAR" property="systemid" />
+    <result column="account" jdbcType="VARCHAR" property="account" />
     <result column="password" jdbcType="VARCHAR" property="password" />
     <result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
     <result column="create_id" jdbcType="BIGINT" property="createId" />
@@ -73,8 +74,8 @@
     </where>
   </sql>
   <sql id="Base_Column_List">
-    guid, userID, userPWD, systemId, password, create_time, create_id, bank_name, bank_no, 
-    bank_code, account_name
+    guid, userID, userPWD, systemId, account, password, create_time, create_id, bank_name, 
+    bank_no, bank_code, account_name
   </sql>
   <select id="selectByExample" parameterType="com.hcloud.microserver.bank.mbg.modul.BUserExample" resultMap="BaseResultMap">
     select
@@ -108,13 +109,15 @@
   </delete>
   <insert id="insert" parameterType="com.hcloud.microserver.bank.mbg.modul.BUser">
     insert into b_user (guid, userID, userPWD, 
-      systemId, password, create_time, 
-      create_id, bank_name, bank_no, 
-      bank_code, account_name)
+      systemId, account, password, 
+      create_time, create_id, bank_name, 
+      bank_no, bank_code, account_name
+      )
     values (#{guid,jdbcType=BIGINT}, #{userid,jdbcType=VARCHAR}, #{userpwd,jdbcType=VARCHAR}, 
-      #{systemid,jdbcType=VARCHAR}, #{password,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP}, 
-      #{createId,jdbcType=BIGINT}, #{bankName,jdbcType=VARCHAR}, #{bankNo,jdbcType=VARCHAR}, 
-      #{bankCode,jdbcType=VARCHAR}, #{accountName,jdbcType=VARCHAR})
+      #{systemid,jdbcType=VARCHAR}, #{account,jdbcType=VARCHAR}, #{password,jdbcType=VARCHAR}, 
+      #{createTime,jdbcType=TIMESTAMP}, #{createId,jdbcType=BIGINT}, #{bankName,jdbcType=VARCHAR}, 
+      #{bankNo,jdbcType=VARCHAR}, #{bankCode,jdbcType=VARCHAR}, #{accountName,jdbcType=VARCHAR}
+      )
   </insert>
   <insert id="insertSelective" parameterType="com.hcloud.microserver.bank.mbg.modul.BUser">
     insert into b_user
@@ -131,6 +134,9 @@
       <if test="systemid != null">
         systemId,
       </if>
+      <if test="account != null">
+        account,
+      </if>
       <if test="password != null">
         password,
       </if>
@@ -166,6 +172,9 @@
       <if test="systemid != null">
         #{systemid,jdbcType=VARCHAR},
       </if>
+      <if test="account != null">
+        #{account,jdbcType=VARCHAR},
+      </if>
       <if test="password != null">
         #{password,jdbcType=VARCHAR},
       </if>
@@ -210,6 +219,9 @@
       <if test="record.systemid != null">
         systemId = #{record.systemid,jdbcType=VARCHAR},
       </if>
+      <if test="record.account != null">
+        account = #{record.account,jdbcType=VARCHAR},
+      </if>
       <if test="record.password != null">
         password = #{record.password,jdbcType=VARCHAR},
       </if>
@@ -242,6 +254,7 @@
       userID = #{record.userid,jdbcType=VARCHAR},
       userPWD = #{record.userpwd,jdbcType=VARCHAR},
       systemId = #{record.systemid,jdbcType=VARCHAR},
+      account = #{record.account,jdbcType=VARCHAR},
       password = #{record.password,jdbcType=VARCHAR},
       create_time = #{record.createTime,jdbcType=TIMESTAMP},
       create_id = #{record.createId,jdbcType=BIGINT},
@@ -265,6 +278,9 @@
       <if test="systemid != null">
         systemId = #{systemid,jdbcType=VARCHAR},
       </if>
+      <if test="account != null">
+        account = #{account,jdbcType=VARCHAR},
+      </if>
       <if test="password != null">
         password = #{password,jdbcType=VARCHAR},
       </if>
@@ -294,6 +310,7 @@
     set userID = #{userid,jdbcType=VARCHAR},
       userPWD = #{userpwd,jdbcType=VARCHAR},
       systemId = #{systemid,jdbcType=VARCHAR},
+      account = #{account,jdbcType=VARCHAR},
       password = #{password,jdbcType=VARCHAR},
       create_time = #{createTime,jdbcType=TIMESTAMP},
       create_id = #{createId,jdbcType=BIGINT},

carbon-bank/carbon-bank-service/pom.xml

@@ -107,11 +107,7 @@
             <groupId>com.hcloud.microserver</groupId>
             <version>0.0.1-SNAPSHOT</version>
         </dependency>
-        <dependency>
-            <artifactId>carbon-bank-mbg</artifactId>
-            <groupId>com.hcloud.microserver</groupId>
-            <version>0.0.1-SNAPSHOT</version>
-        </dependency>
+
         <dependency>
 
             <groupId>commons-httpclient</groupId>

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

@@ -1,45 +0,0 @@
-package com.hcloud.microserver.system.bank.bo;
-
-import com.alibaba.fastjson.annotation.JSONField;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import lombok.Data;
-
-import java.io.Serializable;
-
-/**
- * 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 String  I1BGAT;
-    /**终止金额	15P2	非必输*/
-    @JSONField(name = "I1EDAT")
-    private String  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;
-}

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

@@ -1,13 +0,0 @@
-package com.hcloud.microserver.system.bank.bo;
-
-import java.math.BigDecimal;
-
-/**
- * 活期账户历史余额查询
- */
-public class CurrentAccountHistoricalBalanceQueryParam {
-    /**账户号;必输;32A;*/
-    private String accNo;
-    /**日期;必输;8P0;*/
-    private BigDecimal date;
-}

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

@@ -1,28 +0,0 @@
-package com.hcloud.microserver.system.bank.bo;
-
-import lombok.Data;
-
-import java.io.Serializable;
-import java.math.BigDecimal;
-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;
-
-
-
-
-
-}

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

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

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

@@ -1,26 +0,0 @@
-package com.hcloud.microserver.system.bank.bo;
-
-import lombok.Data;
-
-import java.math.BigDecimal;
-
-@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;
-}

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

@@ -1,67 +0,0 @@
-package com.hcloud.microserver.system.bank.bo;
-
-import lombok.Data;
-
-import java.math.BigDecimal;
-
-/**
- * 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;
-}

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

@@ -1,28 +0,0 @@
-package com.hcloud.microserver.system.bank.bo;
-
-import lombok.Data;
-
-import java.math.BigDecimal;
-
-/**
- * 2.7.	转账：行外转账CL0006（需签名）
- */
-@Data
-public class OutOfBankTransferResp {
-    /**渠道流水号;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;
-}

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

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

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

@@ -1,43 +0,0 @@
-package com.hcloud.microserver.system.bank.bo;
-
-import lombok.Data;
-
-import java.math.BigDecimal;
-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 BigDecimal O1DFYF;
-    /**付款账号;必输域;19A;*/
-    private String O1FKAC;
-    /**总笔数;必输域;3P0;*/
-    private BigDecimal O1TRCT;
-    /**总金额;必输域;15P2;*/
-    private BigDecimal O1TRAM;
-    /**批次备注;null;32*O;*/
-    private BigDecimal O1PCBZ;
-    /**企业指令内部编号;null;30A;*/
-    private BigDecimal 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;
-
-}

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

@@ -1,20 +0,0 @@
-package com.hcloud.microserver.system.bank.bo;
-
-import lombok.Data;
-
-/**
- * 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;
-}

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

@@ -30,9 +30,9 @@ public class BUserController extends BaseController {
     @PostMapping("/add")
     public ResponseBase add(@RequestBody BUser bUser){
 
-        int i = bUserService.add(bUser);
-        if (i>0){
-            return responseResultSuccess();
+        BUser add = bUserService.add(bUser);
+        if (add != null){
+            return responseResultSuccess(add);
         }
         return responseResultFailure();
     }
@@ -74,6 +74,16 @@ public class BUserController extends BaseController {
         return responseResultFailure();
     }
 
+    @ApiOperation("检查用户名是否存在")
+    @GetMapping("/checkAccount")
+    public ResponseBase delete(@ApiParam("account") @RequestParam("account") String account){
+        BUser account1 = bUserService.getByAccount(account);
+        if (account1 == null){
+            return responseResultSuccess();
+        }
+        return responseResultFailure();
+    }
+
 
 
 }

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

@@ -0,0 +1,48 @@
+package com.hcloud.microserver.system.bank.controller;
+
+import com.hcloud.microserver.commoncore.base.BaseController;
+import com.hcloud.microserver.commoncore.base.ResponseBase;
+import com.hcloud.microserver.system.bank.carbon.bo.CurrentAccountDetailQueryParam;
+import com.hcloud.microserver.system.bank.carbon.entity.CurrentAccountHistoricalBalanceQueryEntity;
+import com.hcloud.microserver.system.bank.carbon.entity.CurrentAccountQueryDetailEntity;
+import com.hcloud.microserver.system.bank.carbon.entity.CurrentAccountQueryEntity;
+import com.hcloud.microserver.system.bank.carbon.form.BankCurrentAccountForm;
+import com.hcloud.microserver.system.bank.carbon.form.CurrentAccountDetailQueryForm;
+import com.hcloud.microserver.system.bank.carbon.form.CurrentAccountHistoricalBalanceQueryForm;
+import com.hcloud.microserver.system.bank.service.BankTransferService;
+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;
+
+@Api(tags = "银行服务")
+@RestController
+@RequestMapping("/bank/account")
+public class BankTransferController extends BaseController {
+    @Autowired
+    private BankTransferService bankTransferService;
+
+    @ApiOperation("活期账户查询")
+    @PostMapping("/3")
+    public ResponseBase<CurrentAccountQueryEntity> getCurrentAccountQueryEntity(@RequestBody BankCurrentAccountForm form){
+        CurrentAccountQueryEntity entity = bankTransferService.currentAccount(form);
+        return responseResultSuccess(entity);
+    }
+
+    @ApiOperation("活期账户明细查询")
+    @PostMapping("/4")
+    public ResponseBase<CurrentAccountQueryEntity> getCurrentAccountQueryEntityDetail(@RequestBody CurrentAccountDetailQueryForm form){
+        CurrentAccountQueryDetailEntity entity = bankTransferService.currentAccountDetail(form);
+        return responseResultSuccess(entity);
+    }
+
+    @ApiOperation("活期账户历史余额查询")
+    @PostMapping("/13")
+    public ResponseBase<CurrentAccountHistoricalBalanceQueryEntity> getCurrentAccountHistorical(@RequestBody CurrentAccountHistoricalBalanceQueryForm form){
+        CurrentAccountHistoricalBalanceQueryEntity entity = bankTransferService.currentAccountHistorical(form);
+        return responseResultSuccess(entity);
+    }
+}

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

@@ -2,6 +2,7 @@ package com.hcloud.microserver.system.bank.service;
 
 import com.github.pagehelper.PageInfo;
 import com.hcloud.microserver.bank.mbg.modul.BUser;
+import com.hcloud.microserver.system.bank.carbon.bo.BankLoginUserRespBO;
 import com.hcloud.microserver.system.bank.carbon.form.BUserForm;
 
 /**
@@ -15,7 +16,7 @@ public interface BUserService {
      * @param bUser
      * @return
      */
-    public int add(BUser bUser);
+    public BUser add(BUser bUser);
 
     /**
      * 分页获取用户列表
@@ -46,4 +47,9 @@ public interface BUserService {
     public BUser get(Long guid);
 
     public BUser getByUserId(String userId);
+
+    public BUser getByAccount(String userName);
+
+
+
 }

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

@@ -1,6 +1,10 @@
 package com.hcloud.microserver.system.bank.service;
 
-import com.hcloud.microserver.system.bank.bo.*;
+import com.hcloud.microserver.bank.mbg.modul.BTransferDetailRequest;
+import com.hcloud.microserver.bank.mbg.modul.BTransferFarmerRequest;
+import com.hcloud.microserver.system.bank.carbon.bo.*;
+import com.hcloud.microserver.system.bank.carbon.form.BankUserAndParam;
+import com.hcloud.microserver.system.bank.carbon.form.RequestTransferForm;
 
 public interface BankTransactionService {
 
@@ -9,7 +13,7 @@ public interface BankTransactionService {
      * @param param
      * @return
      */
-    public CurrentAccountQueryResp currentAccountQuery(CurrentAccountQueryParam param);
+    public CurrentAccountQueryResp currentAccountQuery(BankQueryBaseParam<CurrentAccountQueryParam> param);
 
     /**
      *
@@ -17,7 +21,7 @@ public interface BankTransactionService {
      * @param param
      * @return
      */
-    public CurrentAccountQueryDetailTotalResp currentAccountDetailQuery(CurrentAccountDetailQueryParam param);
+    public CurrentAccountQueryDetailTotalResp currentAccountDetailQuery(BankQueryBaseParam<CurrentAccountDetailQueryParam> param);
 
     /**
      * 2.6.	转账：行内转账CL0005（需签名）
@@ -32,6 +36,16 @@ public interface BankTransactionService {
      * @return
      */
     public IntrabankTransferResp intrabankTransfer(BankQueryBaseParam<IntrabankTransferParam> param);
+
+    public OutOfBankTransferResp outbankTransfer(BankQueryBaseParam<OutOfBankTransferParam> param);
+
+    /**
+     * 2.12.	账务支付：代发工资/代报销CL0033（需签名）
+     * @param param
+     * @return
+     */
+    public PayWagesOrReimbursementResp payBankTransfer(BankQueryBaseParam<PayWagesOrReimbursementParam> param);
+
     /**
      * 2.14.	账务支付：代发/代报销指令详细查询CL0032
      * @param param
@@ -46,4 +60,30 @@ public interface BankTransactionService {
      */
     public InquiryOfWithholdingInstructionDetailsResp inquiryOfWithholdingInstructionDetails(InquiryOfWithholdingInstructionDetailsParam param);
 
+    /**
+     * 活期账户历史余额查询
+     * @param param
+     * @return
+     */
+    public CurrentAccountHistoricalBalanceQueryResp currentAccountHistoricalBalance(BankQueryBaseParam<CurrentAccountHistoricalBalanceQueryParam> param);
+
+    /**
+     * 获取需要验证密码的请求参数
+     * @param form
+     * @return
+     */
+    public BankUserAndParam getBankQueryBaseParam(RequestTransferForm form);
+
+    /**
+     * 获取不需要使用密码银行请求参数
+     * @param type
+     * @param guid
+     * @return
+     */
+    public BankUserAndParam getBankQueryBaseParam(Integer type,Long guid);
+
+    public BTransferFarmerRequest getFarmerRequest(Long guid);
+
+    public BTransferDetailRequest getDetailRequest(Long guid);
+
 }

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

@@ -0,0 +1,42 @@
+package com.hcloud.microserver.system.bank.service;
+
+import com.hcloud.microserver.system.bank.carbon.entity.CurrentAccountHistoricalBalanceQueryEntity;
+import com.hcloud.microserver.system.bank.carbon.entity.CurrentAccountQueryDetailEntity;
+import com.hcloud.microserver.system.bank.carbon.entity.CurrentAccountQueryEntity;
+import com.hcloud.microserver.system.bank.carbon.entity.TransactionOrderStatusQueryEntity;
+import com.hcloud.microserver.system.bank.carbon.form.BankCurrentAccountForm;
+import com.hcloud.microserver.system.bank.carbon.form.CurrentAccountDetailQueryForm;
+import com.hcloud.microserver.system.bank.carbon.form.CurrentAccountHistoricalBalanceQueryForm;
+import com.hcloud.microserver.system.bank.carbon.form.TransactionOrderStatusQueryForm;
+
+public interface BankTransferService {
+
+    /**
+     * 活期账户明细查询
+     * @param form
+     * @return
+     */
+    public CurrentAccountQueryDetailEntity currentAccountDetail(CurrentAccountDetailQueryForm form);
+
+    /**
+     * 活期账户查询
+     * @param form
+     * @return
+     */
+    public CurrentAccountQueryEntity currentAccount(BankCurrentAccountForm form);
+
+    /**
+     * 活期账户历史余额查询
+     * @param form
+     * @return
+     */
+    public CurrentAccountHistoricalBalanceQueryEntity currentAccountHistorical(CurrentAccountHistoricalBalanceQueryForm form);
+
+    /**
+     * 交易指令状态查询
+     * @param form
+     * @return
+     */
+    public TransactionOrderStatusQueryEntity transactionOrderStatus(TransactionOrderStatusQueryForm form);
+
+}

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

@@ -4,10 +4,8 @@ import com.github.pagehelper.PageInfo;
 import com.hcloud.microserver.bank.mbg.modul.BUser;
 import com.hcloud.microserver.bank.mbg.modul.BUserLogin;
 import com.hcloud.microserver.commoncore.base.BaseForm;
-import com.hcloud.microserver.system.bank.bo.BankLoginUserReqParam;
-import com.hcloud.microserver.system.bank.bo.BankLoginUserRespBO;
-
-import java.util.List;
+import com.hcloud.microserver.system.bank.carbon.bo.BankLoginUserReqParam;
+import com.hcloud.microserver.system.bank.carbon.bo.BankLoginUserRespBO;
 
 /**
  * 银行用户
@@ -41,4 +39,6 @@ public interface BankUserService {
      */
      public BUserLogin getDetail(Long guid);
 
+    public BankLoginUserRespBO getSessionId(BUser bUser);
+
 }

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

@@ -27,6 +27,10 @@ public interface MakeClearingService {
 
     public int makeTransfer(MakeClearForm form);
 
+//    public int onBehalf();
+
 
     public int transferDetailToCqBank(BUser user, BTransfer total, List<BTransferDetail> details, String sessionId);
+
+    public int onBeToCqBank(BUser user,BTransfer total, List<BTransferDetail> details, String sessionId);
 }

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

@@ -0,0 +1,11 @@
+package com.hcloud.microserver.system.bank.service;
+
+import com.hcloud.microserver.system.bank.carbon.entity.CurrentAccountQueryEntity;
+
+/***
+ * 转账指令查询service
+ */
+public interface TransferOrderQueryService {
+
+    public CurrentAccountQueryEntity getResponseCurrentAccount(String account);
+}