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

carbon-admin/carbon-admin-service/src/main/java/com/hcloud/microserver/system/bank/controller/provide/DataProvideController.java

@@ -3,7 +3,6 @@ package com.hcloud.microserver.system.bank.controller.provide;
 import com.github.pagehelper.PageInfo;
 import com.hcloud.microserver.system.bank.bo.CredentialInfoBO;
 import com.hcloud.microserver.system.bank.bo.PaymentBO;
-import com.hcloud.microserver.bank.service.*;
 import com.hcloud.microserver.commoncore.base.BaseController;
 import com.hcloud.microserver.commoncore.base.ResponseBase;
 import com.hcloud.microserver.system.bank.service.*;

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

@@ -3,7 +3,6 @@ package com.hcloud.microserver.system.bank.service.impl;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
 import com.hcloud.microserver.system.bank.bo.CustomerInfoBO;
-import com.hcloud.microserver.bank.dao.*;
 import com.hcloud.microserver.system.bank.dao.*;
 import com.hcloud.microserver.system.bank.enums.LoginChannelEnum;
 import com.hcloud.microserver.system.bank.service.CustomerCompanyInfoService;

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

@@ -5,7 +5,6 @@ import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
 import com.google.common.collect.Lists;
 import com.hcloud.microserver.system.bank.bo.GoodsInfoBO;
-import com.hcloud.microserver.bank.dao.*;
 import com.hcloud.microserver.system.bank.dao.*;
 import com.hcloud.microserver.system.bank.service.GoodsInfoService;
 import com.hcloud.microserver.commoncore.base.PageBean;

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

@@ -5,7 +5,6 @@ import com.github.pagehelper.PageInfo;
 import com.hcloud.microserver.system.bank.bo.OrderInfoBO;
 import com.hcloud.microserver.system.bank.dao.GoodsOrderInfoMapper;
 import com.hcloud.microserver.system.bank.events.CredentialInfoEvent;
-import com.hcloud.microserver.bank.service.*;
 import com.hcloud.microserver.commoncore.base.PageBean;
 import com.hcloud.microserver.commoncore.util.BeanCopyUtil;
 import com.hcloud.microserver.commoncore.util.GeneratorIdUtils;

carbon-admin/carbon-admin-service/src/main/java/com/hcloud/microserver/system/bank/service/impl/ProductInfoServiceImpl.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.bank.dao.*;
 import com.hcloud.microserver.system.bank.dao.*;
 import com.hcloud.microserver.system.bank.service.ProductInfoService;
 import com.hcloud.microserver.commoncore.util.BeanCopyUtil;

carbon-admin/carbon-admin-service/src/main/resources/com/hcloud/microserver/system/bank/dao/BasePositionMapper.xml

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

carbon-back/carbon-back-common/src/main/java/com/hcloud/microserver/system/facade/carbon/client/BankAndBackClient.java

@@ -0,0 +1,9 @@
+package com.hcloud.microserver.system.facade.carbon.client;
+
+import com.hcloud.microserver.system.facade.carbon.fallback.BankAndBackFallbackFactory;
+import org.springframework.cloud.openfeign.FeignClient;
+
+@FeignClient(contextId = "bankAndBackClient", value = "system", fallbackFactory = BankAndBackFallbackFactory.class)
+public interface BankAndBackClient {
+
+}

carbon-back/carbon-back-common/src/main/java/com/hcloud/microserver/system/facade/carbon/fallback/BankAndBackFallbackFactory.java

@@ -0,0 +1,29 @@
+package com.hcloud.microserver.system.facade.carbon.fallback;
+
+import com.hcloud.microserver.system.facade.carbon.client.BankAndBackClient;
+import feign.hystrix.FallbackFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.stereotype.Component;
+import org.springframework.web.multipart.MultipartFile;
+
+/**
+ * 文件服务降级处理
+ * 
+ * @author ruoyi
+ */
+@Component
+public class BankAndBackFallbackFactory implements FallbackFactory<BankAndBackClient>
+{
+    private static final Logger log = LoggerFactory.getLogger(BankAndBackFallbackFactory.class);
+
+    @Override
+    public BankAndBackClient create(Throwable throwable)
+    {
+        log.error("文件服务调用失败:{}", throwable.getMessage());
+        return new BankAndBackClient()
+        {
+
+        };
+    }
+}

carbon-back/carbon-back-mbg/src/main/java/com/hcloud/microserver/system/mbg/mapper/TTransferDetailMapper.java

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

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

@@ -32,7 +32,7 @@
 
         <javaModelGenerator targetPackage="com.hcloud.microserver.system.mbg.modul" targetProject="carbon-back\carbon-back-mbg\src\main\java"/>
 
-        <sqlMapGenerator targetPackage="mapper" targetProject="carbon-back\carbon-back-mbg\src\main\resources"/>
+        <sqlMapGenerator targetPackage="com.hcloud.microserver.system.mbg.mapper" targetProject="carbon-back\carbon-back-mbg\src\main\resources"/>
 
         <javaClientGenerator type="XMLMAPPER" targetPackage="com.hcloud.microserver.system.mbg.mapper"
                              targetProject="carbon-back\carbon-back-mbg\src\main\java"/>

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

@@ -19,7 +19,9 @@ import org.springframework.transaction.annotation.EnableTransactionManagement;
 @EnableDiscoveryClient
 @EnableTransactionManagement
 @ComponentScan(basePackages = "com.hcloud")
-@MapperScan(basePackages = {"com.hcloud.microserver.bank.dao"})
+@MapperScan(basePackages = {"com.hcloud.microserver.system.mbg.mapper",
+"com.hcloud.microserver.system.mapper",
+"com.hcloud.microserver.system.bank.dao"})
 @SpringBootApplication
 public class CarbonSystemApplication
 {
@@ -27,15 +29,5 @@ public class CarbonSystemApplication
     public static void main(String[] args)
     {
         SpringApplication.run(CarbonSystemApplication.class, args);
-        System.out.println("(♥◠‿◠)ﾉﾞ  系统模块启动成功   ლ(´ڡ`ლ)ﾞ  \n" +
-                " .-------.       ____     __        \n" +
-                " |  _ _   \\      \\   \\   /  /    \n" +
-                " | ( ' )  |       \\  _. /  '       \n" +
-                " |(_ o _) /        _( )_ .'         \n" +
-                " | (_,_).' __  ___(_ o _)'          \n" +
-                " |  |\\ \\  |  ||   |(_,_)'         \n" +
-                " |  | \\ `'   /|   `-'  /           \n" +
-                " |  |  \\    /  \\      /           \n" +
-                " ''-'   `'-'    `-..-'              ");
     }
 }

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

@@ -1,6 +1,5 @@
 package com.hcloud.microserver.system.config;
 
-import com.hcloud.microserver.security.component.DynamicSecurityService;
 import com.hcloud.microserver.security.config.SecurityConfig;
 
 import com.hcloud.microserver.system.service.ISysPermissionService;
@@ -8,17 +7,10 @@ import com.hcloud.microserver.system.service.ISysUserService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
-import org.springframework.security.access.ConfigAttribute;
 import org.springframework.security.config.annotation.method.configuration.EnableGlobalMethodSecurity;
-import org.springframework.security.config.annotation.web.builders.HttpSecurity;
 import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity;
-import org.springframework.security.config.annotation.web.configurers.ExpressionUrlAuthorizationConfigurer;
-import org.springframework.security.core.userdetails.UserDetails;
 import org.springframework.security.core.userdetails.UserDetailsService;
 
-import java.util.List;
-import java.util.Map;
-import java.util.concurrent.ConcurrentHashMap;
 
 
 /**
@@ -30,8 +22,6 @@ import java.util.concurrent.ConcurrentHashMap;
 @EnableGlobalMethodSecurity(prePostEnabled = true)
 public class CarbonSecurityConfig extends SecurityConfig {
 
-    @Autowired
-    private ISysPermissionService permissionService;
     @Autowired
     private ISysUserService sysUserService;
     @Bean

carbon-bank/carbon-bank-common/src/main/java/com/hcloud/microserver/system/bank/carbon/client/BankClearService.java

@@ -4,6 +4,6 @@ package com.hcloud.microserver.system.bank.carbon.client;
 import com.hcloud.microserver.system.bank.carbon.fallback.BankClearFallbackFactory;
 import org.springframework.cloud.openfeign.FeignClient;
 
-@FeignClient(contextId = "remoteUserService", value = "carbon-back", fallbackFactory = BankClearFallbackFactory.class)
+@FeignClient(contextId = "bankClearService", value = "system", fallbackFactory = BankClearFallbackFactory.class)
 public class BankClearService {
 }

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

@@ -0,0 +1,35 @@
+package com.hcloud.microserver.system.bank.carbon.form;
+
+import com.hcloud.microserver.commoncore.base.BaseForm;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@ApiModel("清分明细modul")
+@Data
+public class BTransferDetailForm extends BaseForm
+{
+    @ApiModelProperty(value = "主键")
+    private Long guid;
+
+    @ApiModelProperty(value = "总清分id")
+    private Long fkTransferId;
+
+    @ApiModelProperty(value = "清分类型，0：农户清分，1:村组清分")
+    private Integer transferType;
+
+    @ApiModelProperty(value = "农户或者村组id")
+    private String fkFcId;
+
+    @ApiModelProperty(value = "序列号")
+    private String serilNo;
+
+    @ApiModelProperty(value = "收款方户名")
+    private String name;
+
+    @ApiModelProperty(value = "交易状态")
+    private String transferStatus;
+
+    @ApiModelProperty(value = "错误代码")
+    private String code;
+}

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

@@ -0,0 +1,13 @@
+package com.hcloud.microserver.system.bank.carbon.form;
+
+import com.hcloud.microserver.commoncore.base.BaseForm;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@ApiModel("清分请求记录表")
+@Data
+public class BTransferFarmerRequestForm extends BaseForm {
+    @ApiModelProperty(value = "清分总表id")
+    private Long fkTransferId;
+}

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

@@ -0,0 +1,32 @@
+package com.hcloud.microserver.system.bank.carbon.form;
+
+import com.hcloud.microserver.commoncore.base.BaseForm;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.Date;
+
+@ApiModel("清分总表")
+@Data
+public class BTransferForm extends BaseForm {
+    @ApiModelProperty("主键")
+    private Long guid;
+
+    @ApiModelProperty("服务代码")
+    private String serviceId;
+
+    @ApiModelProperty("响应代码")
+    private String retCode;
+
+    @ApiModelProperty("清分类型")
+    private Integer transferType;
+
+    @ApiModelProperty("起始时间")
+    private Date startTime;
+
+    @ApiModelProperty("结束时间")
+    private Date endTime;
+
+
+}

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

@@ -0,0 +1,17 @@
+package com.hcloud.microserver.system.bank.carbon.form;
+
+import com.hcloud.microserver.commoncore.base.BaseForm;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@ApiModel("银行用户Form")
+@Data
+public class BUserForm extends BaseForm {
+    @ApiModelProperty("用户id")
+    private String userid;
+    @ApiModelProperty("支付密码")
+    private String userpwd;
+
+}

carbon-bank/carbon-bank-mbg/pom.xml

@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <artifactId>carbon-bank</artifactId>
+        <groupId>com.hcloud.microserver</groupId>
+        <version>0.0.1-SNAPSHOT</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>carbon-bank-mbg</artifactId>
+    <packaging>jar</packaging>
+    <dependencies>
+        <dependency>
+            <groupId>com.alibaba</groupId>
+            <artifactId>druid-spring-boot-starter</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.mybatis.generator</groupId>
+            <artifactId>mybatis-generator-core</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>mysql</groupId>
+            <artifactId>mysql-connector-java</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.jetbrains</groupId>
+            <artifactId>annotations</artifactId>
+            <version>RELEASE</version>
+            <scope>compile</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.jetbrains</groupId>
+            <artifactId>annotations</artifactId>
+            <version>RELEASE</version>
+            <scope>compile</scope>
+        </dependency>
+        <dependency>
+            <groupId>javax.validation</groupId>
+            <artifactId>validation-api</artifactId>
+        </dependency>
+    </dependencies>
+
+</project>

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

@@ -0,0 +1,73 @@
+package com.hcloud.microserver.bank.mbg;
+
+import org.mybatis.generator.api.IntrospectedColumn;
+import org.mybatis.generator.api.IntrospectedTable;
+import org.mybatis.generator.api.dom.java.CompilationUnit;
+import org.mybatis.generator.api.dom.java.Field;
+import org.mybatis.generator.api.dom.java.FullyQualifiedJavaType;
+import org.mybatis.generator.internal.DefaultCommentGenerator;
+import org.mybatis.generator.internal.util.StringUtility;
+
+import java.util.Properties;
+
+/**
+ * 自定义注释生成器
+ * Created by macro on 2018/4/26.
+ */
+public class CommentGenerator extends DefaultCommentGenerator {
+    private boolean addRemarkComments = false;
+    private static final String EXAMPLE_SUFFIX="Example";
+    private static final String API_MODEL_PROPERTY_FULL_CLASS_NAME="io.swagger.annotations.ApiModelProperty";
+
+    /**
+     * 设置用户配置的参数
+     */
+    @Override
+    public void addConfigurationProperties(Properties properties) {
+        super.addConfigurationProperties(properties);
+        this.addRemarkComments = StringUtility.isTrue(properties.getProperty("addRemarkComments"));
+    }
+
+    /**
+     * 给字段添加注释
+     */
+    @Override
+    public void addFieldComment(Field field, IntrospectedTable introspectedTable,
+                                IntrospectedColumn introspectedColumn) {
+        String remarks = introspectedColumn.getRemarks();
+        //根据参数和备注信息判断是否添加备注信息
+        if(addRemarkComments&& StringUtility.stringHasValue(remarks)){
+//            addFieldJavaDoc(field, remarks);
+            //数据库中特殊字符需要转义
+            if(remarks.contains("\"")){
+                remarks = remarks.replace("\"","'");
+            }
+            //给model的字段添加swagger注解
+            field.addJavaDocLine("@ApiModelProperty(value = \""+remarks+"\")");
+        }
+    }
+
+    /**
+     * 给model的字段添加注释
+     */
+    private void addFieldJavaDoc(Field field, String remarks) {
+        //文档注释开始
+        field.addJavaDocLine("/**");
+        //获取数据库字段的备注信息
+        String[] remarkLines = remarks.split(System.getProperty("line.separator"));
+        for(String remarkLine:remarkLines){
+            field.addJavaDocLine(" * "+remarkLine);
+        }
+        addJavadocTag(field, false);
+        field.addJavaDocLine(" */");
+    }
+
+    @Override
+    public void addJavaFileComment(CompilationUnit compilationUnit) {
+        super.addJavaFileComment(compilationUnit);
+        //只在model中添加swagger注解类的导入
+        if(!compilationUnit.isJavaInterface()&&!compilationUnit.getType().getFullyQualifiedName().contains(EXAMPLE_SUFFIX)){
+            compilationUnit.addImportedType(new FullyQualifiedJavaType(API_MODEL_PROPERTY_FULL_CLASS_NAME));
+        }
+    }
+}

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

@@ -0,0 +1,38 @@
+package com.hcloud.microserver.bank.mbg;
+
+import org.mybatis.generator.api.MyBatisGenerator;
+import org.mybatis.generator.config.Configuration;
+import org.mybatis.generator.config.xml.ConfigurationParser;
+import org.mybatis.generator.internal.DefaultShellCallback;
+
+import java.io.InputStream;
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * 用于生产MBG的代码
+ * Created by macro on 2018/4/26.
+ */
+public class Generator {
+    public static void main(String[] args) throws Exception {
+        //MBG 执行过程中的警告信息
+        List<String> warnings = new ArrayList<String>();
+        //当生成的代码重复时，覆盖原代码
+        boolean overwrite = true;
+        //读取我们的 MBG 配置文件
+        InputStream is = Generator.class.getResourceAsStream("/generatorConfig.xml");
+        ConfigurationParser cp = new ConfigurationParser(warnings);
+        Configuration config = cp.parseConfiguration(is);
+        is.close();
+
+        DefaultShellCallback callback = new DefaultShellCallback(overwrite);
+        //创建 MBG
+        MyBatisGenerator myBatisGenerator = new MyBatisGenerator(config, callback, warnings);
+        //执行生成代码
+        myBatisGenerator.generate(null);
+        //输出警告信息
+        for (String warning : warnings) {
+            System.out.println(warning);
+        }
+    }
+}

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

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

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

@@ -0,0 +1,22 @@
+package com.hcloud.microserver.bank.mbg.mapper;
+
+import com.hcloud.microserver.bank.mbg.modul.BTransferFarmerRequest;
+import com.hcloud.microserver.bank.mbg.modul.BTransferFarmerRequestExample;
+import java.util.List;
+import org.apache.ibatis.annotations.Param;
+
+public interface BTransferFarmerRequestMapper {
+    long countByExample(BTransferFarmerRequestExample example);
+
+    int deleteByExample(BTransferFarmerRequestExample example);
+
+    int insert(BTransferFarmerRequest record);
+
+    int insertSelective(BTransferFarmerRequest record);
+
+    List<BTransferFarmerRequest> selectByExample(BTransferFarmerRequestExample example);
+
+    int updateByExampleSelective(@Param("record") BTransferFarmerRequest record, @Param("example") BTransferFarmerRequestExample example);
+
+    int updateByExample(@Param("record") BTransferFarmerRequest record, @Param("example") BTransferFarmerRequestExample example);
+}

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

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

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

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

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

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

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

@@ -0,0 +1,225 @@
+package com.hcloud.microserver.bank.mbg.modul;
+
+import io.swagger.annotations.ApiModelProperty;
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Date;
+
+public class BTransfer implements Serializable {
+    @ApiModelProperty(value = "主键")
+    private Long guid;
+
+    @ApiModelProperty(value = "清分类型")
+    private Integer transferType;
+
+    @ApiModelProperty(value = "清分状态0，待清分，1:发起清分中，2待银行确认清分完成，3完成清分")
+    private Integer transferStatus;
+
+    @ApiModelProperty(value = "清分时间")
+    private Date transferTime;
+
+    @ApiModelProperty(value = "清分金额")
+    private BigDecimal transferAmount;
+
+    @ApiModelProperty(value = "清分流水号")
+    private String serialNo;
+
+    @ApiModelProperty(value = "交易代码")
+    private String serviceId;
+
+    @ApiModelProperty(value = "清分使用的session_id")
+    private String sessionId;
+
+    @ApiModelProperty(value = "清分时间")
+    private String reqTime;
+
+    @ApiModelProperty(value = "响应代码")
+    private String retCode;
+
+    @ApiModelProperty(value = "错误消息")
+    private String errorMsg;
+
+    @ApiModelProperty(value = "创建人guid")
+    private Long createId;
+
+    @ApiModelProperty(value = "创建人姓名")
+    private String createName;
+
+    @ApiModelProperty(value = "创建时间")
+    private Date createTime;
+
+    @ApiModelProperty(value = "清分人id")
+    private Long transferId;
+
+    @ApiModelProperty(value = "清分人名称")
+    private String transferName;
+
+    @ApiModelProperty(value = "状态0：删除清分单，1，生成清分订单，2，退回清分单")
+    private Integer state;
+
+    private static final long serialVersionUID = 1L;
+
+    public Long getGuid() {
+        return guid;
+    }
+
+    public void setGuid(Long guid) {
+        this.guid = guid;
+    }
+
+    public Integer getTransferType() {
+        return transferType;
+    }
+
+    public void setTransferType(Integer transferType) {
+        this.transferType = transferType;
+    }
+
+    public Integer getTransferStatus() {
+        return transferStatus;
+    }
+
+    public void setTransferStatus(Integer transferStatus) {
+        this.transferStatus = transferStatus;
+    }
+
+    public Date getTransferTime() {
+        return transferTime;
+    }
+
+    public void setTransferTime(Date transferTime) {
+        this.transferTime = transferTime;
+    }
+
+    public BigDecimal getTransferAmount() {
+        return transferAmount;
+    }
+
+    public void setTransferAmount(BigDecimal transferAmount) {
+        this.transferAmount = transferAmount;
+    }
+
+    public String getSerialNo() {
+        return serialNo;
+    }
+
+    public void setSerialNo(String serialNo) {
+        this.serialNo = serialNo;
+    }
+
+    public String getServiceId() {
+        return serviceId;
+    }
+
+    public void setServiceId(String serviceId) {
+        this.serviceId = serviceId;
+    }
+
+    public String getSessionId() {
+        return sessionId;
+    }
+
+    public void setSessionId(String sessionId) {
+        this.sessionId = sessionId;
+    }
+
+    public String getReqTime() {
+        return reqTime;
+    }
+
+    public void setReqTime(String reqTime) {
+        this.reqTime = reqTime;
+    }
+
+    public String getRetCode() {
+        return retCode;
+    }
+
+    public void setRetCode(String retCode) {
+        this.retCode = retCode;
+    }
+
+    public String getErrorMsg() {
+        return errorMsg;
+    }
+
+    public void setErrorMsg(String errorMsg) {
+        this.errorMsg = errorMsg;
+    }
+
+    public Long getCreateId() {
+        return createId;
+    }
+
+    public void setCreateId(Long createId) {
+        this.createId = createId;
+    }
+
+    public String getCreateName() {
+        return createName;
+    }
+
+    public void setCreateName(String createName) {
+        this.createName = createName;
+    }
+
+    public Date getCreateTime() {
+        return createTime;
+    }
+
+    public void setCreateTime(Date createTime) {
+        this.createTime = createTime;
+    }
+
+    public Long getTransferId() {
+        return transferId;
+    }
+
+    public void setTransferId(Long transferId) {
+        this.transferId = transferId;
+    }
+
+    public String getTransferName() {
+        return transferName;
+    }
+
+    public void setTransferName(String transferName) {
+        this.transferName = transferName;
+    }
+
+    public Integer getState() {
+        return state;
+    }
+
+    public void setState(Integer state) {
+        this.state = state;
+    }
+
+    @Override
+    public String toString() {
+        StringBuilder sb = new StringBuilder();
+        sb.append(getClass().getSimpleName());
+        sb.append(" [");
+        sb.append("Hash = ").append(hashCode());
+        sb.append(", guid=").append(guid);
+        sb.append(", transferType=").append(transferType);
+        sb.append(", transferStatus=").append(transferStatus);
+        sb.append(", transferTime=").append(transferTime);
+        sb.append(", transferAmount=").append(transferAmount);
+        sb.append(", serialNo=").append(serialNo);
+        sb.append(", serviceId=").append(serviceId);
+        sb.append(", sessionId=").append(sessionId);
+        sb.append(", reqTime=").append(reqTime);
+        sb.append(", retCode=").append(retCode);
+        sb.append(", errorMsg=").append(errorMsg);
+        sb.append(", createId=").append(createId);
+        sb.append(", createName=").append(createName);
+        sb.append(", createTime=").append(createTime);
+        sb.append(", transferId=").append(transferId);
+        sb.append(", transferName=").append(transferName);
+        sb.append(", state=").append(state);
+        sb.append(", serialVersionUID=").append(serialVersionUID);
+        sb.append("]");
+        return sb.toString();
+    }
+}

carbon-back/carbon-back-mbg/src/main/java/com/hcloud/microserver/system/mbg/modul/TTransferDetail.java

@@ -1,10 +1,10 @@
-package com.hcloud.microserver.system.mbg.modul;
+package com.hcloud.microserver.bank.mbg.modul;
 
 import io.swagger.annotations.ApiModelProperty;
 import java.io.Serializable;
 import java.util.Date;
 
-public class TTransferDetail implements Serializable {
+public class BTransferDetail implements Serializable {
     @ApiModelProperty(value = "主键")
     private Long guid;
 
@@ -12,7 +12,7 @@ public class TTransferDetail implements Serializable {
     private Long fkTransferId;
 
     @ApiModelProperty(value = "清分类型，0：农户清分，1:村组清分")
-    private String transferType;
+    private Integer transferType;
 
     @ApiModelProperty(value = "农户或者村组id")
     private String fkFcId;
@@ -26,7 +26,7 @@ public class TTransferDetail implements Serializable {
     @ApiModelProperty(value = "收款方银行卡号")
     private String bankNo;
 
-    @ApiModelProperty(value = "收款方省份证号")
+    @ApiModelProperty(value = "收款方身份证号")
     private String accountPid;
 
     @ApiModelProperty(value = "交易状态")
@@ -50,6 +50,27 @@ public class TTransferDetail implements Serializable {
     @ApiModelProperty(value = "分类id")
     private Integer nationId;
 
+    @ApiModelProperty(value = "创建时间")
+    private Date createTime;
+
+    @ApiModelProperty(value = "创建人")
+    private Long createId;
+
+    @ApiModelProperty(value = "创建人名称")
+    private String createName;
+
+    @ApiModelProperty(value = "清分人id")
+    private Long transferId;
+
+    @ApiModelProperty(value = "清分人名称")
+    private String transferName;
+
+    @ApiModelProperty(value = "清分发起时间")
+    private Date transferTime;
+
+    @ApiModelProperty(value = "清分状态0，删除，1，生成，2，已经退回到订单")
+    private Integer state;
+
     private static final long serialVersionUID = 1L;
 
     public Long getGuid() {
@@ -68,11 +89,11 @@ public class TTransferDetail implements Serializable {
         this.fkTransferId = fkTransferId;
     }
 
-    public String getTransferType() {
+    public Integer getTransferType() {
         return transferType;
     }
 
-    public void setTransferType(String transferType) {
+    public void setTransferType(Integer transferType) {
         this.transferType = transferType;
     }
 
@@ -172,6 +193,62 @@ public class TTransferDetail implements Serializable {
         this.nationId = nationId;
     }
 
+    public Date getCreateTime() {
+        return createTime;
+    }
+
+    public void setCreateTime(Date createTime) {
+        this.createTime = createTime;
+    }
+
+    public Long getCreateId() {
+        return createId;
+    }
+
+    public void setCreateId(Long createId) {
+        this.createId = createId;
+    }
+
+    public String getCreateName() {
+        return createName;
+    }
+
+    public void setCreateName(String createName) {
+        this.createName = createName;
+    }
+
+    public Long getTransferId() {
+        return transferId;
+    }
+
+    public void setTransferId(Long transferId) {
+        this.transferId = transferId;
+    }
+
+    public String getTransferName() {
+        return transferName;
+    }
+
+    public void setTransferName(String transferName) {
+        this.transferName = transferName;
+    }
+
+    public Date getTransferTime() {
+        return transferTime;
+    }
+
+    public void setTransferTime(Date transferTime) {
+        this.transferTime = transferTime;
+    }
+
+    public Integer getState() {
+        return state;
+    }
+
+    public void setState(Integer state) {
+        this.state = state;
+    }
+
     @Override
     public String toString() {
         StringBuilder sb = new StringBuilder();
@@ -193,6 +270,13 @@ public class TTransferDetail implements Serializable {
         sb.append(", time=").append(time);
         sb.append(", transferNation=").append(transferNation);
         sb.append(", nationId=").append(nationId);
+        sb.append(", createTime=").append(createTime);
+        sb.append(", createId=").append(createId);
+        sb.append(", createName=").append(createName);
+        sb.append(", transferId=").append(transferId);
+        sb.append(", transferName=").append(transferName);
+        sb.append(", transferTime=").append(transferTime);
+        sb.append(", state=").append(state);
         sb.append(", serialVersionUID=").append(serialVersionUID);
         sb.append("]");
         return sb.toString();

carbon-back/carbon-back-mbg/src/main/java/com/hcloud/microserver/system/mbg/modul/TTransferDetailExample.java

@@ -1,17 +1,17 @@
-package com.hcloud.microserver.system.mbg.modul;
+package com.hcloud.microserver.bank.mbg.modul;
 
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
 
-public class TTransferDetailExample {
+public class BTransferDetailExample {
     protected String orderByClause;
 
     protected boolean distinct;
 
     protected List<Criteria> oredCriteria;
 
-    public TTransferDetailExample() {
+    public BTransferDetailExample() {
         oredCriteria = new ArrayList<Criteria>();
     }
 
@@ -235,62 +235,52 @@ public class TTransferDetailExample {
             return (Criteria) this;
         }
 
-        public Criteria andTransferTypeEqualTo(String value) {
+        public Criteria andTransferTypeEqualTo(Integer value) {
             addCriterion("transfer_type =", value, "transferType");
             return (Criteria) this;
         }
 
-        public Criteria andTransferTypeNotEqualTo(String value) {
+        public Criteria andTransferTypeNotEqualTo(Integer value) {
             addCriterion("transfer_type <>", value, "transferType");
             return (Criteria) this;
         }
 
-        public Criteria andTransferTypeGreaterThan(String value) {
+        public Criteria andTransferTypeGreaterThan(Integer value) {
             addCriterion("transfer_type >", value, "transferType");
             return (Criteria) this;
         }
 
-        public Criteria andTransferTypeGreaterThanOrEqualTo(String value) {
+        public Criteria andTransferTypeGreaterThanOrEqualTo(Integer value) {
             addCriterion("transfer_type >=", value, "transferType");
             return (Criteria) this;
         }
 
-        public Criteria andTransferTypeLessThan(String value) {
+        public Criteria andTransferTypeLessThan(Integer value) {
             addCriterion("transfer_type <", value, "transferType");
             return (Criteria) this;
         }
 
-        public Criteria andTransferTypeLessThanOrEqualTo(String value) {
+        public Criteria andTransferTypeLessThanOrEqualTo(Integer value) {
             addCriterion("transfer_type <=", value, "transferType");
             return (Criteria) this;
         }
 
-        public Criteria andTransferTypeLike(String value) {
-            addCriterion("transfer_type like", value, "transferType");
-            return (Criteria) this;
-        }
-
-        public Criteria andTransferTypeNotLike(String value) {
-            addCriterion("transfer_type not like", value, "transferType");
-            return (Criteria) this;
-        }
-
-        public Criteria andTransferTypeIn(List<String> values) {
+        public Criteria andTransferTypeIn(List<Integer> values) {
             addCriterion("transfer_type in", values, "transferType");
             return (Criteria) this;
         }
 
-        public Criteria andTransferTypeNotIn(List<String> values) {
+        public Criteria andTransferTypeNotIn(List<Integer> values) {
             addCriterion("transfer_type not in", values, "transferType");
             return (Criteria) this;
         }
 
-        public Criteria andTransferTypeBetween(String value1, String value2) {
+        public Criteria andTransferTypeBetween(Integer value1, Integer value2) {
             addCriterion("transfer_type between", value1, value2, "transferType");
             return (Criteria) this;
         }
 
-        public Criteria andTransferTypeNotBetween(String value1, String value2) {
+        public Criteria andTransferTypeNotBetween(Integer value1, Integer value2) {
             addCriterion("transfer_type not between", value1, value2, "transferType");
             return (Criteria) this;
         }
@@ -1114,6 +1104,446 @@ public class TTransferDetailExample {
             addCriterion("nation_id not between", value1, value2, "nationId");
             return (Criteria) this;
         }
+
+        public Criteria andCreateTimeIsNull() {
+            addCriterion("create_time is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeIsNotNull() {
+            addCriterion("create_time is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeEqualTo(Date value) {
+            addCriterion("create_time =", value, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeNotEqualTo(Date value) {
+            addCriterion("create_time <>", value, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeGreaterThan(Date value) {
+            addCriterion("create_time >", value, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeGreaterThanOrEqualTo(Date value) {
+            addCriterion("create_time >=", value, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeLessThan(Date value) {
+            addCriterion("create_time <", value, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeLessThanOrEqualTo(Date value) {
+            addCriterion("create_time <=", value, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeIn(List<Date> values) {
+            addCriterion("create_time in", values, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeNotIn(List<Date> values) {
+            addCriterion("create_time not in", values, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeBetween(Date value1, Date value2) {
+            addCriterion("create_time between", value1, value2, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeNotBetween(Date value1, Date value2) {
+            addCriterion("create_time not between", value1, value2, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateIdIsNull() {
+            addCriterion("create_id is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateIdIsNotNull() {
+            addCriterion("create_id is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateIdEqualTo(Long value) {
+            addCriterion("create_id =", value, "createId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateIdNotEqualTo(Long value) {
+            addCriterion("create_id <>", value, "createId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateIdGreaterThan(Long value) {
+            addCriterion("create_id >", value, "createId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateIdGreaterThanOrEqualTo(Long value) {
+            addCriterion("create_id >=", value, "createId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateIdLessThan(Long value) {
+            addCriterion("create_id <", value, "createId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateIdLessThanOrEqualTo(Long value) {
+            addCriterion("create_id <=", value, "createId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateIdIn(List<Long> values) {
+            addCriterion("create_id in", values, "createId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateIdNotIn(List<Long> values) {
+            addCriterion("create_id not in", values, "createId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateIdBetween(Long value1, Long value2) {
+            addCriterion("create_id between", value1, value2, "createId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateIdNotBetween(Long value1, Long value2) {
+            addCriterion("create_id not between", value1, value2, "createId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateNameIsNull() {
+            addCriterion("create_name is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateNameIsNotNull() {
+            addCriterion("create_name is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateNameEqualTo(String value) {
+            addCriterion("create_name =", value, "createName");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateNameNotEqualTo(String value) {
+            addCriterion("create_name <>", value, "createName");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateNameGreaterThan(String value) {
+            addCriterion("create_name >", value, "createName");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateNameGreaterThanOrEqualTo(String value) {
+            addCriterion("create_name >=", value, "createName");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateNameLessThan(String value) {
+            addCriterion("create_name <", value, "createName");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateNameLessThanOrEqualTo(String value) {
+            addCriterion("create_name <=", value, "createName");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateNameLike(String value) {
+            addCriterion("create_name like", value, "createName");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateNameNotLike(String value) {
+            addCriterion("create_name not like", value, "createName");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateNameIn(List<String> values) {
+            addCriterion("create_name in", values, "createName");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateNameNotIn(List<String> values) {
+            addCriterion("create_name not in", values, "createName");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateNameBetween(String value1, String value2) {
+            addCriterion("create_name between", value1, value2, "createName");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateNameNotBetween(String value1, String value2) {
+            addCriterion("create_name not between", value1, value2, "createName");
+            return (Criteria) this;
+        }
+
+        public Criteria andTransferIdIsNull() {
+            addCriterion("transfer_id is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andTransferIdIsNotNull() {
+            addCriterion("transfer_id is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andTransferIdEqualTo(Long value) {
+            addCriterion("transfer_id =", value, "transferId");
+            return (Criteria) this;
+        }
+
+        public Criteria andTransferIdNotEqualTo(Long value) {
+            addCriterion("transfer_id <>", value, "transferId");
+            return (Criteria) this;
+        }
+
+        public Criteria andTransferIdGreaterThan(Long value) {
+            addCriterion("transfer_id >", value, "transferId");
+            return (Criteria) this;
+        }
+
+        public Criteria andTransferIdGreaterThanOrEqualTo(Long value) {
+            addCriterion("transfer_id >=", value, "transferId");
+            return (Criteria) this;
+        }
+
+        public Criteria andTransferIdLessThan(Long value) {
+            addCriterion("transfer_id <", value, "transferId");
+            return (Criteria) this;
+        }
+
+        public Criteria andTransferIdLessThanOrEqualTo(Long value) {
+            addCriterion("transfer_id <=", value, "transferId");
+            return (Criteria) this;
+        }
+
+        public Criteria andTransferIdIn(List<Long> values) {
+            addCriterion("transfer_id in", values, "transferId");
+            return (Criteria) this;
+        }
+
+        public Criteria andTransferIdNotIn(List<Long> values) {
+            addCriterion("transfer_id not in", values, "transferId");
+            return (Criteria) this;
+        }
+
+        public Criteria andTransferIdBetween(Long value1, Long value2) {
+            addCriterion("transfer_id between", value1, value2, "transferId");
+            return (Criteria) this;
+        }
+
+        public Criteria andTransferIdNotBetween(Long value1, Long value2) {
+            addCriterion("transfer_id not between", value1, value2, "transferId");
+            return (Criteria) this;
+        }
+
+        public Criteria andTransferNameIsNull() {
+            addCriterion("transfer_name is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andTransferNameIsNotNull() {
+            addCriterion("transfer_name is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andTransferNameEqualTo(String value) {
+            addCriterion("transfer_name =", value, "transferName");
+            return (Criteria) this;
+        }
+
+        public Criteria andTransferNameNotEqualTo(String value) {
+            addCriterion("transfer_name <>", value, "transferName");
+            return (Criteria) this;
+        }
+
+        public Criteria andTransferNameGreaterThan(String value) {
+            addCriterion("transfer_name >", value, "transferName");
+            return (Criteria) this;
+        }
+
+        public Criteria andTransferNameGreaterThanOrEqualTo(String value) {
+            addCriterion("transfer_name >=", value, "transferName");
+            return (Criteria) this;
+        }
+
+        public Criteria andTransferNameLessThan(String value) {
+            addCriterion("transfer_name <", value, "transferName");
+            return (Criteria) this;
+        }
+
+        public Criteria andTransferNameLessThanOrEqualTo(String value) {
+            addCriterion("transfer_name <=", value, "transferName");
+            return (Criteria) this;
+        }
+
+        public Criteria andTransferNameLike(String value) {
+            addCriterion("transfer_name like", value, "transferName");
+            return (Criteria) this;
+        }
+
+        public Criteria andTransferNameNotLike(String value) {
+            addCriterion("transfer_name not like", value, "transferName");
+            return (Criteria) this;
+        }
+
+        public Criteria andTransferNameIn(List<String> values) {
+            addCriterion("transfer_name in", values, "transferName");
+            return (Criteria) this;
+        }
+
+        public Criteria andTransferNameNotIn(List<String> values) {
+            addCriterion("transfer_name not in", values, "transferName");
+            return (Criteria) this;
+        }
+
+        public Criteria andTransferNameBetween(String value1, String value2) {
+            addCriterion("transfer_name between", value1, value2, "transferName");
+            return (Criteria) this;
+        }
+
+        public Criteria andTransferNameNotBetween(String value1, String value2) {
+            addCriterion("transfer_name not between", value1, value2, "transferName");
+            return (Criteria) this;
+        }
+
+        public Criteria andTransferTimeIsNull() {
+            addCriterion("transfer_time is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andTransferTimeIsNotNull() {
+            addCriterion("transfer_time is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andTransferTimeEqualTo(Date value) {
+            addCriterion("transfer_time =", value, "transferTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andTransferTimeNotEqualTo(Date value) {
+            addCriterion("transfer_time <>", value, "transferTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andTransferTimeGreaterThan(Date value) {
+            addCriterion("transfer_time >", value, "transferTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andTransferTimeGreaterThanOrEqualTo(Date value) {
+            addCriterion("transfer_time >=", value, "transferTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andTransferTimeLessThan(Date value) {
+            addCriterion("transfer_time <", value, "transferTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andTransferTimeLessThanOrEqualTo(Date value) {
+            addCriterion("transfer_time <=", value, "transferTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andTransferTimeIn(List<Date> values) {
+            addCriterion("transfer_time in", values, "transferTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andTransferTimeNotIn(List<Date> values) {
+            addCriterion("transfer_time not in", values, "transferTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andTransferTimeBetween(Date value1, Date value2) {
+            addCriterion("transfer_time between", value1, value2, "transferTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andTransferTimeNotBetween(Date value1, Date value2) {
+            addCriterion("transfer_time not between", value1, value2, "transferTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andStateIsNull() {
+            addCriterion("state is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andStateIsNotNull() {
+            addCriterion("state is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andStateEqualTo(Integer value) {
+            addCriterion("state =", value, "state");
+            return (Criteria) this;
+        }
+
+        public Criteria andStateNotEqualTo(Integer value) {
+            addCriterion("state <>", value, "state");
+            return (Criteria) this;
+        }
+
+        public Criteria andStateGreaterThan(Integer value) {
+            addCriterion("state >", value, "state");
+            return (Criteria) this;
+        }
+
+        public Criteria andStateGreaterThanOrEqualTo(Integer value) {
+            addCriterion("state >=", value, "state");
+            return (Criteria) this;
+        }
+
+        public Criteria andStateLessThan(Integer value) {
+            addCriterion("state <", value, "state");
+            return (Criteria) this;
+        }
+
+        public Criteria andStateLessThanOrEqualTo(Integer value) {
+            addCriterion("state <=", value, "state");
+            return (Criteria) this;
+        }
+
+        public Criteria andStateIn(List<Integer> values) {
+            addCriterion("state in", values, "state");
+            return (Criteria) this;
+        }
+
+        public Criteria andStateNotIn(List<Integer> values) {
+            addCriterion("state not in", values, "state");
+            return (Criteria) this;
+        }
+
+        public Criteria andStateBetween(Integer value1, Integer value2) {
+            addCriterion("state between", value1, value2, "state");
+            return (Criteria) this;
+        }
+
+        public Criteria andStateNotBetween(Integer value1, Integer value2) {
+            addCriterion("state not between", value1, value2, "state");
+            return (Criteria) this;
+        }
     }
 
     public static class Criteria extends GeneratedCriteria {

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

@@ -0,0 +1,285 @@
+package com.hcloud.microserver.bank.mbg.modul;
+
+import io.swagger.annotations.ApiModelProperty;
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Date;
+
+public class BTransferFarmerRequest implements Serializable {
+    @ApiModelProperty(value = "主键")
+    private Long guid;
+
+    @ApiModelProperty(value = "渠道流水号")
+    private String serilNo;
+
+    @ApiModelProperty(value = "币种")
+    private String currency;
+
+    @ApiModelProperty(value = "提交人")
+    private String submitter;
+
+    @ApiModelProperty(value = "最后授权人")
+    private String authorizer;
+
+    @ApiModelProperty(value = "清分总表id")
+    private Long fkTransferId;
+
+    @ApiModelProperty(value = "付款金额")
+    private BigDecimal payAmount;
+
+    @ApiModelProperty(value = "付款银行名称")
+    private String payBankName;
+
+    @ApiModelProperty(value = "付款账号")
+    private String payAccount;
+
+    @ApiModelProperty(value = "付款人名称")
+    private String payName;
+
+    @ApiModelProperty(value = "交易日期")
+    private String payDate;
+
+    @ApiModelProperty(value = "交易序号")
+    private String paySeril;
+
+    @ApiModelProperty(value = "手续费支付方式")
+    private String handFeeType;
+
+    @ApiModelProperty(value = "交易状态")
+    private String payStatus;
+
+    @ApiModelProperty(value = "状态描述")
+    private String payMsg;
+
+    @ApiModelProperty(value = "交易应答码")
+    private String payResponseCode;
+
+    @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;
+
+    @ApiModelProperty(value = "状态：1-可用 0-不用")
+    private Integer status;
+
+    private static final long serialVersionUID = 1L;
+
+    public Long getGuid() {
+        return guid;
+    }
+
+    public void setGuid(Long guid) {
+        this.guid = guid;
+    }
+
+    public String getSerilNo() {
+        return serilNo;
+    }
+
+    public void setSerilNo(String serilNo) {
+        this.serilNo = serilNo;
+    }
+
+    public String getCurrency() {
+        return currency;
+    }
+
+    public void setCurrency(String currency) {
+        this.currency = currency;
+    }
+
+    public String getSubmitter() {
+        return submitter;
+    }
+
+    public void setSubmitter(String submitter) {
+        this.submitter = submitter;
+    }
+
+    public String getAuthorizer() {
+        return authorizer;
+    }
+
+    public void setAuthorizer(String authorizer) {
+        this.authorizer = authorizer;
+    }
+
+    public Long getFkTransferId() {
+        return fkTransferId;
+    }
+
+    public void setFkTransferId(Long fkTransferId) {
+        this.fkTransferId = fkTransferId;
+    }
+
+    public BigDecimal getPayAmount() {
+        return payAmount;
+    }
+
+    public void setPayAmount(BigDecimal payAmount) {
+        this.payAmount = payAmount;
+    }
+
+    public String getPayBankName() {
+        return payBankName;
+    }
+
+    public void setPayBankName(String payBankName) {
+        this.payBankName = payBankName;
+    }
+
+    public String getPayAccount() {
+        return payAccount;
+    }
+
+    public void setPayAccount(String payAccount) {
+        this.payAccount = payAccount;
+    }
+
+    public String getPayName() {
+        return payName;
+    }
+
+    public void setPayName(String payName) {
+        this.payName = payName;
+    }
+
+    public String getPayDate() {
+        return payDate;
+    }
+
+    public void setPayDate(String payDate) {
+        this.payDate = payDate;
+    }
+
+    public String getPaySeril() {
+        return paySeril;
+    }
+
+    public void setPaySeril(String paySeril) {
+        this.paySeril = paySeril;
+    }
+
+    public String getHandFeeType() {
+        return handFeeType;
+    }
+
+    public void setHandFeeType(String handFeeType) {
+        this.handFeeType = handFeeType;
+    }
+
+    public String getPayStatus() {
+        return payStatus;
+    }
+
+    public void setPayStatus(String payStatus) {
+        this.payStatus = payStatus;
+    }
+
+    public String getPayMsg() {
+        return payMsg;
+    }
+
+    public void setPayMsg(String payMsg) {
+        this.payMsg = payMsg;
+    }
+
+    public String getPayResponseCode() {
+        return payResponseCode;
+    }
+
+    public void setPayResponseCode(String payResponseCode) {
+        this.payResponseCode = payResponseCode;
+    }
+
+    public String getFailReson() {
+        return failReson;
+    }
+
+    public void setFailReson(String failReson) {
+        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;
+    }
+
+    public void setCreateTime(Date createTime) {
+        this.createTime = createTime;
+    }
+
+    public Integer getStatus() {
+        return status;
+    }
+
+    public void setStatus(Integer status) {
+        this.status = status;
+    }
+
+    @Override
+    public String toString() {
+        StringBuilder sb = new StringBuilder();
+        sb.append(getClass().getSimpleName());
+        sb.append(" [");
+        sb.append("Hash = ").append(hashCode());
+        sb.append(", guid=").append(guid);
+        sb.append(", serilNo=").append(serilNo);
+        sb.append(", currency=").append(currency);
+        sb.append(", submitter=").append(submitter);
+        sb.append(", authorizer=").append(authorizer);
+        sb.append(", fkTransferId=").append(fkTransferId);
+        sb.append(", payAmount=").append(payAmount);
+        sb.append(", payBankName=").append(payBankName);
+        sb.append(", payAccount=").append(payAccount);
+        sb.append(", payName=").append(payName);
+        sb.append(", payDate=").append(payDate);
+        sb.append(", paySeril=").append(paySeril);
+        sb.append(", handFeeType=").append(handFeeType);
+        sb.append(", payStatus=").append(payStatus);
+        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(", serialVersionUID=").append(serialVersionUID);
+        sb.append("]");
+        return sb.toString();
+    }
+}

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

@@ -0,0 +1,104 @@
+package com.hcloud.microserver.bank.mbg.modul;
+
+import io.swagger.annotations.ApiModelProperty;
+import java.io.Serializable;
+import java.util.Date;
+
+public class BUser implements Serializable {
+    @ApiModelProperty(value = "主键")
+    private Long guid;
+
+    @ApiModelProperty(value = "用户id")
+    private String userid;
+
+    @ApiModelProperty(value = "用户密码")
+    private String userpwd;
+
+    @ApiModelProperty(value = "系统编号")
+    private String systemid;
+
+    @ApiModelProperty(value = "交易密码")
+    private String password;
+
+    @ApiModelProperty(value = "创建时间")
+    private Date createTime;
+
+    @ApiModelProperty(value = "创建人id")
+    private Long createId;
+
+    private static final long serialVersionUID = 1L;
+
+    public Long getGuid() {
+        return guid;
+    }
+
+    public void setGuid(Long guid) {
+        this.guid = guid;
+    }
+
+    public String getUserid() {
+        return userid;
+    }
+
+    public void setUserid(String userid) {
+        this.userid = userid;
+    }
+
+    public String getUserpwd() {
+        return userpwd;
+    }
+
+    public void setUserpwd(String userpwd) {
+        this.userpwd = userpwd;
+    }
+
+    public String getSystemid() {
+        return systemid;
+    }
+
+    public void setSystemid(String systemid) {
+        this.systemid = systemid;
+    }
+
+    public String getPassword() {
+        return password;
+    }
+
+    public void setPassword(String password) {
+        this.password = password;
+    }
+
+    public Date getCreateTime() {
+        return createTime;
+    }
+
+    public void setCreateTime(Date createTime) {
+        this.createTime = createTime;
+    }
+
+    public Long getCreateId() {
+        return createId;
+    }
+
+    public void setCreateId(Long createId) {
+        this.createId = createId;
+    }
+
+    @Override
+    public String toString() {
+        StringBuilder sb = new StringBuilder();
+        sb.append(getClass().getSimpleName());
+        sb.append(" [");
+        sb.append("Hash = ").append(hashCode());
+        sb.append(", guid=").append(guid);
+        sb.append(", userid=").append(userid);
+        sb.append(", userpwd=").append(userpwd);
+        sb.append(", systemid=").append(systemid);
+        sb.append(", password=").append(password);
+        sb.append(", createTime=").append(createTime);
+        sb.append(", createId=").append(createId);
+        sb.append(", serialVersionUID=").append(serialVersionUID);
+        sb.append("]");
+        return sb.toString();
+    }
+}

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

@@ -0,0 +1,661 @@
+package com.hcloud.microserver.bank.mbg.modul;
+
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+
+public class BUserExample {
+    protected String orderByClause;
+
+    protected boolean distinct;
+
+    protected List<Criteria> oredCriteria;
+
+    public BUserExample() {
+        oredCriteria = new ArrayList<Criteria>();
+    }
+
+    public void setOrderByClause(String orderByClause) {
+        this.orderByClause = orderByClause;
+    }
+
+    public String getOrderByClause() {
+        return orderByClause;
+    }
+
+    public void setDistinct(boolean distinct) {
+        this.distinct = distinct;
+    }
+
+    public boolean isDistinct() {
+        return distinct;
+    }
+
+    public List<Criteria> getOredCriteria() {
+        return oredCriteria;
+    }
+
+    public void or(Criteria criteria) {
+        oredCriteria.add(criteria);
+    }
+
+    public Criteria or() {
+        Criteria criteria = createCriteriaInternal();
+        oredCriteria.add(criteria);
+        return criteria;
+    }
+
+    public Criteria createCriteria() {
+        Criteria criteria = createCriteriaInternal();
+        if (oredCriteria.size() == 0) {
+            oredCriteria.add(criteria);
+        }
+        return criteria;
+    }
+
+    protected Criteria createCriteriaInternal() {
+        Criteria criteria = new Criteria();
+        return criteria;
+    }
+
+    public void clear() {
+        oredCriteria.clear();
+        orderByClause = null;
+        distinct = false;
+    }
+
+    protected abstract static class GeneratedCriteria {
+        protected List<Criterion> criteria;
+
+        protected GeneratedCriteria() {
+            super();
+            criteria = new ArrayList<Criterion>();
+        }
+
+        public boolean isValid() {
+            return criteria.size() > 0;
+        }
+
+        public List<Criterion> getAllCriteria() {
+            return criteria;
+        }
+
+        public List<Criterion> getCriteria() {
+            return criteria;
+        }
+
+        protected void addCriterion(String condition) {
+            if (condition == null) {
+                throw new RuntimeException("Value for condition cannot be null");
+            }
+            criteria.add(new Criterion(condition));
+        }
+
+        protected void addCriterion(String condition, Object value, String property) {
+            if (value == null) {
+                throw new RuntimeException("Value for " + property + " cannot be null");
+            }
+            criteria.add(new Criterion(condition, value));
+        }
+
+        protected void addCriterion(String condition, Object value1, Object value2, String property) {
+            if (value1 == null || value2 == null) {
+                throw new RuntimeException("Between values for " + property + " cannot be null");
+            }
+            criteria.add(new Criterion(condition, value1, value2));
+        }
+
+        public Criteria andGuidIsNull() {
+            addCriterion("guid is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andGuidIsNotNull() {
+            addCriterion("guid is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andGuidEqualTo(Long value) {
+            addCriterion("guid =", value, "guid");
+            return (Criteria) this;
+        }
+
+        public Criteria andGuidNotEqualTo(Long value) {
+            addCriterion("guid <>", value, "guid");
+            return (Criteria) this;
+        }
+
+        public Criteria andGuidGreaterThan(Long value) {
+            addCriterion("guid >", value, "guid");
+            return (Criteria) this;
+        }
+
+        public Criteria andGuidGreaterThanOrEqualTo(Long value) {
+            addCriterion("guid >=", value, "guid");
+            return (Criteria) this;
+        }
+
+        public Criteria andGuidLessThan(Long value) {
+            addCriterion("guid <", value, "guid");
+            return (Criteria) this;
+        }
+
+        public Criteria andGuidLessThanOrEqualTo(Long value) {
+            addCriterion("guid <=", value, "guid");
+            return (Criteria) this;
+        }
+
+        public Criteria andGuidIn(List<Long> values) {
+            addCriterion("guid in", values, "guid");
+            return (Criteria) this;
+        }
+
+        public Criteria andGuidNotIn(List<Long> values) {
+            addCriterion("guid not in", values, "guid");
+            return (Criteria) this;
+        }
+
+        public Criteria andGuidBetween(Long value1, Long value2) {
+            addCriterion("guid between", value1, value2, "guid");
+            return (Criteria) this;
+        }
+
+        public Criteria andGuidNotBetween(Long value1, Long value2) {
+            addCriterion("guid not between", value1, value2, "guid");
+            return (Criteria) this;
+        }
+
+        public Criteria andUseridIsNull() {
+            addCriterion("userID is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andUseridIsNotNull() {
+            addCriterion("userID is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andUseridEqualTo(String value) {
+            addCriterion("userID =", value, "userid");
+            return (Criteria) this;
+        }
+
+        public Criteria andUseridNotEqualTo(String value) {
+            addCriterion("userID <>", value, "userid");
+            return (Criteria) this;
+        }
+
+        public Criteria andUseridGreaterThan(String value) {
+            addCriterion("userID >", value, "userid");
+            return (Criteria) this;
+        }
+
+        public Criteria andUseridGreaterThanOrEqualTo(String value) {
+            addCriterion("userID >=", value, "userid");
+            return (Criteria) this;
+        }
+
+        public Criteria andUseridLessThan(String value) {
+            addCriterion("userID <", value, "userid");
+            return (Criteria) this;
+        }
+
+        public Criteria andUseridLessThanOrEqualTo(String value) {
+            addCriterion("userID <=", value, "userid");
+            return (Criteria) this;
+        }
+
+        public Criteria andUseridLike(String value) {
+            addCriterion("userID like", value, "userid");
+            return (Criteria) this;
+        }
+
+        public Criteria andUseridNotLike(String value) {
+            addCriterion("userID not like", value, "userid");
+            return (Criteria) this;
+        }
+
+        public Criteria andUseridIn(List<String> values) {
+            addCriterion("userID in", values, "userid");
+            return (Criteria) this;
+        }
+
+        public Criteria andUseridNotIn(List<String> values) {
+            addCriterion("userID not in", values, "userid");
+            return (Criteria) this;
+        }
+
+        public Criteria andUseridBetween(String value1, String value2) {
+            addCriterion("userID between", value1, value2, "userid");
+            return (Criteria) this;
+        }
+
+        public Criteria andUseridNotBetween(String value1, String value2) {
+            addCriterion("userID not between", value1, value2, "userid");
+            return (Criteria) this;
+        }
+
+        public Criteria andUserpwdIsNull() {
+            addCriterion("userPWD is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andUserpwdIsNotNull() {
+            addCriterion("userPWD is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andUserpwdEqualTo(String value) {
+            addCriterion("userPWD =", value, "userpwd");
+            return (Criteria) this;
+        }
+
+        public Criteria andUserpwdNotEqualTo(String value) {
+            addCriterion("userPWD <>", value, "userpwd");
+            return (Criteria) this;
+        }
+
+        public Criteria andUserpwdGreaterThan(String value) {
+            addCriterion("userPWD >", value, "userpwd");
+            return (Criteria) this;
+        }
+
+        public Criteria andUserpwdGreaterThanOrEqualTo(String value) {
+            addCriterion("userPWD >=", value, "userpwd");
+            return (Criteria) this;
+        }
+
+        public Criteria andUserpwdLessThan(String value) {
+            addCriterion("userPWD <", value, "userpwd");
+            return (Criteria) this;
+        }
+
+        public Criteria andUserpwdLessThanOrEqualTo(String value) {
+            addCriterion("userPWD <=", value, "userpwd");
+            return (Criteria) this;
+        }
+
+        public Criteria andUserpwdLike(String value) {
+            addCriterion("userPWD like", value, "userpwd");
+            return (Criteria) this;
+        }
+
+        public Criteria andUserpwdNotLike(String value) {
+            addCriterion("userPWD not like", value, "userpwd");
+            return (Criteria) this;
+        }
+
+        public Criteria andUserpwdIn(List<String> values) {
+            addCriterion("userPWD in", values, "userpwd");
+            return (Criteria) this;
+        }
+
+        public Criteria andUserpwdNotIn(List<String> values) {
+            addCriterion("userPWD not in", values, "userpwd");
+            return (Criteria) this;
+        }
+
+        public Criteria andUserpwdBetween(String value1, String value2) {
+            addCriterion("userPWD between", value1, value2, "userpwd");
+            return (Criteria) this;
+        }
+
+        public Criteria andUserpwdNotBetween(String value1, String value2) {
+            addCriterion("userPWD not between", value1, value2, "userpwd");
+            return (Criteria) this;
+        }
+
+        public Criteria andSystemidIsNull() {
+            addCriterion("systemId is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andSystemidIsNotNull() {
+            addCriterion("systemId is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andSystemidEqualTo(String value) {
+            addCriterion("systemId =", value, "systemid");
+            return (Criteria) this;
+        }
+
+        public Criteria andSystemidNotEqualTo(String value) {
+            addCriterion("systemId <>", value, "systemid");
+            return (Criteria) this;
+        }
+
+        public Criteria andSystemidGreaterThan(String value) {
+            addCriterion("systemId >", value, "systemid");
+            return (Criteria) this;
+        }
+
+        public Criteria andSystemidGreaterThanOrEqualTo(String value) {
+            addCriterion("systemId >=", value, "systemid");
+            return (Criteria) this;
+        }
+
+        public Criteria andSystemidLessThan(String value) {
+            addCriterion("systemId <", value, "systemid");
+            return (Criteria) this;
+        }
+
+        public Criteria andSystemidLessThanOrEqualTo(String value) {
+            addCriterion("systemId <=", value, "systemid");
+            return (Criteria) this;
+        }
+
+        public Criteria andSystemidLike(String value) {
+            addCriterion("systemId like", value, "systemid");
+            return (Criteria) this;
+        }
+
+        public Criteria andSystemidNotLike(String value) {
+            addCriterion("systemId not like", value, "systemid");
+            return (Criteria) this;
+        }
+
+        public Criteria andSystemidIn(List<String> values) {
+            addCriterion("systemId in", values, "systemid");
+            return (Criteria) this;
+        }
+
+        public Criteria andSystemidNotIn(List<String> values) {
+            addCriterion("systemId not in", values, "systemid");
+            return (Criteria) this;
+        }
+
+        public Criteria andSystemidBetween(String value1, String value2) {
+            addCriterion("systemId between", value1, value2, "systemid");
+            return (Criteria) this;
+        }
+
+        public Criteria andSystemidNotBetween(String value1, String value2) {
+            addCriterion("systemId not between", value1, value2, "systemid");
+            return (Criteria) this;
+        }
+
+        public Criteria andPasswordIsNull() {
+            addCriterion("password is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andPasswordIsNotNull() {
+            addCriterion("password is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andPasswordEqualTo(String value) {
+            addCriterion("password =", value, "password");
+            return (Criteria) this;
+        }
+
+        public Criteria andPasswordNotEqualTo(String value) {
+            addCriterion("password <>", value, "password");
+            return (Criteria) this;
+        }
+
+        public Criteria andPasswordGreaterThan(String value) {
+            addCriterion("password >", value, "password");
+            return (Criteria) this;
+        }
+
+        public Criteria andPasswordGreaterThanOrEqualTo(String value) {
+            addCriterion("password >=", value, "password");
+            return (Criteria) this;
+        }
+
+        public Criteria andPasswordLessThan(String value) {
+            addCriterion("password <", value, "password");
+            return (Criteria) this;
+        }
+
+        public Criteria andPasswordLessThanOrEqualTo(String value) {
+            addCriterion("password <=", value, "password");
+            return (Criteria) this;
+        }
+
+        public Criteria andPasswordLike(String value) {
+            addCriterion("password like", value, "password");
+            return (Criteria) this;
+        }
+
+        public Criteria andPasswordNotLike(String value) {
+            addCriterion("password not like", value, "password");
+            return (Criteria) this;
+        }
+
+        public Criteria andPasswordIn(List<String> values) {
+            addCriterion("password in", values, "password");
+            return (Criteria) this;
+        }
+
+        public Criteria andPasswordNotIn(List<String> values) {
+            addCriterion("password not in", values, "password");
+            return (Criteria) this;
+        }
+
+        public Criteria andPasswordBetween(String value1, String value2) {
+            addCriterion("password between", value1, value2, "password");
+            return (Criteria) this;
+        }
+
+        public Criteria andPasswordNotBetween(String value1, String value2) {
+            addCriterion("password not between", value1, value2, "password");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeIsNull() {
+            addCriterion("create_time is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeIsNotNull() {
+            addCriterion("create_time is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeEqualTo(Date value) {
+            addCriterion("create_time =", value, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeNotEqualTo(Date value) {
+            addCriterion("create_time <>", value, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeGreaterThan(Date value) {
+            addCriterion("create_time >", value, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeGreaterThanOrEqualTo(Date value) {
+            addCriterion("create_time >=", value, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeLessThan(Date value) {
+            addCriterion("create_time <", value, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeLessThanOrEqualTo(Date value) {
+            addCriterion("create_time <=", value, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeIn(List<Date> values) {
+            addCriterion("create_time in", values, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeNotIn(List<Date> values) {
+            addCriterion("create_time not in", values, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeBetween(Date value1, Date value2) {
+            addCriterion("create_time between", value1, value2, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeNotBetween(Date value1, Date value2) {
+            addCriterion("create_time not between", value1, value2, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateIdIsNull() {
+            addCriterion("create_id is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateIdIsNotNull() {
+            addCriterion("create_id is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateIdEqualTo(Long value) {
+            addCriterion("create_id =", value, "createId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateIdNotEqualTo(Long value) {
+            addCriterion("create_id <>", value, "createId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateIdGreaterThan(Long value) {
+            addCriterion("create_id >", value, "createId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateIdGreaterThanOrEqualTo(Long value) {
+            addCriterion("create_id >=", value, "createId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateIdLessThan(Long value) {
+            addCriterion("create_id <", value, "createId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateIdLessThanOrEqualTo(Long value) {
+            addCriterion("create_id <=", value, "createId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateIdIn(List<Long> values) {
+            addCriterion("create_id in", values, "createId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateIdNotIn(List<Long> values) {
+            addCriterion("create_id not in", values, "createId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateIdBetween(Long value1, Long value2) {
+            addCriterion("create_id between", value1, value2, "createId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateIdNotBetween(Long value1, Long value2) {
+            addCriterion("create_id not between", value1, value2, "createId");
+            return (Criteria) this;
+        }
+    }
+
+    public static class Criteria extends GeneratedCriteria {
+
+        protected Criteria() {
+            super();
+        }
+    }
+
+    public static class Criterion {
+        private String condition;
+
+        private Object value;
+
+        private Object secondValue;
+
+        private boolean noValue;
+
+        private boolean singleValue;
+
+        private boolean betweenValue;
+
+        private boolean listValue;
+
+        private String typeHandler;
+
+        public String getCondition() {
+            return condition;
+        }
+
+        public Object getValue() {
+            return value;
+        }
+
+        public Object getSecondValue() {
+            return secondValue;
+        }
+
+        public boolean isNoValue() {
+            return noValue;
+        }
+
+        public boolean isSingleValue() {
+            return singleValue;
+        }
+
+        public boolean isBetweenValue() {
+            return betweenValue;
+        }
+
+        public boolean isListValue() {
+            return listValue;
+        }
+
+        public String getTypeHandler() {
+            return typeHandler;
+        }
+
+        protected Criterion(String condition) {
+            super();
+            this.condition = condition;
+            this.typeHandler = null;
+            this.noValue = true;
+        }
+
+        protected Criterion(String condition, Object value, String typeHandler) {
+            super();
+            this.condition = condition;
+            this.value = value;
+            this.typeHandler = typeHandler;
+            if (value instanceof List<?>) {
+                this.listValue = true;
+            } else {
+                this.singleValue = true;
+            }
+        }
+
+        protected Criterion(String condition, Object value) {
+            this(condition, value, null);
+        }
+
+        protected Criterion(String condition, Object value, Object secondValue, String typeHandler) {
+            super();
+            this.condition = condition;
+            this.value = value;
+            this.secondValue = secondValue;
+            this.typeHandler = typeHandler;
+            this.betweenValue = true;
+        }
+
+        protected Criterion(String condition, Object value, Object secondValue) {
+            this(condition, value, secondValue, null);
+        }
+    }
+}

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

@@ -0,0 +1,164 @@
+package com.hcloud.microserver.bank.mbg.modul;
+
+import io.swagger.annotations.ApiModelProperty;
+import java.io.Serializable;
+import java.util.Date;
+
+public class BUserLogin implements Serializable {
+    @ApiModelProperty(value = "住建")
+    private Long guid;
+
+    @ApiModelProperty(value = "会话编号")
+    private String sessionId;
+
+    @ApiModelProperty(value = "服务编号")
+    private String serviceId;
+
+    @ApiModelProperty(value = "交易序列号")
+    private String serialNo;
+
+    @ApiModelProperty(value = "请求时间")
+    private String reqTime;
+
+    @ApiModelProperty(value = "响应代码")
+    private String retCode;
+
+    @ApiModelProperty(value = "错误信息")
+    private String errorMsg;
+
+    @ApiModelProperty(value = "用户登录ID")
+    private String userid;
+
+    @ApiModelProperty(value = "银企直联密码")
+    private String userpwd;
+
+    @ApiModelProperty(value = "系统编号")
+    private String systemid;
+
+    @ApiModelProperty(value = "所属企业名称")
+    private String corpname;
+
+    @ApiModelProperty(value = "创建时间")
+    private Date createTime;
+
+    private static final long serialVersionUID = 1L;
+
+    public Long getGuid() {
+        return guid;
+    }
+
+    public void setGuid(Long guid) {
+        this.guid = guid;
+    }
+
+    public String getSessionId() {
+        return sessionId;
+    }
+
+    public void setSessionId(String sessionId) {
+        this.sessionId = sessionId;
+    }
+
+    public String getServiceId() {
+        return serviceId;
+    }
+
+    public void setServiceId(String serviceId) {
+        this.serviceId = serviceId;
+    }
+
+    public String getSerialNo() {
+        return serialNo;
+    }
+
+    public void setSerialNo(String serialNo) {
+        this.serialNo = serialNo;
+    }
+
+    public String getReqTime() {
+        return reqTime;
+    }
+
+    public void setReqTime(String reqTime) {
+        this.reqTime = reqTime;
+    }
+
+    public String getRetCode() {
+        return retCode;
+    }
+
+    public void setRetCode(String retCode) {
+        this.retCode = retCode;
+    }
+
+    public String getErrorMsg() {
+        return errorMsg;
+    }
+
+    public void setErrorMsg(String errorMsg) {
+        this.errorMsg = errorMsg;
+    }
+
+    public String getUserid() {
+        return userid;
+    }
+
+    public void setUserid(String userid) {
+        this.userid = userid;
+    }
+
+    public String getUserpwd() {
+        return userpwd;
+    }
+
+    public void setUserpwd(String userpwd) {
+        this.userpwd = userpwd;
+    }
+
+    public String getSystemid() {
+        return systemid;
+    }
+
+    public void setSystemid(String systemid) {
+        this.systemid = systemid;
+    }
+
+    public String getCorpname() {
+        return corpname;
+    }
+
+    public void setCorpname(String corpname) {
+        this.corpname = corpname;
+    }
+
+    public Date getCreateTime() {
+        return createTime;
+    }
+
+    public void setCreateTime(Date createTime) {
+        this.createTime = createTime;
+    }
+
+    @Override
+    public String toString() {
+        StringBuilder sb = new StringBuilder();
+        sb.append(getClass().getSimpleName());
+        sb.append(" [");
+        sb.append("Hash = ").append(hashCode());
+        sb.append(", guid=").append(guid);
+        sb.append(", sessionId=").append(sessionId);
+        sb.append(", serviceId=").append(serviceId);
+        sb.append(", serialNo=").append(serialNo);
+        sb.append(", reqTime=").append(reqTime);
+        sb.append(", retCode=").append(retCode);
+        sb.append(", errorMsg=").append(errorMsg);
+        sb.append(", userid=").append(userid);
+        sb.append(", userpwd=").append(userpwd);
+        sb.append(", systemid=").append(systemid);
+        sb.append(", corpname=").append(corpname);
+        sb.append(", createTime=").append(createTime);
+        sb.append(", serialVersionUID=").append(serialVersionUID);
+        sb.append("]");
+        return sb.toString();
+    }
+}

carbon-back/carbon-back-mbg/src/main/resources/mapper/TTransferDetailMapper.xml

@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.hcloud.microserver.system.mbg.mapper.TTransferDetailMapper">
-  <resultMap id="BaseResultMap" type="com.hcloud.microserver.system.mbg.modul.TTransferDetail">
+<mapper namespace="com.hcloud.microserver.bank.mbg.mapper.BTransferDetailMapper">
+  <resultMap id="BaseResultMap" type="com.hcloud.microserver.bank.mbg.modul.BTransferDetail">
     <id column="guid" jdbcType="BIGINT" property="guid" />
     <result column="fk_transfer_id" jdbcType="BIGINT" property="fkTransferId" />
-    <result column="transfer_type" jdbcType="VARCHAR" property="transferType" />
+    <result column="transfer_type" jdbcType="INTEGER" property="transferType" />
     <result column="fk_fc_id" jdbcType="VARCHAR" property="fkFcId" />
     <result column="seril_no" jdbcType="VARCHAR" property="serilNo" />
     <result column="name" jdbcType="VARCHAR" property="name" />
@@ -17,6 +17,13 @@
     <result column="time" jdbcType="TIMESTAMP" property="time" />
     <result column="transfer_nation" jdbcType="VARCHAR" property="transferNation" />
     <result column="nation_id" jdbcType="INTEGER" property="nationId" />
+    <result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
+    <result column="create_id" jdbcType="BIGINT" property="createId" />
+    <result column="create_name" jdbcType="VARCHAR" property="createName" />
+    <result column="transfer_id" jdbcType="BIGINT" property="transferId" />
+    <result column="transfer_name" jdbcType="VARCHAR" property="transferName" />
+    <result column="transfer_time" jdbcType="TIMESTAMP" property="transferTime" />
+    <result column="state" jdbcType="INTEGER" property="state" />
   </resultMap>
   <sql id="Example_Where_Clause">
     <where>
@@ -78,15 +85,16 @@
   </sql>
   <sql id="Base_Column_List">
     guid, fk_transfer_id, transfer_type, fk_fc_id, seril_no, name, bank_no, account_pid, 
-    transfer_status, code, msg, date, time, transfer_nation, nation_id
+    transfer_status, code, msg, date, time, transfer_nation, nation_id, create_time, 
+    create_id, create_name, transfer_id, transfer_name, transfer_time, state
   </sql>
-  <select id="selectByExample" parameterType="com.hcloud.microserver.system.mbg.modul.TTransferDetailExample" resultMap="BaseResultMap">
+  <select id="selectByExample" parameterType="com.hcloud.microserver.bank.mbg.modul.BTransferDetailExample" resultMap="BaseResultMap">
     select
     <if test="distinct">
       distinct
     </if>
     <include refid="Base_Column_List" />
-    from t_transfer_detail
+    from b_transfer_detail
     <if test="_parameter != null">
       <include refid="Example_Where_Clause" />
     </if>
@@ -97,33 +105,39 @@
   <select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="BaseResultMap">
     select 
     <include refid="Base_Column_List" />
-    from t_transfer_detail
+    from b_transfer_detail
     where guid = #{guid,jdbcType=BIGINT}
   </select>
   <delete id="deleteByPrimaryKey" parameterType="java.lang.Long">
-    delete from t_transfer_detail
+    delete from b_transfer_detail
     where guid = #{guid,jdbcType=BIGINT}
   </delete>
-  <delete id="deleteByExample" parameterType="com.hcloud.microserver.system.mbg.modul.TTransferDetailExample">
-    delete from t_transfer_detail
+  <delete id="deleteByExample" parameterType="com.hcloud.microserver.bank.mbg.modul.BTransferDetailExample">
+    delete from b_transfer_detail
     <if test="_parameter != null">
       <include refid="Example_Where_Clause" />
     </if>
   </delete>
-  <insert id="insert" parameterType="com.hcloud.microserver.system.mbg.modul.TTransferDetail">
-    insert into t_transfer_detail (guid, fk_transfer_id, transfer_type, 
+  <insert id="insert" parameterType="com.hcloud.microserver.bank.mbg.modul.BTransferDetail">
+    insert into b_transfer_detail (guid, fk_transfer_id, transfer_type, 
       fk_fc_id, seril_no, name, 
       bank_no, account_pid, transfer_status, 
       code, msg, date, time, 
-      transfer_nation, nation_id)
-    values (#{guid,jdbcType=BIGINT}, #{fkTransferId,jdbcType=BIGINT}, #{transferType,jdbcType=VARCHAR}, 
+      transfer_nation, nation_id, create_time, 
+      create_id, create_name, transfer_id, 
+      transfer_name, transfer_time, state
+      )
+    values (#{guid,jdbcType=BIGINT}, #{fkTransferId,jdbcType=BIGINT}, #{transferType,jdbcType=INTEGER}, 
       #{fkFcId,jdbcType=VARCHAR}, #{serilNo,jdbcType=VARCHAR}, #{name,jdbcType=VARCHAR}, 
       #{bankNo,jdbcType=VARCHAR}, #{accountPid,jdbcType=VARCHAR}, #{transferStatus,jdbcType=VARCHAR}, 
       #{code,jdbcType=VARCHAR}, #{msg,jdbcType=VARCHAR}, #{date,jdbcType=VARCHAR}, #{time,jdbcType=TIMESTAMP}, 
-      #{transferNation,jdbcType=VARCHAR}, #{nationId,jdbcType=INTEGER})
+      #{transferNation,jdbcType=VARCHAR}, #{nationId,jdbcType=INTEGER}, #{createTime,jdbcType=TIMESTAMP}, 
+      #{createId,jdbcType=BIGINT}, #{createName,jdbcType=VARCHAR}, #{transferId,jdbcType=BIGINT}, 
+      #{transferName,jdbcType=VARCHAR}, #{transferTime,jdbcType=TIMESTAMP}, #{state,jdbcType=INTEGER}
+      )
   </insert>
-  <insert id="insertSelective" parameterType="com.hcloud.microserver.system.mbg.modul.TTransferDetail">
-    insert into t_transfer_detail
+  <insert id="insertSelective" parameterType="com.hcloud.microserver.bank.mbg.modul.BTransferDetail">
+    insert into b_transfer_detail
     <trim prefix="(" suffix=")" suffixOverrides=",">
       <if test="guid != null">
         guid,
@@ -170,6 +184,27 @@
       <if test="nationId != null">
         nation_id,
       </if>
+      <if test="createTime != null">
+        create_time,
+      </if>
+      <if test="createId != null">
+        create_id,
+      </if>
+      <if test="createName != null">
+        create_name,
+      </if>
+      <if test="transferId != null">
+        transfer_id,
+      </if>
+      <if test="transferName != null">
+        transfer_name,
+      </if>
+      <if test="transferTime != null">
+        transfer_time,
+      </if>
+      <if test="state != null">
+        state,
+      </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides=",">
       <if test="guid != null">
@@ -179,7 +214,7 @@
         #{fkTransferId,jdbcType=BIGINT},
       </if>
       <if test="transferType != null">
-        #{transferType,jdbcType=VARCHAR},
+        #{transferType,jdbcType=INTEGER},
       </if>
       <if test="fkFcId != null">
         #{fkFcId,jdbcType=VARCHAR},
@@ -217,16 +252,37 @@
       <if test="nationId != null">
         #{nationId,jdbcType=INTEGER},
       </if>
+      <if test="createTime != null">
+        #{createTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="createId != null">
+        #{createId,jdbcType=BIGINT},
+      </if>
+      <if test="createName != null">
+        #{createName,jdbcType=VARCHAR},
+      </if>
+      <if test="transferId != null">
+        #{transferId,jdbcType=BIGINT},
+      </if>
+      <if test="transferName != null">
+        #{transferName,jdbcType=VARCHAR},
+      </if>
+      <if test="transferTime != null">
+        #{transferTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="state != null">
+        #{state,jdbcType=INTEGER},
+      </if>
     </trim>
   </insert>
-  <select id="countByExample" parameterType="com.hcloud.microserver.system.mbg.modul.TTransferDetailExample" resultType="java.lang.Long">
-    select count(*) from t_transfer_detail
+  <select id="countByExample" parameterType="com.hcloud.microserver.bank.mbg.modul.BTransferDetailExample" resultType="java.lang.Long">
+    select count(*) from b_transfer_detail
     <if test="_parameter != null">
       <include refid="Example_Where_Clause" />
     </if>
   </select>
   <update id="updateByExampleSelective" parameterType="map">
-    update t_transfer_detail
+    update b_transfer_detail
     <set>
       <if test="record.guid != null">
         guid = #{record.guid,jdbcType=BIGINT},
@@ -235,7 +291,7 @@
         fk_transfer_id = #{record.fkTransferId,jdbcType=BIGINT},
       </if>
       <if test="record.transferType != null">
-        transfer_type = #{record.transferType,jdbcType=VARCHAR},
+        transfer_type = #{record.transferType,jdbcType=INTEGER},
       </if>
       <if test="record.fkFcId != null">
         fk_fc_id = #{record.fkFcId,jdbcType=VARCHAR},
@@ -273,16 +329,37 @@
       <if test="record.nationId != null">
         nation_id = #{record.nationId,jdbcType=INTEGER},
       </if>
+      <if test="record.createTime != null">
+        create_time = #{record.createTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="record.createId != null">
+        create_id = #{record.createId,jdbcType=BIGINT},
+      </if>
+      <if test="record.createName != null">
+        create_name = #{record.createName,jdbcType=VARCHAR},
+      </if>
+      <if test="record.transferId != null">
+        transfer_id = #{record.transferId,jdbcType=BIGINT},
+      </if>
+      <if test="record.transferName != null">
+        transfer_name = #{record.transferName,jdbcType=VARCHAR},
+      </if>
+      <if test="record.transferTime != null">
+        transfer_time = #{record.transferTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="record.state != null">
+        state = #{record.state,jdbcType=INTEGER},
+      </if>
     </set>
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
     </if>
   </update>
   <update id="updateByExample" parameterType="map">
-    update t_transfer_detail
+    update b_transfer_detail
     set guid = #{record.guid,jdbcType=BIGINT},
       fk_transfer_id = #{record.fkTransferId,jdbcType=BIGINT},
-      transfer_type = #{record.transferType,jdbcType=VARCHAR},
+      transfer_type = #{record.transferType,jdbcType=INTEGER},
       fk_fc_id = #{record.fkFcId,jdbcType=VARCHAR},
       seril_no = #{record.serilNo,jdbcType=VARCHAR},
       name = #{record.name,jdbcType=VARCHAR},
@@ -294,19 +371,26 @@
       date = #{record.date,jdbcType=VARCHAR},
       time = #{record.time,jdbcType=TIMESTAMP},
       transfer_nation = #{record.transferNation,jdbcType=VARCHAR},
-      nation_id = #{record.nationId,jdbcType=INTEGER}
+      nation_id = #{record.nationId,jdbcType=INTEGER},
+      create_time = #{record.createTime,jdbcType=TIMESTAMP},
+      create_id = #{record.createId,jdbcType=BIGINT},
+      create_name = #{record.createName,jdbcType=VARCHAR},
+      transfer_id = #{record.transferId,jdbcType=BIGINT},
+      transfer_name = #{record.transferName,jdbcType=VARCHAR},
+      transfer_time = #{record.transferTime,jdbcType=TIMESTAMP},
+      state = #{record.state,jdbcType=INTEGER}
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
     </if>
   </update>
-  <update id="updateByPrimaryKeySelective" parameterType="com.hcloud.microserver.system.mbg.modul.TTransferDetail">
-    update t_transfer_detail
+  <update id="updateByPrimaryKeySelective" parameterType="com.hcloud.microserver.bank.mbg.modul.BTransferDetail">
+    update b_transfer_detail
     <set>
       <if test="fkTransferId != null">
         fk_transfer_id = #{fkTransferId,jdbcType=BIGINT},
       </if>
       <if test="transferType != null">
-        transfer_type = #{transferType,jdbcType=VARCHAR},
+        transfer_type = #{transferType,jdbcType=INTEGER},
       </if>
       <if test="fkFcId != null">
         fk_fc_id = #{fkFcId,jdbcType=VARCHAR},
@@ -344,13 +428,34 @@
       <if test="nationId != null">
         nation_id = #{nationId,jdbcType=INTEGER},
       </if>
+      <if test="createTime != null">
+        create_time = #{createTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="createId != null">
+        create_id = #{createId,jdbcType=BIGINT},
+      </if>
+      <if test="createName != null">
+        create_name = #{createName,jdbcType=VARCHAR},
+      </if>
+      <if test="transferId != null">
+        transfer_id = #{transferId,jdbcType=BIGINT},
+      </if>
+      <if test="transferName != null">
+        transfer_name = #{transferName,jdbcType=VARCHAR},
+      </if>
+      <if test="transferTime != null">
+        transfer_time = #{transferTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="state != null">
+        state = #{state,jdbcType=INTEGER},
+      </if>
     </set>
     where guid = #{guid,jdbcType=BIGINT}
   </update>
-  <update id="updateByPrimaryKey" parameterType="com.hcloud.microserver.system.mbg.modul.TTransferDetail">
-    update t_transfer_detail
+  <update id="updateByPrimaryKey" parameterType="com.hcloud.microserver.bank.mbg.modul.BTransferDetail">
+    update b_transfer_detail
     set fk_transfer_id = #{fkTransferId,jdbcType=BIGINT},
-      transfer_type = #{transferType,jdbcType=VARCHAR},
+      transfer_type = #{transferType,jdbcType=INTEGER},
       fk_fc_id = #{fkFcId,jdbcType=VARCHAR},
       seril_no = #{serilNo,jdbcType=VARCHAR},
       name = #{name,jdbcType=VARCHAR},
@@ -362,7 +467,14 @@
       date = #{date,jdbcType=VARCHAR},
       time = #{time,jdbcType=TIMESTAMP},
       transfer_nation = #{transferNation,jdbcType=VARCHAR},
-      nation_id = #{nationId,jdbcType=INTEGER}
+      nation_id = #{nationId,jdbcType=INTEGER},
+      create_time = #{createTime,jdbcType=TIMESTAMP},
+      create_id = #{createId,jdbcType=BIGINT},
+      create_name = #{createName,jdbcType=VARCHAR},
+      transfer_id = #{transferId,jdbcType=BIGINT},
+      transfer_name = #{transferName,jdbcType=VARCHAR},
+      transfer_time = #{transferTime,jdbcType=TIMESTAMP},
+      state = #{state,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

@@ -0,0 +1,376 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.hcloud.microserver.bank.mbg.mapper.BTransferFarmerRequestMapper">
+  <resultMap id="BaseResultMap" type="com.hcloud.microserver.bank.mbg.modul.BTransferFarmerRequest">
+    <result column="guid" jdbcType="BIGINT" property="guid" />
+    <result column="seril_no" jdbcType="VARCHAR" property="serilNo" />
+    <result column="currency" jdbcType="VARCHAR" property="currency" />
+    <result column="submitter" jdbcType="VARCHAR" property="submitter" />
+    <result column="authorizer" jdbcType="VARCHAR" property="authorizer" />
+    <result column="fk_transfer_id" jdbcType="BIGINT" property="fkTransferId" />
+    <result column="pay_amount" jdbcType="DECIMAL" property="payAmount" />
+    <result column="pay_bank_name" jdbcType="VARCHAR" property="payBankName" />
+    <result column="pay_account" jdbcType="VARCHAR" property="payAccount" />
+    <result column="pay_name" jdbcType="VARCHAR" property="payName" />
+    <result column="pay_date" jdbcType="VARCHAR" property="payDate" />
+    <result column="pay_seril" jdbcType="VARCHAR" property="paySeril" />
+    <result column="hand_fee_type" jdbcType="VARCHAR" property="handFeeType" />
+    <result column="pay_status" jdbcType="VARCHAR" property="payStatus" />
+    <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" />
+  </resultMap>
+  <sql id="Example_Where_Clause">
+    <where>
+      <foreach collection="oredCriteria" item="criteria" separator="or">
+        <if test="criteria.valid">
+          <trim prefix="(" prefixOverrides="and" suffix=")">
+            <foreach collection="criteria.criteria" item="criterion">
+              <choose>
+                <when test="criterion.noValue">
+                  and ${criterion.condition}
+                </when>
+                <when test="criterion.singleValue">
+                  and ${criterion.condition} #{criterion.value}
+                </when>
+                <when test="criterion.betweenValue">
+                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
+                </when>
+                <when test="criterion.listValue">
+                  and ${criterion.condition}
+                  <foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
+                    #{listItem}
+                  </foreach>
+                </when>
+              </choose>
+            </foreach>
+          </trim>
+        </if>
+      </foreach>
+    </where>
+  </sql>
+  <sql id="Update_By_Example_Where_Clause">
+    <where>
+      <foreach collection="example.oredCriteria" item="criteria" separator="or">
+        <if test="criteria.valid">
+          <trim prefix="(" prefixOverrides="and" suffix=")">
+            <foreach collection="criteria.criteria" item="criterion">
+              <choose>
+                <when test="criterion.noValue">
+                  and ${criterion.condition}
+                </when>
+                <when test="criterion.singleValue">
+                  and ${criterion.condition} #{criterion.value}
+                </when>
+                <when test="criterion.betweenValue">
+                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
+                </when>
+                <when test="criterion.listValue">
+                  and ${criterion.condition}
+                  <foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
+                    #{listItem}
+                  </foreach>
+                </when>
+              </choose>
+            </foreach>
+          </trim>
+        </if>
+      </foreach>
+    </where>
+  </sql>
+  <sql id="Base_Column_List">
+    guid, 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
+  </sql>
+  <select id="selectByExample" parameterType="com.hcloud.microserver.bank.mbg.modul.BTransferFarmerRequestExample" resultMap="BaseResultMap">
+    select
+    <if test="distinct">
+      distinct
+    </if>
+    <include refid="Base_Column_List" />
+    from b_transfer_farmer_request
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+    <if test="orderByClause != null">
+      order by ${orderByClause}
+    </if>
+  </select>
+  <delete id="deleteByExample" parameterType="com.hcloud.microserver.bank.mbg.modul.BTransferFarmerRequestExample">
+    delete from b_transfer_farmer_request
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+  </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)
+    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})
+  </insert>
+  <insert id="insertSelective" parameterType="com.hcloud.microserver.bank.mbg.modul.BTransferFarmerRequest">
+    insert into b_transfer_farmer_request
+    <trim prefix="(" suffix=")" suffixOverrides=",">
+      <if test="guid != null">
+        guid,
+      </if>
+      <if test="serilNo != null">
+        seril_no,
+      </if>
+      <if test="currency != null">
+        currency,
+      </if>
+      <if test="submitter != null">
+        submitter,
+      </if>
+      <if test="authorizer != null">
+        authorizer,
+      </if>
+      <if test="fkTransferId != null">
+        fk_transfer_id,
+      </if>
+      <if test="payAmount != null">
+        pay_amount,
+      </if>
+      <if test="payBankName != null">
+        pay_bank_name,
+      </if>
+      <if test="payAccount != null">
+        pay_account,
+      </if>
+      <if test="payName != null">
+        pay_name,
+      </if>
+      <if test="payDate != null">
+        pay_date,
+      </if>
+      <if test="paySeril != null">
+        pay_seril,
+      </if>
+      <if test="handFeeType != null">
+        hand_fee_type,
+      </if>
+      <if test="payStatus != null">
+        pay_status,
+      </if>
+      <if test="payMsg != null">
+        pay_msg,
+      </if>
+      <if test="payResponseCode != null">
+        pay_response_code,
+      </if>
+      <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>
+      <if test="status != null">
+        status,
+      </if>
+    </trim>
+    <trim prefix="values (" suffix=")" suffixOverrides=",">
+      <if test="guid != null">
+        #{guid,jdbcType=BIGINT},
+      </if>
+      <if test="serilNo != null">
+        #{serilNo,jdbcType=VARCHAR},
+      </if>
+      <if test="currency != null">
+        #{currency,jdbcType=VARCHAR},
+      </if>
+      <if test="submitter != null">
+        #{submitter,jdbcType=VARCHAR},
+      </if>
+      <if test="authorizer != null">
+        #{authorizer,jdbcType=VARCHAR},
+      </if>
+      <if test="fkTransferId != null">
+        #{fkTransferId,jdbcType=BIGINT},
+      </if>
+      <if test="payAmount != null">
+        #{payAmount,jdbcType=DECIMAL},
+      </if>
+      <if test="payBankName != null">
+        #{payBankName,jdbcType=VARCHAR},
+      </if>
+      <if test="payAccount != null">
+        #{payAccount,jdbcType=VARCHAR},
+      </if>
+      <if test="payName != null">
+        #{payName,jdbcType=VARCHAR},
+      </if>
+      <if test="payDate != null">
+        #{payDate,jdbcType=VARCHAR},
+      </if>
+      <if test="paySeril != null">
+        #{paySeril,jdbcType=VARCHAR},
+      </if>
+      <if test="handFeeType != null">
+        #{handFeeType,jdbcType=VARCHAR},
+      </if>
+      <if test="payStatus != null">
+        #{payStatus,jdbcType=VARCHAR},
+      </if>
+      <if test="payMsg != null">
+        #{payMsg,jdbcType=VARCHAR},
+      </if>
+      <if test="payResponseCode != null">
+        #{payResponseCode,jdbcType=VARCHAR},
+      </if>
+      <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>
+      <if test="status != null">
+        #{status,jdbcType=INTEGER},
+      </if>
+    </trim>
+  </insert>
+  <select id="countByExample" parameterType="com.hcloud.microserver.bank.mbg.modul.BTransferFarmerRequestExample" resultType="java.lang.Long">
+    select count(*) from b_transfer_farmer_request
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+  </select>
+  <update id="updateByExampleSelective" parameterType="map">
+    update b_transfer_farmer_request
+    <set>
+      <if test="record.guid != null">
+        guid = #{record.guid,jdbcType=BIGINT},
+      </if>
+      <if test="record.serilNo != null">
+        seril_no = #{record.serilNo,jdbcType=VARCHAR},
+      </if>
+      <if test="record.currency != null">
+        currency = #{record.currency,jdbcType=VARCHAR},
+      </if>
+      <if test="record.submitter != null">
+        submitter = #{record.submitter,jdbcType=VARCHAR},
+      </if>
+      <if test="record.authorizer != null">
+        authorizer = #{record.authorizer,jdbcType=VARCHAR},
+      </if>
+      <if test="record.fkTransferId != null">
+        fk_transfer_id = #{record.fkTransferId,jdbcType=BIGINT},
+      </if>
+      <if test="record.payAmount != null">
+        pay_amount = #{record.payAmount,jdbcType=DECIMAL},
+      </if>
+      <if test="record.payBankName != null">
+        pay_bank_name = #{record.payBankName,jdbcType=VARCHAR},
+      </if>
+      <if test="record.payAccount != null">
+        pay_account = #{record.payAccount,jdbcType=VARCHAR},
+      </if>
+      <if test="record.payName != null">
+        pay_name = #{record.payName,jdbcType=VARCHAR},
+      </if>
+      <if test="record.payDate != null">
+        pay_date = #{record.payDate,jdbcType=VARCHAR},
+      </if>
+      <if test="record.paySeril != null">
+        pay_seril = #{record.paySeril,jdbcType=VARCHAR},
+      </if>
+      <if test="record.handFeeType != null">
+        hand_fee_type = #{record.handFeeType,jdbcType=VARCHAR},
+      </if>
+      <if test="record.payStatus != null">
+        pay_status = #{record.payStatus,jdbcType=VARCHAR},
+      </if>
+      <if test="record.payMsg != null">
+        pay_msg = #{record.payMsg,jdbcType=VARCHAR},
+      </if>
+      <if test="record.payResponseCode != null">
+        pay_response_code = #{record.payResponseCode,jdbcType=VARCHAR},
+      </if>
+      <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>
+      <if test="record.status != null">
+        status = #{record.status,jdbcType=INTEGER},
+      </if>
+    </set>
+    <if test="_parameter != null">
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+  </update>
+  <update id="updateByExample" parameterType="map">
+    update b_transfer_farmer_request
+    set guid = #{record.guid,jdbcType=BIGINT},
+      seril_no = #{record.serilNo,jdbcType=VARCHAR},
+      currency = #{record.currency,jdbcType=VARCHAR},
+      submitter = #{record.submitter,jdbcType=VARCHAR},
+      authorizer = #{record.authorizer,jdbcType=VARCHAR},
+      fk_transfer_id = #{record.fkTransferId,jdbcType=BIGINT},
+      pay_amount = #{record.payAmount,jdbcType=DECIMAL},
+      pay_bank_name = #{record.payBankName,jdbcType=VARCHAR},
+      pay_account = #{record.payAccount,jdbcType=VARCHAR},
+      pay_name = #{record.payName,jdbcType=VARCHAR},
+      pay_date = #{record.payDate,jdbcType=VARCHAR},
+      pay_seril = #{record.paySeril,jdbcType=VARCHAR},
+      hand_fee_type = #{record.handFeeType,jdbcType=VARCHAR},
+      pay_status = #{record.payStatus,jdbcType=VARCHAR},
+      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}
+    <if test="_parameter != null">
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+  </update>
+</mapper>

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

@@ -0,0 +1,401 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.hcloud.microserver.bank.mbg.mapper.BTransferMapper">
+  <resultMap id="BaseResultMap" type="com.hcloud.microserver.bank.mbg.modul.BTransfer">
+    <id column="guid" jdbcType="BIGINT" property="guid" />
+    <result column="transfer_type" jdbcType="INTEGER" property="transferType" />
+    <result column="transfer_status" jdbcType="INTEGER" property="transferStatus" />
+    <result column="transfer_time" jdbcType="TIMESTAMP" property="transferTime" />
+    <result column="transfer_amount" jdbcType="DECIMAL" property="transferAmount" />
+    <result column="serial_no" jdbcType="VARCHAR" property="serialNo" />
+    <result column="service_id" jdbcType="VARCHAR" property="serviceId" />
+    <result column="session_id" jdbcType="VARCHAR" property="sessionId" />
+    <result column="req_time" jdbcType="VARCHAR" property="reqTime" />
+    <result column="ret_code" jdbcType="VARCHAR" property="retCode" />
+    <result column="error_msg" jdbcType="VARCHAR" property="errorMsg" />
+    <result column="create_id" jdbcType="BIGINT" property="createId" />
+    <result column="create_name" jdbcType="VARCHAR" property="createName" />
+    <result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
+    <result column="transfer_id" jdbcType="BIGINT" property="transferId" />
+    <result column="transfer_name" jdbcType="VARCHAR" property="transferName" />
+    <result column="state" jdbcType="INTEGER" property="state" />
+  </resultMap>
+  <sql id="Example_Where_Clause">
+    <where>
+      <foreach collection="oredCriteria" item="criteria" separator="or">
+        <if test="criteria.valid">
+          <trim prefix="(" prefixOverrides="and" suffix=")">
+            <foreach collection="criteria.criteria" item="criterion">
+              <choose>
+                <when test="criterion.noValue">
+                  and ${criterion.condition}
+                </when>
+                <when test="criterion.singleValue">
+                  and ${criterion.condition} #{criterion.value}
+                </when>
+                <when test="criterion.betweenValue">
+                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
+                </when>
+                <when test="criterion.listValue">
+                  and ${criterion.condition}
+                  <foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
+                    #{listItem}
+                  </foreach>
+                </when>
+              </choose>
+            </foreach>
+          </trim>
+        </if>
+      </foreach>
+    </where>
+  </sql>
+  <sql id="Update_By_Example_Where_Clause">
+    <where>
+      <foreach collection="example.oredCriteria" item="criteria" separator="or">
+        <if test="criteria.valid">
+          <trim prefix="(" prefixOverrides="and" suffix=")">
+            <foreach collection="criteria.criteria" item="criterion">
+              <choose>
+                <when test="criterion.noValue">
+                  and ${criterion.condition}
+                </when>
+                <when test="criterion.singleValue">
+                  and ${criterion.condition} #{criterion.value}
+                </when>
+                <when test="criterion.betweenValue">
+                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
+                </when>
+                <when test="criterion.listValue">
+                  and ${criterion.condition}
+                  <foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
+                    #{listItem}
+                  </foreach>
+                </when>
+              </choose>
+            </foreach>
+          </trim>
+        </if>
+      </foreach>
+    </where>
+  </sql>
+  <sql id="Base_Column_List">
+    guid, transfer_type, transfer_status, transfer_time, transfer_amount, serial_no, 
+    service_id, session_id, req_time, ret_code, error_msg, create_id, create_name, create_time, 
+    transfer_id, transfer_name, state
+  </sql>
+  <select id="selectByExample" parameterType="com.hcloud.microserver.bank.mbg.modul.BTransferExample" resultMap="BaseResultMap">
+    select
+    <if test="distinct">
+      distinct
+    </if>
+    <include refid="Base_Column_List" />
+    from b_transfer
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+    <if test="orderByClause != null">
+      order by ${orderByClause}
+    </if>
+  </select>
+  <select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="BaseResultMap">
+    select 
+    <include refid="Base_Column_List" />
+    from b_transfer
+    where guid = #{guid,jdbcType=BIGINT}
+  </select>
+  <delete id="deleteByPrimaryKey" parameterType="java.lang.Long">
+    delete from b_transfer
+    where guid = #{guid,jdbcType=BIGINT}
+  </delete>
+  <delete id="deleteByExample" parameterType="com.hcloud.microserver.bank.mbg.modul.BTransferExample">
+    delete from b_transfer
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+  </delete>
+  <insert id="insert" parameterType="com.hcloud.microserver.bank.mbg.modul.BTransfer">
+    insert into b_transfer (guid, transfer_type, transfer_status, 
+      transfer_time, transfer_amount, serial_no, 
+      service_id, session_id, req_time, 
+      ret_code, error_msg, create_id, 
+      create_name, create_time, transfer_id, 
+      transfer_name, state)
+    values (#{guid,jdbcType=BIGINT}, #{transferType,jdbcType=INTEGER}, #{transferStatus,jdbcType=INTEGER}, 
+      #{transferTime,jdbcType=TIMESTAMP}, #{transferAmount,jdbcType=DECIMAL}, #{serialNo,jdbcType=VARCHAR}, 
+      #{serviceId,jdbcType=VARCHAR}, #{sessionId,jdbcType=VARCHAR}, #{reqTime,jdbcType=VARCHAR}, 
+      #{retCode,jdbcType=VARCHAR}, #{errorMsg,jdbcType=VARCHAR}, #{createId,jdbcType=BIGINT}, 
+      #{createName,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP}, #{transferId,jdbcType=BIGINT}, 
+      #{transferName,jdbcType=VARCHAR}, #{state,jdbcType=INTEGER})
+  </insert>
+  <insert id="insertSelective" parameterType="com.hcloud.microserver.bank.mbg.modul.BTransfer">
+    insert into b_transfer
+    <trim prefix="(" suffix=")" suffixOverrides=",">
+      <if test="guid != null">
+        guid,
+      </if>
+      <if test="transferType != null">
+        transfer_type,
+      </if>
+      <if test="transferStatus != null">
+        transfer_status,
+      </if>
+      <if test="transferTime != null">
+        transfer_time,
+      </if>
+      <if test="transferAmount != null">
+        transfer_amount,
+      </if>
+      <if test="serialNo != null">
+        serial_no,
+      </if>
+      <if test="serviceId != null">
+        service_id,
+      </if>
+      <if test="sessionId != null">
+        session_id,
+      </if>
+      <if test="reqTime != null">
+        req_time,
+      </if>
+      <if test="retCode != null">
+        ret_code,
+      </if>
+      <if test="errorMsg != null">
+        error_msg,
+      </if>
+      <if test="createId != null">
+        create_id,
+      </if>
+      <if test="createName != null">
+        create_name,
+      </if>
+      <if test="createTime != null">
+        create_time,
+      </if>
+      <if test="transferId != null">
+        transfer_id,
+      </if>
+      <if test="transferName != null">
+        transfer_name,
+      </if>
+      <if test="state != null">
+        state,
+      </if>
+    </trim>
+    <trim prefix="values (" suffix=")" suffixOverrides=",">
+      <if test="guid != null">
+        #{guid,jdbcType=BIGINT},
+      </if>
+      <if test="transferType != null">
+        #{transferType,jdbcType=INTEGER},
+      </if>
+      <if test="transferStatus != null">
+        #{transferStatus,jdbcType=INTEGER},
+      </if>
+      <if test="transferTime != null">
+        #{transferTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="transferAmount != null">
+        #{transferAmount,jdbcType=DECIMAL},
+      </if>
+      <if test="serialNo != null">
+        #{serialNo,jdbcType=VARCHAR},
+      </if>
+      <if test="serviceId != null">
+        #{serviceId,jdbcType=VARCHAR},
+      </if>
+      <if test="sessionId != null">
+        #{sessionId,jdbcType=VARCHAR},
+      </if>
+      <if test="reqTime != null">
+        #{reqTime,jdbcType=VARCHAR},
+      </if>
+      <if test="retCode != null">
+        #{retCode,jdbcType=VARCHAR},
+      </if>
+      <if test="errorMsg != null">
+        #{errorMsg,jdbcType=VARCHAR},
+      </if>
+      <if test="createId != null">
+        #{createId,jdbcType=BIGINT},
+      </if>
+      <if test="createName != null">
+        #{createName,jdbcType=VARCHAR},
+      </if>
+      <if test="createTime != null">
+        #{createTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="transferId != null">
+        #{transferId,jdbcType=BIGINT},
+      </if>
+      <if test="transferName != null">
+        #{transferName,jdbcType=VARCHAR},
+      </if>
+      <if test="state != null">
+        #{state,jdbcType=INTEGER},
+      </if>
+    </trim>
+  </insert>
+  <select id="countByExample" parameterType="com.hcloud.microserver.bank.mbg.modul.BTransferExample" resultType="java.lang.Long">
+    select count(*) from b_transfer
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+  </select>
+  <update id="updateByExampleSelective" parameterType="map">
+    update b_transfer
+    <set>
+      <if test="record.guid != null">
+        guid = #{record.guid,jdbcType=BIGINT},
+      </if>
+      <if test="record.transferType != null">
+        transfer_type = #{record.transferType,jdbcType=INTEGER},
+      </if>
+      <if test="record.transferStatus != null">
+        transfer_status = #{record.transferStatus,jdbcType=INTEGER},
+      </if>
+      <if test="record.transferTime != null">
+        transfer_time = #{record.transferTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="record.transferAmount != null">
+        transfer_amount = #{record.transferAmount,jdbcType=DECIMAL},
+      </if>
+      <if test="record.serialNo != null">
+        serial_no = #{record.serialNo,jdbcType=VARCHAR},
+      </if>
+      <if test="record.serviceId != null">
+        service_id = #{record.serviceId,jdbcType=VARCHAR},
+      </if>
+      <if test="record.sessionId != null">
+        session_id = #{record.sessionId,jdbcType=VARCHAR},
+      </if>
+      <if test="record.reqTime != null">
+        req_time = #{record.reqTime,jdbcType=VARCHAR},
+      </if>
+      <if test="record.retCode != null">
+        ret_code = #{record.retCode,jdbcType=VARCHAR},
+      </if>
+      <if test="record.errorMsg != null">
+        error_msg = #{record.errorMsg,jdbcType=VARCHAR},
+      </if>
+      <if test="record.createId != null">
+        create_id = #{record.createId,jdbcType=BIGINT},
+      </if>
+      <if test="record.createName != null">
+        create_name = #{record.createName,jdbcType=VARCHAR},
+      </if>
+      <if test="record.createTime != null">
+        create_time = #{record.createTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="record.transferId != null">
+        transfer_id = #{record.transferId,jdbcType=BIGINT},
+      </if>
+      <if test="record.transferName != null">
+        transfer_name = #{record.transferName,jdbcType=VARCHAR},
+      </if>
+      <if test="record.state != null">
+        state = #{record.state,jdbcType=INTEGER},
+      </if>
+    </set>
+    <if test="_parameter != null">
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+  </update>
+  <update id="updateByExample" parameterType="map">
+    update b_transfer
+    set guid = #{record.guid,jdbcType=BIGINT},
+      transfer_type = #{record.transferType,jdbcType=INTEGER},
+      transfer_status = #{record.transferStatus,jdbcType=INTEGER},
+      transfer_time = #{record.transferTime,jdbcType=TIMESTAMP},
+      transfer_amount = #{record.transferAmount,jdbcType=DECIMAL},
+      serial_no = #{record.serialNo,jdbcType=VARCHAR},
+      service_id = #{record.serviceId,jdbcType=VARCHAR},
+      session_id = #{record.sessionId,jdbcType=VARCHAR},
+      req_time = #{record.reqTime,jdbcType=VARCHAR},
+      ret_code = #{record.retCode,jdbcType=VARCHAR},
+      error_msg = #{record.errorMsg,jdbcType=VARCHAR},
+      create_id = #{record.createId,jdbcType=BIGINT},
+      create_name = #{record.createName,jdbcType=VARCHAR},
+      create_time = #{record.createTime,jdbcType=TIMESTAMP},
+      transfer_id = #{record.transferId,jdbcType=BIGINT},
+      transfer_name = #{record.transferName,jdbcType=VARCHAR},
+      state = #{record.state,jdbcType=INTEGER}
+    <if test="_parameter != null">
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+  </update>
+  <update id="updateByPrimaryKeySelective" parameterType="com.hcloud.microserver.bank.mbg.modul.BTransfer">
+    update b_transfer
+    <set>
+      <if test="transferType != null">
+        transfer_type = #{transferType,jdbcType=INTEGER},
+      </if>
+      <if test="transferStatus != null">
+        transfer_status = #{transferStatus,jdbcType=INTEGER},
+      </if>
+      <if test="transferTime != null">
+        transfer_time = #{transferTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="transferAmount != null">
+        transfer_amount = #{transferAmount,jdbcType=DECIMAL},
+      </if>
+      <if test="serialNo != null">
+        serial_no = #{serialNo,jdbcType=VARCHAR},
+      </if>
+      <if test="serviceId != null">
+        service_id = #{serviceId,jdbcType=VARCHAR},
+      </if>
+      <if test="sessionId != null">
+        session_id = #{sessionId,jdbcType=VARCHAR},
+      </if>
+      <if test="reqTime != null">
+        req_time = #{reqTime,jdbcType=VARCHAR},
+      </if>
+      <if test="retCode != null">
+        ret_code = #{retCode,jdbcType=VARCHAR},
+      </if>
+      <if test="errorMsg != null">
+        error_msg = #{errorMsg,jdbcType=VARCHAR},
+      </if>
+      <if test="createId != null">
+        create_id = #{createId,jdbcType=BIGINT},
+      </if>
+      <if test="createName != null">
+        create_name = #{createName,jdbcType=VARCHAR},
+      </if>
+      <if test="createTime != null">
+        create_time = #{createTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="transferId != null">
+        transfer_id = #{transferId,jdbcType=BIGINT},
+      </if>
+      <if test="transferName != null">
+        transfer_name = #{transferName,jdbcType=VARCHAR},
+      </if>
+      <if test="state != null">
+        state = #{state,jdbcType=INTEGER},
+      </if>
+    </set>
+    where guid = #{guid,jdbcType=BIGINT}
+  </update>
+  <update id="updateByPrimaryKey" parameterType="com.hcloud.microserver.bank.mbg.modul.BTransfer">
+    update b_transfer
+    set transfer_type = #{transferType,jdbcType=INTEGER},
+      transfer_status = #{transferStatus,jdbcType=INTEGER},
+      transfer_time = #{transferTime,jdbcType=TIMESTAMP},
+      transfer_amount = #{transferAmount,jdbcType=DECIMAL},
+      serial_no = #{serialNo,jdbcType=VARCHAR},
+      service_id = #{serviceId,jdbcType=VARCHAR},
+      session_id = #{sessionId,jdbcType=VARCHAR},
+      req_time = #{reqTime,jdbcType=VARCHAR},
+      ret_code = #{retCode,jdbcType=VARCHAR},
+      error_msg = #{errorMsg,jdbcType=VARCHAR},
+      create_id = #{createId,jdbcType=BIGINT},
+      create_name = #{createName,jdbcType=VARCHAR},
+      create_time = #{createTime,jdbcType=TIMESTAMP},
+      transfer_id = #{transferId,jdbcType=BIGINT},
+      transfer_name = #{transferName,jdbcType=VARCHAR},
+      state = #{state,jdbcType=INTEGER}
+    where guid = #{guid,jdbcType=BIGINT}
+  </update>
+</mapper>

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

@@ -0,0 +1,323 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.hcloud.microserver.bank.mbg.mapper.BUserLoginMapper">
+  <resultMap id="BaseResultMap" type="com.hcloud.microserver.bank.mbg.modul.BUserLogin">
+    <id column="guid" jdbcType="BIGINT" property="guid" />
+    <result column="session_id" jdbcType="VARCHAR" property="sessionId" />
+    <result column="service_id" jdbcType="VARCHAR" property="serviceId" />
+    <result column="serial_no" jdbcType="VARCHAR" property="serialNo" />
+    <result column="req_time" jdbcType="VARCHAR" property="reqTime" />
+    <result column="ret_code" jdbcType="VARCHAR" property="retCode" />
+    <result column="error_msg" jdbcType="VARCHAR" property="errorMsg" />
+    <result column="userID" jdbcType="VARCHAR" property="userid" />
+    <result column="userPWD" jdbcType="VARCHAR" property="userpwd" />
+    <result column="systemId" jdbcType="VARCHAR" property="systemid" />
+    <result column="corpName" jdbcType="VARCHAR" property="corpname" />
+    <result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
+  </resultMap>
+  <sql id="Example_Where_Clause">
+    <where>
+      <foreach collection="oredCriteria" item="criteria" separator="or">
+        <if test="criteria.valid">
+          <trim prefix="(" prefixOverrides="and" suffix=")">
+            <foreach collection="criteria.criteria" item="criterion">
+              <choose>
+                <when test="criterion.noValue">
+                  and ${criterion.condition}
+                </when>
+                <when test="criterion.singleValue">
+                  and ${criterion.condition} #{criterion.value}
+                </when>
+                <when test="criterion.betweenValue">
+                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
+                </when>
+                <when test="criterion.listValue">
+                  and ${criterion.condition}
+                  <foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
+                    #{listItem}
+                  </foreach>
+                </when>
+              </choose>
+            </foreach>
+          </trim>
+        </if>
+      </foreach>
+    </where>
+  </sql>
+  <sql id="Update_By_Example_Where_Clause">
+    <where>
+      <foreach collection="example.oredCriteria" item="criteria" separator="or">
+        <if test="criteria.valid">
+          <trim prefix="(" prefixOverrides="and" suffix=")">
+            <foreach collection="criteria.criteria" item="criterion">
+              <choose>
+                <when test="criterion.noValue">
+                  and ${criterion.condition}
+                </when>
+                <when test="criterion.singleValue">
+                  and ${criterion.condition} #{criterion.value}
+                </when>
+                <when test="criterion.betweenValue">
+                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
+                </when>
+                <when test="criterion.listValue">
+                  and ${criterion.condition}
+                  <foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
+                    #{listItem}
+                  </foreach>
+                </when>
+              </choose>
+            </foreach>
+          </trim>
+        </if>
+      </foreach>
+    </where>
+  </sql>
+  <sql id="Base_Column_List">
+    guid, session_id, service_id, serial_no, req_time, ret_code, error_msg, userID, userPWD, 
+    systemId, corpName, create_time
+  </sql>
+  <select id="selectByExample" parameterType="com.hcloud.microserver.bank.mbg.modul.BUserLoginExample" resultMap="BaseResultMap">
+    select
+    <if test="distinct">
+      distinct
+    </if>
+    <include refid="Base_Column_List" />
+    from b_user_login
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+    <if test="orderByClause != null">
+      order by ${orderByClause}
+    </if>
+  </select>
+  <select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="BaseResultMap">
+    select 
+    <include refid="Base_Column_List" />
+    from b_user_login
+    where guid = #{guid,jdbcType=BIGINT}
+  </select>
+  <delete id="deleteByPrimaryKey" parameterType="java.lang.Long">
+    delete from b_user_login
+    where guid = #{guid,jdbcType=BIGINT}
+  </delete>
+  <delete id="deleteByExample" parameterType="com.hcloud.microserver.bank.mbg.modul.BUserLoginExample">
+    delete from b_user_login
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+  </delete>
+  <insert id="insert" parameterType="com.hcloud.microserver.bank.mbg.modul.BUserLogin">
+    insert into b_user_login (guid, session_id, service_id, 
+      serial_no, req_time, ret_code, 
+      error_msg, userID, userPWD, 
+      systemId, corpName, create_time
+      )
+    values (#{guid,jdbcType=BIGINT}, #{sessionId,jdbcType=VARCHAR}, #{serviceId,jdbcType=VARCHAR}, 
+      #{serialNo,jdbcType=VARCHAR}, #{reqTime,jdbcType=VARCHAR}, #{retCode,jdbcType=VARCHAR}, 
+      #{errorMsg,jdbcType=VARCHAR}, #{userid,jdbcType=VARCHAR}, #{userpwd,jdbcType=VARCHAR}, 
+      #{systemid,jdbcType=VARCHAR}, #{corpname,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP}
+      )
+  </insert>
+  <insert id="insertSelective" parameterType="com.hcloud.microserver.bank.mbg.modul.BUserLogin">
+    insert into b_user_login
+    <trim prefix="(" suffix=")" suffixOverrides=",">
+      <if test="guid != null">
+        guid,
+      </if>
+      <if test="sessionId != null">
+        session_id,
+      </if>
+      <if test="serviceId != null">
+        service_id,
+      </if>
+      <if test="serialNo != null">
+        serial_no,
+      </if>
+      <if test="reqTime != null">
+        req_time,
+      </if>
+      <if test="retCode != null">
+        ret_code,
+      </if>
+      <if test="errorMsg != null">
+        error_msg,
+      </if>
+      <if test="userid != null">
+        userID,
+      </if>
+      <if test="userpwd != null">
+        userPWD,
+      </if>
+      <if test="systemid != null">
+        systemId,
+      </if>
+      <if test="corpname != null">
+        corpName,
+      </if>
+      <if test="createTime != null">
+        create_time,
+      </if>
+    </trim>
+    <trim prefix="values (" suffix=")" suffixOverrides=",">
+      <if test="guid != null">
+        #{guid,jdbcType=BIGINT},
+      </if>
+      <if test="sessionId != null">
+        #{sessionId,jdbcType=VARCHAR},
+      </if>
+      <if test="serviceId != null">
+        #{serviceId,jdbcType=VARCHAR},
+      </if>
+      <if test="serialNo != null">
+        #{serialNo,jdbcType=VARCHAR},
+      </if>
+      <if test="reqTime != null">
+        #{reqTime,jdbcType=VARCHAR},
+      </if>
+      <if test="retCode != null">
+        #{retCode,jdbcType=VARCHAR},
+      </if>
+      <if test="errorMsg != null">
+        #{errorMsg,jdbcType=VARCHAR},
+      </if>
+      <if test="userid != null">
+        #{userid,jdbcType=VARCHAR},
+      </if>
+      <if test="userpwd != null">
+        #{userpwd,jdbcType=VARCHAR},
+      </if>
+      <if test="systemid != null">
+        #{systemid,jdbcType=VARCHAR},
+      </if>
+      <if test="corpname != null">
+        #{corpname,jdbcType=VARCHAR},
+      </if>
+      <if test="createTime != null">
+        #{createTime,jdbcType=TIMESTAMP},
+      </if>
+    </trim>
+  </insert>
+  <select id="countByExample" parameterType="com.hcloud.microserver.bank.mbg.modul.BUserLoginExample" resultType="java.lang.Long">
+    select count(*) from b_user_login
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+  </select>
+  <update id="updateByExampleSelective" parameterType="map">
+    update b_user_login
+    <set>
+      <if test="record.guid != null">
+        guid = #{record.guid,jdbcType=BIGINT},
+      </if>
+      <if test="record.sessionId != null">
+        session_id = #{record.sessionId,jdbcType=VARCHAR},
+      </if>
+      <if test="record.serviceId != null">
+        service_id = #{record.serviceId,jdbcType=VARCHAR},
+      </if>
+      <if test="record.serialNo != null">
+        serial_no = #{record.serialNo,jdbcType=VARCHAR},
+      </if>
+      <if test="record.reqTime != null">
+        req_time = #{record.reqTime,jdbcType=VARCHAR},
+      </if>
+      <if test="record.retCode != null">
+        ret_code = #{record.retCode,jdbcType=VARCHAR},
+      </if>
+      <if test="record.errorMsg != null">
+        error_msg = #{record.errorMsg,jdbcType=VARCHAR},
+      </if>
+      <if test="record.userid != null">
+        userID = #{record.userid,jdbcType=VARCHAR},
+      </if>
+      <if test="record.userpwd != null">
+        userPWD = #{record.userpwd,jdbcType=VARCHAR},
+      </if>
+      <if test="record.systemid != null">
+        systemId = #{record.systemid,jdbcType=VARCHAR},
+      </if>
+      <if test="record.corpname != null">
+        corpName = #{record.corpname,jdbcType=VARCHAR},
+      </if>
+      <if test="record.createTime != null">
+        create_time = #{record.createTime,jdbcType=TIMESTAMP},
+      </if>
+    </set>
+    <if test="_parameter != null">
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+  </update>
+  <update id="updateByExample" parameterType="map">
+    update b_user_login
+    set guid = #{record.guid,jdbcType=BIGINT},
+      session_id = #{record.sessionId,jdbcType=VARCHAR},
+      service_id = #{record.serviceId,jdbcType=VARCHAR},
+      serial_no = #{record.serialNo,jdbcType=VARCHAR},
+      req_time = #{record.reqTime,jdbcType=VARCHAR},
+      ret_code = #{record.retCode,jdbcType=VARCHAR},
+      error_msg = #{record.errorMsg,jdbcType=VARCHAR},
+      userID = #{record.userid,jdbcType=VARCHAR},
+      userPWD = #{record.userpwd,jdbcType=VARCHAR},
+      systemId = #{record.systemid,jdbcType=VARCHAR},
+      corpName = #{record.corpname,jdbcType=VARCHAR},
+      create_time = #{record.createTime,jdbcType=TIMESTAMP}
+    <if test="_parameter != null">
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+  </update>
+  <update id="updateByPrimaryKeySelective" parameterType="com.hcloud.microserver.bank.mbg.modul.BUserLogin">
+    update b_user_login
+    <set>
+      <if test="sessionId != null">
+        session_id = #{sessionId,jdbcType=VARCHAR},
+      </if>
+      <if test="serviceId != null">
+        service_id = #{serviceId,jdbcType=VARCHAR},
+      </if>
+      <if test="serialNo != null">
+        serial_no = #{serialNo,jdbcType=VARCHAR},
+      </if>
+      <if test="reqTime != null">
+        req_time = #{reqTime,jdbcType=VARCHAR},
+      </if>
+      <if test="retCode != null">
+        ret_code = #{retCode,jdbcType=VARCHAR},
+      </if>
+      <if test="errorMsg != null">
+        error_msg = #{errorMsg,jdbcType=VARCHAR},
+      </if>
+      <if test="userid != null">
+        userID = #{userid,jdbcType=VARCHAR},
+      </if>
+      <if test="userpwd != null">
+        userPWD = #{userpwd,jdbcType=VARCHAR},
+      </if>
+      <if test="systemid != null">
+        systemId = #{systemid,jdbcType=VARCHAR},
+      </if>
+      <if test="corpname != null">
+        corpName = #{corpname,jdbcType=VARCHAR},
+      </if>
+      <if test="createTime != null">
+        create_time = #{createTime,jdbcType=TIMESTAMP},
+      </if>
+    </set>
+    where guid = #{guid,jdbcType=BIGINT}
+  </update>
+  <update id="updateByPrimaryKey" parameterType="com.hcloud.microserver.bank.mbg.modul.BUserLogin">
+    update b_user_login
+    set session_id = #{sessionId,jdbcType=VARCHAR},
+      service_id = #{serviceId,jdbcType=VARCHAR},
+      serial_no = #{serialNo,jdbcType=VARCHAR},
+      req_time = #{reqTime,jdbcType=VARCHAR},
+      ret_code = #{retCode,jdbcType=VARCHAR},
+      error_msg = #{errorMsg,jdbcType=VARCHAR},
+      userID = #{userid,jdbcType=VARCHAR},
+      userPWD = #{userpwd,jdbcType=VARCHAR},
+      systemId = #{systemid,jdbcType=VARCHAR},
+      corpName = #{corpname,jdbcType=VARCHAR},
+      create_time = #{createTime,jdbcType=TIMESTAMP}
+    where guid = #{guid,jdbcType=BIGINT}
+  </update>
+</mapper>

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

@@ -0,0 +1,243 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.hcloud.microserver.bank.mbg.mapper.BUserMapper">
+  <resultMap id="BaseResultMap" type="com.hcloud.microserver.bank.mbg.modul.BUser">
+    <id column="guid" jdbcType="BIGINT" property="guid" />
+    <result column="userID" jdbcType="VARCHAR" property="userid" />
+    <result column="userPWD" jdbcType="VARCHAR" property="userpwd" />
+    <result column="systemId" jdbcType="VARCHAR" property="systemid" />
+    <result column="password" jdbcType="VARCHAR" property="password" />
+    <result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
+    <result column="create_id" jdbcType="BIGINT" property="createId" />
+  </resultMap>
+  <sql id="Example_Where_Clause">
+    <where>
+      <foreach collection="oredCriteria" item="criteria" separator="or">
+        <if test="criteria.valid">
+          <trim prefix="(" prefixOverrides="and" suffix=")">
+            <foreach collection="criteria.criteria" item="criterion">
+              <choose>
+                <when test="criterion.noValue">
+                  and ${criterion.condition}
+                </when>
+                <when test="criterion.singleValue">
+                  and ${criterion.condition} #{criterion.value}
+                </when>
+                <when test="criterion.betweenValue">
+                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
+                </when>
+                <when test="criterion.listValue">
+                  and ${criterion.condition}
+                  <foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
+                    #{listItem}
+                  </foreach>
+                </when>
+              </choose>
+            </foreach>
+          </trim>
+        </if>
+      </foreach>
+    </where>
+  </sql>
+  <sql id="Update_By_Example_Where_Clause">
+    <where>
+      <foreach collection="example.oredCriteria" item="criteria" separator="or">
+        <if test="criteria.valid">
+          <trim prefix="(" prefixOverrides="and" suffix=")">
+            <foreach collection="criteria.criteria" item="criterion">
+              <choose>
+                <when test="criterion.noValue">
+                  and ${criterion.condition}
+                </when>
+                <when test="criterion.singleValue">
+                  and ${criterion.condition} #{criterion.value}
+                </when>
+                <when test="criterion.betweenValue">
+                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
+                </when>
+                <when test="criterion.listValue">
+                  and ${criterion.condition}
+                  <foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
+                    #{listItem}
+                  </foreach>
+                </when>
+              </choose>
+            </foreach>
+          </trim>
+        </if>
+      </foreach>
+    </where>
+  </sql>
+  <sql id="Base_Column_List">
+    guid, userID, userPWD, systemId, password, create_time, create_id
+  </sql>
+  <select id="selectByExample" parameterType="com.hcloud.microserver.bank.mbg.modul.BUserExample" resultMap="BaseResultMap">
+    select
+    <if test="distinct">
+      distinct
+    </if>
+    <include refid="Base_Column_List" />
+    from b_user
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+    <if test="orderByClause != null">
+      order by ${orderByClause}
+    </if>
+  </select>
+  <select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="BaseResultMap">
+    select 
+    <include refid="Base_Column_List" />
+    from b_user
+    where guid = #{guid,jdbcType=BIGINT}
+  </select>
+  <delete id="deleteByPrimaryKey" parameterType="java.lang.Long">
+    delete from b_user
+    where guid = #{guid,jdbcType=BIGINT}
+  </delete>
+  <delete id="deleteByExample" parameterType="com.hcloud.microserver.bank.mbg.modul.BUserExample">
+    delete from b_user
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+  </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)
+    values (#{guid,jdbcType=BIGINT}, #{userid,jdbcType=VARCHAR}, #{userpwd,jdbcType=VARCHAR}, 
+      #{systemid,jdbcType=VARCHAR}, #{password,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP}, 
+      #{createId,jdbcType=BIGINT})
+  </insert>
+  <insert id="insertSelective" parameterType="com.hcloud.microserver.bank.mbg.modul.BUser">
+    insert into b_user
+    <trim prefix="(" suffix=")" suffixOverrides=",">
+      <if test="guid != null">
+        guid,
+      </if>
+      <if test="userid != null">
+        userID,
+      </if>
+      <if test="userpwd != null">
+        userPWD,
+      </if>
+      <if test="systemid != null">
+        systemId,
+      </if>
+      <if test="password != null">
+        password,
+      </if>
+      <if test="createTime != null">
+        create_time,
+      </if>
+      <if test="createId != null">
+        create_id,
+      </if>
+    </trim>
+    <trim prefix="values (" suffix=")" suffixOverrides=",">
+      <if test="guid != null">
+        #{guid,jdbcType=BIGINT},
+      </if>
+      <if test="userid != null">
+        #{userid,jdbcType=VARCHAR},
+      </if>
+      <if test="userpwd != null">
+        #{userpwd,jdbcType=VARCHAR},
+      </if>
+      <if test="systemid != null">
+        #{systemid,jdbcType=VARCHAR},
+      </if>
+      <if test="password != null">
+        #{password,jdbcType=VARCHAR},
+      </if>
+      <if test="createTime != null">
+        #{createTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="createId != null">
+        #{createId,jdbcType=BIGINT},
+      </if>
+    </trim>
+  </insert>
+  <select id="countByExample" parameterType="com.hcloud.microserver.bank.mbg.modul.BUserExample" resultType="java.lang.Long">
+    select count(*) from b_user
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+  </select>
+  <update id="updateByExampleSelective" parameterType="map">
+    update b_user
+    <set>
+      <if test="record.guid != null">
+        guid = #{record.guid,jdbcType=BIGINT},
+      </if>
+      <if test="record.userid != null">
+        userID = #{record.userid,jdbcType=VARCHAR},
+      </if>
+      <if test="record.userpwd != null">
+        userPWD = #{record.userpwd,jdbcType=VARCHAR},
+      </if>
+      <if test="record.systemid != null">
+        systemId = #{record.systemid,jdbcType=VARCHAR},
+      </if>
+      <if test="record.password != null">
+        password = #{record.password,jdbcType=VARCHAR},
+      </if>
+      <if test="record.createTime != null">
+        create_time = #{record.createTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="record.createId != null">
+        create_id = #{record.createId,jdbcType=BIGINT},
+      </if>
+    </set>
+    <if test="_parameter != null">
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+  </update>
+  <update id="updateByExample" parameterType="map">
+    update b_user
+    set guid = #{record.guid,jdbcType=BIGINT},
+      userID = #{record.userid,jdbcType=VARCHAR},
+      userPWD = #{record.userpwd,jdbcType=VARCHAR},
+      systemId = #{record.systemid,jdbcType=VARCHAR},
+      password = #{record.password,jdbcType=VARCHAR},
+      create_time = #{record.createTime,jdbcType=TIMESTAMP},
+      create_id = #{record.createId,jdbcType=BIGINT}
+    <if test="_parameter != null">
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+  </update>
+  <update id="updateByPrimaryKeySelective" parameterType="com.hcloud.microserver.bank.mbg.modul.BUser">
+    update b_user
+    <set>
+      <if test="userid != null">
+        userID = #{userid,jdbcType=VARCHAR},
+      </if>
+      <if test="userpwd != null">
+        userPWD = #{userpwd,jdbcType=VARCHAR},
+      </if>
+      <if test="systemid != null">
+        systemId = #{systemid,jdbcType=VARCHAR},
+      </if>
+      <if test="password != null">
+        password = #{password,jdbcType=VARCHAR},
+      </if>
+      <if test="createTime != null">
+        create_time = #{createTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="createId != null">
+        create_id = #{createId,jdbcType=BIGINT},
+      </if>
+    </set>
+    where guid = #{guid,jdbcType=BIGINT}
+  </update>
+  <update id="updateByPrimaryKey" parameterType="com.hcloud.microserver.bank.mbg.modul.BUser">
+    update b_user
+    set userID = #{userid,jdbcType=VARCHAR},
+      userPWD = #{userpwd,jdbcType=VARCHAR},
+      systemId = #{systemid,jdbcType=VARCHAR},
+      password = #{password,jdbcType=VARCHAR},
+      create_time = #{createTime,jdbcType=TIMESTAMP},
+      create_id = #{createId,jdbcType=BIGINT}
+    where guid = #{guid,jdbcType=BIGINT}
+  </update>
+</mapper>

carbon-bank/carbon-bank-mbg/src/main/resources/generator.properties

@@ -0,0 +1,4 @@
+jdbc.driverClass=com.mysql.cj.jdbc.Driver
+jdbc.connectionURL=jdbc:mysql://172.16.90.253:3306/cq-carbon-platform-dev?useUnicode=true&characterEncoding=utf-8&serverTimezone=Asia/Shanghai
+jdbc.userId=root
+jdbc.password=123456

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

@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE generatorConfiguration
+        PUBLIC "-//mybatis.org//DTD MyBatis Generator Configuration 1.0//EN"
+        "http://mybatis.org/dtd/mybatis-generator-config_1_0.dtd">
+
+<generatorConfiguration>
+    <properties resource="generator.properties"/>
+    <context id="MySqlContext" targetRuntime="MyBatis3" defaultModelType="flat">
+        <property name="beginningDelimiter" value="`"/>
+        <property name="endingDelimiter" value="`"/>
+        <property name="javaFileEncoding" value="UTF-8"/>
+        <!-- 为模型生成序列化方法-->
+        <plugin type="org.mybatis.generator.plugins.SerializablePlugin"/>
+        <!-- 为生成的Java模型创建一个toString方法 -->
+        <plugin type="org.mybatis.generator.plugins.ToStringPlugin"/>
+        <!--生成mapper.xml时覆盖原文件-->
+        <plugin type="org.mybatis.generator.plugins.UnmergeableXmlMappersPlugin" />
+        <commentGenerator type="com.hcloud.microserver.bank.mbg.CommentGenerator">
+            <!-- 是否去除自动生成的注释 true：是 ： false:否 -->
+            <property name="suppressAllComments" value="true"/>
+            <property name="suppressDate" value="true"/>
+            <property name="addRemarkComments" value="true"/>
+        </commentGenerator>
+
+        <jdbcConnection driverClass="${jdbc.driverClass}"
+                        connectionURL="${jdbc.connectionURL}"
+                        userId="${jdbc.userId}"
+                        password="${jdbc.password}">
+            <!--解决mysql驱动升级到8.0后不生成指定数据库代码的问题-->
+            <property name="nullCatalogMeansCurrent" value="true" />
+        </jdbcConnection>
+
+        <javaModelGenerator targetPackage="com.hcloud.microserver.bank.mbg.modul" targetProject="carbon-bank\carbon-bank-mbg\src\main\java"/>
+
+        <sqlMapGenerator targetPackage="com.hcloud.microserver.bank.mbg.mapper" targetProject="carbon-bank\carbon-bank-mbg\src\main\resources"/>
+
+        <javaClientGenerator type="XMLMAPPER" targetPackage="com.hcloud.microserver.bank.mbg.mapper"
+                             targetProject="carbon-bank\carbon-bank-mbg\src\main\java"/>
+        <!--生成全部表tableName设为%-->
+        <table tableName="b_transfer_farmer_request">
+            <generatedKey column="id" sqlStatement="MySql" identity="true"/>
+        </table>
+    </context>
+</generatorConfiguration>

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

@@ -107,6 +107,11 @@
             <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/CarbonManagerServiceApplication.java

@@ -15,12 +15,12 @@ import org.springframework.transaction.annotation.EnableTransactionManagement;
 @EnableDiscoveryClient
 @EnableTransactionManagement
 @ComponentScan(basePackages = "com.hcloud")
-@MapperScan(basePackages = {"com.hcloud.microserver.bank.dao"})
+@MapperScan(basePackages = {"com.hcloud.microserver.bank.mbg","com.hcloud.microserver.system.bank.dao"})
 @SpringBootApplication
-public class CarbonManagerServiceApplication {
+public class BankServiceApplication {
 
     public static void main(String[] args) {
-        SpringApplication.run(CarbonManagerServiceApplication.class, args);
+        SpringApplication.run(BankServiceApplication.class, args);
     }
 
 }

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

@@ -2,6 +2,7 @@ package com.hcloud.microserver.system.bank.config;
 
 import com.hcloud.microserver.security.component.DynamicSecurityService;
 import com.hcloud.microserver.security.config.SecurityConfig;
+import com.hcloud.microserver.system.bank.service.SysUserService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
@@ -18,10 +19,19 @@ import java.util.concurrent.ConcurrentHashMap;
  * mall-security模块相关配置
  * Created by macro on 2019/11/9.
  */
-//@Configuration
-//@EnableWebSecurity
-//@EnableGlobalMethodSecurity(prePostEnabled = true)
+@Configuration
+@EnableWebSecurity
+@EnableGlobalMethodSecurity(prePostEnabled = true)
 public class CarbonSecurityConfig extends SecurityConfig {
 
+    @Autowired
+    private SysUserService sysUserService;
+    @Bean
+    @Override
+    public UserDetailsService userDetailsService() {
+        //获取登录用户信息
+        return username -> sysUserService.loadUser(username);
+    }
+
 
 }

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

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

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

@@ -31,7 +31,7 @@ public class Swagger2Config {
         return new Docket(DocumentationType.SWAGGER_2)
                 .apiInfo(apiInfo())
                 .select()
-                .apis(RequestHandlerSelectors.basePackage("com.hwrj.cloud.admin.controller"))
+                .apis(RequestHandlerSelectors.basePackage("com.hcloud.microserver.system.bank.controller"))
                 .paths(PathSelectors.any())
                 .build()
                 .securitySchemes(securitySchemes())
@@ -40,10 +40,10 @@ public class Swagger2Config {
 
     private ApiInfo apiInfo() {
         return new ApiInfoBuilder()
-                .title("mall后台系统")
-                .description("mall后台模块")
-                .contact(new Contact("macro","",""))
-                .version("1.0")
+                .title("重庆碳汇清分管理系统")
+                .description("重庆碳汇清分后台模块")
+                .contact(new Contact("carbon","",""))
+                .version("0.0.1")
                 .build();
     }
 

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

@@ -0,0 +1,42 @@
+package com.hcloud.microserver.system.bank.controller;
+
+import com.github.pagehelper.PageInfo;
+import com.hcloud.microserver.bank.mbg.modul.BTransfer;
+import com.hcloud.microserver.commoncore.base.BaseController;
+import com.hcloud.microserver.commoncore.base.ResponseBase;
+import com.hcloud.microserver.system.bank.carbon.form.BTransferForm;
+import com.hcloud.microserver.system.bank.service.BTransferService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+@Slf4j
+@Api(tags = "清分接口")
+@RestController
+@RequestMapping("/bank/transfer")
+public class BTransferController extends BaseController {
+    @Autowired
+    private BTransferService bTransferService;
+
+    @ApiOperation("获取清分接口")
+    @PostMapping("/list")
+    public ResponseBase<List<BTransfer>> list(@RequestBody BTransferForm form){
+        PageInfo<BTransfer> list = bTransferService.list(form);
+        return responseSuccess(list);
+
+    }
+
+    @ApiOperation("获取清分明细")
+    @GetMapping("/{guid}")
+    public ResponseBase<BTransfer> detail(@PathVariable("guid")Long guid){
+        BTransfer detail = bTransferService.detail(guid);
+        if (detail!= null){
+            return responseResultSuccess(detail);
+        }
+        return responseResultFailure();
+    }
+}

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

@@ -0,0 +1,55 @@
+package com.hcloud.microserver.system.bank.controller;
+
+import com.github.pagehelper.PageInfo;
+import com.hcloud.microserver.bank.mbg.modul.BTransferDetail;
+import com.hcloud.microserver.commoncore.base.BaseController;
+import com.hcloud.microserver.commoncore.base.ResponseBase;
+import com.hcloud.microserver.system.bank.carbon.form.BTransferDetailForm;
+import com.hcloud.microserver.system.bank.service.BTransferDetailService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiParam;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+@Api(tags = "清分明细")
+@Slf4j
+@RestController
+@RequestMapping("/bank/transfer/detail")
+public class BTransferDetailController extends BaseController {
+    @Autowired
+    private BTransferDetailService bTransferDetailService;
+
+    @ApiOperation("清分明细列表")
+    @PostMapping("/list")
+    public ResponseBase<List<BTransferDetail>> list(@RequestBody BTransferDetailForm form){
+        PageInfo<BTransferDetail> list = bTransferDetailService.list(form);
+        return responseSuccess(list);
+    }
+
+    @ApiOperation("清分明细")
+    @PostMapping("/detail")
+    public ResponseBase<BTransferDetail> detail(@ApiParam("清分明细id") @RequestParam("guid") Long guid){
+        BTransferDetail list = bTransferDetailService.detail(guid);
+        if (list != null){
+            return responseResultSuccess(list);
+        }
+        return responseResultFailure();
+    }
+
+
+    @ApiOperation("清分明细")
+    @PostMapping("/detailByTransfer")
+    public ResponseBase<BTransferDetail> detailByTransfer(@ApiParam("清分id") @RequestParam("guid") Long guid){
+        BTransferDetail list = bTransferDetailService.detail(guid);
+        if (list != null){
+            return responseResultSuccess(list);
+        }
+        return responseResultFailure();
+    }
+
+
+}

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

@@ -0,0 +1,57 @@
+package com.hcloud.microserver.system.bank.controller;
+
+
+import com.github.pagehelper.PageInfo;
+import com.hcloud.microserver.bank.mbg.modul.BTransferFarmerRequest;
+import com.hcloud.microserver.commoncore.base.BaseController;
+import com.hcloud.microserver.commoncore.base.ResponseBase;
+import com.hcloud.microserver.system.bank.carbon.form.BTransferFarmerRequestForm;
+import com.hcloud.microserver.system.bank.service.BTransferFarmerRequestService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiParam;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+@Slf4j
+@Api(tags = "清分请求记录表")
+@RestController
+@RequestMapping("/bank/transfer/request")
+public class BTransferFarmerRequestController extends BaseController {
+
+    @Autowired
+    private BTransferFarmerRequestService transferFarmerRequestService;
+
+
+
+    @ApiOperation("获取去清分请求记录列表")
+    @PostMapping("/list")
+    public ResponseBase<List<BTransferFarmerRequest>> list(@RequestBody BTransferFarmerRequestForm form){
+        PageInfo<BTransferFarmerRequest> list = transferFarmerRequestService.list(form);
+        return responseSuccess(list);
+    }
+
+    @ApiOperation("获取清分请求详细信息")
+    @PostMapping("/detail")
+    public ResponseBase<BTransferFarmerRequest> detail(@ApiParam("清分请求id") @RequestParam("guid")Long guid){
+        BTransferFarmerRequest detail = transferFarmerRequestService.detail(guid);
+        if (detail != null){
+            return responseResultSuccess(detail);
+        }
+        return responseResultFailure();
+    }
+
+    @ApiOperation("根据清分信息获取清分请求详细信息")
+    @PostMapping("/detailByTransfer")
+    public ResponseBase<BTransferFarmerRequest> detailByFkTransferId(@ApiParam("清分id")@RequestParam("fkTransferId")Long fkTransferId){
+        BTransferFarmerRequest detail = transferFarmerRequestService.detailByFkTransferId(fkTransferId);
+        if (detail != null){
+            return responseResultSuccess(detail);
+        }
+        return responseResultFailure();
+    }
+
+}

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

@@ -0,0 +1,79 @@
+package com.hcloud.microserver.system.bank.controller;
+
+import com.github.pagehelper.PageInfo;
+import com.hcloud.microserver.bank.mbg.modul.BUser;
+import com.hcloud.microserver.commoncore.base.BaseController;
+import com.hcloud.microserver.commoncore.base.ResponseBase;
+import com.hcloud.microserver.commoncore.domain.LoginUser;
+import com.hcloud.microserver.security.service.TokenService;
+import com.hcloud.microserver.system.bank.carbon.form.BUserForm;
+import com.hcloud.microserver.system.bank.service.BUserService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiParam;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+@RestController
+@Slf4j
+@RequestMapping("/bank/user")
+@Api(tags = "银行用户管理")
+public class BUserController extends BaseController {
+
+    @Autowired
+    private BUserService bUserService;
+
+
+
+    @ApiOperation("添加用户")
+    @PostMapping("/add")
+    public ResponseBase add(@RequestBody BUser bUser){
+
+        int i = bUserService.add(bUser);
+        if (i>0){
+            return responseResultSuccess();
+        }
+        return responseResultFailure();
+    }
+
+    @ApiOperation("获取用户列表")
+    @PostMapping("/list")
+    public ResponseBase<BUser> list(@RequestBody BUserForm bUserForm){
+        PageInfo<BUser> list = bUserService.list(bUserForm);
+        return responseSuccess(list);
+    }
+
+    @ApiOperation("修改用户")
+    @PostMapping("/update")
+    public ResponseBase update(@RequestBody BUser bUser){
+        int i = bUserService.update(bUser);
+        if (i>0){
+            return responseResultSuccess();
+        }
+        return responseResultFailure();
+    }
+
+    @ApiOperation("用户明细")
+    @GetMapping("/detail")
+    public ResponseBase<BUser> get(@ApiParam("用户id") @RequestParam("guid") Long guid){
+        BUser bUser = bUserService.get(guid);
+        if (bUser != null){
+            return responseResultSuccess(bUser);
+        }
+        return responseResultFailure();
+    }
+
+    @ApiOperation("删除用户")
+    @GetMapping("/delete")
+    public ResponseBase delete(@ApiParam("用户id") @RequestParam("guid") Long guid){
+        int i = bUserService.delete(guid);
+        if (i>0){
+            return responseResultSuccess();
+        }
+        return responseResultFailure();
+    }
+
+
+
+}

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

@@ -0,0 +1,43 @@
+package com.hcloud.microserver.system.bank.controller;
+
+import com.github.pagehelper.PageInfo;
+import com.hcloud.microserver.bank.mbg.modul.BUserLogin;
+import com.hcloud.microserver.commoncore.base.BaseController;
+import com.hcloud.microserver.commoncore.base.BaseForm;
+import com.hcloud.microserver.commoncore.base.ResponseBase;
+import com.hcloud.microserver.system.bank.service.BankUserService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiParam;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+@RestController
+@Slf4j
+@RequestMapping("/bank/user/log")
+@Api(tags = "银行用户登录日志")
+public class BUserLoginContorller extends BaseController {
+    @Autowired
+    private BankUserService bankUserService;
+
+    @ApiOperation("获取登录日志列表")
+    @PostMapping("/list")
+    public ResponseBase<List<BUserLogin>> list(@RequestBody BaseForm baseForm){
+        PageInfo<BUserLogin> info = bankUserService.listBUserLogin(baseForm);
+        return responseSuccess(info);
+    }
+
+    @ApiOperation("获取登录日志详细信息")
+    @GetMapping("/detail")
+    public ResponseBase<BUserLogin> detail(@ApiParam("日志id")@RequestParam("guid")Long guid){
+        BUserLogin detail = bankUserService.getDetail(guid);
+        if (detail != null){
+            return responseResultSuccess(detail);
+        }
+        return responseResultFailure();
+    }
+
+}

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

@@ -0,0 +1,30 @@
+package com.hcloud.microserver.system.bank.dao;
+
+import com.hcloud.microserver.commoncore.domain.SysRole;
+import com.hcloud.microserver.commoncore.domain.SysUser;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * 用户表 数据层
+ * 
+ * @author ruoyi
+ */
+public interface SysUserMapper
+{
+
+
+    /**
+     * 通过用户名查询用户
+     * 
+     * @param userName 用户名
+     * @return 用户对象信息
+     */
+    public SysUser selectUserByUserName(String userName);
+
+    public List<SysRole> selectRolePermissionByUserId(Long userId);
+
+    public List<String> selectMenuPermsByUserId(Long userId);
+
+}

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

@@ -0,0 +1,57 @@
+package com.hcloud.microserver.system.bank.service;
+
+import com.github.pagehelper.PageInfo;
+import com.hcloud.microserver.bank.mbg.modul.BTransfer;
+import com.hcloud.microserver.bank.mbg.modul.BTransferDetail;
+import com.hcloud.microserver.system.bank.carbon.form.BTransferDetailForm;
+
+import java.util.List;
+
+public interface BTransferDetailService {
+    /**
+     *添加清分明细
+     * @param bTransferDetail
+     * @return
+     */
+    public int add(BTransferDetail bTransferDetail);
+
+    /**
+     * 获取清分明细列表
+     * @param form
+     * @return
+     */
+    public PageInfo<BTransferDetail> list(BTransferDetailForm form);
+
+    /**
+     * 获取清分明细的明细
+     * @param guid
+     * @return
+     */
+    public BTransferDetail detail(Long guid);
+
+    /**
+     * 删除清分明细
+     * @param guids
+     * @return
+     */
+    public int delete(List<Long> guids);
+
+    /**
+     * 修改清分明细
+     * @param detail
+     * @return
+     */
+    public int updateByGuid(BTransferDetail detail);
+
+    /**
+     * 根据总清分id获取清分明细
+     * @param fkTransferId
+     * @param pageNo
+     * @param pageSize
+     * @return
+     */
+    public PageInfo<BTransferDetail> getBTransferDetailListByFkTransferId(Long fkTransferId,int pageNo,int pageSize);
+
+
+
+}

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

@@ -0,0 +1,49 @@
+package com.hcloud.microserver.system.bank.service;
+
+import com.github.pagehelper.PageInfo;
+import com.hcloud.microserver.bank.mbg.modul.BTransferFarmerRequest;
+import com.hcloud.microserver.system.bank.carbon.form.BTransferFarmerRequestForm;
+
+import java.util.List;
+
+/**
+ * 农户清分请求记录
+ */
+public interface BTransferFarmerRequestService {
+    /**
+     * 添加农户请求清分记录
+     * @param request
+     * @return
+     */
+    public int add(BTransferFarmerRequest request);
+
+    /**
+     * 删除农户请求清分记录
+     * @param guids
+     * @return
+     */
+    public int delete(List<Long> guids);
+
+    /**
+     * 获取农户请求清分记录列表
+     * @param bTransferFarmerRequestForm
+     * @return
+     */
+    public PageInfo<BTransferFarmerRequest> list(BTransferFarmerRequestForm bTransferFarmerRequestForm);
+
+
+    /**
+     * 获取清分请求明细
+     * @param guid
+     * @return
+     */
+    public BTransferFarmerRequest detail(Long guid);
+
+
+    /**
+     * 通过清分id获取清分请求明细
+     * @param fkTransferId
+     * @return
+     */
+    public BTransferFarmerRequest detailByFkTransferId(Long fkTransferId);
+}

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

@@ -0,0 +1,50 @@
+package com.hcloud.microserver.system.bank.service;
+
+import com.github.pagehelper.PageInfo;
+import com.hcloud.microserver.bank.mbg.modul.BTransfer;
+import com.hcloud.microserver.system.bank.carbon.form.BTransferForm;
+
+/**
+ * 清分总表
+ */
+public interface BTransferService {
+
+    /**
+     * 添加清分记录
+     * @param bTransfer
+     * @return
+     */
+    public int add(BTransfer bTransfer);
+
+    /**
+     * 修改清分记录
+     * @param bTransfer
+     * @return
+     */
+    public int updateByBTransfer(BTransfer bTransfer);
+
+    /**
+     * 删除清分记录
+     * @param guid
+     * @return
+     */
+    public int delete(Long guid);
+
+    /**
+     * 获取清分列表
+     * @param form
+     * @return
+     */
+    public PageInfo<BTransfer> list(BTransferForm form);
+
+    /**
+     * 获取清分明细
+     * @param guid
+     * @return
+     */
+    public BTransfer detail(Long guid);
+
+
+
+
+}

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

@@ -0,0 +1,49 @@
+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.form.BUserForm;
+
+/**
+ * 银行用户管理
+ * @Author qiubo
+ */
+public interface BUserService {
+
+    /**
+     * 添加银行用户
+     * @param bUser
+     * @return
+     */
+    public int add(BUser bUser);
+
+    /**
+     * 分页获取用户列表
+     * @param bUserForm
+     * @return
+     */
+    public PageInfo<BUser> list(BUserForm bUserForm);
+
+    /**
+     * 修改银行用户
+     * @param bUser
+     * @return
+     */
+    public int update(BUser bUser);
+
+    /**
+     * 删除银行账户
+     * @param guid
+     * @return
+     */
+    public int delete(Long guid);
+
+    /**
+     * 获取银行账户详情
+     * @param guid
+     * @return
+     */
+    public BUser get(Long guid);
+
+    public BUser getByUserId(String userId);
+}

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

@@ -1,6 +1,5 @@
 package com.hcloud.microserver.system.bank.service;
 
-import com.hcloud.microserver.bank.bo.*;
 import com.hcloud.microserver.system.bank.bo.*;
 
 public interface BankTransactionService {

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

@@ -1,8 +1,14 @@
 package com.hcloud.microserver.system.bank.service;
 
+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;
+
 /**
  * 银行用户
  */
@@ -14,4 +20,25 @@ public interface BankUserService {
      */
     public BankLoginUserRespBO loginUser(BankLoginUserReqParam reqBO);
 
+    /**
+     * 添加银行用户登录日志
+     * @param bUserLogin
+     * @return
+     */
+    public int addBUserLogin(BUserLogin bUserLogin);
+
+    /**
+     * 获取银行用户登录日志列表
+     * @param baseForm
+     * @return
+     */
+     public PageInfo<BUserLogin> listBUserLogin(BaseForm baseForm);
+
+    /**
+     * 获取银行用户登录日志明细
+     * @param guid
+     * @return
+     */
+     public BUserLogin getDetail(Long guid);
+
 }

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

@@ -0,0 +1,9 @@
+package com.hcloud.microserver.system.bank.service;
+
+import com.hcloud.microserver.commoncore.domain.LoginUserDetails;
+
+public interface SysUserService {
+
+    public LoginUserDetails loadUser(String username);
+
+}

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

@@ -0,0 +1,113 @@
+package com.hcloud.microserver.system.bank.service.impl;
+
+import com.github.pagehelper.PageHelper;
+import com.github.pagehelper.PageInfo;
+import com.hcloud.microserver.bank.mbg.mapper.BTransferDetailMapper;
+import com.hcloud.microserver.bank.mbg.modul.BTransfer;
+import com.hcloud.microserver.bank.mbg.modul.BTransferDetail;
+import com.hcloud.microserver.bank.mbg.modul.BTransferDetailExample;
+import com.hcloud.microserver.commoncore.domain.LoginUser;
+import com.hcloud.microserver.commoncore.domain.SysUser;
+import com.hcloud.microserver.commoncore.util.string.StringUtils;
+import com.hcloud.microserver.security.service.TokenService;
+import com.hcloud.microserver.system.bank.carbon.form.BTransferDetailForm;
+import com.hcloud.microserver.system.bank.service.BTransferDetailService;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.Date;
+import java.util.List;
+
+@Service
+@Slf4j
+public class BTransferDetailServiceImpl implements BTransferDetailService {
+    @Autowired
+    private BTransferDetailMapper bTransferDetailMapper;
+    @Autowired
+    private TokenService tokenService;
+    @Override
+    public int add(BTransferDetail bTransferDetail) {
+        if (bTransferDetail != null){
+            LoginUser loginUser = tokenService.getLoginUser();
+            if (loginUser != null&& loginUser.getSysUser() != null){
+                SysUser sysUser = loginUser.getSysUser();
+                bTransferDetail.setCreateId(sysUser.getUserId());
+                bTransferDetail.setCreateName(sysUser.getUserName());
+
+            }
+            bTransferDetail.setCreateTime(new Date());
+            return bTransferDetailMapper.insert(bTransferDetail);
+        }
+        return 0;
+    }
+
+    @Override
+    public PageInfo<BTransferDetail> list(BTransferDetailForm form) {
+        BTransferDetailExample example = new BTransferDetailExample();
+        BTransferDetailExample.Criteria criteria = example.createCriteria();
+        if (StringUtils.isNotNull(form.getGuid())){
+            criteria.andGuidEqualTo(form.getGuid());
+        }
+        if (StringUtils.isNotNull(form.getFkTransferId())){
+            criteria.andFkTransferIdEqualTo(form.getFkTransferId());
+        }
+        if (StringUtils.isNotNull(form.getFkFcId())){
+            criteria.andFkFcIdEqualTo(form.getFkFcId());
+        }
+        if (StringUtils.isNotEmpty(form.getName())){
+            criteria.andNameLike("%"+form.getName()+"%");
+        }
+        if (StringUtils.isNotNull(form.getTransferType())){
+            criteria.andTransferTypeEqualTo(form.getTransferType());
+        }
+        if (StringUtils.isNotEmpty(form.getCode())){
+            criteria.andCodeLike("%"+form.getCode()+"%");
+        }
+        List<BTransferDetail> bTransferDetails = bTransferDetailMapper.selectByExample(example);
+        return new PageInfo<>(bTransferDetails);
+    }
+
+    @Override
+    public BTransferDetail detail(Long guid) {
+        if (StringUtils.isNotNull(guid)){
+            BTransferDetail transferDetail = bTransferDetailMapper.selectByPrimaryKey(guid);
+            return transferDetail;
+        }
+        return null;
+    }
+
+    @Override
+    public int delete(List<Long> guids) {
+        if(guids != null&& guids.size()>0){
+            BTransferDetailExample example = new BTransferDetailExample();
+            BTransferDetailExample.Criteria criteria = example.createCriteria();
+            criteria.andGuidIn(guids);
+            BTransferDetail bTransferDetail = new BTransferDetail();
+            bTransferDetail.setState(0);
+            return bTransferDetailMapper.updateByExample(bTransferDetail,example);
+        }
+        return 0;
+    }
+
+    @Override
+    public int updateByGuid(BTransferDetail detail) {
+        if (detail != null && StringUtils.isNotNull(detail.getGuid())){
+            return bTransferDetailMapper.updateByPrimaryKey(detail);
+        }
+        return 0;
+    }
+
+    @Override
+    public PageInfo<BTransferDetail> getBTransferDetailListByFkTransferId(Long fkTransferId,int pageNo,int pageSize) {
+        PageHelper.startPage(pageNo,pageSize);
+        if (fkTransferId != null){
+            BTransferDetailExample example = new BTransferDetailExample();
+            BTransferDetailExample.Criteria criteria = example.createCriteria();
+            criteria.andFkTransferIdEqualTo(fkTransferId);
+            List<BTransferDetail> list = bTransferDetailMapper.selectByExample(example);
+            return new PageInfo<>(list);
+        }
+        return new PageInfo<>();
+    }
+}

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

@@ -0,0 +1,95 @@
+package com.hcloud.microserver.system.bank.service.impl;
+
+import com.github.pagehelper.PageHelper;
+import com.github.pagehelper.PageInfo;
+import com.hcloud.microserver.bank.mbg.mapper.BTransferFarmerRequestMapper;
+import com.hcloud.microserver.bank.mbg.modul.BTransferFarmerRequest;
+import com.hcloud.microserver.bank.mbg.modul.BTransferFarmerRequestExample;
+import com.hcloud.microserver.commoncore.domain.LoginUser;
+import com.hcloud.microserver.security.service.TokenService;
+import com.hcloud.microserver.system.bank.carbon.form.BTransferFarmerRequestForm;
+import com.hcloud.microserver.system.bank.service.BTransferFarmerRequestService;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.Date;
+import java.util.List;
+
+@Slf4j
+@Service
+public class BTransferFarmerRequestServiceImpl implements BTransferFarmerRequestService {
+    @Autowired
+    private BTransferFarmerRequestMapper transferFarmerRequestMapper;
+    @Autowired
+    private TokenService tokenService;
+    @Override
+    public int add(BTransferFarmerRequest request) {
+        if (request != null){
+            LoginUser loginUser = tokenService.getLoginUser();
+            if (loginUser != null&& loginUser.getSysUser()!= null){
+                String userName = loginUser.getSysUser().getUserName();
+                Long userId = loginUser.getSysUser().getUserId();
+            }
+            request.setCreateTime(new Date());
+            transferFarmerRequestMapper.insert(request);
+        }
+        return 0;
+    }
+
+    @Override
+    public int delete(List<Long> guids) {
+        if (guids != null&&guids.size()>0){
+            BTransferFarmerRequestExample example = new BTransferFarmerRequestExample();
+            BTransferFarmerRequestExample.Criteria criteria = example.createCriteria();
+            criteria.andGuidIn(guids);
+            BTransferFarmerRequest request = new BTransferFarmerRequest();
+            request.setStatus(0);
+            transferFarmerRequestMapper.updateByExample(request,example);
+        }
+        return 0;
+    }
+
+    @Override
+    public PageInfo<BTransferFarmerRequest> list(BTransferFarmerRequestForm bTransferFarmerRequestForm) {
+        PageHelper.startPage(bTransferFarmerRequestForm.getPageNo(),bTransferFarmerRequestForm.getPageSize());
+        BTransferFarmerRequestExample example = new BTransferFarmerRequestExample();
+        BTransferFarmerRequestExample.Criteria criteria = example.createCriteria();
+        if (bTransferFarmerRequestForm.getFkTransferId()!=null){
+            criteria.andFkTransferIdEqualTo(bTransferFarmerRequestForm.getFkTransferId());
+        }
+        List<BTransferFarmerRequest> requests = transferFarmerRequestMapper.selectByExample(example);
+        return new PageInfo<>(requests);
+    }
+
+    @Override
+    public BTransferFarmerRequest detail(Long guid) {
+
+        if (guid != null){
+            BTransferFarmerRequestExample example = new BTransferFarmerRequestExample();
+            BTransferFarmerRequestExample.Criteria criteria = example.createCriteria();
+            criteria.andGuidEqualTo(guid);
+            List<BTransferFarmerRequest> requests = transferFarmerRequestMapper.selectByExample(example);
+            if (requests != null&&requests.size()>0){
+                BTransferFarmerRequest request = requests.get(0);
+                return request;
+            }
+        }
+        return null;
+    }
+
+    @Override
+    public BTransferFarmerRequest detailByFkTransferId(Long fkTransferId) {
+        if (fkTransferId != null){
+            BTransferFarmerRequestExample example = new BTransferFarmerRequestExample();
+            BTransferFarmerRequestExample.Criteria criteria = example.createCriteria();
+            criteria.andFkTransferIdEqualTo(fkTransferId);
+            List<BTransferFarmerRequest> requests = transferFarmerRequestMapper.selectByExample(example);
+            if (requests != null&&requests.size()>0){
+                BTransferFarmerRequest request = requests.get(0);
+                return request;
+            }
+        }
+        return null;
+    }
+}

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

@@ -0,0 +1,102 @@
+package com.hcloud.microserver.system.bank.service.impl;
+
+import com.github.pagehelper.PageHelper;
+import com.github.pagehelper.PageInfo;
+import com.hcloud.microserver.bank.mbg.mapper.BTransferMapper;
+import com.hcloud.microserver.bank.mbg.modul.BTransfer;
+import com.hcloud.microserver.bank.mbg.modul.BTransferExample;
+import com.hcloud.microserver.commoncore.domain.LoginUser;
+import com.hcloud.microserver.commoncore.domain.SysUser;
+import com.hcloud.microserver.commoncore.util.reflect.DateUtils;
+import com.hcloud.microserver.commoncore.util.string.StringUtils;
+import com.hcloud.microserver.security.service.TokenService;
+import com.hcloud.microserver.system.bank.carbon.form.BTransferForm;
+import com.hcloud.microserver.system.bank.service.BTransferService;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.Date;
+import java.util.List;
+
+@Service
+@Slf4j
+public class BTransferServiceImpl implements BTransferService {
+    @Autowired
+    private BTransferMapper bTransferMapper;
+
+    @Autowired
+    private TokenService tokenService;
+    @Override
+    public int add(BTransfer bTransfer) {
+        if(bTransfer != null){
+            LoginUser loginUser = tokenService.getLoginUser();
+
+            bTransfer.setCreateTime(new Date());
+            if (loginUser!=null&&loginUser.getSysUser() != null){
+                SysUser sysUser = loginUser.getSysUser();
+                bTransfer.setCreateId(sysUser.getUserId());
+                bTransfer.setCreateName(sysUser.getUserName());
+            }
+            return bTransferMapper.insert(bTransfer);
+
+
+        }
+        return 0;
+    }
+
+    @Override
+    public int updateByBTransfer(BTransfer bTransfer) {
+        if (bTransfer != null && StringUtils.isNotNull(bTransfer.getGuid())){
+            return bTransferMapper.updateByPrimaryKeySelective(bTransfer);
+        }
+        return 0;
+    }
+
+    @Override
+    public int delete(Long guid) {
+        if (StringUtils.isNotNull(guid)){
+           return bTransferMapper.deleteByPrimaryKey(guid);
+        }
+        return 0;
+    }
+
+    @Override
+    public PageInfo<BTransfer> list(BTransferForm form) {
+        PageHelper.startPage(form.getPageNo(),form.getPageSize());
+        BTransferExample example = new BTransferExample();
+        BTransferExample.Criteria criteria = example.createCriteria();
+        if (StringUtils.isNotNull(form.getGuid())){
+            criteria.andGuidEqualTo(form.getGuid());
+        }
+        if (StringUtils.isNotEmpty(form.getRetCode())){
+            criteria.andRetCodeLike("%"+form.getRetCode()+"%");
+        }
+        if (StringUtils.isNotEmpty(form.getServiceId())){
+            criteria.andServiceIdLike("%"+form.getServiceId()+"%");
+        }
+        if (StringUtils.isNotNull(form.getTransferType())){
+            criteria.andTransferTypeEqualTo(form.getTransferType());
+        }
+        if (form.getStartTime() != null&& form.getEndTime()==null){
+            criteria.andCreateTimeGreaterThanOrEqualTo(DateUtils.getTodayStartTime(form.getStartTime()));
+        }
+        if (form.getEndTime() != null&& form.getStartTime()==null){
+            criteria.andCreateTimeLessThanOrEqualTo(DateUtils.getTodayStartTime(form.getEndTime()));
+        }
+
+        if (form.getEndTime() != null&& form.getStartTime()!=null){
+            criteria.andCreateTimeBetween(DateUtils.getTodayStartTime(form.getStartTime()),DateUtils.getTodayEndTime(form.getEndTime()));
+        }
+        List<BTransfer> bTransfers = bTransferMapper.selectByExample(example);
+        return new PageInfo<>(bTransfers);
+    }
+
+    @Override
+    public BTransfer detail(Long guid) {
+        if (StringUtils.isNotNull(guid)){
+            return bTransferMapper.selectByPrimaryKey(guid);
+        }
+        return null;
+    }
+}

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

@@ -0,0 +1,100 @@
+package com.hcloud.microserver.system.bank.service.impl;
+
+import com.github.pagehelper.PageHelper;
+import com.github.pagehelper.PageInfo;
+import com.hcloud.microserver.bank.mbg.mapper.BUserMapper;
+import com.hcloud.microserver.bank.mbg.modul.BUser;
+import com.hcloud.microserver.bank.mbg.modul.BUserExample;
+import com.hcloud.microserver.commoncore.domain.LoginUser;
+import com.hcloud.microserver.commoncore.util.string.StringUtils;
+import com.hcloud.microserver.security.service.TokenService;
+import com.hcloud.microserver.system.bank.carbon.form.BUserForm;
+import com.hcloud.microserver.system.bank.service.BUserService;
+import com.hcloud.microserver.system.bank.util.SHAEncrytp;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import java.util.Date;
+import java.util.List;
+
+@Service
+public class BUserServiceImpl implements BUserService {
+
+    @Autowired
+    private BUserMapper bUserMapper;
+
+    @Autowired
+    private TokenService tokenService;
+    @Override
+    public int add(BUser bUser) {
+
+        if (bUser != null&& StringUtils.isNotEmpty(bUser.getUserid())&&StringUtils.isNotEmpty(bUser.getUserpwd())){
+            BUser byUserId = getByUserId(bUser.getUserid());
+            if (byUserId != null){
+                throw new RuntimeException("用户已经存在，请勿重复添加用户");
+            }
+            LoginUser loginUser = tokenService.getLoginUser();
+            SHAEncrytp shaEncrytp = new SHAEncrytp();
+            String origin = bUser.getUserid()+bUser.getUserpwd();
+            String digestOfString = shaEncrytp.getDigestOfString(origin.getBytes());
+            bUser.setUserpwd(digestOfString);
+            bUser.setCreateTime(new Date());
+            bUser.setCreateId(loginUser.getSysUser().getUserId());
+            return bUserMapper.insert(bUser);
+
+        }
+
+        return 0;
+    }
+
+    @Override
+    public PageInfo<BUser> list(BUserForm bUserForm) {
+        PageHelper.startPage(bUserForm.getPageNo(),bUserForm.getPageSize());
+        BUserExample example = new BUserExample();
+        BUserExample.Criteria criteria = example.createCriteria();
+        if (StringUtils.isNotEmpty(bUserForm.getUserid())){
+            criteria.andUseridLike("%"+bUserForm.getUserid()+"%");
+
+        }
+        List<BUser> bUsers = bUserMapper.selectByExample(example);
+        return new PageInfo<>(bUsers);
+    }
+
+    @Override
+    public int update(BUser bUser) {
+        if (bUser != null&&StringUtils.isNotNull(bUser.getGuid())){
+           return bUserMapper.updateByPrimaryKey(bUser);
+        }
+        return 0;
+    }
+
+    @Override
+    public int delete(Long guid) {
+        if (StringUtils.isNotNull(guid)){
+            return bUserMapper.deleteByPrimaryKey(guid);
+        }
+        return 0;
+    }
+
+    @Override
+    public BUser get(Long guid) {
+        if (StringUtils.isNotNull(guid)){
+            return bUserMapper.selectByPrimaryKey(guid);
+        }
+        return null;
+    }
+
+    @Override
+    public BUser getByUserId(String userId) {
+        if(StringUtils.isEmpty(userId)){
+            return null;
+        }
+        BUserExample example = new BUserExample();
+        BUserExample.Criteria criteria = example.createCriteria();
+        criteria.andUseridEqualTo(userId);
+        List<BUser> bUsers = bUserMapper.selectByExample(example);
+        if (bUsers != null&&bUsers.size()>0){
+            return bUsers.get(0);
+        }
+        return null;
+    }
+}

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

@@ -1,7 +1,6 @@
 package com.hcloud.microserver.system.bank.service.impl;
 
 import com.alibaba.fastjson.JSONObject;
-import com.hcloud.microserver.bank.bo.*;
 import com.hcloud.microserver.system.bank.bo.*;
 import com.hcloud.microserver.system.bank.service.BankTransactionService;
 import com.hcloud.microserver.system.bank.util.BankNoUtial;
@@ -26,7 +25,7 @@ public class BankTransactionServiceImpl implements BankTransactionService {
         String time = bankUtil.getTime(new Date());
         String serviceId = "CL0003";
 //        String sessionId="-1";
-        BankLoginUserRespBO loginSession = bankUtil.getLoginSession();
+        BankLoginUserRespBO loginSession = bankUtil.getLoginSession("");
         String sessionId = loginSession.getSessionId();
 
         BankQueryBaseParam<CurrentAccountQueryParam> paramReq = new BankQueryBaseParam<>();
@@ -51,7 +50,7 @@ public class BankTransactionServiceImpl implements BankTransactionService {
         String time = bankUtil.getTime(new Date());
         String serviceId = "CL0004";
 //        String sessionId="-1";
-        BankLoginUserRespBO loginSession = bankUtil.getLoginSession();
+        BankLoginUserRespBO loginSession = bankUtil.getLoginSession("");
         String sessionId = loginSession.getSessionId();
 
         BankQueryBaseParam<CurrentAccountDetailQueryParam> paramReq = new BankQueryBaseParam<>();
@@ -74,7 +73,7 @@ public class BankTransactionServiceImpl implements BankTransactionService {
         String time = bankUtil.getTime(new Date());
         String serviceId = "CL0004";
 //        String sessionId="-1";
-        BankLoginUserRespBO loginSession = bankUtil.getLoginSession();
+        BankLoginUserRespBO loginSession = bankUtil.getLoginSession("");
         String sessionId = loginSession.getSessionId();
 
         BankQueryBaseParam<IntrabankTransferParam> paramReq = new BankQueryBaseParam<>();

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

@@ -1,6 +1,14 @@
 package com.hcloud.microserver.system.bank.service.impl;
 
 import com.alibaba.fastjson.JSONObject;
+import com.github.pagehelper.PageHelper;
+import com.github.pagehelper.PageInfo;
+import com.hcloud.microserver.bank.mbg.mapper.BUserLoginMapper;
+import com.hcloud.microserver.bank.mbg.modul.BUser;
+import com.hcloud.microserver.bank.mbg.modul.BUserLogin;
+import com.hcloud.microserver.bank.mbg.modul.BUserLoginExample;
+import com.hcloud.microserver.commoncore.base.BaseForm;
+import com.hcloud.microserver.commoncore.util.string.StringUtils;
 import com.hcloud.microserver.system.bank.bo.BankLoginUserReqParam;
 import com.hcloud.microserver.system.bank.bo.BankLoginUserRespBO;
 import com.hcloud.microserver.system.bank.bo.BankQueryBaseParam;
@@ -9,10 +17,12 @@ import com.hcloud.microserver.system.bank.util.BankNoUtial;
 import com.hcloud.microserver.system.bank.util.BankUtil;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.data.redis.core.RedisTemplate;
 import org.springframework.stereotype.Service;
 
 import java.util.Date;
+import java.util.List;
 
 @Slf4j
 @Service
@@ -23,10 +33,11 @@ public class BankUserServiceImpl implements BankUserService {
     @Autowired
     private BankUtil bankUtil;
 
-    @Autowired
-    private RedisTemplate redisTemplate;
 
 
+    @Autowired
+    private BUserLoginMapper bUserLoginMapper;
+
 
     @Override
     public BankLoginUserRespBO loginUser(BankLoginUserReqParam reqBO) {
@@ -46,8 +57,55 @@ public class BankUserServiceImpl implements BankUserService {
         BankLoginUserRespBO bankResponseBase =(BankLoginUserRespBO) bankUtil.bankRequst(param, 1, BankLoginUserRespBO.class);
         log.info(JSONObject.toJSONString(bankResponseBase));
         if ("00000000".equals(bankResponseBase.getRetCode())){
-            bankUtil.cacheLoginSession(bankResponseBase);
+            bankUtil.cacheLoginSession(bankResponseBase,reqBO.getUserID());
+        }
+        int i = toBUserLogin(param, bankResponseBase);
+        if (i <1){
+            log.info(">>>添加银行登录日志记录失败{}",reqBO);
         }
         return bankResponseBase;
     }
+
+    public int toBUserLogin(BankQueryBaseParam<BankLoginUserReqParam> param,BankLoginUserRespBO bankResponseBase){
+        BUserLogin login =new BUserLogin();
+        login.setCorpname(bankResponseBase.getCorpName());
+        login.setErrorMsg(bankResponseBase.getErrorMsg());
+        login.setRetCode(bankResponseBase.getRetCode());
+        login.setReqTime(param.getReqTime());
+        login.setSerialNo(param.getSerialNo());
+        login.setServiceId(login.getServiceId());
+        login.setSessionId(bankResponseBase.getSessionId());
+        login.setSystemid(param.getData().getSystemId());
+        login.setUserid(param.getData().getUserID());
+        login.setUserpwd(param.getData().getUserPWD());
+       return   addBUserLogin(login);
+
+    }
+
+    @Override
+    public int addBUserLogin(BUserLogin bUserLogin) {
+        if (bUserLogin != null){
+            bUserLogin.setCreateTime(new Date());
+            return bUserLoginMapper.insert(bUserLogin);
+        }
+        return 0;
+    }
+
+    @Override
+    public PageInfo<BUserLogin> listBUserLogin(BaseForm baseForm) {
+        PageHelper.startPage(baseForm.getPageNo(),baseForm.getPageSize());
+        BUserLoginExample example = new BUserLoginExample();
+//        BUserLoginExample.Criteria criteria = example.createCriteria();
+        List<BUserLogin> logins = bUserLoginMapper.selectByExample(example);
+        return new PageInfo<>(logins);
+    }
+
+    @Override
+    public BUserLogin getDetail(Long guid) {
+        if (StringUtils.isNotNull(guid)){
+          return   bUserLoginMapper.selectByPrimaryKey(guid);
+        }
+        return null;
+    }
+
 }

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

@@ -0,0 +1,100 @@
+package com.hcloud.microserver.system.bank.service.impl;
+
+import com.hcloud.microserver.commoncore.domain.LoginUser;
+import com.hcloud.microserver.commoncore.domain.LoginUserDetails;
+import com.hcloud.microserver.commoncore.domain.SysRole;
+import com.hcloud.microserver.commoncore.domain.SysUser;
+import com.hcloud.microserver.commoncore.util.string.StringUtils;
+import com.hcloud.microserver.system.bank.dao.SysUserMapper;
+import com.hcloud.microserver.system.bank.service.SysUserService;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.*;
+
+@Service
+@Slf4j
+public class SysUserServiceImpl implements SysUserService {
+
+    @Autowired
+    private SysUserMapper userMapper;
+
+    @Override
+    public LoginUserDetails loadUser(String username) {
+        SysUser sysUser = userMapper.selectUserByUserName(username);
+        if (sysUser != null){
+
+            // 角色集合
+            Set<String> roles = getRolePermission(sysUser.getUserId());
+            // 权限集合
+            Set<String> permissions = getMenuPermission(sysUser.getUserId());
+            List<String> menuPermission = new ArrayList<>(permissions);
+            LoginUser sysUserVo = new LoginUser();
+            sysUserVo.setSysUser(sysUser);
+            sysUserVo.setRoles(roles);
+            sysUserVo.setPermissions(permissions);
+            return new LoginUserDetails(sysUserVo,menuPermission);
+        }
+        return null;
+    }
+
+    public Set<String> getRolePermission(Long userId)
+    {
+        Set<String> roles = new HashSet<String>();
+        // 管理员拥有所有权限
+        if (SysUser.isAdmin(userId))
+        {
+            roles.add("admin");
+        }
+        else
+        {
+            roles.addAll(selectRolePermissionByUserId(userId));
+        }
+        return roles;
+    }
+
+    public Set<String> selectRolePermissionByUserId(Long userId)
+    {
+        List<SysRole> perms = userMapper.selectRolePermissionByUserId(userId);
+        Set<String> permsSet = new HashSet<>();
+        for (SysRole perm : perms)
+        {
+            if (StringUtils.isNotNull(perm))
+            {
+                permsSet.addAll(Arrays.asList(perm.getRoleKey().trim().split(",")));
+            }
+        }
+        return permsSet;
+    }
+
+
+    public Set<String> getMenuPermission(Long userId)
+    {
+        Set<String> perms = new HashSet<String>();
+        // 管理员拥有所有权限
+        if (SysUser.isAdmin(userId))
+        {
+            perms.add("*:*:*");
+        }
+        else
+        {
+            perms.addAll(selectMenuPermsByUserId(userId));
+        }
+        return perms;
+    }
+
+    public Set<String> selectMenuPermsByUserId(Long userId)
+    {
+        List<String> perms = userMapper.selectMenuPermsByUserId(userId);
+        Set<String> permsSet = new HashSet<>();
+        for (String perm : perms)
+        {
+            if (StringUtils.isNotEmpty(perm))
+            {
+                permsSet.addAll(Arrays.asList(perm.trim().split(",")));
+            }
+        }
+        return permsSet;
+    }
+}

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

@@ -47,6 +47,13 @@ public class BankUtil {
     @Value("${cqrcb.bank.sslclient.port}")
     private int port;
 
+
+    @Value("${redis.buser.key}")
+    private String bankUserKey;
+
+    @Value("${redis.buser.expire}")
+    private long bankUserExpire;
+
     @Autowired
     private RedisTemplate redisTemplate;
 
@@ -376,14 +383,16 @@ public class BankUtil {
     }
 
 
-    public void cacheLoginSession(BankLoginUserRespBO bankLoginUserRespBO){
+    public void cacheLoginSession(BankLoginUserRespBO bankLoginUserRespBO,String userId){
         ValueOperations ops = redisTemplate.opsForValue();
-        ops.set("cqcarbon.bank.user.sessionId",bankLoginUserRespBO,12*3600, TimeUnit.SECONDS);
+        String key = bankUserKey+":"+userId;
+        ops.set(key,bankLoginUserRespBO,bankUserExpire, TimeUnit.SECONDS);
     }
 
-    public BankLoginUserRespBO getLoginSession(){
+    public BankLoginUserRespBO getLoginSession(String userId){
+        String key = bankUserKey+":"+userId;
         ValueOperations ops = redisTemplate.opsForValue();
-        BankLoginUserRespBO o = (BankLoginUserRespBO)ops.get("cqcarbon.bank.user.sessionId");
+        BankLoginUserRespBO o = (BankLoginUserRespBO)ops.get(key);
         if (o != null){
             return o;
         }

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

@@ -0,0 +1,104 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.hcloud.microserver.system.bank.dao.SysUserMapper">
+
+	<resultMap type="com.hcloud.microserver.commoncore.domain.SysUser" id="SysUserResult">
+		<id     property="userId"       column="user_id"      />
+		<result property="deptId"       column="dept_id"      />
+		<result property="userName"     column="user_name"    />
+		<result property="nickName"     column="nick_name"    />
+		<result property="email"        column="email"        />
+		<result property="phonenumber"  column="phonenumber"  />
+		<result property="sex"          column="sex"          />
+		<result property="avatar"       column="avatar"       />
+		<result property="password"     column="password"     />
+		<result property="status"       column="status"       />
+		<result property="delFlag"      column="del_flag"     />
+		<result property="loginIp"      column="login_ip"     />
+		<result property="loginDate"    column="login_date"   />
+		<result property="createBy"     column="create_by"    />
+		<result property="createTime"   column="create_time"  />
+		<result property="updateBy"     column="update_by"    />
+		<result property="updateTime"   column="update_time"  />
+		<result property="remark"       column="remark"       />
+		<association property="dept"    column="dept_id" javaType="com.hcloud.microserver.commoncore.domain.SysDept" resultMap="deptResult" />
+		<collection  property="roles"   javaType="java.util.List"        resultMap="RoleResult" />
+	</resultMap>
+	
+	<resultMap id="deptResult" type="com.hcloud.microserver.commoncore.domain.SysDept">
+		<id     property="deptId"   column="dept_id"     />
+		<result property="parentId" column="parent_id"   />
+		<result property="deptName" column="dept_name"   />
+		<result property="orderNum" column="order_num"   />
+		<result property="leader"   column="leader"      />
+		<result property="status"   column="dept_status" />
+	</resultMap>
+	
+	<resultMap id="RoleResult" type="com.hcloud.microserver.commoncore.domain.SysRole">
+		<id     property="roleId"       column="role_id"        />
+		<result property="roleName"     column="role_name"      />
+		<result property="roleKey"      column="role_key"       />
+		<result property="roleSort"     column="role_sort"      />
+		<result property="dataScope"     column="data_scope"    />
+		<result property="status"       column="role_status"    />
+	</resultMap>
+
+
+	<resultMap type="com.hcloud.microserver.commoncore.domain.SysRole" id="SysRoleResult">
+		<id     property="roleId"             column="role_id"               />
+		<result property="roleName"           column="role_name"             />
+		<result property="roleKey"            column="role_key"              />
+		<result property="roleSort"           column="role_sort"             />
+		<result property="dataScope"          column="data_scope"            />
+		<result property="menuCheckStrictly"  column="menu_check_strictly"   />
+		<result property="deptCheckStrictly"  column="dept_check_strictly"   />
+		<result property="status"             column="status"                />
+		<result property="delFlag"            column="del_flag"              />
+		<result property="createBy"           column="create_by"             />
+		<result property="createTime"         column="create_time"           />
+		<result property="updateBy"           column="update_by"             />
+		<result property="updateTime"         column="update_time"           />
+		<result property="remark"             column="remark"                />
+	</resultMap>
+	
+	<sql id="selectUserVo">
+        select u.user_id, u.dept_id, u.user_name, u.nick_name, u.email, u.avatar, u.phonenumber, u.password, u.sex, u.status, u.del_flag, u.login_ip, u.login_date, u.create_by, u.create_time, u.remark, 
+        d.dept_id, d.parent_id, d.dept_name, d.order_num, d.leader, d.status as dept_status,
+        r.role_id, r.role_name, r.role_key, r.role_sort, r.data_scope, r.status as role_status
+        from sys_user u
+		    left join sys_dept d on u.dept_id = d.dept_id
+		    left join sys_user_role ur on u.user_id = ur.user_id
+		    left join sys_role r on r.role_id = ur.role_id
+    </sql>
+
+	
+	<select id="selectUserByUserName" parameterType="String" resultMap="SysUserResult">
+	    <include refid="selectUserVo"/>
+		where u.user_name = #{userName}
+	</select>
+
+
+	<select id="selectRolePermissionByUserId" parameterType="Long" resultMap="SysRoleResult">
+		select distinct r.role_id, r.role_name, r.role_key, r.role_sort, r.data_scope, r.menu_check_strictly, r.dept_check_strictly,
+            r.status, r.del_flag, r.create_time, r.remark
+        from sys_role r
+	        left join sys_user_role ur on ur.role_id = r.role_id
+	        left join sys_user u on u.user_id = ur.user_id
+	        left join sys_dept d on u.dept_id = d.dept_id
+		WHERE r.del_flag = '0' and ur.user_id = #{userId}
+	</select>
+
+	<select id="selectMenuPermsByUserId" parameterType="Long" resultType="String">
+		select distinct m.perms
+		from sys_menu m
+			 left join sys_role_menu rm on m.menu_id = rm.menu_id
+			 left join sys_user_role ur on rm.role_id = ur.role_id
+			 left join sys_role r on r.role_id = ur.role_id
+		where m.status = '0' and r.status = '0' and ur.user_id = #{userId}
+	</select>
+	
+
+	
+</mapper> 

carbon-bank/carbon-bank-service/src/main/resources/bootstrap.yml

@@ -13,9 +13,9 @@ spring:
   cloud:
     nacos:
       discovery:
-        server-addr: 127.0.0.1:8898
+        server-addr: 127.0.0.1:8892
       config:
-        server-addr: 127.0.0.1:8898
+        server-addr: 127.0.0.1:8892
         prefix: carbon-bank
         file-extension: yml
         # 公共配置文件

carbon-bank/pom.xml

@@ -12,6 +12,7 @@
     <modules>
         <module>carbon-bank-service</module>
         <module>carbon-bank-common</module>
+        <module>carbon-bank-mbg</module>
     </modules>
     <artifactId>carbon-bank</artifactId>
     <groupId>com.hcloud.microserver</groupId>

carbon-gateway/src/main/java/com/hcloud/microserver/gateway/filter/AuthGlobalFilter.java

@@ -6,7 +6,6 @@ import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.hcloud.microserver.commoncore.base.ResultCode;
 import com.hcloud.microserver.commoncore.constant.CacheConstants;
-import com.hcloud.microserver.commoncore.constant.Constants;
 import com.hcloud.microserver.commoncore.domain.R;
 import com.hcloud.microserver.commoncore.exception.ApiException;
 import com.hcloud.microserver.gateway.config.IgnoreUrlsConfig;

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

@@ -13,13 +13,14 @@ import java.util.Date;
 public class BaseForm implements Serializable {
 
     protected Integer page = 0;
-
+    @ApiModelProperty("分页页数")
     protected Integer pageNo = 0;
     /**
      * 分页
      */
     protected Integer pageNum = 1;
 
+    @ApiModelProperty("分页每页条数")
     protected Integer pageSize = 10;
 
     protected Integer pageStart;

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

@@ -5,6 +5,7 @@ import org.apache.commons.lang3.time.DateFormatUtils;
 import java.lang.management.ManagementFactory;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
+import java.util.Calendar;
 import java.util.Date;
 
 /**
@@ -162,4 +163,32 @@ public class DateUtils extends org.apache.commons.lang3.time.DateUtils
         // long sec = diff % nd % nh % nm / ns;
         return day + "天" + hour + "小时" + min + "分钟";
     }
+
+    /**
+     * 获取当前天的开始时间
+     * @param date
+     * @return
+     */
+    public static Date getTodayStartTime(Date date) {
+
+        Calendar todayStart = Calendar.getInstance();
+        if (date != null){
+            todayStart.setTime(date);
+        }
+        todayStart.set(Calendar.HOUR_OF_DAY, 0);
+        todayStart.set(Calendar.MINUTE, 0);
+        todayStart.set(Calendar.SECOND, 0);
+        return todayStart.getTime();
+    }
+
+    public static Date getTodayEndTime(Date date) {
+        Calendar todayEnd = Calendar.getInstance();
+        if (date != null){
+            todayEnd.setTime(date);
+        }
+        todayEnd.set(Calendar.HOUR_OF_DAY, 23);
+        todayEnd.set(Calendar.MINUTE, 59);
+        todayEnd.set(Calendar.SECOND, 59);
+        return todayEnd.getTime();
+    }
 }