1

winsea-haixin-plugin-servicer/pom.xml

@@ -1,57 +0,0 @@
-<?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>winsea-haixin</artifactId>
-        <groupId>com.yh.haixin</groupId>
-        <version>0.7.0</version>
-    </parent>
-    <modelVersion>4.0.0</modelVersion>
-
-    <artifactId>winsea-haixin-plugin-servicer</artifactId>
-    <packaging>jar</packaging>
-
-    <dependencies>
-        <dependency>
-            <groupId>io.springfox</groupId>
-            <artifactId>springfox-swagger2</artifactId>
-            <version>2.7.0</version>
-        </dependency>
-
-        <dependency>
-            <groupId>io.springfox</groupId>
-            <artifactId>springfox-swagger-ui</artifactId>
-            <version>2.6.1</version>
-        </dependency>
-
-        <dependency>
-            <groupId>com.yh.haixin</groupId>
-            <artifactId>winsea-haixin-plugin-base</artifactId>
-            <version>0.7.0</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-validation</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.cxf</groupId>
-            <artifactId>cxf-spring-boot-starter-jaxws</artifactId>
-            <version>3.3.3</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.cxf</groupId>
-            <artifactId>cxf-rt-ws-security</artifactId>
-            <version>3.3.3</version>
-        </dependency>
-        <dependency>
-            <groupId>mysql</groupId>
-            <artifactId>mysql-connector-java</artifactId>
-        </dependency>
-    </dependencies>
-
-
-
-</project>

winsea-haixin-plugin-servicer/src/main/java/com/yh/saas/plugin/servicer/annotation/DateTime.java

@@ -1,18 +0,0 @@
-package com.yh.saas.plugin.servicer.annotation;
-import javax.validation.Constraint;
-import javax.validation.Payload;
-
-import java.lang.annotation.*;
-
-@Target({ElementType.FIELD, ElementType.PARAMETER})
-@Retention(RetentionPolicy.RUNTIME)
-@Constraint(validatedBy = DateTimeValidator.class)
-public @interface DateTime {
-    String message() default "格式错误";
-
-    String format() default "yyyy/MM/dd";
-    
-    Class<?>[] groups() default {};
-
-    Class<? extends Payload>[] payload() default {};
-}

winsea-haixin-plugin-servicer/src/main/java/com/yh/saas/plugin/servicer/annotation/DateTimeValidator.java

@@ -1,39 +0,0 @@
-package com.yh.saas.plugin.servicer.annotation;
-
-
-import java.text.SimpleDateFormat;
-
-import javax.validation.ConstraintValidator;
-import javax.validation.ConstraintValidatorContext;
-
-public class DateTimeValidator implements ConstraintValidator<DateTime, String> {
-	
-	private DateTime dateTime;
-
-	@Override
-	public void initialize(DateTime dateTime) {
-		this.dateTime = dateTime;
-	}
-
-	@Override
-	public boolean isValid(String value, ConstraintValidatorContext context) { 
-																				
-        if (value == null) {
-            return true;
-        }
-		String format = dateTime.format();
-		
-		if (value.length() != format.length()) {
-			return false;
-		}
-		
-		SimpleDateFormat simpleDateFormat = new SimpleDateFormat(format);
-		try {
-			simpleDateFormat.setLenient(false);
-			simpleDateFormat.parse(value);
-		} catch (Exception e) {
-			return false;
-		}
-		return true;
-	}
-}

winsea-haixin-plugin-servicer/src/main/java/com/yh/saas/plugin/servicer/config/ServiceConfig.java

@@ -1,11 +0,0 @@
-package com.yh.saas.plugin.servicer.config;
-
-import com.yh.saas.common.support.plugin.RegisterPlugin;
-import org.mybatis.spring.annotation.MapperScan;
-import org.springframework.context.annotation.Configuration;
-
-@RegisterPlugin(id = "servicer", name = "服务商管理", desc = "服务商管理", entryPackage = {"com.yh.saas.plugin.servicer.controller"})
-@Configuration
-@MapperScan("com.yh.saas.plugin.servicer.mapper")
-public class ServiceConfig {
-}

winsea-haixin-plugin-servicer/src/main/java/com/yh/saas/plugin/servicer/constant/ServicerFeatureConstant.java

@@ -1,39 +0,0 @@
-package com.yh.saas.plugin.servicer.constant;
-/**
- * 服务商权限定义
- * 
- * @author yul
- *
- */
-public class ServicerFeatureConstant {
-
-	private ServicerFeatureConstant() {
-
-	}
-
-	/**
-	 * 服务商信息_查看
-	 */
-	public static final String SERVICER_MERCHANT_INFO_VIEW = "ServicerMerchant-View";
-
-	/**
-	 * 服务商信息_新增
-	 */
-	public static final String SERVICER_MERCHANT_INFO_ADD = "ServicerMerchant-Add";
-
-	/**
-	 * 服务商信息_编辑
-	 */
-	public static final String SERVICER_MERCHANT_INFO_EDIT = "ServicerMerchant-Edit";
-
-	/**
-	 * 服务商信息_提交
-	 */
-	public static final String SERVICER_MERCHANT_INFO_SUBMIT = "ServicerMerchant-Submit";
-
-	/**
-	 * 服务商信息_删除
-	 */
-	public static final String SERVICER_MERCHANT_INFO_REMOVE = "ServicerMerchant-Remove";
-
-}

winsea-haixin-plugin-servicer/src/main/java/com/yh/saas/plugin/servicer/constant/ServicerVariable.java

@@ -1,35 +0,0 @@
-package com.yh.saas.plugin.servicer.constant;
-
-/**
- * 服务商常量数据
- * 
- * @author yul
- *
- */
-public class ServicerVariable {
-
-	private ServicerVariable() {
-
-	}
-
-	/** 模块 */
-	public static final String SERVICER = "SERVICER";
-
-	/** 删除标识：已删除 */
-	public static final String DELETEFLAG_1 = "1";
-	/** 删除标识：未删除 */
-	public static final String DELETEFLAG_0 = "0";
-
-	/** 操作标识：新增保存 */
-	public static final String OPER_MODEL_ADD = "saveAdd";
-	/** 操作标识：编辑保存 */
-	public static final String OPER_MODEL_EDIT = "saveEdit";
-
-	/** 任务ID变量key */
-	public static final String TASKID = "taskId";
-
-	/** 审批通过标识：1通过，0驳回 */
-	public static final String APPROVE_PASS = "1";
-	public static final String APPROVE_NOT_PASS = "0";
-
-}

winsea-haixin-plugin-servicer/src/main/java/com/yh/saas/plugin/servicer/constant/ServicerWorkFlow.java

@@ -1,11 +0,0 @@
-package com.yh.saas.plugin.servicer.constant;
-
-public class ServicerWorkFlow {
-
-	// 新增服务商申请审核流businessCode
-	public static final String SERVICER_MERCHANT_ADD = "SERVICER-MERCHANT-ADD";
-
-	private ServicerWorkFlow() {
-
-	}
-}

winsea-haixin-plugin-servicer/src/main/java/com/yh/saas/plugin/servicer/controller/ServicerMerchantInfoController.java

@@ -1,177 +0,0 @@
-package com.yh.saas.plugin.servicer.controller;
-
-import com.baomidou.mybatisplus.plugins.Page;
-import com.winsea.svc.base.base.util.page.PageUtil;
-import com.yh.saas.common.support.plugin.PluginFeature;
-import com.yh.saas.plugin.servicer.entity.ServicerBillOperateHis;
-import com.yh.saas.plugin.servicer.entity.ServicerMerchantInfo;
-import com.yh.saas.plugin.servicer.entity.view.ServicerView;
-import com.yh.saas.plugin.servicer.service.IServicerBillOperateHisService;
-import com.yh.saas.plugin.servicer.service.IServicerMerchantInfoService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-
-import java.util.List;
-import java.util.Map;
-
-/**
- * <p>
- * 记录服务商信息表 前端控制器
- * </p>
- *
- * @author yul
- * @since 2019-11-11
- */
-@PluginFeature(id = "SupplyServicerMerchantInfo", name = "服务商信息")
-@RestController
-@RequestMapping("/servicerMerchantInfo")
-public class ServicerMerchantInfoController {
-
-	@Autowired
-	private IServicerMerchantInfoService merchantInfoService;
-
-	@Autowired
-	private IServicerBillOperateHisService servicerBillOperateHisService;
-
-	/**
-	 * 新增服务商信息
-	 * 
-	 * @param merchantInfoView
-	 * @return
-	 */
-	@PostMapping("/api/saveAdd")
-	@PluginFeature(id = "ServicerMerchant-Add", name = "服务商信息_新增")
-	public String saveAdd(@RequestBody ServicerView<ServicerMerchantInfo> merchantInfoView) {
-		return merchantInfoService.saveServicerMerchant(merchantInfoView);
-	}
-
-	/**
-	 * 编辑服务商信息
-	 * 
-	 * @param merchantInfoView
-	 */
-	@PostMapping("/api/saveEdit")
-	@PluginFeature(id = "ServicerMerchant-Edit", name = "服务商信息_编辑")
-	public void saveEdit(@RequestBody ServicerView<ServicerMerchantInfo> merchantInfoView) {
-		merchantInfoService.saveServicerMerchant(merchantInfoView);
-	}
-
-	/**
-	 * 提交服务商
-	 * 
-	 * @param merchantInfoView
-	 */
-	@PluginFeature(id = "ServicerMerchant-Submit", name = "服务商信息_提交")
-	@PostMapping("/api/submitServicerMerchant")
-	public void submitServicerMerchant(@RequestBody ServicerView<ServicerMerchantInfo> merchantInfoView) {
-		merchantInfoView.setOnlySubmit(Boolean.TRUE);
-		merchantInfoService.saveServicerMerchant(merchantInfoView);
-	}
-
-	/**
-	 * 审核服务商
-	 * 
-	 * @param merchantInfoView
-	 */
-	@PluginFeature(id = "ServicerMerchant-Approve", name = "服务商信息_审核")
-	@PostMapping(value = "/api/approveServicerMerchant")
-	public void approveServicerMerchant(@RequestBody ServicerView<ServicerMerchantInfo> merchantInfoView) {
-		merchantInfoService.approveServicerMerchant(merchantInfoView);
-	}
-
-	/**
-	 * 删除服务商信息
-	 *
-	 * @param merchantInfo
-	 */
-	@PostMapping("/api/deleteMerchantById")
-	@PluginFeature(id = "ServicerMerchant-Remove", name = "服务商信息_删除")
-	public void deleteMerchantById(@RequestBody ServicerMerchantInfo merchantInfo) {
-		merchantInfoService.deleteMerchantById(merchantInfo);
-	}
-
-	/**
-	 * 修改是否启用
-	 *
-	 * @param merchantInfo
-	 */
-	@PostMapping("/api/updateEnabled")
-	@PluginFeature(id = "ServicerMerchant-Edit", name = "服务商信息_编辑")
-	public void updateEnabled(@RequestBody ServicerMerchantInfo merchantInfo) {
-		merchantInfoService.updateEnabled(merchantInfo.getServicerId());
-	}
-
-	/**
-	 * 服务商信息分页列表查询
-	 * 
-	 * @param paramMap
-	 * @return
-	 */
-	@PluginFeature(id = "ServicerMerchant-View", name = "服务商信息_查看")
-	@GetMapping("/query/getPageByCondition")
-	public Page<ServicerMerchantInfo> getPageByCondition(@RequestParam Map<String, Object> paramMap) {
-		return merchantInfoService.selectPageByCondition(PageUtil.convertMap(paramMap));
-	}
-
-	/**
-	 * 服务商信息列表查询
-	 * 
-	 * @param paramMap
-	 * @return
-	 */
-	@PluginFeature(id = "ServicerMerchant-View", name = "服务商信息_查看")
-	@GetMapping("/query/getListByCondition")
-	public List<ServicerMerchantInfo> getListByCondition(@RequestParam Map<String, Object> paramMap) {
-		return merchantInfoService.selectListByCondition(paramMap);
-	}
-
-	/**
-	 * 服务商银行信息列表查询
-	 * 
-	 * @param paramMap
-	 * @return
-	 */
-	@PluginFeature(id = "ServicerMerchant-View", name = "服务商信息_查看")
-	@GetMapping("/query/getBankListByCondition")
-	public List<Map<String, Object>> getBankListByCondition(@RequestParam Map<String, Object> paramMap) {
-		return merchantInfoService.selectBankListByCondition(paramMap);
-	}
-
-	/**
-	 * 根据服务商ID查看服务商详情
-	 * 
-	 * @param servicerId
-	 * @return
-	 */
-	@PluginFeature(id = "ServicerMerchant-View", name = "服务商信息_查看")
-	@GetMapping("/query/getServicerMerchantInfoById")
-	public ServicerMerchantInfo getServicerMerchantInfoById(
-			@RequestParam(name = "servicerId", required = true) String servicerId) {
-		return merchantInfoService.selectServicerMerchantInfoById(servicerId);
-	}
-
-	/**
-	 * 操作历史查询
-	 *
-	 * @param id
-	 * @param workflowId
-	 * @return
-	 */
-	@PluginFeature(id = "ServicerMerchant-View", name = "服务商信息_查看")
-	@GetMapping("/query/getBillOperateHis")
-	public List<ServicerBillOperateHis> getBillOperateHis(@RequestParam String id, @RequestParam String workflowId) {
-		return servicerBillOperateHisService.getBillOperateHis(id, workflowId);
-	}
-
-	/**
-	 * 获取服务商邮箱地址
-	 *
-	 * @param servicerId
-	 * @return
-	 */
-	@GetMapping("/query/getServicerMerchantMailInfo")
-	public String getServicerMerchantMailInfo(String servicerId) {
-		return merchantInfoService.getServicerMerchantMailInfo(servicerId);
-	}
-
-}

winsea-haixin-plugin-servicer/src/main/java/com/yh/saas/plugin/servicer/entity/ServicerBillOperateHis.java

@@ -1,109 +0,0 @@
-package com.yh.saas.plugin.servicer.entity;
-
-import com.baomidou.mybatisplus.annotations.TableField;
-import com.baomidou.mybatisplus.annotations.TableId;
-import com.baomidou.mybatisplus.enums.IdType;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import com.yh.saas.common.support.entity.BaseModel;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.experimental.Accessors;
-
-import java.io.Serializable;
-import java.util.Date;
-
-/**
- * <p>
- * 记录服务商单据操作历史
- * </p>
- *
- * @author yul
- * @since 2019-12-23
- */
-@Data
-@EqualsAndHashCode(callSuper = true)
-@Accessors(chain = true)
-public class ServicerBillOperateHis extends BaseModel<ServicerBillOperateHis> {
-
-	private static final long serialVersionUID = -9190264106027572967L;
-
-	/**
-	 * 主键id
-	 */
-	@TableId(type = IdType.INPUT)
-	private String id;
-	/**
-	 * 单据类型
-	 */
-	private String billType;
-	/**
-	 * 单据ID
-	 */
-	private String billId;
-	/**
-	 * 单据名称
-	 */
-	private String billName;
-	/**
-	 * 操作人
-	 */
-	private String operateUser;
-	/**
-	 * 操作时间
-	 */
-	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-	private Date operateDate;
-	/**
-	 * 处理信息
-	 */
-	private String dealMsg;
-	/**
-	 * 处理信息英文
-	 */
-	private String dealMsgEn;
-	/**
-	 * 审核意见
-	 */
-	private String verifyRemark;
-	/**
-	 * 审核人职务
-	 */
-	private String verifyUserDuty;
-	/**
-	 * 审批结果
-	 */
-	@TableField(exist = false)
-	private String approveResult;
-
-	@Override
-	protected Serializable pkVal() {
-		return this.id;
-	}
-
-	/**
-	 * 查询类
-	 */
-	public static class QueryFields {
-
-		private QueryFields() {
-
-		}
-
-		public static final String BILL_ID = "bill_id";
-		public static final String OPERATE_DATE = "operate_date";
-
-	}
-
-	public static ServicerBillOperateHis getInstance(String operateUser, Date operateDate, String approveResult,
-			String dealMsg, String dealMsgEn, String duty, String verifyRemark) {
-		ServicerBillOperateHis history = new ServicerBillOperateHis();
-		history.setOperateUser(duty + " " + operateUser);
-		history.setOperateDate(operateDate);
-		history.setDealMsg(dealMsg);
-		history.setDealMsgEn(dealMsgEn);
-		history.setApproveResult(approveResult);
-		history.setVerifyRemark(verifyRemark);
-		return history;
-	}
-
-}

winsea-haixin-plugin-servicer/src/main/java/com/yh/saas/plugin/servicer/entity/ServicerMerchantBankInfo.java

@@ -1,109 +0,0 @@
-package com.yh.saas.plugin.servicer.entity;
-
-import com.baomidou.mybatisplus.annotations.TableId;
-import com.baomidou.mybatisplus.annotations.TableName;
-import com.baomidou.mybatisplus.enums.IdType;
-import com.yh.saas.common.support.entity.BaseModel;
-import com.yh.saas.common.support.util.query.SearchField;
-import com.yh.saas.common.support.util.query.SearchMode;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.experimental.Accessors;
-
-import java.io.Serializable;
-
-/**
- * <p>
- * 记录服务商银行账户信息表
- * </p>
- *
- * @author yul
- * @since 2019-11-11
- */
-@Data
-@EqualsAndHashCode(callSuper = true)
-@Accessors(chain = true)
-@TableName("servicer_merchant_bank_info")
-public class ServicerMerchantBankInfo extends BaseModel<ServicerMerchantBankInfo> {
-
-	private static final long serialVersionUID = -2953416870220877273L;
-
-	/**
-	 * 银行账户ID
-	 */
-	@TableId(type = IdType.UUID)
-	private String bankId;
-	/**
-	 * 服务商ID
-	 */
-	@SearchField(mode = SearchMode.EQ)
-	private String servicerId;
-	/**
-	 * 公司ID
-	 */
-	private String compId;
-	/**
-	 * 收款人名称
-	 */
-	private String payeeName;
-	/**
-	 * 收款人SWFT
-	 */
-	private String payeeSwft;
-	/**
-	 * 收款人地址
-	 */
-	private String payeeAddress;
-	/**
-	 * 开户行国籍
-	 */
-	private String nationalityKey;
-	/**
-	 * 开户行国籍名称
-	 */
-	private String nationalityValue;
-	/**
-	 * 开户行国籍英文名
-	 */
-	private String nationalityEnValue;
-	/**
-	 * 开户行账号
-	 */
-	private String receiveBankAccount;
-	/**
-	 * 开户行名称
-	 */
-	private String receiveBankName;
-	/**
-	 * 开户行地址
-	 */
-	private String receiveBankAddress;
-	/**
-	 * 序号
-	 */
-	private Long serialNumber;
-
-	@Override
-	protected Serializable pkVal() {
-		return this.bankId;
-	}
-
-	/**
-	 * 查询用字段
-	 * 
-	 */
-	public static class QueryFields {
-
-		public static final String COMP_ID = "comp_id";
-
-		public static final String SERVICER_ID = "servicer_id";
-
-		public static final String BANK_ID = "bank_id";
-
-		public static final String DELETE_FALG = "delete_flag";
-
-		private QueryFields() {
-		}
-	}
-
-}

winsea-haixin-plugin-servicer/src/main/java/com/yh/saas/plugin/servicer/entity/ServicerMerchantContactsInfo.java

@@ -1,101 +0,0 @@
-package com.yh.saas.plugin.servicer.entity;
-
-import com.baomidou.mybatisplus.annotations.TableId;
-import com.baomidou.mybatisplus.annotations.TableName;
-import com.baomidou.mybatisplus.enums.IdType;
-import com.yh.saas.common.support.entity.BaseModel;
-import com.yh.saas.common.support.util.query.SearchField;
-import com.yh.saas.common.support.util.query.SearchMode;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.experimental.Accessors;
-
-import java.io.Serializable;
-
-/**
- * <p>
- * 记录服务商联系人信息表
- * </p>
- *
- * @author yul
- * @since 2019-11-11
- */
-@Data
-@EqualsAndHashCode(callSuper = true)
-@Accessors(chain = true)
-@TableName("servicer_merchant_contacts_info")
-public class ServicerMerchantContactsInfo extends BaseModel<ServicerMerchantContactsInfo> {
-
-	private static final long serialVersionUID = 6890462238366385691L;
-
-	/**
-	 * 联系人ID
-	 */
-	@TableId(type = IdType.UUID)
-	private String contactsId;
-	/**
-	 * 服务商ID
-	 */
-	@SearchField(mode = SearchMode.EQ)
-	private String servicerId;
-	/**
-	 * 公司ID
-	 */
-	private String compId;
-	/**
-	 * 联系人
-	 */
-	private String linkMan;
-	/**
-	 * 手机号码
-	 */
-	private String mobileNumber;
-	/**
-	 * 上一次手机号码
-	 */
-	private String oldMobileNumber;
-	/**
-	 * 邮箱
-	 */
-	private String emailAddress;
-	/**
-	 * 联系电话
-	 */
-	private String telNumber;
-	/**
-	 * QQ/微信
-	 */
-	private String tencentNumber;
-	/**
-	 * 联系人职务
-	 */
-	private String linkManDuty;
-	/**
-	 * 序号
-	 */
-	private Long serialNumber;
-
-	@Override
-	protected Serializable pkVal() {
-		return this.contactsId;
-	}
-
-	/**
-	 * 查询用字段
-	 * 
-	 */
-	public static class QueryFields {
-
-		public static final String COMP_ID = "comp_id";
-
-		public static final String SERVICER_ID = "servicer_id";
-
-		public static final String CONTACTS_ID = "contacts_id";
-
-		public static final String DELETE_FALG = "delete_flag";
-
-		private QueryFields() {
-		}
-	}
-
-}

winsea-haixin-plugin-servicer/src/main/java/com/yh/saas/plugin/servicer/entity/ServicerMerchantInfo.java

@@ -1,261 +0,0 @@
-package com.yh.saas.plugin.servicer.entity;
-
-import com.baomidou.mybatisplus.annotations.TableField;
-import com.baomidou.mybatisplus.annotations.TableId;
-import com.baomidou.mybatisplus.annotations.TableName;
-import com.baomidou.mybatisplus.enums.IdType;
-import com.yh.saas.common.support.entity.BaseModel;
-import com.yh.saas.common.support.util.query.SearchField;
-import com.yh.saas.common.support.util.query.SearchMode;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.experimental.Accessors;
-import org.apache.commons.lang3.StringUtils;
-
-import java.io.Serializable;
-import java.util.List;
-
-/**
- * <p>
- * 记录服务商信息表
- * </p>
- *
- * @author yul
- * @since 2019-11-11
- */
-@Data
-@EqualsAndHashCode(callSuper = true)
-@Accessors(chain = true)
-@TableName("servicer_merchant_info")
-public class ServicerMerchantInfo extends BaseModel<ServicerMerchantInfo> {
-
-	private static final long serialVersionUID = -7319219122494086826L;
-	/**
-	 * 服务商ID
-	 */
-	@TableId(type = IdType.UUID)
-	private String servicerId;
-	/**
-	 * 公司ID
-	 */
-	@SearchField(mode = SearchMode.EQ)
-	private String compId;
-	/**
-	 * 服务商名称
-	 */
-	@SearchField(mode = SearchMode.EQ)
-	private String servicerName;
-	/**
-	 * 服务商英文名
-	 */
-	@SearchField(mode = SearchMode.EQ)
-	private String servicerEnName;
-
-	/**
-	 * 服务商类型
-	 */
-	private String servicerTypeId;
-
-	/**
-	 * 服务商类型英文
-	 */
-	private String servicerType;
-
-	/**
-	 * 国籍编码
-	 */
-	private String nationalityKey;
-	/**
-	 * 国籍名称
-	 */
-	private String nationalityValue;
-	/**
-	 * 国籍英文名
-	 */
-	private String nationalityEnValue;
-	/**
-	 * 统一社会信用代码
-	 */
-	@SearchField(mode = SearchMode.EQ)
-	private String uscc;
-	/**
-	 * 所属省份编码
-	 */
-	private Integer provKey;
-	/**
-	 * 所属省份名称
-	 */
-	private String provValue;
-	/**
-	 * 所属城市编码
-	 */
-	private Integer cityKey;
-	/**
-	 * 所属城市名称
-	 */
-	private String cityValue;
-	/**
-	 * 地区全名
-	 */
-	private String area_full_name;
-	/**
-	 * 服务商公司地址
-	 */
-	private String address;
-	/**
-	 * 传真
-	 */
-	private String faxNumber;
-	/**
-	 * 邮政编码
-	 */
-	private String postalCode;
-	/**
-	 * 备注
-	 */
-	private String remark;
-	/**
-	 * 服务类型ID
-	 */
-	private String serviceTypeIds;
-	/**
-	 * 服务类型名称
-	 */
-	private String serviceTypeNames;
-	/**
-	 * 服务类型名称（英文）
-	 */
-	private String serviceTypeNamesEn;
-	/**
-	 * 服务类型备注
-	 */
-	private String serviceTypeRemark;
-	/**
-	 * 单一采购标识
-	 */
-	private String singlePurchaseFlag;
-	/**
-	 * 营业执照附件地址
-	 */
-	private String certificateAppendixIds;
-	/**
-	 * 资质附件地址
-	 */
-	private String qualificationAppendixIds;
-	/**
-	 * 服务商状态
-	 */
-	private String statusFlag;
-	/**
-	 * 服务商状态名称
-	 */
-	private String statusName;
-	/**
-	 * 服务商状态英文名
-	 */
-	private String statusEnName;
-	/**
-	 * 审核状态
-	 */
-	private String approveStatus;
-	/**
-	 * 审核状态英文
-	 */
-	private String approveStatusEn;
-	/**
-	 * 工作流ID
-	 */
-	private String workFlowId;
-	/**
-	 * 备用工作流ID
-	 */
-	private String spareWorkFlowId;
-	/**
-	 * 是否启用
-	 */
-	private Integer enabled;
-	/**
-	 * 是否审核通过
-	 */
-	private Integer passFlag;
-	/**
-	 * 服务商账号
-	 */
-	private String servicerAccount;
-	/**
-	 * 服务商密码
-	 */
-	private String servicerPassword;
-	/**
-	 * 服务商公司ID
-	 */
-	private String servicerCompId;
-    /**
-     * 公共邮箱
-     */
-    private String commonEmailAddress;
-    /**
-     * 黑名单标识
-     */
-    private Boolean blackFlag;
-    /**
-     * 黑名单原因
-     */
-    private String blackReason;
-
-	/**
-	 * 服务商联系人列表
-	 */
-	@TableField(exist = false)
-	private List<ServicerMerchantContactsInfo> contactsList;
-
-	/**
-	 * 服务商银行账户列表
-	 */
-	@TableField(exist = false)
-	private List<ServicerMerchantBankInfo> bankList;
-
-	/**
-	 * 任务ID
-	 */
-	@TableField(exist = false)
-	private String taskId;
-
-	@Override
-	protected Serializable pkVal() {
-		return this.servicerId;
-	}
-
-	/**
-	 * 查询用字段
-	 * 
-	 */
-	public static class QueryFields {
-
-		public static final String SERVICER_ID = "servicer_id";
-
-		public static final String COMP_ID = "comp_id";
-
-		public static final String SERVICER_NAME = "servicer_name";
-
-		public static final String SERVICER_EN_NAME = "servicer_en_name";
-
-		public static final String USCC = "uscc";
-
-		public static final String DELETE_FALG = "delete_flag";
-
-		public static final String CREATE_DATE = "create_date";
-
-		private QueryFields() {
-		}
-	}
-
-	public String getCurrentWorkflowId() {
-		if (!StringUtils.contains(this.workFlowId, ",")) {
-			return this.workFlowId;
-		}
-		String[] workflowIdArr = this.workFlowId.split(",");
-		return workflowIdArr[workflowIdArr.length - 1];
-	}
-
-}

winsea-haixin-plugin-servicer/src/main/java/com/yh/saas/plugin/servicer/entity/view/ServicerView.java

@@ -1,36 +0,0 @@
-package com.yh.saas.plugin.servicer.entity.view;
-
-import lombok.Data;
-
-@Data
-public class ServicerView<T> {
-
-	private T merchantInfo;
-
-	/**
-	 * 任务ID
-	 */
-	private String taskId;
-
-	private Boolean editable;
-
-	/**
-	 * 页面审批标识是否通过 1.通过 2.退回
-	 */
-	private String isApprove;
-
-	/**
-	 * 审核意见
-	 */
-	private String auditMind;
-
-	private Boolean onlySubmit = false;
-
-	public ServicerView<T> getInstance(T applyInfo, String taskId, boolean editable) {
-		ServicerView<T> servicerView = new ServicerView<>();
-		servicerView.setMerchantInfo(applyInfo);
-		servicerView.setTaskId(taskId);
-		servicerView.setEditable(editable);
-		return servicerView;
-	}
-}

winsea-haixin-plugin-servicer/src/main/java/com/yh/saas/plugin/servicer/enums/ServicerStatusEnum.java

@@ -1,51 +0,0 @@
-package com.yh.saas.plugin.servicer.enums;
-import lombok.Getter;
-
-/**
- * 服务商状态
- * 
- * @author yul
- *
- */
-public enum ServicerStatusEnum {
-	
-	// 服务商状态
-	REFUSED("0", "已退回，待完善", "Backed to perfect", ""),
-	WAIT_SUBMIT("1", "待提交", "Wait submit"),
-	WAITSUBMIT_2("2", "待申请人确认并提交审核", "Wait applicater confirm and submit", ""),
-	SUBMITED("3", "待审核", "Have submit", "已提交"),
-	COMPLETED("5", "已审核通过", "Completed", ""),
-	
-	// 服务商启用状态
-	ENABLED("1", "已启用", "enabled"),
-	NOT_ENABLED("0", "不启用", "not enabled");
-	
-	@Getter
-	private String flag;
-
-	@Getter
-	private String name;
-
-	@Getter
-	private String nameEn;
-
-	@Getter
-	private String description;
-	private ServicerStatusEnum(String flag, String name, String nameEn) {
-		this.flag = flag;
-		this.name = name;
-		this.nameEn = nameEn;
-	}
-	
-	private ServicerStatusEnum(String flag, String name, String nameEn, String description) {
-		this.flag = flag;
-		this.name = name;
-		this.nameEn = nameEn;
-		this.description = description;
-	}
-
-	@Override
-	public String toString() {
-		return "[" + this.flag + "]" + this.name + "_" + this.nameEn;
-	}
-}

winsea-haixin-plugin-servicer/src/main/java/com/yh/saas/plugin/servicer/exception/ServicerException.java

@@ -1,27 +0,0 @@
-package com.yh.saas.plugin.servicer.exception;
-
-import lombok.Getter;
-
-@Getter
-public class ServicerException extends RuntimeException {
-
-	private static final long serialVersionUID = 1L;
-
-	private final String code;
-
-	private final String message;
-
-	public ServicerException(ServicerExceptionEnum exceptionEnum) {
-		super(exceptionEnum.getDesc());
-
-		this.code = exceptionEnum.getValue();
-		this.message = exceptionEnum.getDesc();
-	}
-
-	public ServicerException(String code, String message) {
-		super(message);
-
-		this.code = code;
-		this.message = message;
-	}
-}

winsea-haixin-plugin-servicer/src/main/java/com/yh/saas/plugin/servicer/exception/ServicerExceptionEnum.java

@@ -1,56 +0,0 @@
-package com.yh.saas.plugin.servicer.exception;
-
-import lombok.Getter;
-
-/**
- * 服务商管理错误码
- * 
- * @author yul
- *
- */
-public enum ServicerExceptionEnum {
-
-	SERVICER_SYSTEM_ERROR("ERROR", "服务商系统错误！"),
-
-	SERVICER_NAME_AT_LEAST_ONE("SEAFARER_001", "中文/英文名称至少填写一项"),
-
-	SERVICER_ZH_NAME_REPEAT("SEAFARER_002", "中文名称已存在"),
-
-	SERVICER_EN_NAME_REPEAT("SEAFARER_003", "英文名称已存在"),
-
-	SERVICER_USCC_REQUIRE("SEAFARER_004", "统一社会信用代码不能为空"),
-
-	SERVICER_USCC_REPEAT("SEAFARER_005", "统一社会信用代码已存在"),
-
-	SERVICER_LINK_MAN_AT_LEAST_ONE("SEAFARER_006", "联系人至少填写一个"),
-
-	SERVICER_ZH_NAME_REPEAT_BLACK("SEAFARER_007", "该服务商已经存在于黑名单中！"),
-
-	SERVICER_EN_NAME_REPEAT_BLACK("SEAFARER_008", "该服务商已经存在于黑名单中！"),
-	
-	SERVICER_REGISTER_ACCOUNT_REPEAT("SEAFARER_REGISTER_001", "账号（sss）已被注册"),
-	
-	SERVICER_REGISTER_ACCOUNT_ERROR("SEAFARER_REGISTER_002", "供应平台账号注册失败"),
-	
-	SERVICER_REGISTER_ACCOUNT_ERROR3("SEAFARER_REGISTER_003", "供应平台账号注册失败，服务商名称、联系人手机号、联系人名称必填！"),
-
-	SERVICER_CREATE_ERROR("SEAFARER_CREATE_001", "填写字段有误，请注意必填内容，以及数据格式"),
-
-	SERVICER_MERCHANT_ADD_WORKFLOW_ERROR("SERVICER_MERCHANT_ADD_WORKFLOW_ERROR-001", "新增服务商没有可以进行的工作流！");
-
-	@Getter
-	private String value;
-
-	@Getter
-	private String desc;
-
-	private ServicerExceptionEnum(String value, String desc) {
-		this.value = value;
-		this.desc = desc;
-	}
-
-	@Override
-	public String toString() {
-		return "[" + this.value + "]" + this.desc;
-	}
-}

winsea-haixin-plugin-servicer/src/main/java/com/yh/saas/plugin/servicer/mapper/ServicerBillOperateHisMapper.java

@@ -1,16 +0,0 @@
-package com.yh.saas.plugin.servicer.mapper;
-
-import com.baomidou.mybatisplus.mapper.BaseMapper;
-import com.yh.saas.plugin.servicer.entity.ServicerBillOperateHis;
-
-/**
- * <p>
- * 记录服务商单据操作历史 Mapper 接口
- * </p>
- *
- * @author yul
- * @since 2019-12-23
- */
-public interface ServicerBillOperateHisMapper extends BaseMapper<ServicerBillOperateHis> {
-
-}

winsea-haixin-plugin-servicer/src/main/java/com/yh/saas/plugin/servicer/mapper/ServicerMerchantBankInfoMapper.java

@@ -1,16 +0,0 @@
-package com.yh.saas.plugin.servicer.mapper;
-
-import com.baomidou.mybatisplus.mapper.BaseMapper;
-import com.yh.saas.plugin.servicer.entity.ServicerMerchantBankInfo;
-
-/**
- * <p>
- * 记录服务商银行账户信息表 Mapper 接口
- * </p>
- *
- * @author yul
- * @since 2019-11-11
- */
-public interface ServicerMerchantBankInfoMapper extends BaseMapper<ServicerMerchantBankInfo> {
-
-}

winsea-haixin-plugin-servicer/src/main/java/com/yh/saas/plugin/servicer/mapper/ServicerMerchantContactsInfoMapper.java

@@ -1,15 +0,0 @@
-package com.yh.saas.plugin.servicer.mapper;
-import com.baomidou.mybatisplus.mapper.BaseMapper;
-import com.yh.saas.plugin.servicer.entity.ServicerMerchantContactsInfo;
-
-/**
- * <p>
- * 记录服务商联系人信息表 Mapper 接口
- * </p>
- *
- * @author yul
- * @since 2019-11-11
- */
-public interface ServicerMerchantContactsInfoMapper extends BaseMapper<ServicerMerchantContactsInfo> {
-
-}

winsea-haixin-plugin-servicer/src/main/java/com/yh/saas/plugin/servicer/mapper/ServicerMerchantInfoMapper.java

@@ -1,51 +0,0 @@
-package com.yh.saas.plugin.servicer.mapper;
-
-import com.baomidou.mybatisplus.mapper.BaseMapper;
-import com.yh.saas.plugin.servicer.entity.ServicerMerchantInfo;
-
-import java.util.List;
-import java.util.Map;
-
-/**
- * <p>
- * 记录服务商信息表 Mapper 接口
- * </p>
- *
- * @author yul
- * @since 2019-11-11
- */
-public interface ServicerMerchantInfoMapper extends BaseMapper<ServicerMerchantInfo> {
-
-	/**
-	 * 根据条件分页查询服务商id列表
-	 * 
-	 * @param pageView
-	 * @return
-	 */
-	List<String> getPageListByCondition(Map<String, Object> pageView);
-
-	/**
-	 * 根据条件查询服务商总数
-	 * 
-	 * @param pageView
-	 * @return
-	 */
-	Integer getCountByCondition(Map<String, Object> pageView);
-
-	/**
-	 * 根据条件查询服务商信息列表
-	 * 
-	 * @param pageView
-	 * @return
-	 */
-	List<ServicerMerchantInfo> getListByCondition(Map<String, Object> pageView);
-
-	/**
-	 * 根据条件查询服务商银行信息列表
-	 * 
-	 * @param pageView
-	 * @return
-	 */
-	List<ServicerMerchantInfo> getBankListByCondition(Map<String, Object> pageView);
-
-}

winsea-haixin-plugin-servicer/src/main/java/com/yh/saas/plugin/servicer/service/IServicerBillOperateHisService.java

@@ -1,48 +0,0 @@
-package com.yh.saas.plugin.servicer.service;
-import java.util.Date;
-import java.util.List;
-import com.baomidou.mybatisplus.service.IService;
-import com.yh.saas.plugin.servicer.entity.ServicerBillOperateHis;
-
-/**
- * <p>
- * 记录服务商单据操作历史 服务类
- * </p>
- *
- * @author yul
- * @since 2019-12-23
- */
-public interface IServicerBillOperateHisService extends IService<ServicerBillOperateHis> {
-
-	/**
-	 * 操作历史查询
-	 * 
-	 * @param id
-	 * @param workflowId
-	 * @return
-	 */
-	List<ServicerBillOperateHis> getBillOperateHis(String id, String workflowId);
-
-	/**
-	 * 插入操作历史
-	 * 
-	 * @param billType
-	 * @param id
-	 * @param billName
-	 * @param makeUser
-	 * @param nowDate
-	 * @param statusName
-	 * @param statusNameEn
-	 * @param reason
-	 */
-	void saveBillOperateHis(String billType, String id, String billName, String makeUser, Date nowDate,
-                            String statusName, String statusNameEn, String reason);
-
-	/**
-	 * 取得当前登录人职务姓名
-	 *
-	 * @return
-	 */
-	String getStaffAndName();
-
-}

winsea-haixin-plugin-servicer/src/main/java/com/yh/saas/plugin/servicer/service/IServicerMerchantBankInfoService.java

@@ -1,16 +0,0 @@
-package com.yh.saas.plugin.servicer.service;
-
-import com.baomidou.mybatisplus.service.IService;
-import com.yh.saas.plugin.servicer.entity.ServicerMerchantBankInfo;
-
-/**
- * <p>
- * 记录服务商银行账户信息表 服务类
- * </p>
- *
- * @author yul
- * @since 2019-11-11
- */
-public interface IServicerMerchantBankInfoService extends IService<ServicerMerchantBankInfo> {
-
-}

winsea-haixin-plugin-servicer/src/main/java/com/yh/saas/plugin/servicer/service/IServicerMerchantContactsInfoService.java

@@ -1,16 +0,0 @@
-package com.yh.saas.plugin.servicer.service;
-
-import com.baomidou.mybatisplus.service.IService;
-import com.yh.saas.plugin.servicer.entity.ServicerMerchantContactsInfo;
-
-/**
- * <p>
- * 记录服务商联系人信息表 服务类
- * </p>
- *
- * @author yul
- * @since 2019-11-11
- */
-public interface IServicerMerchantContactsInfoService extends IService<ServicerMerchantContactsInfo> {
-
-}

winsea-haixin-plugin-servicer/src/main/java/com/yh/saas/plugin/servicer/service/IServicerMerchantInfoService.java

@@ -1,87 +0,0 @@
-package com.yh.saas.plugin.servicer.service;
-import com.winsea.svc.base.base.util.page.PageView;
-
-import java.util.List;
-import java.util.Map;
-import com.baomidou.mybatisplus.plugins.Page;
-import com.baomidou.mybatisplus.service.IService;
-import com.yh.saas.plugin.servicer.entity.ServicerMerchantInfo;
-import com.yh.saas.plugin.servicer.entity.view.ServicerView;
-
-/**
- * <p>
- * 记录服务商信息表 服务类
- * </p>
- *
- * @author yul
- * @since 2019-11-11
- */
-public interface IServicerMerchantInfoService extends IService<ServicerMerchantInfo> {
-
-	/**
-	 * 保存服务商信息
-	 * 
-	 * @param merchantInfoView
-	 * @return
-	 */
-	String saveServicerMerchant(ServicerView<ServicerMerchantInfo> merchantInfoView);
-
-	/**
-	 * 审核服务商信息
-	 * 
-	 * @param merchantInfoView
-	 * @return
-	 */
-	void approveServicerMerchant(ServicerView<ServicerMerchantInfo> merchantInfoView);
-
-	/**
-	 * 删除服务商信息
-	 * 
-	 * @param merchantInfo
-	 */
-	void deleteMerchantById(ServicerMerchantInfo merchantInfo);
-
-	/**
-	 * 服务商信息分页列表查询
-	 * 
-	 * @param pageView
-	 * @return
-	 */
-	Page<ServicerMerchantInfo> selectPageByCondition(PageView pageView);
-
-	/**
-	 * 服务商信息列表查询
-	 * 
-	 * @param params
-	 * @return
-	 */
-	List<ServicerMerchantInfo> selectListByCondition(Map<String, Object> params);
-
-	/**
-	 * 服务商银行信息列表查询
-	 * 
-	 * @param params
-	 * @return
-	 */
-	List<Map<String, Object>> selectBankListByCondition(Map<String, Object> params);
-
-	/**
-	 * 根据服务商ID查看服务商详情
-	 * 
-	 * @param servicerId
-	 * @return
-	 */
-	ServicerMerchantInfo selectServicerMerchantInfoById(String servicerId);
-
-	/**
-	 * 获取服务商邮箱地址
-	 * @param servicerId
-	 * @return
-	 */
-	String getServicerMerchantMailInfo(String servicerId);
-
-	/**
-	 * 修改是否启用
-	 */
-	void updateEnabled(String id);
-}

winsea-haixin-plugin-servicer/src/main/java/com/yh/saas/plugin/servicer/service/impl/ServicerBillOperateHisServiceImpl.java

@@ -1,109 +0,0 @@
-package com.yh.saas.plugin.servicer.service.impl;
-
-import com.alipay.sofa.runtime.api.annotation.SofaReference;
-import com.baomidou.mybatisplus.mapper.EntityWrapper;
-import com.baomidou.mybatisplus.service.impl.ServiceImpl;
-import com.winsea.svc.base.base.entity.CommonRole;
-import com.winsea.svc.base.base.entity.CommonStaff;
-import com.winsea.svc.base.base.entity.CommonStaffRole;
-import com.winsea.svc.base.base.service.ICommonRoleService;
-import com.winsea.svc.base.base.service.ICommonStaffRoleService;
-import com.winsea.svc.base.base.service.ICommonStaffService;
-import com.winsea.svc.base.security.entity.User;
-import com.winsea.svc.base.security.util.AuthSecurityUtils;
-import com.winsea.svc.base.workflow.entity.WorkflowHistoricTask;
-import com.yh.saas.common.support.util.IdGenerator;
-import com.yh.saas.plugin.servicer.entity.ServicerBillOperateHis;
-import com.yh.saas.plugin.servicer.mapper.ServicerBillOperateHisMapper;
-import com.yh.saas.plugin.servicer.service.IServicerBillOperateHisService;
-import com.yh.saas.toolkit.workflow.service.IWorkflowHistoryService;
-import org.apache.commons.lang3.StringUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-import java.util.Comparator;
-import java.util.Date;
-import java.util.List;
-import java.util.stream.Collectors;
-
-/**
- * <p>
- * 记录服务商单据操作历史 服务实现类
- * </p>
- *
- * @author yul
- * @since 2019-12-23
- */
-@Service
-public class ServicerBillOperateHisServiceImpl extends ServiceImpl<ServicerBillOperateHisMapper, ServicerBillOperateHis>
-		implements IServicerBillOperateHisService {
-
-	@SofaReference
-	private ICommonStaffRoleService staffRoleService;
-
-	@SofaReference
-	private ICommonStaffService staffService;
-
-	@SofaReference
-	private ICommonRoleService roleService;
-
-	@Autowired
-	private IWorkflowHistoryService workflowHistoryService;
-
-	@Override
-	public List<ServicerBillOperateHis> getBillOperateHis(String id, String workflowId) {
-		List<ServicerBillOperateHis> list = this.selectList(
-				new EntityWrapper<ServicerBillOperateHis>().eq(ServicerBillOperateHis.QueryFields.BILL_ID, id)
-						.orderBy(ServicerBillOperateHis.QueryFields.OPERATE_DATE, false));
-		if (StringUtils.isNotEmpty(workflowId)) {
-			List<WorkflowHistoricTask> historicTasks = this.workflowHistoryService.getInstanceHistories(workflowId, id);
-			historicTasks
-					.forEach(
-							histortyTask -> list.add(ServicerBillOperateHis.getInstance(histortyTask.getOperatorName(),
-									histortyTask.getEndTime() == null ? histortyTask.getClaimTime()
-											: histortyTask.getEndTime(),
-									histortyTask.getApproved() ? "1" : "0", histortyTask.getTaskName(),
-									histortyTask.getTaskNameEn(), histortyTask.getOperatorMajorRoleName(),
-									histortyTask.getAuditMind())));
-		}
-		return list.stream().sorted(Comparator.comparing(ServicerBillOperateHis::getOperateDate).reversed())
-				.collect(Collectors.toList());
-	}
-
-	@Override
-	public void saveBillOperateHis(String billType, String billId, String billName, String makeUser, Date nowDate,
-			String statusName, String statusNameEn, String reason) {
-		String id = IdGenerator.generateUUID();
-		// 插入操作历史
-		ServicerBillOperateHis billOperateHis = new ServicerBillOperateHis();
-		billOperateHis.setBillType(billType);
-		billOperateHis.setId(id);
-		billOperateHis.setBillId(billId);
-		billOperateHis.setBillName(billName);
-		billOperateHis.setOperateUser(makeUser);
-		if (nowDate == null) {
-			nowDate = new Date();
-		}
-		billOperateHis.setOperateDate(nowDate);
-		billOperateHis.setDealMsg(statusName);
-		billOperateHis.setDealMsgEn(statusNameEn);
-		billOperateHis.setVerifyRemark(reason);
-		this.insert(billOperateHis);
-	}
-
-	/**
-	 * 取得当前登录人职务姓名
-	 *
-	 * @return
-	 */
-	@Override
-	public String getStaffAndName() {
-		User currentUser = AuthSecurityUtils.getCurrentUserInfo();
-		// 当前登录人主要角色
-		CommonStaffRole staffRole = staffRoleService.getMajorRole(currentUser.getUserId());
-		CommonStaff staff = staffService.getInfo(staffRole.getStaffId());
-		CommonRole role = roleService.selectById(staffRole.getRoleId());
-		return role.getRoleName() + " " + staff.getStaffName();
-	}
-
-}

winsea-haixin-plugin-servicer/src/main/java/com/yh/saas/plugin/servicer/service/impl/ServicerMerchantBankInfoServiceImpl.java

@@ -1,20 +0,0 @@
-package com.yh.saas.plugin.servicer.service.impl;
-
-import com.baomidou.mybatisplus.service.impl.ServiceImpl;
-import com.yh.saas.plugin.servicer.entity.ServicerMerchantBankInfo;
-import com.yh.saas.plugin.servicer.mapper.ServicerMerchantBankInfoMapper;
-import com.yh.saas.plugin.servicer.service.IServicerMerchantBankInfoService;
-import org.springframework.stereotype.Service;
-
-/**
- * <p>
- * 记录服务商银行账户信息表 服务实现类
- * </p>
- *
- * @author yul
- * @since 2019-11-11
- */
-@Service
-public class ServicerMerchantBankInfoServiceImpl extends ServiceImpl<ServicerMerchantBankInfoMapper, ServicerMerchantBankInfo> implements IServicerMerchantBankInfoService {
-
-}

winsea-haixin-plugin-servicer/src/main/java/com/yh/saas/plugin/servicer/service/impl/ServicerMerchantContactsInfoServiceImpl.java

@@ -1,20 +0,0 @@
-package com.yh.saas.plugin.servicer.service.impl;
-
-import com.baomidou.mybatisplus.service.impl.ServiceImpl;
-import com.yh.saas.plugin.servicer.entity.ServicerMerchantContactsInfo;
-import com.yh.saas.plugin.servicer.mapper.ServicerMerchantContactsInfoMapper;
-import com.yh.saas.plugin.servicer.service.IServicerMerchantContactsInfoService;
-import org.springframework.stereotype.Service;
-
-/**
- * <p>
- * 记录服务商联系人信息表 服务实现类
- * </p>
- *
- * @author yul
- * @since 2019-11-11
- */
-@Service
-public class ServicerMerchantContactsInfoServiceImpl extends ServiceImpl<ServicerMerchantContactsInfoMapper, ServicerMerchantContactsInfo> implements IServicerMerchantContactsInfoService {
-
-}

winsea-haixin-plugin-servicer/src/main/java/com/yh/saas/plugin/servicer/service/impl/ServicerMerchantInfoServiceImpl.java

@@ -1,1164 +0,0 @@
-package com.yh.saas.plugin.servicer.service.impl;
-
-import com.alibaba.fastjson.JSONArray;
-import com.alibaba.fastjson.JSONObject;
-import com.alipay.sofa.runtime.api.annotation.SofaReference;
-import com.alipay.sofa.runtime.api.annotation.SofaService;
-import com.baomidou.mybatisplus.mapper.EntityWrapper;
-import com.baomidou.mybatisplus.mapper.Wrapper;
-import com.baomidou.mybatisplus.plugins.Page;
-import com.baomidou.mybatisplus.service.impl.ServiceImpl;
-import com.baomidou.mybatisplus.toolkit.CollectionUtils;
-import com.google.common.collect.Lists;
-import com.winsea.svc.base.base.entity.CommonCity;
-import com.winsea.svc.base.base.entity.CommonCompany;
-import com.winsea.svc.base.base.entity.CommonParameterCompany;
-import com.winsea.svc.base.base.entity.CommonRoleResource;
-import com.winsea.svc.base.base.service.ICommonCityService;
-import com.winsea.svc.base.base.service.ICommonCompanyService;
-import com.winsea.svc.base.base.service.ICommonParameterCompanyService;
-import com.winsea.svc.base.base.service.ICommonRoleResourceService;
-import com.winsea.svc.base.base.util.page.PageView;
-import com.winsea.svc.base.security.entity.User;
-import com.winsea.svc.base.security.util.AuthSecurityUtils;
-import com.winsea.svc.base.workflow.entity.Workflow;
-import com.winsea.svc.base.workflow.entity.WorkflowHistoricTask;
-import com.winsea.svc.notice.entity.base.BaseNotice;
-import com.winsea.svc.notice.service.INoticeService;
-import com.yh.saas.common.support.lock.DistributedLock;
-import com.yh.saas.common.support.util.IdGenerator;
-import com.yh.saas.plugin.servicer.constant.ServicerFeatureConstant;
-import com.yh.saas.plugin.servicer.constant.ServicerVariable;
-import com.yh.saas.plugin.servicer.constant.ServicerWorkFlow;
-import com.yh.saas.plugin.servicer.entity.ServicerMerchantBankInfo;
-import com.yh.saas.plugin.servicer.entity.ServicerMerchantContactsInfo;
-import com.yh.saas.plugin.servicer.entity.ServicerMerchantInfo;
-import com.yh.saas.plugin.servicer.entity.view.ServicerView;
-import com.yh.saas.plugin.servicer.enums.ServicerStatusEnum;
-import com.yh.saas.plugin.servicer.exception.ServicerException;
-import com.yh.saas.plugin.servicer.exception.ServicerExceptionEnum;
-import com.yh.saas.plugin.servicer.mapper.ServicerMerchantInfoMapper;
-import com.yh.saas.plugin.servicer.service.IServicerBillOperateHisService;
-import com.yh.saas.plugin.servicer.service.IServicerMerchantBankInfoService;
-import com.yh.saas.plugin.servicer.service.IServicerMerchantContactsInfoService;
-import com.yh.saas.plugin.servicer.service.IServicerMerchantInfoService;
-import com.yh.saas.plugin.servicer.ws.client.SupplyWebServiceClient;
-import com.yh.saas.plugin.supply.servicer.entity.SupplyServicerMerchantBankInfo;
-import com.yh.saas.plugin.supply.servicer.entity.SupplyServicerMerchantContactsInfo;
-import com.yh.saas.plugin.supply.servicer.entity.SupplyServicerMerchantInfo;
-import com.yh.saas.plugin.supply.servicer.service.ISupplyServicerMerchantBankInfoService;
-import com.yh.saas.plugin.supply.servicer.service.ISupplyServicerMerchantContactsInfoService;
-import com.yh.saas.plugin.supply.servicer.service.ISupplyServicerMerchantInfoService;
-import com.yh.saas.toolkit.workflow.service.IWorkflowHistoryService;
-import com.yh.saas.toolkit.workflow.service.IWorkflowService;
-import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.lang3.StringUtils;
-import org.springframework.beans.BeanUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.transaction.annotation.Transactional;
-
-import java.text.SimpleDateFormat;
-import java.util.*;
-import java.util.stream.Collectors;
-
-/**
- * <p>
- * 记录服务商信息表 服务实现类
- * </p>
- *
- * @author yul
- * @since 2019-11-11
- */
-@SofaService
-@Slf4j
-public class ServicerMerchantInfoServiceImpl extends ServiceImpl<ServicerMerchantInfoMapper, ServicerMerchantInfo>
-        implements IServicerMerchantInfoService {
-
-    @Value("${purchase.webservice.address:}")
-    public String webServiceUrl;
-
-    @Value("${servicer.register.webservice.address:}")
-    public String registerWebServiceUrl;
-
-    @Autowired
-    private IWorkflowService workflowService;
-
-    @Autowired
-    private IServicerMerchantContactsInfoService merchantContactsInfoService;
-
-    @Autowired
-    private IServicerMerchantBankInfoService merchantBankInfoService;
-
-    @SofaReference
-    private ICommonCityService commonCityService;
-
-    @SofaReference
-    private ICommonCompanyService commonCompanyService;
-
-    @SofaReference
-    private ICommonParameterCompanyService commonParameterCompanyService;
-
-    @Autowired
-    private IServicerBillOperateHisService billOperateHisService;
-
-    @SofaReference
-    private ICommonRoleResourceService roleResourceService;
-
-    @Autowired
-    private IWorkflowHistoryService workflowHistoryService;
-
-    @SofaReference
-    private ISupplyServicerMerchantInfoService supplyServicerMerchantInfoService;
-
-    @SofaReference
-    private ISupplyServicerMerchantContactsInfoService supplyServicerMerchantContactsInfoService;
-
-    @SofaReference
-    private ISupplyServicerMerchantBankInfoService supplyServicerMerchantBankInfoService;
-
-    @SofaReference
-    private INoticeService noticeService;
-
-    @Override
-    public Page<ServicerMerchantInfo> selectPageByCondition(PageView pageView) {
-
-        // 状态类型（0：全部，1：待处理，2：待跟踪）
-        String statusType = (String) pageView.get("statusType");
-        User currentUser = AuthSecurityUtils.getCurrentUserInfo();
-        pageView.put("startRecord", (Integer.parseInt((String) pageView.get("currentPage")) - 1)
-                * Integer.parseInt((String) pageView.get("pageSize")));
-        // 公司ID
-        pageView.put("compId", AuthSecurityUtils.getCurrentUserInfo().getCompId());
-        // 操作人ID
-        pageView.put("staffId", currentUser.getUserId());
-        // 排序设置
-        if (StringUtils.isNotBlank(pageView.getOrderColunm())) {
-            pageView.put("orderColumn", pageView.getOrderColunm());
-            pageView.put("order", pageView.getOrder());
-        }
-
-        List<String> businessKeys = new ArrayList<>();
-        // 获取待处理的服务商id列表
-        if (StringUtils.equals("1", statusType)) {// 待处理
-            businessKeys = workflowService.getTaskBusinessKeysByCode(ServicerWorkFlow.SERVICER_MERCHANT_ADD);
-            // 权限集合
-            List<String> resourceIdList = roleResourceService.getBindResourcesByUserId(currentUser.getUserId()).stream()
-                    .map(CommonRoleResource::getResourceId).collect(Collectors.toList());
-            pageView.put("statusList", this.getQueryStatusList(resourceIdList));
-        } else if (StringUtils.equals("2", statusType)) {// 待跟踪
-            businessKeys = workflowService.getDoneTaskBusinessKeysByCode(ServicerWorkFlow.SERVICER_MERCHANT_ADD);
-        }
-        pageView.put("businessKeys", businessKeys);
-
-        // 不是服务商一览页 写死查非黑名单的
-        if (!"1".equals(pageView.get("pageFlag"))) {
-            pageView.put("blackFlag", "0");
-        }
-        // 查询服务商总数
-        Integer dataCount = baseMapper.getCountByCondition(pageView);
-        List<ServicerMerchantInfo> dataList = null;
-        List<String> idList = null;
-        if (dataCount != null && dataCount > 0) {
-            // 查询服务商id分页列表
-            idList = baseMapper.getPageListByCondition(pageView);
-        }
-
-        // 根据服务商id分页列表获取服务商信息列表
-        if (CollectionUtils.isNotEmpty(idList)) {
-            Map<String, Object> sCondition = new HashMap<String, Object>();
-            sCondition.put("compId", AuthSecurityUtils.getCurrentUserInfo().getCompId());
-            sCondition.put("servicerIdList", idList);
-            sCondition.put("currentPage", pageView.get("currentPage"));
-            sCondition.put("pageSize", pageView.get("pageSize"));
-            sCondition.put("startRecord", (Integer.parseInt((String) sCondition.get("currentPage")) - 1)
-                    * Integer.parseInt((String) sCondition.get("pageSize")));
-
-            // 排序设置
-            if (StringUtils.isNotBlank(pageView.getOrderColunm())) {
-                sCondition.put("orderColumn", pageView.getOrderColunm());
-                sCondition.put("order", pageView.getOrder());
-
-                // 服务商排序
-                if ("service_type".equals((String) sCondition.get("orderColumn"))) {
-                    Wrapper<CommonParameterCompany> wapperCommonParameter = new EntityWrapper<>();
-                    wapperCommonParameter.eq(CommonParameterCompany.QueryFields.COMP_ID,
-                            AuthSecurityUtils.getCurrentUserInfo().getCompId());
-                    wapperCommonParameter.eq(CommonParameterCompany.QueryFields.CONST_CODE, "SERVICER_SERVICE_TYPE");
-                    wapperCommonParameter.eq("delete_flag", ServicerVariable.DELETEFLAG_0);
-                    List<CommonParameterCompany> commonParameterList = commonParameterCompanyService
-                            .selectList(wapperCommonParameter);
-                    if (CollectionUtils.isNotEmpty(commonParameterList)) {
-                        sCondition.put("orderColumnServiceTypeIds",
-                                commonParameterList.stream().map(CommonParameterCompany::getParameterKey)
-                                        .filter(detail -> StringUtils.isNotBlank(detail)).collect(Collectors.toList()));
-                    }
-                }
-            }
-            // 不是服务商一览页 写死查非黑名单的
-            if (!"1".equals(pageView.get("pageFlag"))) {
-                sCondition.put("blackFlag", "0");
-            }
-            dataList = baseMapper.getListByCondition(sCondition);
-        }
-
-        Page<ServicerMerchantInfo> page = new Page<>();
-        page.setRecords(dataList == null ? Lists.newArrayList() : dataList);
-        page.setTotal(dataCount == null ? 0 : dataCount);
-        page.setCurrent(pageView.getCurrentPage());
-        page.setSize(pageView.getPageSize());
-
-        return page;
-    }
-
-    @Override
-    public List<ServicerMerchantInfo> selectListByCondition(Map<String, Object> params) {
-        Map<String, Object> sCondition = new HashMap<String, Object>();
-        sCondition.putAll(params);
-        sCondition.put("compId", AuthSecurityUtils.getCurrentUserInfo().getCompId());
-
-        // 排序设置
-        String orderColumn = params.get("orderColumn") == null ? "" : params.get("orderColumn").toString();
-        if (StringUtils.isNotEmpty(orderColumn)) {
-            // 服务商排序
-            if ("service_type".equals(orderColumn)) {
-                Wrapper<CommonParameterCompany> wapperCommonParameter = new EntityWrapper<>();
-                wapperCommonParameter.eq(CommonParameterCompany.QueryFields.COMP_ID,
-                        AuthSecurityUtils.getCurrentUserInfo().getCompId());
-                wapperCommonParameter.eq(CommonParameterCompany.QueryFields.CONST_CODE, "SERVICER_SERVICE_TYPE");
-                wapperCommonParameter.eq("delete_flag", ServicerVariable.DELETEFLAG_0);
-                List<CommonParameterCompany> commonParameterList = commonParameterCompanyService
-                        .selectList(wapperCommonParameter);
-                if (CollectionUtils.isNotEmpty(commonParameterList)) {
-                    sCondition.put("orderColumnServiceTypeIds",
-                            commonParameterList.stream().map(CommonParameterCompany::getParameterKey)
-                                    .filter(detail -> StringUtils.isNotBlank(detail)).collect(Collectors.toList()));
-                }
-            }
-        }
-
-        // 只查不在黑名单中的服务商
-        sCondition.put("blackFlag", "0");
-        List<ServicerMerchantInfo> dataList = baseMapper.getListByCondition(sCondition);
-        return dataList;
-    }
-
-    @Override
-    public List<Map<String, Object>> selectBankListByCondition(Map<String, Object> params) {
-        Map<String, Object> sCondition = new HashMap<String, Object>();
-        sCondition.putAll(params);
-        sCondition.put("compId", AuthSecurityUtils.getCurrentUserInfo().getCompId());
-
-        // 只查不在黑名单中的服务商
-        sCondition.put("blackFlag", "0");
-        List<ServicerMerchantInfo> results = baseMapper.getBankListByCondition(sCondition);
-        List<Map<String, Object>> dataList = null;
-        if (CollectionUtils.isNotEmpty(results)) {
-            dataList = new ArrayList<Map<String, Object>>();
-            for (ServicerMerchantInfo mInfo : results) {
-                JSONObject merchantInfo = new JSONObject();
-                merchantInfo.put("servicerId", mInfo.getServicerId());
-                merchantInfo.put("compId", mInfo.getCompId());
-                merchantInfo.put("servicerName", mInfo.getServicerName());
-                merchantInfo.put("servicerEnName", mInfo.getServicerEnName());
-
-                JSONArray bankList = new JSONArray();
-                merchantInfo.put("bankList", bankList);
-                if (CollectionUtils.isNotEmpty(mInfo.getBankList())) {
-                    for (ServicerMerchantBankInfo bInfo : mInfo.getBankList()) {
-                        JSONObject bank = new JSONObject();
-                        bank.put("bankId", bInfo.getBankId());
-                        bank.put("payeeName", bInfo.getPayeeName());
-                        bank.put("payeeSwft", bInfo.getPayeeSwft());
-                        bank.put("payeeAddress", bInfo.getPayeeAddress());
-                        bank.put("receiveBankAccount", bInfo.getReceiveBankAccount());
-                        bank.put("receiveBankName", bInfo.getReceiveBankName());
-                        bank.put("receiveBankAddress", bInfo.getReceiveBankAddress());
-                        // 开户行国籍key
-                        bank.put("nationalityKey", bInfo.getNationalityKey());
-                        bank.put("nationalityValue", bInfo.getNationalityValue());
-                        bank.put("nationalityEnValue", bInfo.getNationalityEnValue());
-                        bankList.add(bank);
-                    }
-                }
-                dataList.add(merchantInfo);
-            }
-        }
-        return dataList;
-    }
-
-    @SuppressWarnings("deprecation")
-    @Transactional
-    @Override
-    @DistributedLock(keys = "'servicer-merchant-info-' + #merchantInfoView.getMerchantInfo().getCompId() + '-action-create'")
-    public String saveServicerMerchant(ServicerView<ServicerMerchantInfo> merchantInfoView) {
-        boolean insertFlag = false;
-        boolean saveRegisteredFlag = true;
-        ServicerMerchantInfo merchantInfo = merchantInfoView.getMerchantInfo();
-        String servicerId = merchantInfo.getServicerId();
-        ServicerMerchantInfo newmerchantInfo = null;
-        if (StringUtils.isBlank(servicerId)) {
-            servicerId = IdGenerator.generateUUID();
-            merchantInfo.setCompId(AuthSecurityUtils.getCurrentUserInfo().getCompId());
-            // 保存校验（新增）
-            checkSave(merchantInfo, ServicerVariable.OPER_MODEL_ADD);
-
-            merchantInfo.setServicerId(servicerId);
-            // 设置服务商状态，默认：待提交
-            merchantInfo.setStatusFlag(ServicerStatusEnum.WAIT_SUBMIT.getFlag());
-            merchantInfo.setStatusName(ServicerStatusEnum.WAIT_SUBMIT.getName());
-            merchantInfo.setStatusEnName(ServicerStatusEnum.WAIT_SUBMIT.getNameEn());
-            // 设置启用状态，默认不启用
-            merchantInfo.setEnabled(Integer.valueOf(ServicerStatusEnum.NOT_ENABLED.getFlag()));
-            insertFlag = true;
-        } else {
-            newmerchantInfo = this.selectById(servicerId);
-            // 保存校验（编辑）
-            checkSave(merchantInfo, ServicerVariable.OPER_MODEL_EDIT);
-            merchantInfo.setCompId(AuthSecurityUtils.getCurrentUserInfo().getCompId());
-            ServicerMerchantInfo newServicerMerchantInfo = this.selectById(servicerId);
-            if (null != merchantInfo && CollectionUtils.isNotEmpty(merchantInfo.getContactsList())
-                    && null != merchantInfo.getContactsList().get(0)) {
-                if (StringUtils.isNotEmpty(merchantInfo.getContactsList().get(0).getMobileNumber())) {
-                    // 查询联系人列表
-                    Wrapper<ServicerMerchantContactsInfo> wapperContacts = new EntityWrapper<>();
-                    wapperContacts.eq(ServicerMerchantContactsInfo.QueryFields.SERVICER_ID, servicerId);
-                    wapperContacts.eq(ServicerMerchantContactsInfo.QueryFields.DELETE_FALG,
-                            ServicerVariable.DELETEFLAG_0);
-                    List<ServicerMerchantContactsInfo> contactsList = merchantContactsInfoService
-                            .selectList(wapperContacts);
-                    if (null != contactsList && contactsList.size() > 0) {
-                        if (merchantInfo.getContactsList().get(0).getMobileNumber()
-                                .equals(contactsList.get(0).getOldMobileNumber())) {
-                            saveRegisteredFlag = false;
-                        }
-                    }
-
-                }
-            }
-            if (newServicerMerchantInfo.getStatusFlag().equals("5")) {// 判断是否再次编辑
-                if (merchantInfoView.getOnlySubmit() == true) {
-                    // 设置服务商状态，已提交
-                    merchantInfo.setStatusFlag(ServicerStatusEnum.SUBMITED.getFlag());
-                    merchantInfo.setStatusName(ServicerStatusEnum.SUBMITED.getName());
-                    merchantInfo.setStatusEnName(ServicerStatusEnum.SUBMITED.getNameEn());
-                } else {
-                    // 设置服务商状态，默认：待提交
-                    merchantInfo.setStatusFlag(ServicerStatusEnum.WAIT_SUBMIT.getFlag());
-                    merchantInfo.setStatusName(ServicerStatusEnum.WAIT_SUBMIT.getName());
-                    merchantInfo.setStatusEnName(ServicerStatusEnum.WAIT_SUBMIT.getNameEn());
-                }
-
-            }
-        }
-
-        // 设置地区全名（根据所选的最小行政级别地区id来查询）
-        Integer cityId = null;
-        if (merchantInfo.getCityKey() != null) {
-            cityId = merchantInfo.getCityKey();
-        } else if (merchantInfo.getProvKey() != null) {
-            cityId = merchantInfo.getProvKey();
-        }
-        if (cityId != null) {
-            CommonCity commonCity = commonCityService.getCityById(String.valueOf(cityId));
-            if (commonCity != null) {
-                merchantInfo.setArea_full_name(commonCity.getQueryCondition());
-            }
-        }
-
-        boolean isStartWorkflow = false;
-        boolean isActivateWorkflow = false;
-        String workFlowId = null;
-        // 提交操作
-        if (merchantInfoView.getOnlySubmit().equals(Boolean.TRUE)) {
-//            workFlowId = null != newmerchantInfo ? newmerchantInfo.getCurrentWorkflowId() : null;
-            // 如果单据已经存在审核流，仍然始终继续走审核，不管你以后删不删工作流
-//            if (StringUtils.isNotEmpty(workFlowId)) {
-//                merchantInfo.setStatusFlag(ServicerStatusEnum.SUBMITED.getFlag());
-//                merchantInfo.setStatusName(ServicerStatusEnum.SUBMITED.getName());
-//                merchantInfo.setStatusEnName(ServicerStatusEnum.SUBMITED.getNameEn());
-//                // 激活审核流
-//                isActivateWorkflow = true;
-//            } else {// 如果不存在，则要先判断是否配置了审核流
-//                Workflow workflow = workflowService
-//                        .findLatestWorkflowByBusinessCode(ServicerWorkFlow.SERVICER_MERCHANT_ADD);
-//                // 如果没配置审核流，单据就直接完成
-//                if (workflow == null) {
-                    // 清空审核流ID
-                    workFlowId = null;
-                    merchantInfo.setWorkFlowId(workFlowId);
-                    merchantInfo.setSpareWorkFlowId(workFlowId);
-                    // 设置状态
-                    merchantInfo.setStatusFlag(ServicerStatusEnum.COMPLETED.getFlag());
-                    merchantInfo.setStatusName(ServicerStatusEnum.COMPLETED.getName());
-                    merchantInfo.setStatusEnName(ServicerStatusEnum.COMPLETED.getNameEn());
-                    merchantInfo.setPassFlag(1);
-//                } else {// 否则，就走审核流
-//                    workFlowId = workflow.getId();
-//                    merchantInfo.setWorkFlowId(workFlowId);
-//                    merchantInfo.setSpareWorkFlowId(workFlowId);
-//                    // 设置状态
-//                    merchantInfo.setStatusFlag(ServicerStatusEnum.SUBMITED.getFlag());
-//                    merchantInfo.setStatusName(ServicerStatusEnum.SUBMITED.getName());
-//                    merchantInfo.setStatusEnName(ServicerStatusEnum.SUBMITED.getNameEn());
-//                    // 开启审核流
-//                    isStartWorkflow = true;
-//                }
-//            }
-        }
-
-        // TODO:提交时注册供应平台账号（当从未注册过，或已注册的账号不在当前联系人手机列表中，说白了，就是必须保证注册账号匹配上手机号中的某个）
-        if (Boolean.TRUE.equals(merchantInfoView.getOnlySubmit()) && Boolean.TRUE == saveRegisteredFlag) {
-            if (insertFlag) {
-                //不在此处调用供应商信息
-//                this.registerServicerByWebService(merchantInfo);
-            } else {
-                // 查询服务商信息
-                ServicerMerchantInfo merchantInfoEd = baseMapper.selectById(servicerId);
-                if (merchantInfoEd != null) {
-                    String servicerAccount = merchantInfoEd.getServicerAccount();
-                    if (StringUtils.isEmpty(servicerAccount)) {
-                        this.registerServicerByWebService(merchantInfo);
-                    } else {
-                        List<String> equalList = merchantInfo.getContactsList().stream()
-                                .map(ServicerMerchantContactsInfo::getMobileNumber)
-                                .filter(detail -> StringUtils.equals(servicerAccount, detail))
-                                .collect(Collectors.toList());
-                        if (CollectionUtils.isEmpty(equalList)) {
-                            this.registerServicerByWebService(merchantInfo);
-                        }
-                    }
-                }
-            }
-        }
-
-        if (insertFlag) {
-            this.saveAddMerchantInfo(merchantInfoView);
-        } else {
-            this.saveEditMerchantInfo(merchantInfoView, merchantInfoView.getOnlySubmit());
-        }
-
-        if (!merchantInfoView.getOnlySubmit().equals(Boolean.TRUE)) {
-            if (StringUtils.isNotEmpty(servicerId)) {
-                ServicerMerchantInfo ma = baseMapper.selectById(servicerId);
-                ma.setWorkFlowId(null);
-                this.updateAllColumnById(ma);
-
-                SupplyServicerMerchantInfo supplyServicerMerchantInfo = new SupplyServicerMerchantInfo();
-                BeanUtils.copyProperties(ma, supplyServicerMerchantInfo);
-                supplyServicerMerchantInfoService.updateAllColumnById(supplyServicerMerchantInfo);
-            }
-
-        }
-
-        // 开启工作流
-//        if (isStartWorkflow) {
-//            boolean approved = true;
-//            List<WorkflowHistoricTask> historicTasks = this.workflowHistoryService.getInstanceHistories(workFlowId,
-//                    servicerId);
-//            Collections.sort(historicTasks, Comparator.comparing(WorkflowHistoricTask::getCreateTime).reversed());
-//            if (CollectionUtils.isNotEmpty(historicTasks)) {
-//                if (!historicTasks.get(0).getApproved()) {
-//                    approved = false;
-//                }
-//            }
-//            if (approved) {
-//                workflowService.startInstance(workFlowId, servicerId);
-//            } else {
-//                workflowService.activateInstance(workFlowId, servicerId);
-//            }
-//
-//        } else if (isActivateWorkflow) {// 激活工作流
-//            workflowService.activateInstance(workFlowId, servicerId);
-//        }
-
-        return merchantInfo.getServicerId();
-    }
-
-    @Transactional
-    @Override
-    public void approveServicerMerchant(ServicerView<ServicerMerchantInfo> merchantInfoView) {
-        String isApprove = merchantInfoView.getIsApprove();
-        String auditMind = merchantInfoView.getAuditMind();
-        ServicerMerchantInfo merchantInfo = baseMapper.selectById(merchantInfoView.getMerchantInfo().getServicerId());
-        List<String> workflowIds = Lists.newArrayList(merchantInfo.getWorkFlowId());
-        String taskId = workflowService.getActiveTask(workflowIds, merchantInfo.getServicerId())
-                .getString(ServicerVariable.TASKID);
-        if (taskId == null) {
-            throw new ServicerException(ServicerExceptionEnum.SERVICER_MERCHANT_ADD_WORKFLOW_ERROR);
-        }
-
-        // 审核通过
-        /**
-         * taskId:任务ID,approved:是否通过(1通过，0驳回),auditMind:审核意见
-         */
-        if (StringUtils.equals(ServicerVariable.APPROVE_PASS, isApprove)) {
-            // 通过
-            // 工作流方法中自动在任务监听调用任务Listener调用handleStatusChanged()处理业务;
-            workflowService.handle(taskId, true, auditMind, false);
-        } else {
-            // 驳回
-            // 工作流方法中自动在任务监听调用任务Listener调用handleRejectApplicationRepulsed()处理业务;
-            workflowService.handle(taskId, false, auditMind, true);
-        }
-    }
-
-    @Transactional
-    @Override
-    public void deleteMerchantById(ServicerMerchantInfo merchantInfo) {
-        String servicerId = merchantInfo.getServicerId();
-        if (StringUtils.isEmpty(servicerId)) {
-            throw new ServicerException(ServicerExceptionEnum.SERVICER_CREATE_ERROR);
-        }
-
-        // 删除联系人信息
-        Wrapper<ServicerMerchantContactsInfo> wapperContacts = new EntityWrapper<>();
-        wapperContacts.eq(ServicerMerchantContactsInfo.QueryFields.SERVICER_ID, servicerId);
-        wapperContacts.eq(ServicerMerchantContactsInfo.QueryFields.DELETE_FALG, ServicerVariable.DELETEFLAG_0);
-        merchantContactsInfoService.delete(wapperContacts);
-
-//		// 删除联系人信息(同步到采购)
-//		Wrapper<SupplyServicerMerchantContactsInfo> wapperSupplyContacts = new EntityWrapper<>();
-//		wapperSupplyContacts.eq(SupplyServicerMerchantContactsInfo.QueryFields.SERVICER_ID, servicerId);
-//		wapperSupplyContacts.eq(SupplyServicerMerchantContactsInfo.QueryFields.DELETE_FALG, ServicerVariable.DELETEFLAG_0);
-//		supplyServicerMerchantContactsInfoService.delete(wapperSupplyContacts);
-
-        // 删除银行账号信息
-        Wrapper<ServicerMerchantBankInfo> wapperBank = new EntityWrapper<>();
-        wapperBank.eq(ServicerMerchantBankInfo.QueryFields.SERVICER_ID, servicerId);
-        wapperBank.eq(ServicerMerchantBankInfo.QueryFields.DELETE_FALG, ServicerVariable.DELETEFLAG_0);
-        merchantBankInfoService.delete(wapperBank);
-
-//		// 删除银行账号信息(同步到采购)
-//		Wrapper<SupplyServicerMerchantBankInfo> wapperSupplyBank = new EntityWrapper<>();
-//		wapperSupplyBank.eq(SupplyServicerMerchantBankInfo.QueryFields.SERVICER_ID, servicerId);
-//		wapperSupplyBank.eq(SupplyServicerMerchantBankInfo.QueryFields.DELETE_FALG, ServicerVariable.DELETEFLAG_0);
-//		supplyServicerMerchantBankInfoService.delete(wapperSupplyBank);
-
-        // 删除后，如果有工作流的话，要结束工作流
-        ServicerMerchantInfo merchant = this.selectById(servicerId);
-        if (StringUtils.isNotBlank(merchant.getWorkFlowId())) {
-            workflowService.stopInstance(merchant.getWorkFlowId(), merchant.getServicerId(), "已删除");
-        }
-
-        // 删除服务商信息
-        this.deleteById(servicerId);
-        // 同步到采购
-        SupplyServicerMerchantInfo supplyServicerMerchantInfo = new SupplyServicerMerchantInfo();
-        supplyServicerMerchantInfo.setServicerId(servicerId);
-        supplyServicerMerchantInfoService.deleteMerchantById(supplyServicerMerchantInfo);
-
-        // 可能有退回的任务 删除掉
-        noticeService.removeNotice(BaseNotice.NoticeStatus.ALL, null, servicerId, null);
-
-        // 插入操作历史
-        billOperateHisService.saveBillOperateHis("SERVICER-MERCHANT", merchantInfo.getServicerId(), "服务商信息",
-                billOperateHisService.getStaffAndName(), null, "删除", "Delete", "");
-    }
-
-    @Override
-    public ServicerMerchantInfo selectServicerMerchantInfoById(String servicerId) {
-        // 查询服务商信息
-        ServicerMerchantInfo merchantInfo = baseMapper.selectById(servicerId);
-        if (merchantInfo != null) {
-//            if (StringUtils.isNotEmpty(merchantInfo.getSpareWorkFlowId())) {
-//                merchantInfo.setWorkFlowId(merchantInfo.getSpareWorkFlowId());
-//            }
-            // 查询联系人列表
-            Wrapper<ServicerMerchantContactsInfo> wapperContacts = new EntityWrapper<>();
-            wapperContacts.eq(ServicerMerchantContactsInfo.QueryFields.SERVICER_ID, merchantInfo.getServicerId());
-            wapperContacts.eq(ServicerMerchantContactsInfo.QueryFields.DELETE_FALG, ServicerVariable.DELETEFLAG_0);
-            List<ServicerMerchantContactsInfo> contactsList = merchantContactsInfoService.selectList(wapperContacts);
-            merchantInfo.setContactsList(contactsList);
-            // 查询银行账号列表
-            Wrapper<ServicerMerchantBankInfo> wapperBank = new EntityWrapper<>();
-            wapperBank.eq(ServicerMerchantBankInfo.QueryFields.SERVICER_ID, merchantInfo.getServicerId());
-            wapperBank.eq(ServicerMerchantBankInfo.QueryFields.DELETE_FALG, ServicerVariable.DELETEFLAG_0);
-            List<ServicerMerchantBankInfo> bankList = merchantBankInfoService.selectList(wapperBank);
-            merchantInfo.setBankList(bankList);
-            String taskId = null;
-            // 只有待审核状态才有taskId
-            if (StringUtils.equals(ServicerStatusEnum.SUBMITED.getFlag(), merchantInfo.getStatusFlag())) {
-                JSONObject jsonObject = workflowService
-                        .getActiveTask(Lists.newArrayList(merchantInfo.getCurrentWorkflowId()), servicerId);
-                taskId = jsonObject.getString(ServicerVariable.TASKID);
-                merchantInfo.setTaskId(taskId);
-            }
-        }
-        return merchantInfo;
-    }
-
-    /**
-     * 保存校验
-     *
-     * @param merchantInfo
-     * @param operFlag
-     */
-    private void checkSave(ServicerMerchantInfo merchantInfo, String operFlag) {
-        // *** 暂时只做数据/业务层面的校验，而必填，格式等由前台处理 ***
-        // 中文/英文名称至少有一项不空
-        if (StringUtils.isEmpty(merchantInfo.getServicerName())
-                && StringUtils.isEmpty(merchantInfo.getServicerEnName())) {
-            throw new ServicerException(ServicerExceptionEnum.SERVICER_NAME_AT_LEAST_ONE);
-        }
-        // 中文名称存在性校验（公司内唯一）
-        if (StringUtils.isNotEmpty(merchantInfo.getServicerName())) {
-            Wrapper<ServicerMerchantInfo> wapperMerchant = new EntityWrapper<>();
-            wapperMerchant.eq(ServicerMerchantInfo.QueryFields.COMP_ID, merchantInfo.getCompId());
-            // 忽略已删除的服务商
-            wapperMerchant.eq(ServicerMerchantInfo.QueryFields.DELETE_FALG, ServicerVariable.DELETEFLAG_0);
-            wapperMerchant.eq(ServicerMerchantInfo.QueryFields.SERVICER_NAME, merchantInfo.getServicerName());
-            if (operFlag.equals(ServicerVariable.OPER_MODEL_EDIT)) {
-                wapperMerchant.ne(ServicerMerchantInfo.QueryFields.SERVICER_ID, merchantInfo.getServicerId());
-            }
-            ServicerMerchantInfo info = this.selectOne(wapperMerchant);
-            if (info != null) {
-                // 与黑名单中的重复
-                if (info.getBlackFlag()) {
-                    throw new ServicerException(ServicerExceptionEnum.SERVICER_ZH_NAME_REPEAT_BLACK);
-                } else {
-                    throw new ServicerException(ServicerExceptionEnum.SERVICER_ZH_NAME_REPEAT);
-                }
-            }
-        }
-        // 英文名称存在性校验（公司内唯一）
-        if (StringUtils.isNotEmpty(merchantInfo.getServicerEnName())) {
-            Wrapper<ServicerMerchantInfo> wapperMerchant = new EntityWrapper<>();
-            wapperMerchant.eq(ServicerMerchantInfo.QueryFields.COMP_ID, merchantInfo.getCompId());
-            // 忽略已删除的服务商
-            wapperMerchant.eq(ServicerMerchantInfo.QueryFields.DELETE_FALG, ServicerVariable.DELETEFLAG_0);
-            wapperMerchant.eq(ServicerMerchantInfo.QueryFields.SERVICER_EN_NAME, merchantInfo.getServicerEnName());
-            if (operFlag.equals(ServicerVariable.OPER_MODEL_EDIT)) {
-                wapperMerchant.ne(ServicerMerchantInfo.QueryFields.SERVICER_ID, merchantInfo.getServicerId());
-            }
-            ServicerMerchantInfo info = this.selectOne(wapperMerchant);
-            if (info != null) {
-                // 与黑名单中的重复
-                if (info.getBlackFlag()) {
-                    throw new ServicerException(ServicerExceptionEnum.SERVICER_EN_NAME_REPEAT_BLACK);
-                } else {
-                    throw new ServicerException(ServicerExceptionEnum.SERVICER_EN_NAME_REPEAT);
-                }
-            }
-        }
-
-        // 统一社会信用代码不能为空
-        if (StringUtils.isEmpty(merchantInfo.getUscc())) {
-            // throw new
-            // ServicerException(ServicerExceptionEnum.SERVICER_USCC_REQUIRE);
-        }
-        // 统一社会信用代码存在性校验（公司内唯一）
-        if (StringUtils.isNotEmpty(merchantInfo.getUscc())) {
-            Wrapper<ServicerMerchantInfo> wapperMerchant = new EntityWrapper<>();
-            wapperMerchant.eq(ServicerMerchantInfo.QueryFields.COMP_ID, merchantInfo.getCompId());
-            // 忽略已删除的服务商
-            wapperMerchant.eq(ServicerMerchantInfo.QueryFields.DELETE_FALG, ServicerVariable.DELETEFLAG_0);
-            wapperMerchant.eq(ServicerMerchantInfo.QueryFields.USCC, merchantInfo.getUscc());
-            if (operFlag.equals(ServicerVariable.OPER_MODEL_EDIT)) {
-                wapperMerchant.ne(ServicerMerchantInfo.QueryFields.SERVICER_ID, merchantInfo.getServicerId());
-            }
-            int checkCount = this.selectCount(wapperMerchant);
-            if (checkCount > 0) {
-                throw new ServicerException(ServicerExceptionEnum.SERVICER_USCC_REPEAT);
-            }
-        }
-
-        // 联系人至少填写一个
-        if (CollectionUtils.isEmpty(merchantInfo.getContactsList())) {
-            // throw new
-            // ServicerException(ServicerExceptionEnum.SERVICER_LINK_MAN_AT_LEAST_ONE);
-        }
-    }
-
-    /**
-     * 新增服务商信息
-     *
-     * @param merchantInfoView
-     * @return
-     */
-    private void saveAddMerchantInfo(ServicerView<ServicerMerchantInfo> merchantInfoView) {
-        ServicerMerchantInfo merchantInfo = merchantInfoView.getMerchantInfo();
-        this.insert(merchantInfo);
-
-        SupplyServicerMerchantInfo supplyServicerMerchantInfo = new SupplyServicerMerchantInfo();
-        BeanUtils.copyProperties(merchantInfo, supplyServicerMerchantInfo);
-//        supplyServicerMerchantInfoService.insert(supplyServicerMerchantInfo);
-
-        // *** 新增联系人信息 ***
-        if (CollectionUtils.isNotEmpty(merchantInfo.getContactsList())) {
-            for (ServicerMerchantContactsInfo contactsInfo : merchantInfo.getContactsList()) {
-                // contactsInfo.setContactsId(IdGenerator.generateUUID());
-                contactsInfo.setServicerId(merchantInfo.getServicerId());
-                contactsInfo.setCompId(merchantInfo.getCompId());
-            }
-            merchantContactsInfoService.insertBatch(merchantInfo.getContactsList());
-            log.info("---------------------supplyServicerMerchantContactsInfoService-----------" + getCopyServicerMerchantContactsInfoList(merchantInfo.getContactsList()).toString());
-            supplyServicerMerchantContactsInfoService.insertBatch(getCopyServicerMerchantContactsInfoList(merchantInfo.getContactsList()));
-        }
-
-        // *** 新增银行账户信息 ***
-        if (CollectionUtils.isNotEmpty(merchantInfo.getBankList())) {
-            for (ServicerMerchantBankInfo bankInfo : merchantInfo.getBankList()) {
-                // bankInfo.setBankId(IdGenerator.generateUUID());
-                bankInfo.setServicerId(merchantInfo.getServicerId());
-                bankInfo.setCompId(merchantInfo.getCompId());
-            }
-            merchantBankInfoService.insertBatch(merchantInfo.getBankList());
-            log.info("---------------------supplyServicerMerchantBankInfoService-----------" + getCopyServicerMerchantBankInfoList(merchantInfo.getBankList()).toString());
-            supplyServicerMerchantBankInfoService.insertBatch(getCopyServicerMerchantBankInfoList(merchantInfo.getBankList()));
-        }
-
-        // 插入操作历史
-        billOperateHisService.saveBillOperateHis("SERVICER-MERCHANT", merchantInfo.getServicerId(), "服务商信息",
-                billOperateHisService.getStaffAndName(), null, ServicerStatusEnum.WAIT_SUBMIT.getName(),
-                ServicerStatusEnum.WAIT_SUBMIT.getNameEn(), "");
-    }
-
-    /**
-     * 编辑服务商信息
-     *
-     * @param merchantInfoView
-     * @param merBoolean
-     */
-    private void saveEditMerchantInfo(ServicerView<ServicerMerchantInfo> merchantInfoView, boolean merBoolean) {
-        // 更新服务商信息
-        ServicerMerchantInfo merchantInfo = merchantInfoView.getMerchantInfo();
-        this.updateById(merchantInfo);
-
-        SupplyServicerMerchantInfo supplyServicerMerchantInfo = new SupplyServicerMerchantInfo();
-        BeanUtils.copyProperties(merchantInfo, supplyServicerMerchantInfo);
-        supplyServicerMerchantInfoService.updateById(supplyServicerMerchantInfo);
-
-        // 更新联系人信息
-        if (CollectionUtils.isNotEmpty(merchantInfo.getContactsList())) {
-            for (ServicerMerchantContactsInfo contactsInfo : merchantInfo.getContactsList()) {
-                if (StringUtils.isEmpty(contactsInfo.getContactsId())) {
-                    // contactsInfo.setContactsId(IdGenerator.generateUUID());
-                }
-            }
-
-            merchantInfo.getContactsList().stream().forEach(contacts -> {
-                contacts.setServicerId(merchantInfo.getServicerId()).setCompId(merchantInfo.getCompId())
-                        .setDeleteFlag(ServicerVariable.DELETEFLAG_0);
-            });
-            // 先删后插（or更新）
-            Wrapper<ServicerMerchantContactsInfo> wapperContactsDel = new EntityWrapper<>();
-            wapperContactsDel.eq(ServicerMerchantContactsInfo.QueryFields.COMP_ID, merchantInfo.getCompId());
-            wapperContactsDel.eq(ServicerMerchantContactsInfo.QueryFields.SERVICER_ID, merchantInfo.getServicerId());
-            wapperContactsDel.eq(ServicerMerchantContactsInfo.QueryFields.DELETE_FALG, ServicerVariable.DELETEFLAG_0);
-            wapperContactsDel.notIn(ServicerMerchantContactsInfo.QueryFields.CONTACTS_ID,
-                    merchantInfo.getContactsList().stream().map(ServicerMerchantContactsInfo::getContactsId)
-                            .filter(detail -> StringUtils.isNotBlank(detail)).collect(Collectors.toList()));
-            merchantContactsInfoService.delete(wapperContactsDel);
-
-            // 先删后插（or更新）
-            Wrapper<SupplyServicerMerchantContactsInfo> wapperContactsDe2 = new EntityWrapper<>();
-            wapperContactsDe2.eq(SupplyServicerMerchantContactsInfo.QueryFields.COMP_ID, merchantInfo.getCompId());
-            wapperContactsDe2.eq(SupplyServicerMerchantContactsInfo.QueryFields.SERVICER_ID, merchantInfo.getServicerId());
-            wapperContactsDe2.eq(SupplyServicerMerchantContactsInfo.QueryFields.DELETE_FALG, ServicerVariable.DELETEFLAG_0);
-            wapperContactsDe2.notIn(SupplyServicerMerchantContactsInfo.QueryFields.CONTACTS_ID,
-                    merchantInfo.getContactsList().stream().map(ServicerMerchantContactsInfo::getContactsId)
-                            .filter(detail -> StringUtils.isNotBlank(detail)).collect(Collectors.toList()));
-            supplyServicerMerchantContactsInfoService.delete(wapperContactsDe2);
-
-
-            merchantInfo.getContactsList().forEach(contacts -> {
-                if (merBoolean) {
-                    contacts.setOldMobileNumber(contacts.getMobileNumber());
-                }
-            });
-
-            supplyServicerMerchantContactsInfoService.insertOrUpdateBatch(getCopyServicerMerchantContactsInfoList(merchantInfo.getContactsList()));
-            merchantContactsInfoService.insertOrUpdateBatch(merchantInfo.getContactsList());
-
-        } else {
-            // 先删后插（or更新）
-            Wrapper<ServicerMerchantContactsInfo> wapperContactsDel = new EntityWrapper<>();
-            wapperContactsDel.eq(ServicerMerchantContactsInfo.QueryFields.COMP_ID, merchantInfo.getCompId());
-            wapperContactsDel.eq(ServicerMerchantContactsInfo.QueryFields.SERVICER_ID, merchantInfo.getServicerId());
-            wapperContactsDel.eq(ServicerMerchantContactsInfo.QueryFields.DELETE_FALG, ServicerVariable.DELETEFLAG_0);
-            wapperContactsDel.notIn(ServicerMerchantContactsInfo.QueryFields.CONTACTS_ID,
-                    merchantInfo.getContactsList().stream().map(ServicerMerchantContactsInfo::getContactsId)
-                            .filter(detail -> StringUtils.isNotBlank(detail)).collect(Collectors.toList()));
-            merchantContactsInfoService.delete(wapperContactsDel);
-
-            // 先删后插（or更新）
-            Wrapper<SupplyServicerMerchantContactsInfo> wapperContactsDe2 = new EntityWrapper<>();
-            wapperContactsDe2.eq(SupplyServicerMerchantContactsInfo.QueryFields.COMP_ID, merchantInfo.getCompId());
-            wapperContactsDe2.eq(SupplyServicerMerchantContactsInfo.QueryFields.SERVICER_ID, merchantInfo.getServicerId());
-            wapperContactsDe2.eq(SupplyServicerMerchantContactsInfo.QueryFields.DELETE_FALG, ServicerVariable.DELETEFLAG_0);
-            wapperContactsDe2.notIn(SupplyServicerMerchantContactsInfo.QueryFields.CONTACTS_ID,
-                    merchantInfo.getContactsList().stream().map(ServicerMerchantContactsInfo::getContactsId)
-                            .filter(detail -> StringUtils.isNotBlank(detail)).collect(Collectors.toList()));
-            supplyServicerMerchantContactsInfoService.delete(wapperContactsDe2);
-        }
-        // 更新银行账号信息
-        if (CollectionUtils.isNotEmpty(merchantInfo.getBankList())) {
-            for (ServicerMerchantBankInfo bankInfo : merchantInfo.getBankList()) {
-                if (StringUtils.isEmpty(bankInfo.getBankId())) {
-                    // bankInfo.setBankId(IdGenerator.generateUUID());
-                }
-            }
-
-            merchantInfo.getBankList().stream().forEach(bank -> {
-                bank.setServicerId(merchantInfo.getServicerId()).setCompId(merchantInfo.getCompId())
-                        .setDeleteFlag(ServicerVariable.DELETEFLAG_0);
-            });
-            // 先删后插（or更新）
-            Wrapper<ServicerMerchantBankInfo> wapperBankDel = new EntityWrapper<>();
-            wapperBankDel.eq(ServicerMerchantBankInfo.QueryFields.COMP_ID, merchantInfo.getCompId());
-            wapperBankDel.eq(ServicerMerchantBankInfo.QueryFields.SERVICER_ID, merchantInfo.getServicerId());
-            wapperBankDel.eq(ServicerMerchantBankInfo.QueryFields.DELETE_FALG, ServicerVariable.DELETEFLAG_0);
-            wapperBankDel.notIn(ServicerMerchantBankInfo.QueryFields.BANK_ID,
-                    merchantInfo.getBankList().stream().map(ServicerMerchantBankInfo::getBankId)
-                            .filter(detail -> StringUtils.isNotBlank(detail)).collect(Collectors.toList()));
-            merchantBankInfoService.delete(wapperBankDel);
-
-            // 先删后插（or更新）
-            Wrapper<SupplyServicerMerchantBankInfo> wapperBankDe2 = new EntityWrapper<>();
-            wapperBankDe2.eq(SupplyServicerMerchantBankInfo.QueryFields.COMP_ID, merchantInfo.getCompId());
-            wapperBankDe2.eq(SupplyServicerMerchantBankInfo.QueryFields.SERVICER_ID, merchantInfo.getServicerId());
-            wapperBankDe2.eq(SupplyServicerMerchantBankInfo.QueryFields.DELETE_FALG, ServicerVariable.DELETEFLAG_0);
-            wapperBankDe2.notIn(SupplyServicerMerchantBankInfo.QueryFields.BANK_ID,
-                    merchantInfo.getBankList().stream().map(ServicerMerchantBankInfo::getBankId)
-                            .filter(detail -> StringUtils.isNotBlank(detail)).collect(Collectors.toList()));
-            supplyServicerMerchantBankInfoService.delete(wapperBankDe2);
-
-
-            supplyServicerMerchantBankInfoService.insertOrUpdateBatch(getCopyServicerMerchantBankInfoList(merchantInfo.getBankList()));
-            merchantBankInfoService.insertOrUpdateBatch(merchantInfo.getBankList());
-        } else {
-            // 先删后插（or更新）
-            Wrapper<ServicerMerchantBankInfo> wapperBankDel = new EntityWrapper<>();
-            wapperBankDel.eq(ServicerMerchantBankInfo.QueryFields.COMP_ID, merchantInfo.getCompId());
-            wapperBankDel.eq(ServicerMerchantBankInfo.QueryFields.SERVICER_ID, merchantInfo.getServicerId());
-            wapperBankDel.eq(ServicerMerchantBankInfo.QueryFields.DELETE_FALG, ServicerVariable.DELETEFLAG_0);
-            wapperBankDel.notIn(ServicerMerchantBankInfo.QueryFields.BANK_ID,
-                    merchantInfo.getBankList().stream().map(ServicerMerchantBankInfo::getBankId)
-                            .filter(detail -> StringUtils.isNotBlank(detail)).collect(Collectors.toList()));
-            merchantBankInfoService.delete(wapperBankDel);
-
-            // 先删后插（or更新）
-            Wrapper<SupplyServicerMerchantBankInfo> wapperBankDe2 = new EntityWrapper<>();
-            wapperBankDe2.eq(SupplyServicerMerchantBankInfo.QueryFields.COMP_ID, merchantInfo.getCompId());
-            wapperBankDe2.eq(SupplyServicerMerchantBankInfo.QueryFields.SERVICER_ID, merchantInfo.getServicerId());
-            wapperBankDe2.eq(SupplyServicerMerchantBankInfo.QueryFields.DELETE_FALG, ServicerVariable.DELETEFLAG_0);
-            wapperBankDe2.notIn(SupplyServicerMerchantBankInfo.QueryFields.BANK_ID,
-                    merchantInfo.getBankList().stream().map(ServicerMerchantBankInfo::getBankId)
-                            .filter(detail -> StringUtils.isNotBlank(detail)).collect(Collectors.toList()));
-            supplyServicerMerchantBankInfoService.delete(wapperBankDe2);
-        }
-        ServicerMerchantInfo servicerMerchantInfo = this.selectById(merchantInfo.getServicerId());
-        if (null != servicerMerchantInfo.getPassFlag() && 1 == servicerMerchantInfo.getPassFlag()) {
-            // 插入操作历史
-            billOperateHisService.saveBillOperateHis("SERVICER-MERCHANT", merchantInfo.getServicerId(), "服务商信息",
-                    billOperateHisService.getStaffAndName(), null, ServicerStatusEnum.WAIT_SUBMIT.getName(),
-                    ServicerStatusEnum.WAIT_SUBMIT.getNameEn(), "");
-        }
-
-    }
-
-    /**
-     * 注册供应商账号（供应、油品、修船模块自己启用供应商时使用）
-     *
-     * @param merchantInfo
-     * @return
-     */
-    private String registerServicerByWebService(ServicerMerchantInfo merchantInfo) throws ServicerException {
-        // 不提供联系人的话，也不强制注册供应平台账号了
-        if (merchantInfo == null || CollectionUtils.isEmpty(merchantInfo.getContactsList())) {
-            return null;
-        }
-        if (registerWebServiceUrl.contains("121.199.3.172")) {// 生产环境
-            return this.registerServicerByWebServiceForProd(merchantInfo);
-        } else if (registerWebServiceUrl.contains("114.115.215.70") || registerWebServiceUrl.contains("localhost")
-                || registerWebServiceUrl.contains("127.0.0.1")) {// 测试环境
-            return this.registerServicerByWebServiceForTest(merchantInfo);
-        } else {
-            throw new ServicerException(ServicerExceptionEnum.SERVICER_REGISTER_ACCOUNT_ERROR);
-        }
-    }
-
-    private String registerServicerByWebServiceForProd(ServicerMerchantInfo merchantInfo) throws ServicerException {
-        // 提示：注册供应平台账号，默认第一个联系人的手机号（估计以后得用统一社会信用代码作为登录id，或者是系统自动分配一个账号，强烈不建议用手机号）
-        String vendorIdSupply = "";
-        // 第一个联系人信息
-        ServicerMerchantContactsInfo contactsInfo = null;
-        // 联系人手机号（登录账号）
-        String mobileNumber = null;
-        // 服务商名称
-        String servicerName = null;
-        // 服务商联系人
-        String linkman = null;
-        List<ServicerMerchantContactsInfo> contactsList = merchantInfo.getContactsList();
-        if (CollectionUtils.isNotEmpty(contactsList)) {
-            contactsInfo = contactsList.get(0);
-        } else {
-            throw new ServicerException(ServicerExceptionEnum.SERVICER_REGISTER_ACCOUNT_ERROR3);
-        }
-        mobileNumber = contactsInfo.getMobileNumber();
-        linkman = contactsInfo.getLinkMan();
-        if (StringUtils.isEmpty(mobileNumber) || StringUtils.isEmpty(linkman)) {
-            throw new ServicerException(ServicerExceptionEnum.SERVICER_REGISTER_ACCOUNT_ERROR3);
-        }
-        // TODO:验证供应商手机号是否在报价平台注册，如果已注册，则返回注册的公司信息，如果没注册，则返回空
-        try {
-            Object[] registerVendors = SupplyWebServiceClient.getData(registerWebServiceUrl, "validateVendorRegister",
-                    mobileNumber);
-            if (registerVendors != null && registerVendors.length > 0 && registerVendors[0] != null
-                    && !registerVendors[0].toString().equalsIgnoreCase("null")) {
-                // 返回的是json格式的字符串
-                String companyInfo = registerVendors[0].toString();
-                // 如果已注册，则返回注册的公司信息
-                if (StringUtils.isNotEmpty(companyInfo)) {
-                    vendorIdSupply = JSONObject.parseObject(companyInfo).getString("comp_id");
-                    merchantInfo.setServicerCompId(vendorIdSupply);
-                    // 供应平台账号
-                    merchantInfo.setServicerAccount(mobileNumber);
-                    // 默认密码：y123456
-                    merchantInfo.setServicerPassword("y123456");
-                    return vendorIdSupply;
-                }
-            }
-        } catch (Exception e) {
-            throw new ServicerException(ServicerExceptionEnum.SERVICER_REGISTER_ACCOUNT_ERROR);
-        }
-
-        if (StringUtils.isNotEmpty(merchantInfo.getServicerName())) {
-            servicerName = merchantInfo.getServicerName();
-        } else if (StringUtils.isNotEmpty(merchantInfo.getServicerEnName())) {
-            servicerName = merchantInfo.getServicerEnName();
-        } else {
-            throw new ServicerException(ServicerExceptionEnum.SERVICER_REGISTER_ACCOUNT_ERROR3);
-        }
-
-        // 根据公司ID获取公司详细信息
-        CommonCompany commonCompany = commonCompanyService.selectById(merchantInfo.getCompId());
-        // 船东公司ID
-        String operCompId = commonCompany.getCustomCompId();
-        // 船东公司名称
-        String operCompName = commonCompany.getCompName();
-        // 固定传1
-        String vendorOpenTypeFlag = "1";
-        // 调用供应系统的webService
-        try {
-            Object[] registerVendors = SupplyWebServiceClient.getData(registerWebServiceUrl, "registerVendor",
-                    mobileNumber, servicerName, operCompId, linkman, operCompName, vendorOpenTypeFlag);
-
-            if (registerVendors != null && registerVendors.length > 0) {
-                vendorIdSupply = registerVendors[0].toString();
-                if (StringUtils.isEmpty(vendorIdSupply)) {
-                    throw new ServicerException(ServicerExceptionEnum.SERVICER_REGISTER_ACCOUNT_ERROR);
-                }
-                merchantInfo.setServicerCompId(vendorIdSupply);
-                // 供应平台账号
-                merchantInfo.setServicerAccount(mobileNumber);
-                // 默认密码：y123456
-                merchantInfo.setServicerPassword("y123456");
-            } else {
-                throw new ServicerException(ServicerExceptionEnum.SERVICER_REGISTER_ACCOUNT_ERROR);
-            }
-        } catch (Exception e) {
-            throw new ServicerException(ServicerExceptionEnum.SERVICER_REGISTER_ACCOUNT_ERROR);
-        }
-
-        return vendorIdSupply;
-    }
-
-    /**
-     * 服务商待处理状态筛选
-     *
-     * @return
-     */
-    private List<String> getQueryStatusList(List<String> resourceIdList) {
-        List<String> statusSet = new ArrayList<>();
-        if (resourceIdList.contains(ServicerFeatureConstant.SERVICER_MERCHANT_INFO_ADD)
-                || resourceIdList.contains(ServicerFeatureConstant.SERVICER_MERCHANT_INFO_EDIT)
-                || resourceIdList.contains(ServicerFeatureConstant.SERVICER_MERCHANT_INFO_SUBMIT)) { // 新增/编辑/提交
-            List<String> statusList = Lists.newArrayList(ServicerStatusEnum.WAIT_SUBMIT.getFlag(),
-                    ServicerStatusEnum.REFUSED.getFlag());
-            statusSet.addAll(statusList);
-        }
-        return statusSet;
-    }
-
-    private String registerServicerByWebServiceForTest(ServicerMerchantInfo merchantInfo) throws ServicerException {
-        // 提示：注册供应平台账号，默认第一个联系人的手机号（估计以后得用统一社会信用代码作为登录id，或者是系统自动分配一个账号，强烈不建议用手机号）
-        String uuid = UUID.randomUUID().toString().replace("-", "");
-        String timeStr = this.formatDate(new Date(), "yyyyMMddHHmmssSSS");
-        String vendorIdSupply = "";
-        // 默认密码：y123456
-        String password = "y123456";
-        // 默认公司编号
-//		Integer maxCompNo = 5001;
-        Integer maxCompNo = 6001;
-        // 第一个联系人信息
-        ServicerMerchantContactsInfo contactsInfo = null;
-        // 联系人手机号（登录账号）
-        String mobileNumber = null;
-        // 服务商名称
-        String servicerName = null;
-        // 服务商联系人
-        String linkman = null;
-        List<ServicerMerchantContactsInfo> contactsList = merchantInfo.getContactsList();
-        if (CollectionUtils.isNotEmpty(contactsList)) {
-            contactsInfo = contactsList.get(0);
-        } else {
-            throw new ServicerException(ServicerExceptionEnum.SERVICER_REGISTER_ACCOUNT_ERROR);
-        }
-        mobileNumber = contactsInfo.getMobileNumber();
-        linkman = contactsInfo.getLinkMan();
-        if (StringUtils.isNotEmpty(merchantInfo.getServicerName())) {
-            servicerName = merchantInfo.getServicerName();
-        } else if (StringUtils.isNotEmpty(merchantInfo.getServicerEnName())) {
-            servicerName = merchantInfo.getServicerEnName();
-        } else {
-            throw new ServicerException(ServicerExceptionEnum.SERVICER_REGISTER_ACCOUNT_ERROR);
-        }
-
-        // 根据公司ID获取公司详细信息
-        CommonCompany commonCompany = commonCompanyService.selectById(merchantInfo.getCompId());
-        // 船东公司ID
-        // String operCompId = commonCompany.getCustomCompId();
-        String maxCustomCompId = null;
-        Wrapper<CommonCompany> companyParameterWrapper = new EntityWrapper<>();
-        companyParameterWrapper.orderBy("custom_comp_id", false);
-        List<CommonCompany> companyList = commonCompanyService.selectList(companyParameterWrapper);
-        if (CollectionUtils.isNotEmpty(companyList)) {
-            if (StringUtils.isNotEmpty(companyList.get(0).getCustomCompId())) {
-                maxCustomCompId = companyList.get(0).getCustomCompId();
-            }
-        }
-
-        String maxServicerCompId = null;
-        Wrapper<ServicerMerchantInfo> merchantInfoWrapper = new EntityWrapper<>();
-        merchantInfoWrapper.orderBy("servicer_comp_id", false);
-        List<ServicerMerchantInfo> merchantInfoList = this.selectList(merchantInfoWrapper);
-        if (CollectionUtils.isNotEmpty(merchantInfoList)) {
-            if (StringUtils.isNotEmpty(merchantInfoList.get(0).getServicerCompId())) {
-                maxServicerCompId = merchantInfoList.get(0).getServicerCompId();
-            }
-        }
-
-        // 取最大值+1
-        maxCompNo = this.maxCompNo(maxCustomCompId, maxServicerCompId, maxCompNo) + 1;
-
-        // 船东公司名称
-        String operCompName = commonCompany.getCompName();
-        // 固定传1
-        String vendorOpenTypeFlag = "1";
-        // 调用供应系统的webService
-        try {
-            Object[] registerVendors = SupplyWebServiceClient.getData(registerWebServiceUrl, "registerVendor",
-                    String.valueOf(maxCompNo), uuid, timeStr, mobileNumber, password, servicerName, operCompName,
-                    linkman, vendorOpenTypeFlag, null);
-
-            if (registerVendors != null && registerVendors.length > 0) {
-                vendorIdSupply = registerVendors[0].toString();
-                if (StringUtils.isEmpty(vendorIdSupply)) {
-                    throw new ServicerException(ServicerExceptionEnum.SERVICER_REGISTER_ACCOUNT_ERROR);
-                }
-                merchantInfo.setServicerCompId(vendorIdSupply);
-                // 供应平台账号
-                merchantInfo.setServicerAccount(mobileNumber);
-                merchantInfo.setServicerPassword(password);
-            } else {
-                throw new ServicerException(ServicerExceptionEnum.SERVICER_REGISTER_ACCOUNT_ERROR);
-            }
-        } catch (Exception e) {
-            throw new ServicerException(ServicerExceptionEnum.SERVICER_REGISTER_ACCOUNT_ERROR);
-        }
-
-        return vendorIdSupply;
-    }
-
-    private String formatDate(Date date, String pattern) {
-        if (date == null) {
-            return "";
-        }
-        SimpleDateFormat format = new SimpleDateFormat();
-        format.applyPattern(pattern);
-        return format.format(date);
-    }
-
-    private Integer maxCompNo(String s1, String s2, Integer defaultVaulue) {
-        if (StringUtils.isEmpty(s1) && StringUtils.isEmpty(s2)) {
-            return defaultVaulue;
-        }
-        if (StringUtils.isEmpty(s1)) {
-            return Integer.valueOf(s2.substring(5, 9));
-        }
-        if (StringUtils.isEmpty(s2)) {
-            return Integer.valueOf(s1.substring(5, 9));
-        }
-        if (Integer.valueOf(s1.substring(5, 9)) >= Integer.valueOf(s2.substring(5, 9))) {
-            return Integer.valueOf(s1.substring(5, 9));
-        } else {
-            return Integer.valueOf(s2.substring(5, 9));
-        }
-    }
-
-    @Override
-    public String getServicerMerchantMailInfo(String servicerId) {
-        String mailAddress = "";
-        ServicerMerchantInfo servicerMerchantInfo = this.selectById(servicerId);
-        if (null != servicerMerchantInfo && StringUtils.isNotEmpty(servicerMerchantInfo.getCommonEmailAddress())) {
-            mailAddress = servicerMerchantInfo.getCommonEmailAddress() + ";";
-        }
-        List<CommonParameterCompany> companyBaseList = commonParameterCompanyService
-                .selectList(new EntityWrapper<CommonParameterCompany>()
-                        .eq(CommonParameterCompany.QueryFields.COMP_ID,
-                                AuthSecurityUtils.getCurrentUserInfo().getCompId())
-                        .eq(CommonParameterCompany.QueryFields.CONST_CODE, "PURCHASE_ENQUIRY_MAIL_CC_ADDRESS")
-                        .setSqlSelect(
-                                "parameter_id as parameterId,parameter_key as parameterKey, parameter_value as parameterValue, parameter_value_en parameterValueEn"));
-        if (null != companyBaseList && companyBaseList.size() > 0) {
-            mailAddress = mailAddress + companyBaseList.get(0).getParameterValue();
-        }
-        if (StringUtils.isNotEmpty(mailAddress) && mailAddress.split(";").length == 1) {
-            mailAddress = mailAddress.replace(";", "");
-        }
-        return mailAddress;
-    }
-
-    /**
-     * 修改是否启用
-     */
-    @Override
-    public void updateEnabled(String id) {
-        ServicerMerchantInfo info = this.selectById(id);
-        info.setEnabled(info.getEnabled() == 1 ? 0 : 1);
-        info.updateById();
-
-        SupplyServicerMerchantInfo supplyServicerMerchantInfo = new SupplyServicerMerchantInfo();
-        BeanUtils.copyProperties(info, supplyServicerMerchantInfo);
-        supplyServicerMerchantInfoService.updateById(supplyServicerMerchantInfo);
-    }
-
-
-    public List<SupplyServicerMerchantContactsInfo> getCopyServicerMerchantContactsInfoList(List<ServicerMerchantContactsInfo> list) {
-        List<SupplyServicerMerchantContactsInfo> supplyList = new ArrayList<SupplyServicerMerchantContactsInfo>();
-        if (CollectionUtils.isNotEmpty(list)) {
-            list.stream().forEach(servicerMerchantContacts -> {
-                SupplyServicerMerchantContactsInfo supplyServicerMerchantContactsInfo = new SupplyServicerMerchantContactsInfo();
-                BeanUtils.copyProperties(servicerMerchantContacts, supplyServicerMerchantContactsInfo);
-                supplyList.add(supplyServicerMerchantContactsInfo);
-            });
-        }
-        return supplyList;
-    }
-
-    public List<SupplyServicerMerchantBankInfo> getCopyServicerMerchantBankInfoList(List<ServicerMerchantBankInfo> list) {
-        List<SupplyServicerMerchantBankInfo> supplyList = new ArrayList<SupplyServicerMerchantBankInfo>();
-        if (CollectionUtils.isNotEmpty(list)) {
-            list.stream().forEach(servicerMerchantBankInfo -> {
-                SupplyServicerMerchantBankInfo supplyServicerMerchantBankInfo = new SupplyServicerMerchantBankInfo();
-                BeanUtils.copyProperties(servicerMerchantBankInfo, supplyServicerMerchantBankInfo);
-                supplyList.add(supplyServicerMerchantBankInfo);
-            });
-        }
-        return supplyList;
-    }
-
-
-}

winsea-haixin-plugin-servicer/src/main/java/com/yh/saas/plugin/servicer/workflow/ServicerMerchantInfoListener.java

@@ -1,68 +0,0 @@
-package com.yh.saas.plugin.servicer.workflow;
-
-import com.alipay.sofa.runtime.api.annotation.SofaReference;
-import com.yh.saas.common.support.workflow.AbstractWorkflowTaskListener;
-import com.yh.saas.common.support.workflow.annotation.WorkflowTaskListener;
-import com.yh.saas.plugin.servicer.entity.ServicerMerchantInfo;
-import com.yh.saas.plugin.servicer.enums.ServicerStatusEnum;
-import com.yh.saas.plugin.servicer.service.IServicerMerchantInfoService;
-import com.yh.saas.plugin.supply.servicer.entity.SupplyServicerMerchantInfo;
-import com.yh.saas.plugin.supply.servicer.service.ISupplyServicerMerchantInfoService;
-import org.springframework.beans.BeanUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-
-@WorkflowTaskListener(name = "新增服务商", group = "服务商管理")
-public class ServicerMerchantInfoListener extends AbstractWorkflowTaskListener {
-
-    private static final long serialVersionUID = 4103656734835351132L;
-
-    @Autowired
-    private IServicerMerchantInfoService merhantInfoService;
-
-    @SofaReference
-    private ISupplyServicerMerchantInfoService supplyMerchantInfoService;
-
-    @Override
-    public void handleStatusChanged(String businessKey, String status, String statusEn, boolean processIsEnd) {
-        ServicerMerchantInfo merchantInfo = merhantInfoService.selectById(businessKey);
-        if (merchantInfo == null) {
-            return;
-        }
-        if (processIsEnd) {
-            merchantInfo.setStatusFlag(ServicerStatusEnum.COMPLETED.getFlag());
-            merchantInfo.setStatusName(ServicerStatusEnum.COMPLETED.getName());
-            merchantInfo.setStatusEnName(ServicerStatusEnum.COMPLETED.getNameEn());
-            merchantInfo.setApproveStatus(null);
-            merchantInfo.setApproveStatusEn(null);
-            merchantInfo.setSpareWorkFlowId(null);
-            merchantInfo.setWorkFlowId(null);
-            merchantInfo.setPassFlag(1);
-        } else {
-            merchantInfo.setApproveStatus(status);
-            merchantInfo.setApproveStatusEn(statusEn);
-        }
-        merhantInfoService.updateAllColumnById(merchantInfo);
-        SupplyServicerMerchantInfo supplyServicerMerchantInfo = new SupplyServicerMerchantInfo();
-        BeanUtils.copyProperties(merchantInfo, supplyServicerMerchantInfo);
-        supplyMerchantInfoService.updateAllColumnById(supplyServicerMerchantInfo);
-    }
-
-    @Override
-    public void handleRejectApplicationRepulsed(String workflowId, String businessKey, boolean needReapply) {
-        ServicerMerchantInfo merchantInfo = merhantInfoService.selectById(businessKey);
-        if (merchantInfo == null) {
-            return;
-        }
-        merchantInfo.setStatusFlag(ServicerStatusEnum.REFUSED.getFlag());
-        merchantInfo.setStatusName(ServicerStatusEnum.REFUSED.getName());
-        merchantInfo.setStatusEnName(ServicerStatusEnum.REFUSED.getNameEn());
-        merchantInfo.setApproveStatus(null);
-        merchantInfo.setApproveStatusEn(null);
-        merhantInfoService.updateAllColumnById(merchantInfo);
-
-        SupplyServicerMerchantInfo supplyServicerMerchantInfo = new SupplyServicerMerchantInfo();
-        BeanUtils.copyProperties(merchantInfo, supplyServicerMerchantInfo);
-        supplyMerchantInfoService.updateAllColumnById(supplyServicerMerchantInfo);
-    }
-
-}

winsea-haixin-plugin-servicer/src/main/java/com/yh/saas/plugin/servicer/ws/client/SupplyWebServiceClient.java

@@ -1,87 +0,0 @@
-package com.yh.saas.plugin.servicer.ws.client;
-
-import ch.qos.logback.classic.Logger;
-import com.alibaba.fastjson.JSON;
-import org.apache.cxf.binding.soap.saaj.SAAJOutInterceptor;
-import org.apache.cxf.endpoint.Client;
-import org.apache.cxf.interceptor.LoggingInInterceptor;
-import org.apache.cxf.interceptor.LoggingOutInterceptor;
-import org.apache.cxf.jaxws.endpoint.dynamic.JaxWsDynamicClientFactory;
-import org.apache.cxf.transport.http.HTTPConduit;
-import org.apache.cxf.transports.http.configuration.HTTPClientPolicy;
-import org.apache.cxf.ws.security.wss4j.WSS4JOutInterceptor;
-import org.apache.wss4j.dom.WSConstants;
-import org.apache.wss4j.dom.handler.WSHandlerConstants;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Value;
-
-import java.util.HashMap;
-import java.util.Map;
-
-@SuppressWarnings("deprecation")
-public class SupplyWebServiceClient {
-    private static final Logger LOG = (Logger) LoggerFactory.getLogger(SupplyWebServiceClient.class);
-
-    @Value("${purchase.webservice.address:}")
-    public static String webServiceUrl;
-
-    /**
-     * 连接超时10分钟 单位毫秒
-     **/
-    public static final long CONTIMEOUT = 600000;
-    /**
-     * 接收超时10分钟 单位毫秒
-     **/
-    public static final long RECTIMEOUT = 600000;
-
-    private SupplyWebServiceClient() {
-
-    }
-
-    public static void main(String[] args) throws Exception {
-        SupplyWebServiceClient.getData(
-                webServiceUrl,
-                "isConnect",
-                "");
-    }
-
-    public static Object[] getData(String url, String serviceName, Object... params) throws Exception {
-        Client client = null;
-        Object[] results = null;
-        try {
-
-            JaxWsDynamicClientFactory factory = JaxWsDynamicClientFactory.newInstance();
-            client = factory.createClient(url);
-            HTTPConduit http = (HTTPConduit) client.getConduit();
-            HTTPClientPolicy httpClientPolicy = new HTTPClientPolicy();
-            httpClientPolicy.setConnectionTimeout(CONTIMEOUT);
-            httpClientPolicy.setAllowChunking(false);
-            httpClientPolicy.setReceiveTimeout(RECTIMEOUT);
-            http.setClient(httpClientPolicy);
-            // 添加cxf安全验证拦截器，必须
-            client.getInInterceptors().add(new LoggingInInterceptor());
-            client.getOutInterceptors().add(new LoggingOutInterceptor());
-            client.getOutInterceptors().add(new SAAJOutInterceptor());
-            client.getOutInterceptors().add(new WSS4JOutInterceptor(getOutProps()));
-            results = client.invoke(serviceName, params);
-            System.out.printf("result:" + JSON.toJSONString(results));
-        } catch (Exception e) {
-            LOG.error(e.getMessage(), e);
-        } finally {
-            if (client != null) {
-                client.close();
-            }
-        }
-        return results;
-    }
-
-    private static Map<String, Object> getOutProps() {
-        Map<String, Object> outProps = new HashMap<>();
-        outProps.put(WSHandlerConstants.ACTION, WSHandlerConstants.USERNAME_TOKEN);
-        outProps.put(WSHandlerConstants.USER, "cxfClient");
-        outProps.put(WSHandlerConstants.PASSWORD_TYPE, WSConstants.PW_DIGEST);
-        outProps.put(WSHandlerConstants.PW_CALLBACK_CLASS, SupplyWsClientAuthHandler.class.getName());
-        return outProps;
-    }
-
-}

winsea-haixin-plugin-servicer/src/main/java/com/yh/saas/plugin/servicer/ws/client/SupplyWsClientAuthHandler.java

@@ -1,36 +0,0 @@
-package com.yh.saas.plugin.servicer.ws.client;
-
-import org.apache.wss4j.common.ext.WSPasswordCallback;
-
-import javax.security.auth.callback.Callback;
-import javax.security.auth.callback.CallbackHandler;
-import javax.security.auth.callback.UnsupportedCallbackException;
-import java.io.IOException;
-
-/**
- * 类名称：客户端WS安全认证处理类
- * 内容摘要：
- *
- * @author yinghai
- * @version 1.0 2012-9-26
- */
-public class SupplyWsClientAuthHandler implements CallbackHandler {
-
-    /**
-     * webservice调用的安全认证用户名
-     */
-    private static final String WEBSERVICE_USERNAME = "yh_webservice_username";
-    /**
-     * webservice调用的安全认证密码
-     */
-    private static final String WEBSERVICE_USERPASS = "yh_webservice_userpass";
-
-    public void handle(Callback[] callbacks) throws IOException, UnsupportedCallbackException {
-        for (int i = 0; i < callbacks.length; i++) {
-            WSPasswordCallback ps = (WSPasswordCallback) callbacks[i];
-            ps.setPassword(WEBSERVICE_USERPASS);
-            ps.setIdentifier(WEBSERVICE_USERNAME);
-        }
-    }
-
-}

winsea-haixin-plugin-servicer/src/main/java/com/yh/saas/plugin/supply/servicer/entity/SupplyServicerMerchantBankInfo.java

@@ -1,109 +0,0 @@
-package com.yh.saas.plugin.supply.servicer.entity;
-
-import com.baomidou.mybatisplus.annotations.TableId;
-import com.baomidou.mybatisplus.annotations.TableName;
-import com.baomidou.mybatisplus.enums.IdType;
-import com.yh.saas.common.support.entity.BaseModel;
-import com.yh.saas.common.support.util.query.SearchField;
-import com.yh.saas.common.support.util.query.SearchMode;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.experimental.Accessors;
-
-import java.io.Serializable;
-
-/**
- * <p>
- * 记录服务商银行账户信息表
- * </p>
- *
- * @author yul
- * @since 2019-11-11
- */
-@Data
-@EqualsAndHashCode(callSuper = true)
-@Accessors(chain = true)
-@TableName("servicer_merchant_bank_info")
-public class SupplyServicerMerchantBankInfo extends BaseModel<SupplyServicerMerchantBankInfo> {
-
-	private static final long serialVersionUID = -2953416870220877273L;
-
-	/**
-	 * 银行账户ID
-	 */
-	@TableId(type = IdType.UUID)
-	private String bankId;
-	/**
-	 * 服务商ID
-	 */
-	@SearchField(mode = SearchMode.EQ)
-	private String servicerId;
-	/**
-	 * 公司ID
-	 */
-	private String compId;
-	/**
-	 * 收款人名称
-	 */
-	private String payeeName;
-	/**
-	 * 收款人SWFT
-	 */
-	private String payeeSwft;
-	/**
-	 * 收款人地址
-	 */
-	private String payeeAddress;
-	/**
-	 * 开户行国籍
-	 */
-	private String nationalityKey;
-	/**
-	 * 开户行国籍名称
-	 */
-	private String nationalityValue;
-	/**
-	 * 开户行国籍英文名
-	 */
-	private String nationalityEnValue;
-	/**
-	 * 开户行账号
-	 */
-	private String receiveBankAccount;
-	/**
-	 * 开户行名称
-	 */
-	private String receiveBankName;
-	/**
-	 * 开户行地址
-	 */
-	private String receiveBankAddress;
-	/**
-	 * 序号
-	 */
-	private Long serialNumber;
-
-	@Override
-	protected Serializable pkVal() {
-		return this.bankId;
-	}
-
-	/**
-	 * 查询用字段
-	 * 
-	 */
-	public static class QueryFields {
-
-		public static final String COMP_ID = "comp_id";
-
-		public static final String SERVICER_ID = "servicer_id";
-
-		public static final String BANK_ID = "bank_id";
-
-		public static final String DELETE_FALG = "delete_flag";
-
-		private QueryFields() {
-		}
-	}
-
-}

winsea-haixin-plugin-servicer/src/main/java/com/yh/saas/plugin/supply/servicer/entity/SupplyServicerMerchantContactsInfo.java

@@ -1,101 +0,0 @@
-package com.yh.saas.plugin.supply.servicer.entity;
-
-import com.baomidou.mybatisplus.annotations.TableId;
-import com.baomidou.mybatisplus.annotations.TableName;
-import com.baomidou.mybatisplus.enums.IdType;
-import com.yh.saas.common.support.entity.BaseModel;
-import com.yh.saas.common.support.util.query.SearchField;
-import com.yh.saas.common.support.util.query.SearchMode;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.experimental.Accessors;
-
-import java.io.Serializable;
-
-/**
- * <p>
- * 记录服务商联系人信息表
- * </p>
- *
- * @author yul
- * @since 2019-11-11
- */
-@Data
-@EqualsAndHashCode(callSuper = true)
-@Accessors(chain = true)
-@TableName("servicer_merchant_contacts_info")
-public class SupplyServicerMerchantContactsInfo extends BaseModel<SupplyServicerMerchantContactsInfo> {
-
-	private static final long serialVersionUID = 6890462238366385691L;
-
-	/**
-	 * 联系人ID
-	 */
-	@TableId(type = IdType.UUID)
-	private String contactsId;
-	/**
-	 * 服务商ID
-	 */
-	@SearchField(mode = SearchMode.EQ)
-	private String servicerId;
-	/**
-	 * 公司ID
-	 */
-	private String compId;
-	/**
-	 * 联系人
-	 */
-	private String linkMan;
-	/**
-	 * 手机号码
-	 */
-	private String mobileNumber;
-	/**
-	 * 上一次手机号码
-	 */
-	private String oldMobileNumber;
-	/**
-	 * 邮箱
-	 */
-	private String emailAddress;
-	/**
-	 * 联系电话
-	 */
-	private String telNumber;
-	/**
-	 * QQ/微信
-	 */
-	private String tencentNumber;
-	/**
-	 * 联系人职务
-	 */
-	private String linkManDuty;
-	/**
-	 * 序号
-	 */
-	private Long serialNumber;
-
-	@Override
-	protected Serializable pkVal() {
-		return this.contactsId;
-	}
-
-	/**
-	 * 查询用字段
-	 * 
-	 */
-	public static class QueryFields {
-
-		public static final String COMP_ID = "comp_id";
-
-		public static final String SERVICER_ID = "servicer_id";
-
-		public static final String CONTACTS_ID = "contacts_id";
-
-		public static final String DELETE_FALG = "delete_flag";
-
-		private QueryFields() {
-		}
-	}
-
-}

winsea-haixin-plugin-servicer/src/main/java/com/yh/saas/plugin/supply/servicer/entity/SupplyServicerMerchantInfo.java

@@ -1,261 +0,0 @@
-package com.yh.saas.plugin.supply.servicer.entity;
-
-import com.baomidou.mybatisplus.annotations.TableField;
-import com.baomidou.mybatisplus.annotations.TableId;
-import com.baomidou.mybatisplus.annotations.TableName;
-import com.baomidou.mybatisplus.enums.IdType;
-import com.yh.saas.common.support.entity.BaseModel;
-import com.yh.saas.common.support.util.query.SearchField;
-import com.yh.saas.common.support.util.query.SearchMode;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.experimental.Accessors;
-import org.apache.commons.lang3.StringUtils;
-
-import java.io.Serializable;
-import java.util.List;
-
-/**
- * <p>
- * 记录服务商信息表
- * </p>
- *
- * @author yul
- * @since 2019-11-11
- */
-@Data
-@EqualsAndHashCode(callSuper = true)
-@Accessors(chain = true)
-@TableName("servicer_merchant_info")
-public class SupplyServicerMerchantInfo extends BaseModel<SupplyServicerMerchantInfo> {
-
-	private static final long serialVersionUID = -7319219122494086826L;
-	/**
-	 * 服务商ID
-	 */
-	@TableId(type = IdType.UUID)
-	private String servicerId;
-	/**
-	 * 公司ID
-	 */
-	@SearchField(mode = SearchMode.EQ)
-	private String compId;
-	/**
-	 * 服务商名称
-	 */
-	@SearchField(mode = SearchMode.EQ)
-	private String servicerName;
-	/**
-	 * 服务商英文名
-	 */
-	@SearchField(mode = SearchMode.EQ)
-	private String servicerEnName;
-
-	/**
-	 * 服务商类型ID
-	 */
-	private String servicerTypeId;
-
-	/**
-	 * 服务商类型
-	 */
-	private String servicerType;
-
-	/**
-	 * 国籍编码
-	 */
-	private String nationalityKey;
-	/**
-	 * 国籍名称
-	 */
-	private String nationalityValue;
-	/**
-	 * 国籍英文名
-	 */
-	private String nationalityEnValue;
-	/**
-	 * 统一社会信用代码
-	 */
-	@SearchField(mode = SearchMode.EQ)
-	private String uscc;
-	/**
-	 * 所属省份编码
-	 */
-	private Integer provKey;
-	/**
-	 * 所属省份名称
-	 */
-	private String provValue;
-	/**
-	 * 所属城市编码
-	 */
-	private Integer cityKey;
-	/**
-	 * 所属城市名称
-	 */
-	private String cityValue;
-	/**
-	 * 地区全名
-	 */
-	private String area_full_name;
-	/**
-	 * 服务商公司地址
-	 */
-	private String address;
-	/**
-	 * 传真
-	 */
-	private String faxNumber;
-	/**
-	 * 邮政编码
-	 */
-	private String postalCode;
-	/**
-	 * 备注
-	 */
-	private String remark;
-	/**
-	 * 服务类型ID
-	 */
-	private String serviceTypeIds;
-	/**
-	 * 服务类型名称
-	 */
-	private String serviceTypeNames;
-	/**
-	 * 服务类型名称（英文）
-	 */
-	private String serviceTypeNamesEn;
-	/**
-	 * 服务类型备注
-	 */
-	private String serviceTypeRemark;
-	/**
-	 * 单一采购标识
-	 */
-	private String singlePurchaseFlag;
-	/**
-	 * 营业执照附件地址
-	 */
-	private String certificateAppendixIds;
-	/**
-	 * 资质附件地址
-	 */
-	private String qualificationAppendixIds;
-	/**
-	 * 服务商状态
-	 */
-	private String statusFlag;
-	/**
-	 * 服务商状态名称
-	 */
-	private String statusName;
-	/**
-	 * 服务商状态英文名
-	 */
-	private String statusEnName;
-	/**
-	 * 审核状态
-	 */
-	private String approveStatus;
-	/**
-	 * 审核状态英文
-	 */
-	private String approveStatusEn;
-	/**
-	 * 工作流ID
-	 */
-	private String workFlowId;
-	/**
-	 * 备用工作流ID
-	 */
-	private String spareWorkFlowId;
-	/**
-	 * 是否启用
-	 */
-	private Integer enabled;
-	/**
-	 * 是否审核通过
-	 */
-	private Integer passFlag;
-	/**
-	 * 服务商账号
-	 */
-	private String servicerAccount;
-	/**
-	 * 服务商密码
-	 */
-	private String servicerPassword;
-	/**
-	 * 服务商公司ID
-	 */
-	private String servicerCompId;
-    /**
-     * 公共邮箱
-     */
-    private String commonEmailAddress;
-    /**
-     * 黑名单标识
-     */
-    private Boolean blackFlag;
-    /**
-     * 黑名单原因
-     */
-    private String blackReason;
-
-	/**
-	 * 服务商联系人列表
-	 */
-	@TableField(exist = false)
-	private List<SupplyServicerMerchantContactsInfo> contactsList;
-
-	/**
-	 * 服务商银行账户列表
-	 */
-	@TableField(exist = false)
-	private List<SupplyServicerMerchantBankInfo> bankList;
-
-	/**
-	 * 任务ID
-	 */
-	@TableField(exist = false)
-	private String taskId;
-
-	@Override
-	protected Serializable pkVal() {
-		return this.servicerId;
-	}
-
-	/**
-	 * 查询用字段
-	 * 
-	 */
-	public static class QueryFields {
-
-		public static final String SERVICER_ID = "servicer_id";
-
-		public static final String COMP_ID = "comp_id";
-
-		public static final String SERVICER_NAME = "servicer_name";
-
-		public static final String SERVICER_EN_NAME = "servicer_en_name";
-
-		public static final String USCC = "uscc";
-
-		public static final String DELETE_FALG = "delete_flag";
-
-		public static final String CREATE_DATE = "create_date";
-
-		private QueryFields() {
-		}
-	}
-
-	public String getCurrentWorkflowId() {
-		if (!StringUtils.contains(this.workFlowId, ",")) {
-			return this.workFlowId;
-		}
-		String[] workflowIdArr = this.workFlowId.split(",");
-		return workflowIdArr[workflowIdArr.length - 1];
-	}
-
-}

winsea-haixin-plugin-servicer/src/main/java/com/yh/saas/plugin/supply/servicer/entity/view/ServicerView.java

@@ -1,36 +0,0 @@
-package com.yh.saas.plugin.supply.servicer.entity.view;
-
-import lombok.Data;
-
-@Data
-public class ServicerView<T> {
-
-	private T merchantInfo;
-
-	/**
-	 * 任务ID
-	 */
-	private String taskId;
-
-	private Boolean editable;
-
-	/**
-	 * 页面审批标识是否通过 1.通过 2.退回
-	 */
-	private String isApprove;
-
-	/**
-	 * 审核意见
-	 */
-	private String auditMind;
-
-	private Boolean onlySubmit = false;
-
-	public ServicerView<T> getInstance(T applyInfo, String taskId, boolean editable) {
-		ServicerView<T> servicerView = new ServicerView<>();
-		servicerView.setMerchantInfo(applyInfo);
-		servicerView.setTaskId(taskId);
-		servicerView.setEditable(editable);
-		return servicerView;
-	}
-}

winsea-haixin-plugin-servicer/src/main/java/com/yh/saas/plugin/supply/servicer/service/ISupplyServicerMerchantBankInfoService.java

@@ -1,16 +0,0 @@
-package com.yh.saas.plugin.supply.servicer.service;
-
-import com.baomidou.mybatisplus.service.IService;
-import com.yh.saas.plugin.supply.servicer.entity.SupplyServicerMerchantBankInfo;
-
-/**
- * <p>
- * 记录服务商银行账户信息表 服务类
- * </p>
- *
- * @author yul
- * @since 2019-11-11
- */
-public interface ISupplyServicerMerchantBankInfoService extends IService<SupplyServicerMerchantBankInfo> {
-
-}

winsea-haixin-plugin-servicer/src/main/java/com/yh/saas/plugin/supply/servicer/service/ISupplyServicerMerchantContactsInfoService.java

@@ -1,16 +0,0 @@
-package com.yh.saas.plugin.supply.servicer.service;
-
-import com.baomidou.mybatisplus.service.IService;
-import com.yh.saas.plugin.supply.servicer.entity.SupplyServicerMerchantContactsInfo;
-
-/**
- * <p>
- * 记录服务商联系人信息表 服务类
- * </p>
- *
- * @author yul
- * @since 2019-11-11
- */
-public interface ISupplyServicerMerchantContactsInfoService extends IService<SupplyServicerMerchantContactsInfo> {
-
-}

winsea-haixin-plugin-servicer/src/main/java/com/yh/saas/plugin/supply/servicer/service/ISupplyServicerMerchantInfoService.java

@@ -1,46 +0,0 @@
-package com.yh.saas.plugin.supply.servicer.service;
-
-import com.baomidou.mybatisplus.service.IService;
-import com.yh.saas.plugin.supply.servicer.entity.SupplyServicerMerchantInfo;
-import com.yh.saas.plugin.supply.servicer.entity.view.ServicerView;
-
-/**
- * <p>
- * 记录服务商信息表 服务类
- * </p>
- *
- * @author yul
- * @since 2019-11-11
- */
-public interface ISupplyServicerMerchantInfoService extends IService<SupplyServicerMerchantInfo> {
-
-	/**
-	 * 保存服务商信息
-	 * 
-	 * @param merchantInfoView
-	 * @return
-	 */
-	void saveServicerMerchant(ServicerView<SupplyServicerMerchantInfo> merchantInfoView);
-
-	/**
-	 * 审核服务商信息
-	 * 
-	 * @param merchantInfoView
-	 * @return
-	 */
-	void approveServicerMerchant(String id,String approveStatus);
-
-	/**
-	 * 删除服务商信息
-	 * 
-	 * @param merchantInfo
-	 */
-	void deleteMerchantById(SupplyServicerMerchantInfo merchantInfo);
-
-
-
-	/**
-	 * 修改是否启用
-	 */
-	void updateEnabled(String id);
-}

winsea-haixin-plugin-servicer/src/main/resources/mapper/ServicerBillOperateHisMapper.xml

@@ -1,5 +0,0 @@
-<?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.yh.saas.plugin.servicer.mapper.ServicerBillOperateHisMapper">
-
-</mapper>

winsea-haixin-plugin-servicer/src/main/resources/mapper/ServicerMerchantBankInfoMapper.xml

@@ -1,5 +0,0 @@
-<?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.yh.saas.plugin.servicer.mapper.ServicerMerchantBankInfoMapper">
-
-</mapper>

winsea-haixin-plugin-servicer/src/main/resources/mapper/ServicerMerchantContactsInfoMapper.xml

@@ -1,5 +0,0 @@
-<?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.yh.saas.plugin.servicer.mapper.ServicerMerchantContactsInfoMapper">
-
-</mapper>

winsea-haixin-plugin-servicer/src/main/resources/mapper/ServicerMerchantInfoMapper.xml

@@ -1,393 +0,0 @@
-<?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.yh.saas.plugin.servicer.mapper.ServicerMerchantInfoMapper">
-	
-	<!-- 服务商复合结果类型 -->
-	<resultMap id="merchantInfoComplexResultMap" type="com.yh.saas.plugin.servicer.entity.ServicerMerchantInfo">
-		<id column="servicer_id" property="servicerId" />
-		<result column="comp_id" property="compId" />
-		<result column="servicer_name" property="servicerName" />
-		<result column="servicer_en_name" property="servicerEnName" />
-		<result column="nationality_key" property="nationalityKey" />
-		<result column="nationality_value" property="nationalityValue" />
-		<result column="nationality_en_value" property="nationalityEnValue" />
-		<result column="uscc" property="uscc" />
-		<result column="prov_key" property="provKey" />
-		<result column="prov_value" property="provValue" />
-		<result column="city_key" property="cityKey" />
-		<result column="city_value" property="cityValue" />
-		<result column="area_full_name" property="area_full_name" />
-		<result column="address" property="address" />
-		<result column="fax_number" property="faxNumber" />
-		<result column="postal_code" property="postalCode" />
-		<result column="remark" property="remark" />
-		<result column="service_type_ids" property="serviceTypeIds" />
-		<result column="service_type_names" property="serviceTypeNames" />
-		<result column="service_type_names_en" property="serviceTypeNamesEn" />
-		<result column="service_type_remark" property="serviceTypeRemark" />
-		<result column="single_purchase_flag" property="singlePurchaseFlag" />
-		<result column="certificate_appendix_ids" property="certificateAppendixIds" />
-		<result column="qualification_appendix_ids" property="qualificationAppendixIds" />
-		<result column="status_flag" property="statusFlag" />
-		<result column="status_name" property="statusName" />
-		<result column="status_en_name" property="statusEnName" />
-		<result column="approve_status" property="approveStatus" />
-		<result column="approve_status_en" property="approveStatusEn" />
-		<result column="work_flow_id" property="workFlowId" />
-		<result column="enabled" property="enabled" />
-		<result column="servicer_account" property="servicerAccount" />
-		<result column="servicer_comp_id" property="servicerCompId" />
-		<collection property="contactsList" column="servicer_id" ofType="com.yh.saas.plugin.servicer.entity.ServicerMerchantContactsInfo"
-					select="getContactsListByServicerId">
-			<id column="contacts_id" property="contactsId" />
-			<result column="servicer_id" property="servicerId" />
-			<result column="comp_id" property="compId" />
-			<result column="link_man" property="linkMan" />
-			<result column="mobile_number" property="mobileNumber" />
-			<result column="email_address" property="emailAddress" />
-			<result column="tel_number" property="telNumber" />
-			<result column="tencent_number" property="tencentNumber" />
-			<result column="link_man_duty" property="linkManDuty" />
-			<result column="serial_number" property="serialNumber" />
-		</collection>
-		<collection property="bankList" column="servicer_id" ofType="com.yh.saas.plugin.servicer.entity.ServicerMerchantBankInfo"
-					select="getBankListByServicerId">
-			<id column="bank_id" property="bankId" />
-			<result column="servicer_id" property="servicerId" />
-			<result column="comp_id" property="compId" />
-			<result column="payee_name" property="payeeName" />
-			<result column="payee_swft" property="payeeSwft" />
-			<result column="payee_address" property="payeeAddress" />
-			<result column="nationality_key" property="nationalityKey" />
-			<result column="nationality_value" property="nationalityValue" />
-			<result column="nationality_en_value" property="nationalityEnValue" />
-			<result column="receive_bank_account" property="receiveBankAccount" />
-			<result column="receive_bank_name" property="receiveBankName" />
-			<result column="receive_bank_address" property="receiveBankAddress" />
-		</collection>
-	</resultMap>
-	
-	<!-- 服务商银行复合结果类型 -->
-	<resultMap id="merchantBankInfoComplexResultMap" type="com.yh.saas.plugin.servicer.entity.ServicerMerchantInfo">
-		<id column="servicer_id" property="servicerId" />
-		<result column="comp_id" property="compId" />
-		<result column="servicer_name" property="servicerName" />
-		<result column="servicer_en_name" property="servicerEnName" />
-		<collection property="bankList" column="servicer_id" ofType="com.yh.saas.plugin.servicer.entity.ServicerMerchantBankInfo">
-			<id column="bank_id" property="bankId" />
-			<result column="servicer_id" property="servicerId" />
-			<result column="comp_id" property="compId" />
-			<result column="payee_name" property="payeeName" />
-			<result column="payee_swft" property="payeeSwft" />
-			<result column="payee_address" property="payeeAddress" />
-			<result column="nationality_key" property="nationalityKey" />
-			<result column="nationality_value" property="nationalityValue" />
-			<result column="nationality_en_value" property="nationalityEnValue" />
-			<result column="receive_bank_account" property="receiveBankAccount" />
-			<result column="receive_bank_name" property="receiveBankName" />
-			<result column="receive_bank_address" property="receiveBankAddress" />
-		</collection>
-	</resultMap>
-	
-	<sql id="searchCondition">
-		t.delete_flag = '0'
-		AND t.comp_id = #{compId}
-		<if test="blackFlag !=null and blackFlag !=''">
-			<if test="blackFlag == 1">
-				AND t.black_flag = '1'
-			</if>
-			<if test="blackFlag != 1">
-				AND (t.black_flag = '0' OR t.black_flag is null)
-			</if>
-		</if>
-		<if test="enabled !=null and enabled !=''">
-			AND t.enabled = #{enabled}
-		</if>
-		<if test="serviceType !=null and serviceType !=''">
-			AND (
-			<foreach collection="serviceType.split(',')" item="serviceTypeId" open="(" close=")" separator="or">
-				find_in_set(#{serviceTypeId}, t.service_type_ids)
-			</foreach>
-			)
-		</if>
-		<if test="statusType == 1 or statusType == 2">
-			AND ( 1 = 2
-			<if test="businessKeys != null and businessKeys.size > 0">
-				OR (
-				<foreach collection="businessKeys" item="businessValue" open="(" close=")" separator="or">
-					t.servicer_id = #{businessValue}
-				</foreach>
-				)
-			</if>
-			<if test="statusList != null and statusList.size > 0">
-                OR (
-                <foreach collection="statusList" item="statusId" separator="or" open="(" close=")">
-                    t.status_flag =
-                    <if test="statusId != null and (statusId == 1 or statusId == 0)">
-                        #{statusId} and t.create_user_id = #{staffId}
-                    </if>
-                    <if test="statusId != null and statusId != 1 and statusId != 0">
-                        #{statusId}
-                    </if>
-                </foreach>
-                )
-            </if>
-            <if test="statusType == 2 ">
-                OR (t.servicer_id in (
-	                	SELECT
-							his.bill_id
-						FROM
-							servicer_bill_operate_his his
-						WHERE
-							his.bill_id = t.servicer_id
-						AND his.create_user_id = #{staffId} 
-						GROUP BY
-							his.bill_id
-                	)
-                )
-            </if>
-            )
-		</if>
-		<if test="searchKeyword !=null and searchKeyword !=''">
-			AND ( 
-			lower(t.servicer_name) like lower(CONCAT('%', #{searchKeyword}, '%'))
-			OR lower(t.servicer_en_name) like lower(CONCAT('%', #{searchKeyword}, '%'))
-			OR lower(t.area_full_name) like lower(CONCAT('%', #{searchKeyword}, '%'))
-			OR lower(t1.link_man) like lower(CONCAT('%', #{searchKeyword}, '%'))
-			)
-		</if>
-	</sql>
-	
-	<select id="getContactsListByServicerId" parameterType="java.lang.String" resultType="com.yh.saas.plugin.servicer.entity.ServicerMerchantContactsInfo">
-		SELECT
-			t1.contacts_id,
-			t1.servicer_id,
-			t1.comp_id,
-			t1.link_man,
-			t1.mobile_number,
-			t1.email_address,
-			t1.tel_number,
-			t1.tencent_number,
-			t1.link_man_duty,
-			t1.serial_number,
-			t1.delete_flag,
-			t1.create_date,
-			t1.create_user_id,
-			t1.update_date,
-			t1.update_user_id
-		FROM
-			servicer_merchant_contacts_info t1
-		WHERE
-			t1.servicer_id = #{servicer_id}
-		AND t1.delete_flag = '0'
-	</select>
-	
-	<select id="getBankListByServicerId" parameterType="java.lang.String" resultType="com.yh.saas.plugin.servicer.entity.ServicerMerchantBankInfo">
-		SELECT
-			t2.bank_id,
-			t2.servicer_id,
-			t2.comp_id,
-			t2.payee_name,
-			t2.payee_swft,
-			t2.payee_address,
-			t2.nationality_key,
-			t2.nationality_value,
-			t2.nationality_en_value,
-			t2.receive_bank_account,
-			t2.receive_bank_name,
-			t2.receive_bank_address
-		FROM
-			servicer_merchant_bank_info t2
-		WHERE
-			t2.servicer_id = #{servicer_id}
-		AND t2.delete_flag = '0'
-	</select>
-	
-	<!-- 获得服务商总数 -->
-	<select id="getCountByCondition" parameterType="Map" resultType="java.lang.Integer">
-		SELECT
-			COUNT(1)
-		FROM
-			(
-				SELECT
-					t.servicer_id
-				FROM
-					servicer_merchant_info t
-				LEFT JOIN servicer_merchant_contacts_info t1 ON t.servicer_id = t1.servicer_id
-				WHERE
-					<include refid="searchCondition"/>
-				GROUP BY
-					t.servicer_id
-			) n
-	</select>
-	
-	<!-- 服务商分页查询 -->
-	<select id="getPageListByCondition" parameterType="Map" resultType="java.lang.String">
-		SELECT
-			t.servicer_id
-		FROM
-			servicer_merchant_info t
-		LEFT JOIN servicer_merchant_contacts_info t1 ON t.servicer_id = t1.servicer_id
-		WHERE
-			<include refid="searchCondition"/>
-		GROUP BY
-			t.servicer_id
-		ORDER BY t.update_date DESC
-	</select>
-
-	<!-- 服务商列表查询 -->
-	<select id="getListByCondition" parameterType="Map" resultMap="merchantInfoComplexResultMap">
-		SELECT
-			t.servicer_id,
-			t.comp_id,
-			t.servicer_name,
-			t.servicer_en_name,
-			t.nationality_key,
-			t.nationality_value,
-			t.nationality_en_value,
-			t.uscc,
-			t.prov_key,
-			t.prov_value,
-			t.city_key,
-			t.city_value,
-			t.area_full_name,
-			t.address,
-			t.fax_number,
-			t.postal_code,
-			t.remark,
-			t.service_type_ids,
-			t.service_type_names,
-			t.service_type_names_en,
-			t.service_type_remark,
-			t.single_purchase_flag,
-			t.certificate_appendix_ids,
-			t.qualification_appendix_ids,
-			t.status_flag,
-			t.status_name,
-			t.status_en_name,
-			t.approve_status,
-			t.approve_status_en,
-			t.work_flow_id,
-			t.enabled,
-			t.servicer_account,
-			t.servicer_password,
-			t.servicer_comp_id,
-			t.delete_flag,
-			t.create_date,
-			t.create_user_id,
-			t.update_date,
-			t.update_user_id
-		FROM
-			servicer_merchant_info t
-		WHERE
-			t.delete_flag = '0'
-		AND t.comp_id = #{compId}
-		<if test="blackFlag !=null and blackFlag !=''">
-			<if test="blackFlag == 1">
-				AND t.black_flag = '1'
-			</if>
-			<if test="blackFlag != 1">
-				AND (t.black_flag = '0' OR t.black_flag is null)
-			</if>
-		</if>
-		<if test="enabled !=null and enabled !=''">
-			AND t.enabled = #{enabled}
-		</if>
-		<if test="servicerIdList !=null and servicerIdList.size > 0">
-			AND (
-				<foreach collection="servicerIdList" item="servicerId" open="(" close=")" separator="or">
-					t.servicer_id = #{servicerId}
-				</foreach>
-			)
-		</if>
-		<if test="serviceType !=null and serviceType !=''">
-			AND (
-				<foreach collection="serviceType.split(',')" item="serviceTypeId" open="(" close=")" separator="or">
-					find_in_set(#{serviceTypeId}, t.service_type_ids)
-				</foreach>
-			)
-		</if>
-		<choose>
-			<when test="orderColumn != null and orderColumn !=''">
-				<if test="orderColumn == 'service_type'">
-					<if test="orderColumnServiceTypeIds != null and orderColumnServiceTypeIds.size > 0">
-					ORDER BY 
-					<foreach collection="orderColumnServiceTypeIds" item="orderColumnServiceTypeId" separator=",">
-						!find_in_set(#{orderColumnServiceTypeId}, t.service_type_ids) ${order}
-					</foreach>
-					</if>
-				</if>
-				<if test="orderColumn == 'area_name'">
-					ORDER BY convert(t.area_full_name using gbk) ${order}
-				</if>
-				<if test="orderColumn != 'service_type' and orderColumn != 'area_name'">
-					ORDER BY t.update_date DESC
-				</if>
-			</when>
-			<otherwise>
-				ORDER BY t.update_date DESC
-			</otherwise>
-		</choose>
-		<if test="currentPage != null and currentPage != ''">
-			LIMIT ${startRecord}, ${pageSize}
-		</if>
-	</select>
-	
-	<!-- 服务商银行列表查询 -->
-	<select id="getBankListByCondition" parameterType="Map" resultMap="merchantBankInfoComplexResultMap">
-		SELECT
-			t.servicer_id,
-			t.comp_id,
-			t.servicer_name,
-			t.servicer_en_name,
-			t1.bank_id,
-			t1.servicer_id,
-			t1.comp_id,
-			t1.payee_name,
-			t1.payee_swft,
-			t1.payee_address,
-			t1.nationality_key,
-			t1.nationality_value,
-			t1.nationality_en_value,
-			t1.receive_bank_account,
-			t1.receive_bank_name,
-			t1.receive_bank_address
-		FROM
-			servicer_merchant_info t
-		LEFT JOIN servicer_merchant_bank_info t1 ON t.servicer_id = t1.servicer_id AND t1.delete_flag = '0'
-		WHERE
-			t.delete_flag = '0'
-		AND t.comp_id = #{compId}
-		<if test="enabled !=null and enabled !=''">
-			AND t.enabled = #{enabled}
-		</if>
-		<if test="blackFlag !=null and blackFlag !=''">
-			<if test="blackFlag == 1">
-				AND t.black_flag = '1'
-			</if>
-			<if test="blackFlag != 1">
-				AND (t.black_flag = '0' OR t.black_flag is null)
-			</if>
-		</if>
-		<if test="serviceType !=null and serviceType !=''">
-			AND (
-				<foreach collection="serviceType.split(',')" item="serviceTypeId" open="(" close=")" separator="or">
-					find_in_set(#{serviceTypeId}, t.service_type_ids)
-				</foreach>
-			)
-		</if>
-		ORDER BY
-			(
-				t.servicer_name IS NULL
-				OR t.servicer_name = ''
-			),
-			CONVERT (t.servicer_name USING gbk),
-			(
-				t.servicer_en_name IS NULL
-				OR t.servicer_en_name = ''
-			),
-			t.servicer_en_name,
-			CONVERT (t1.receive_bank_name USING gbk)
-	</select>
-	
-</mapper>