第三方支付

src/main/java/com/poteviohealth/ym/ipos/config/MetaHandler.java

@@ -0,0 +1,36 @@
+package com.poteviohealth.ym.ipos.config;
+
+import com.baomidou.mybatisplus.core.handlers.MetaObjectHandler;
+import org.apache.ibatis.reflection.MetaObject;
+import org.springframework.stereotype.Component;
+
+import java.util.Date;
+
+/**
+ * 处理新增和更新的基础数据填充，配合BaseEntity和MyBatisPlusConfig使用
+ * @author Qin
+ */
+@Component
+public class MetaHandler implements MetaObjectHandler {
+
+    /**
+     * 新增数据执行
+     * @param metaObject
+     */
+    @Override
+    public void insertFill(MetaObject metaObject) {
+        this.setFieldValByName("createdDate", new Date(), metaObject);
+        this.setFieldValByName("modifiedDate", new Date(), metaObject);
+        this.setFieldValByName("yn", 0, metaObject);
+    }
+
+    /**
+     * 更新数据执行
+     * @param metaObject
+     */
+    @Override
+    public void updateFill(MetaObject metaObject) {
+        this.setFieldValByName("modifiedDate", new Date(), metaObject);
+    }
+
+}

src/main/java/com/poteviohealth/ym/ipos/config/MybatisPlusConfig.java

@@ -0,0 +1,50 @@
+package com.poteviohealth.ym.ipos.config;
+
+import com.baomidou.mybatisplus.core.config.GlobalConfig;
+import com.baomidou.mybatisplus.extension.plugins.PaginationInterceptor;
+import org.mybatis.spring.annotation.MapperScan;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+
+/**
+ * @author LG
+ * @since 2019/8/1
+ */
+@Configuration
+@MapperScan("com.poteviohealth.ym.ipos.mapper")
+public class MybatisPlusConfig {
+
+    /**
+     * 自动填充功能
+     *
+     * @return
+     */
+    @Bean
+    public GlobalConfig globalConfig() {
+        GlobalConfig globalConfig = new GlobalConfig();
+        globalConfig.setMetaObjectHandler(new MetaHandler());
+        return globalConfig;
+    }
+
+    /**
+     * mybatis-plus分页插件<br>
+     * 文档：http://mp.baomidou.com<br>
+     */
+    @Bean
+    public PaginationInterceptor paginationInterceptor() {
+        PaginationInterceptor paginationInterceptor = new PaginationInterceptor();
+        return paginationInterceptor;
+    }
+
+//    //开启SQL性能分析插件
+//    @Bean
+//    @Profile({"dev","test"})    //设置dev和test环境开启，生产不开启
+//    public PerformanceInterceptor performanceInterceptor() {
+//        PerformanceInterceptor performanceInterceptor = new PerformanceInterceptor();
+//        performanceInterceptor.setMaxTime(1); //设置sql执行的最大时间，单位为毫秒。超过最大时间则为慢sql
+//        performanceInterceptor.setFormat(true); //是否格式化代码
+//        return performanceInterceptor;
+//    }
+
+
+}

src/main/java/com/poteviohealth/ym/ipos/controller/AreaController.java

@@ -0,0 +1,39 @@
+package com.poteviohealth.ym.ipos.controller;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.poteviohealth.cgp.common.controller.BaseWebController;
+import com.poteviohealth.cgp.common.model.IntegerParams;
+import com.poteviohealth.cgp.common.model.VaultsResponse;
+import com.poteviohealth.ym.ipos.model.Area;
+import com.poteviohealth.ym.ipos.service.IAreaService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.http.MediaType;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+import java.util.List;
+
+/**
+ * 区域
+ * @author Qin
+ */
+@RestController
+@RequestMapping("/ipos/web/area")
+@Api(value = "AreaController", tags = "地理区域", produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
+public class AreaController extends BaseWebController {
+    @Resource
+    private IAreaService areaService;
+
+    @PostMapping("/listArea")
+    @ApiOperation(httpMethod = "POST", value = "查询列表")
+    public VaultsResponse<List<Area>> listArea(@RequestBody IntegerParams params) {
+        QueryWrapper<Area> queryWrapper = new QueryWrapper<>();
+        if(params.getId() == null){
+            queryWrapper.isNull("parent_id");
+        }else{
+            queryWrapper.eq("parent_id",params.getId());
+        }
+        return VaultsResponse.success(areaService.list(queryWrapper));
+    }
+}

src/main/java/com/poteviohealth/ym/ipos/controller/BankController.java

@@ -0,0 +1,60 @@
+package com.poteviohealth.ym.ipos.controller;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.poteviohealth.cgp.common.controller.BaseWebController;
+import com.poteviohealth.cgp.common.integrated.StringParams;
+import com.poteviohealth.cgp.common.model.IntegerParams;
+import com.poteviohealth.cgp.common.model.VaultsResponse;
+import com.poteviohealth.ym.ipos.model.Area;
+import com.poteviohealth.ym.ipos.model.Bank;
+import com.poteviohealth.ym.ipos.model.BankBranch;
+import com.poteviohealth.ym.ipos.model.dto.BankDto;
+import com.poteviohealth.ym.ipos.service.IAreaService;
+import com.poteviohealth.ym.ipos.service.IBankBranchService;
+import com.poteviohealth.ym.ipos.service.IBankService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.http.MediaType;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+import java.util.List;
+
+/**
+ * 银行信息
+ * @author Qin
+ */
+@RestController
+@RequestMapping("/ipos/web/bank")
+@Api(value = "BankController", tags = "银行信息", produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
+public class BankController extends BaseWebController {
+    @Resource
+    private IBankService bankService;
+    @Resource
+    private IBankBranchService bankBranchService;
+
+    @PostMapping("/listBank")
+    @ApiOperation(httpMethod = "POST", value = "查询银行列表")
+    public VaultsResponse<List<Bank>> listBank(@RequestBody BankDto params) {
+        QueryWrapper<Bank> queryWrapper = new QueryWrapper<>();
+        if(StringUtils.isNotEmpty(params.getName())){
+            queryWrapper.like("name",params.getId());
+        }
+        return VaultsResponse.success(bankService.list(queryWrapper));
+    }
+
+
+    @PostMapping("/listBankBranch")
+    @ApiOperation(httpMethod = "POST", value = "查询分行列表")
+    public VaultsResponse<List<BankBranch>> listBankBranch(@RequestBody BankDto params) {
+        QueryWrapper<BankBranch> queryWrapper = new QueryWrapper<>();
+        if(params.getId() != null){
+            queryWrapper.eq("bank_id",params.getId());
+        }
+        if(StringUtils.isNotEmpty(params.getName())){
+            queryWrapper.like("name",params.getName());
+        }
+        return VaultsResponse.success(bankBranchService.list(queryWrapper));
+    }
+}

src/main/java/com/poteviohealth/ym/ipos/controller/MerchantController.java

@@ -4,6 +4,7 @@ import com.poteviohealth.cgp.common.controller.BaseWebController;
 import com.poteviohealth.cgp.common.facade.log.OperateType;
 import com.poteviohealth.cgp.common.facade.log.OperationLog;
 import com.poteviohealth.cgp.common.model.VaultsResponse;
+import com.poteviohealth.ym.ipos.model.merchant.dto.ImageDto;
 import com.poteviohealth.ym.ipos.model.merchant.dto.SearchDto;
 import com.poteviohealth.ym.ipos.model.merchant.dto.UserDto;
 import com.poteviohealth.ym.ipos.model.merchant.back.UserSearchBack;
@@ -40,8 +41,8 @@ public class MerchantController  extends BaseWebController {
     @PostMapping("/merchantPicture")
     @ApiOperation(value = "上传图片")
     @OperationLog(type = OperateType.ADD, description ="上传图片")
-    public VaultsResponse merchantPicture(MultipartFile file, String type) {
-        return merchantService.merchantPicture(file,type);
+    public VaultsResponse merchantPicture(@RequestBody ImageDto dto) {
+        return merchantService.merchantPicture(dto);
     }
 
     @PostMapping("/merchantQuery")

src/main/java/com/poteviohealth/ym/ipos/mapper/AreaMapper.java

@@ -0,0 +1,12 @@
+package com.poteviohealth.ym.ipos.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.poteviohealth.ym.ipos.model.Area;
+
+/**
+ * 区域
+ * @author Qin
+ */
+public interface AreaMapper extends BaseMapper<Area> {
+
+}

src/main/java/com/poteviohealth/ym/ipos/mapper/BankBranchMapper.java

@@ -0,0 +1,12 @@
+package com.poteviohealth.ym.ipos.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.poteviohealth.ym.ipos.model.BankBranch;
+
+/**
+ * 银行支行
+ * @author Qin
+ */
+public interface BankBranchMapper extends BaseMapper<BankBranch> {
+
+}

src/main/java/com/poteviohealth/ym/ipos/mapper/BankMapper.java

@@ -0,0 +1,12 @@
+package com.poteviohealth.ym.ipos.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.poteviohealth.ym.ipos.model.Bank;
+
+/**
+ * 银行
+ * @author Qin
+ */
+public interface BankMapper extends BaseMapper<Bank> {
+
+}

src/main/java/com/poteviohealth/ym/ipos/model/Area.java

@@ -0,0 +1,32 @@
+package com.poteviohealth.ym.ipos.model;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.poteviohealth.cgp.common.model.BaseEntity;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * 区域
+ * @author Qin
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@Accessors(chain = true)
+@TableName("ipos_area")
+public class Area extends BaseEntity {
+
+    @ApiModelProperty(value = "名称")
+    private String name;
+
+    @ApiModelProperty(value = "编码")
+    private String code;
+
+    @ApiModelProperty(value = "路径")
+    private String codePath;
+
+    @ApiModelProperty(value = "上级ID")
+    private Integer parentId;
+
+}

src/main/java/com/poteviohealth/ym/ipos/model/Bank.java

@@ -0,0 +1,26 @@
+package com.poteviohealth.ym.ipos.model;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.poteviohealth.cgp.common.model.BaseEntity;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * 银行
+ * @author Qin
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@Accessors(chain = true)
+@TableName("ipos_bank")
+public class Bank extends BaseEntity {
+
+    @ApiModelProperty(value = "编码")
+    private String code;
+
+    @ApiModelProperty(value = "名称")
+    private String name;
+
+}

src/main/java/com/poteviohealth/ym/ipos/model/BankBranch.java

@@ -0,0 +1,31 @@
+package com.poteviohealth.ym.ipos.model;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.poteviohealth.cgp.common.model.BaseEntity;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * 银行支行
+ * @author Qin
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@Accessors(chain = true)
+@TableName("ipos_bank_branch")
+public class BankBranch extends BaseEntity {
+
+    @ApiModelProperty(value = "id")
+    private String branchId;
+
+    @ApiModelProperty(value = "银行Id")
+    private Integer bankId;
+
+    @ApiModelProperty(value = "编码")
+    private String code;
+
+    @ApiModelProperty(value = "名称")
+    private String name;
+}

src/main/java/com/poteviohealth/ym/ipos/model/dto/BankDto.java

@@ -0,0 +1,19 @@
+package com.poteviohealth.ym.ipos.model.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * 银行dto
+ * @author Qin
+ */
+@Data
+public class BankDto {
+
+    @ApiModelProperty(value = "名称")
+    private String name;
+
+    @ApiModelProperty(value = "银行Id")
+    private Integer id;
+
+}

src/main/java/com/poteviohealth/ym/ipos/model/merchant/dto/ImageDto.java

@@ -0,0 +1,44 @@
+package com.poteviohealth.ym.ipos.model.merchant.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * 图片上传dto
+ * @author Qin
+ */
+@Data
+public class ImageDto {
+
+
+    /**
+     * 01：负责人或企业法人代表的身份证图片正面
+     * 02：负责人或企业法人代表的身份证图片反面
+     * 03：营业执照图片
+     * 04：组织机构代码证图片
+     * 05：开户许可证照片
+     * 06：门头照
+     * 07：其他图片
+     * 08：收银台照片
+     * 09：门店内景照片
+     * 10： 各大餐饮平台入驻照片
+     * 11： 手持身份证照片
+     * 12： 租赁协议图片
+     * 13：结算卡正面照
+     * 14：结算卡反面照
+     * 15：法人护照人像面
+     * 17：法人港澳台通行证正面
+     * 19：法人其它证件照片(如外国人居留证)
+     * 21：法人其它证件照片-港澳居民证
+     * 23：法人其它证件照片-台湾居民证
+     */
+    @ApiModelProperty(value = "类型")
+    private String type;
+
+    @ApiModelProperty(value = "名称")
+    private String name;
+
+    @ApiModelProperty(value = "图片base64")
+    private String base64Str;
+
+}

src/main/java/com/poteviohealth/ym/ipos/model/merchant/dto/UserDto.java

@@ -51,10 +51,10 @@ public class UserDto {
     private String merchant_id;
 
     @ApiModelProperty(value = "法人证件有效期开始时间,格式：yyyyMMdd")
-    private Date identity_begin_date;
+    private String identity_begin_date;
 
     @ApiModelProperty(value = "法人证件有效期结束时间,格式：yyyyMMdd；非长期有效时必填")
-    private Date identity_end_date;
+    private String identity_end_date;
 
     @ApiModelProperty(value = "法人证件有效期类型,1：长期，0：非长期，默认0")
     private String identity_validity_type;
@@ -72,10 +72,10 @@ public class UserDto {
     private String license_code;
 
     @ApiModelProperty(value = "营业执照有效开始日期,格式：yyyyMMdd")
-    private Date license_begin_date;
+    private String license_begin_date;
 
     @ApiModelProperty(value = "营业执照有效结束日期,非永久有效时必填")
-    private Date license_end_date;
+    private String license_end_date;
 
     @ApiModelProperty(value = "营业执照永久有效标识,1：永久，0：非永久，默认0")
     private String license_validity_type;

src/main/java/com/poteviohealth/ym/ipos/service/IAreaService.java

@@ -0,0 +1,12 @@
+package com.poteviohealth.ym.ipos.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.poteviohealth.ym.ipos.model.Area;
+
+/**
+ * 区域
+ * @author Qin
+ */
+public interface IAreaService extends IService<Area> {
+
+}

src/main/java/com/poteviohealth/ym/ipos/service/IBankBranchService.java

@@ -0,0 +1,12 @@
+package com.poteviohealth.ym.ipos.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.poteviohealth.ym.ipos.model.BankBranch;
+
+/**
+ * 银行支行
+ * @author Qin
+ */
+public interface IBankBranchService extends IService<BankBranch> {
+
+}

src/main/java/com/poteviohealth/ym/ipos/service/IBankService.java

@@ -0,0 +1,12 @@
+package com.poteviohealth.ym.ipos.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.poteviohealth.ym.ipos.model.Bank;
+
+/**
+ * 银行
+ * @author Qin
+ */
+public interface IBankService extends IService<Bank> {
+
+}

src/main/java/com/poteviohealth/ym/ipos/service/IMerchantService.java

@@ -2,6 +2,7 @@ package com.poteviohealth.ym.ipos.service;
 
 import com.poteviohealth.cgp.common.model.VaultsResponse;
 import com.poteviohealth.ym.ipos.model.merchant.back.UserSearchBack;
+import com.poteviohealth.ym.ipos.model.merchant.dto.ImageDto;
 import com.poteviohealth.ym.ipos.model.merchant.dto.UserDto;
 import org.springframework.web.multipart.MultipartFile;
 
@@ -13,11 +14,10 @@ public interface IMerchantService {
 
     /**
      * 上传图片
-     * @param file
-     * @param type
+     * @param dto
      * @return
      */
-     VaultsResponse merchantPicture(MultipartFile file,String type);
+     VaultsResponse merchantPicture(ImageDto dto);
 
     /**
      * 商户新增/修改开户入驻

src/main/java/com/poteviohealth/ym/ipos/service/impl/AreaServiceImpl.java

@@ -0,0 +1,17 @@
+package com.poteviohealth.ym.ipos.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.poteviohealth.ym.ipos.mapper.AreaMapper;
+import com.poteviohealth.ym.ipos.model.Area;
+import com.poteviohealth.ym.ipos.service.IAreaService;
+import org.springframework.stereotype.Service;
+
+/**
+ * 区域
+ * @author Qin
+ */
+@Service
+public class AreaServiceImpl extends ServiceImpl<AreaMapper, Area> implements IAreaService {
+
+
+}

src/main/java/com/poteviohealth/ym/ipos/service/impl/BankBranchServiceImpl.java

@@ -0,0 +1,17 @@
+package com.poteviohealth.ym.ipos.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.poteviohealth.ym.ipos.mapper.BankBranchMapper;
+import com.poteviohealth.ym.ipos.model.BankBranch;
+import com.poteviohealth.ym.ipos.service.IBankBranchService;
+import org.springframework.stereotype.Service;
+
+/**
+ * 银行支行
+ * @author Qin
+ */
+@Service
+public class BankBranchServiceImpl extends ServiceImpl<BankBranchMapper, BankBranch> implements IBankBranchService {
+
+
+}

src/main/java/com/poteviohealth/ym/ipos/service/impl/BankServiceImpl.java

@@ -0,0 +1,17 @@
+package com.poteviohealth.ym.ipos.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.poteviohealth.ym.ipos.mapper.BankMapper;
+import com.poteviohealth.ym.ipos.model.Bank;
+import com.poteviohealth.ym.ipos.service.IBankService;
+import org.springframework.stereotype.Service;
+
+/**
+ * 银行
+ * @author Qin
+ */
+@Service
+public class BankServiceImpl extends ServiceImpl<BankMapper, Bank> implements IBankService {
+
+
+}

src/main/java/com/poteviohealth/ym/ipos/service/impl/IMerchantServiceImpl.java → src/main/java/com/poteviohealth/ym/ipos/service/impl/MerchantServiceImpl.java

@@ -8,6 +8,7 @@ import com.poteviohealth.cgp.common.model.VaultsResponse;
 import com.poteviohealth.ym.ipos.model.back.BaseBack;
 import com.poteviohealth.ym.ipos.model.merchant.*;
 import com.poteviohealth.ym.ipos.model.merchant.detail.*;
+import com.poteviohealth.ym.ipos.model.merchant.dto.ImageDto;
 import com.poteviohealth.ym.ipos.model.merchant.dto.UserDto;
 import com.poteviohealth.ym.ipos.model.merchant.back.PictureBack;
 import com.poteviohealth.ym.ipos.model.merchant.back.UserBack;
@@ -29,7 +30,7 @@ import java.io.IOException;
  */
 @Service
 @Log4j2
-public class IMerchantServiceImpl implements IMerchantService {
+public class MerchantServiceImpl implements IMerchantService {
 
     final String SUCCESS =  "0000";
 
@@ -40,27 +41,16 @@ public class IMerchantServiceImpl implements IMerchantService {
 
     /**
      * 上传图片
-     * @param file
-     * @param type
+     * @param dto
      * @return
      */
     @Override
-    public VaultsResponse merchantPicture(MultipartFile file, String type){
-        if (file == null || file.isEmpty()) {
-            throw new RuntimeException("图片不能为空！");
-        }
+    public VaultsResponse merchantPicture(ImageDto dto){
         Picture p = new Picture();
         PictureDetail detail = new PictureDetail();
-        detail.setType(type);
-        detail.setImage_name(file.getOriginalFilename());
-        byte[] binaryData = new byte[0];
-        try {
-            binaryData = file.getBytes();
-        } catch (IOException e) {
-            e.printStackTrace();
-        }
-        String encodedPolicy = Base64Encoder.encode(binaryData);
-        detail.setImage_content(encodedPolicy);
+        detail.setType(dto.getType());
+        detail.setImage_name(dto.getName());
+        detail.setImage_content(dto.getBase64Str());
         p.setMerchant_picture_request(detail);
 
         PictureBack back = (PictureBack) YmUtil.resultBack(p,new PictureBack());
@@ -205,9 +195,9 @@ public class IMerchantServiceImpl implements IMerchantService {
         IndvregisterAdd iAdd = new IndvregisterAdd();
         IndvregisterAddDetail detail = new IndvregisterAddDetail();
         detail.setMerchant_id(dto.getMerchant_id());
-        detail.setIdentity_begin_date(DateFormatUtils.format(dto.getIdentity_begin_date(),"yyyyMMdd"));
-        if(dto.getIdentity_end_date() != null){
-            detail.setIdentity_end_date(DateFormatUtils.format(dto.getIdentity_end_date(),"yyyyMMdd"));
+        detail.setIdentity_begin_date(dto.getIdentity_begin_date());
+        if(StringUtils.isNotEmpty(dto.getIdentity_end_date())){
+            detail.setIdentity_end_date(dto.getIdentity_end_date());
         }
         detail.setIdentity_validity_type(dto.getIdentity_validity_type());
         detail.setContact_phone(dto.getContact_phone());
@@ -235,9 +225,9 @@ public class IMerchantServiceImpl implements IMerchantService {
         IndvregisterUpdate iUpdate = new IndvregisterUpdate();
         IndvregisterUpdateDetail iUpdateDetail = new IndvregisterUpdateDetail();
         iUpdateDetail.setMerchant_id(dto.getMerchant_id());
-        iUpdateDetail.setIdentity_begin_date(DateFormatUtils.format(dto.getIdentity_begin_date(),"yyyyMMdd"));
-        if(dto.getIdentity_end_date() != null){
-            iUpdateDetail.setIdentity_end_date(DateFormatUtils.format(dto.getIdentity_end_date(),"yyyyMMdd"));
+        iUpdateDetail.setIdentity_begin_date(dto.getIdentity_begin_date());
+        if(StringUtils.isNotEmpty(dto.getIdentity_end_date())){
+            iUpdateDetail.setIdentity_end_date(dto.getIdentity_end_date());
         }
         iUpdateDetail.setIdentity_validity_type(dto.getIdentity_validity_type());
         iUpdateDetail.setContact_phone(dto.getContact_phone());
@@ -262,9 +252,9 @@ public class IMerchantServiceImpl implements IMerchantService {
         EntregisterAdd iAdd = new EntregisterAdd();
         EntregisterAddDetail detail = new EntregisterAddDetail();
         detail.setMerchant_id(dto.getMerchant_id());
-        detail.setLicense_begin_date(DateFormatUtils.format(dto.getLicense_begin_date(),"yyyyMMdd"));
-        if(dto.getLicense_end_date() != null){
-            detail.setLicense_end_date(DateFormatUtils.format(dto.getLicense_end_date(),"yyyyMMdd"));
+        detail.setLicense_begin_date(dto.getLicense_begin_date());
+        if(StringUtils.isNotEmpty(dto.getLicense_end_date())){
+            detail.setLicense_end_date(dto.getLicense_end_date());
         }
         detail.setLicense_validity_type(dto.getLicense_validity_type());
         detail.setLicense_province_code(dto.getLicense_province_code());
@@ -273,9 +263,9 @@ public class IMerchantServiceImpl implements IMerchantService {
         detail.setLicense_address(dto.getLicense_address());
         detail.setLegal_name(dto.getLegal_name());
         detail.setIdentity_no(dto.getIdentity_no());
-        detail.setIdentity_begin_date(DateFormatUtils.format(dto.getIdentity_begin_date(),"yyyyMMdd"));
-        if(dto.getIdentity_end_date() != null){
-            detail.setIdentity_end_date(DateFormatUtils.format(dto.getIdentity_end_date(),"yyyyMMdd"));
+        detail.setIdentity_begin_date(dto.getIdentity_begin_date());
+        if(StringUtils.isNotEmpty(dto.getIdentity_end_date())){
+            detail.setIdentity_end_date(dto.getIdentity_end_date());
         }
         detail.setIdentity_validity_type(dto.getIdentity_validity_type());
         detail.setContact_name(dto.getContact_name());
@@ -304,9 +294,9 @@ public class IMerchantServiceImpl implements IMerchantService {
         EntregisterUpdate iUpdate = new EntregisterUpdate();
         EntregisterUpdateDetail iUpdateDetail = new EntregisterUpdateDetail();
         iUpdateDetail.setMerchant_id(dto.getMerchant_id());
-        iUpdateDetail.setLicense_begin_date(DateFormatUtils.format(dto.getLicense_begin_date(),"yyyyMMdd"));
-        if(dto.getLicense_end_date() != null){
-            iUpdateDetail.setLicense_end_date(DateFormatUtils.format(dto.getLicense_end_date(),"yyyyMMdd"));
+        iUpdateDetail.setLicense_begin_date(dto.getLicense_begin_date());
+        if(StringUtils.isNotEmpty(dto.getLicense_end_date())){
+            iUpdateDetail.setLicense_end_date(dto.getLicense_end_date());
         }
         iUpdateDetail.setLicense_validity_type(dto.getLicense_validity_type());
         iUpdateDetail.setLicense_province_code(dto.getLicense_province_code());
@@ -315,9 +305,9 @@ public class IMerchantServiceImpl implements IMerchantService {
         iUpdateDetail.setLicense_address(dto.getLicense_address());
         iUpdateDetail.setLegal_name(dto.getLegal_name());
         iUpdateDetail.setIdentity_no(dto.getIdentity_no());
-        iUpdateDetail.setIdentity_begin_date(DateFormatUtils.format(dto.getIdentity_begin_date(),"yyyyMMdd"));
-        if(dto.getIdentity_end_date() != null){
-            iUpdateDetail.setIdentity_end_date(DateFormatUtils.format(dto.getIdentity_end_date(),"yyyyMMdd"));
+        iUpdateDetail.setIdentity_begin_date(dto.getIdentity_begin_date());
+        if(StringUtils.isNotEmpty(dto.getIdentity_end_date())){
+            iUpdateDetail.setIdentity_end_date(dto.getIdentity_end_date());
         }
         iUpdateDetail.setIdentity_validity_type(dto.getIdentity_validity_type());
         iUpdateDetail.setContact_name(dto.getContact_name());

src/main/resources/mapper/ipos/AreaMapper.xml

@@ -0,0 +1,4 @@
+<?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.poteviohealth.ym.ipos.mapper.AreaMapper">
+</mapper>

src/main/resources/mapper/ipos/BankBranchMapper.xml

@@ -0,0 +1,4 @@
+<?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.poteviohealth.ym.ipos.mapper.BankBranchMapper">
+</mapper>

src/main/resources/mapper/ipos/BankMapper.xml

@@ -0,0 +1,4 @@
+<?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.poteviohealth.ym.ipos.mapper.BankMapper">
+</mapper>

src/main/resources/uat/application.yml

@@ -23,9 +23,9 @@ spring:
   datasource:
     type: com.alibaba.druid.pool.DruidDataSource
     druid:
-      url: jdbc:mysql://172.17.17.50:3306/cgp_common?characterEncoding=utf8&useSSL=false&serverTimezone=GMT%2B8&allowMultiQueries=true
-      username: cgpcomm
-      password: yqaa0107
+      url: jdbc:mysql://172.17.17.50:3306/ym_ipos?characterEncoding=utf8&useSSL=false&serverTimezone=GMT%2B8&allowMultiQueries=true
+      username: jkyl
+      password: jkyl2014
       filter: stat
       max-active: 100
       initial-size: 5
@@ -41,7 +41,7 @@ mybatis-plus:
 # Logger
 logging:
   level:
-    com.poteviohealth.cgp.partner.mapper: DEBUG
+    com.poteviohealth.ym.ipos.mapper: DEBUG
   config: classpath:logback-spring.xml
 
 ribbon: