Skip to content

G
gic-platform-enterprise
Commit 49ce7acf by zhiwj
Options

Merge branch 'developer' of… 

Merge branch 'developer' of http://115.159.76.241/base_platform_enterprise/gic-platform-enterprise into developer
parents f8d7c4f3 3b1d9b10
Showing with 0 additions and 1664 deletions
gic-platform-enterprise-api/src/main/java/com/gic/enterprise/constant/OrderTypeEnum.java deleted 100644 → 0
package com.gic.enterprise.constant;
/**
* @author guojx
* @date 2019/7/19 10:07 AM
*/
public enum OrderTypeEnum {
Recharge(1, "充值"),
ShortMessagePackage(2, "短信套餐"),
Service(3, "服务"),
ExtensionPackage(4, "拓展包"),
Package(5, "套餐包");
private int code;
private String message;
private OrderTypeEnum(int code, String message) {
this.code = code;
this.message = message;
}
public int getCode() {
return code;
}
public void setCode(int code) {
this.code = code;
}
public String getMessage() {
return message;
}
public void setMessage(String message) {
this.message = message;
}
public static String getMessageBuCode(Integer code) {
if (code == null) {
return "未知";
}
for (OrderTypeEnum statusEnum : values()) {
if (statusEnum.getCode() == code.intValue()) {
return statusEnum.getMessage();
}
}
return "未知";
}
}
gic-platform-enterprise-api/src/main/java/com/gic/enterprise/constant/TransferAccountApprovalStatusEnum.java deleted 100644 → 0
package com.gic.enterprise.constant;
/**
* @author guojx
* @date 2019/7/19 10:07 AM
*/
public enum TransferAccountApprovalStatusEnum {
TO_BE_APPROVED(1, "待审批"),
CANCEL(2, "已取消"),
REJECT(3, "已驳回"),
AGREE(4, "审批通过");
private int code;
private String message;
private TransferAccountApprovalStatusEnum(int code, String message) {
this.code = code;
this.message = message;
}
public int getCode() {
return code;
}
public void setCode(int code) {
this.code = code;
}
public String getMessage() {
return message;
}
public void setMessage(String message) {
this.message = message;
}
public static String getMessageBuCode(Integer code) {
if (code == null) {
return "未知";
}
for (TransferAccountApprovalStatusEnum statusEnum : values()) {
if (statusEnum.getCode() == code.intValue()) {
return statusEnum.getMessage();
}
}
return "未知";
}
}
gic-platform-enterprise-api/src/main/java/com/gic/enterprise/dto/TransferAccountsApprovalDTO.java deleted 100644 → 0
package com.gic.enterprise.dto;
import javax.validation.constraints.NotBlank;
import javax.validation.constraints.NotNull;
import java.io.Serializable;
import java.util.Date;
/**
* @author guojx
* @date 2019/7/19 9:45 AM
*/
public class TransferAccountsApprovalDTO implements Serializable{
private static final long serialVersionUID = 7308268402055202720L;
public interface InitiateApprovalValid {
}
public interface ApprovalValid {
}
/**
*
*/
@NotNull(message = "转账审批主键不能为空", groups = {ApprovalValid.class})
private Integer transferApprovalId;
/**
* 关联订单流水号
*/
@NotBlank(message = "关联订单流水号不能为空", groups = {InitiateApprovalValid.class})
private String orderNumber;
/**
* 关联订单平台方1:GIC
*/
@NotNull(message = "关联订单平台方不能为空", groups = {InitiateApprovalValid.class})
private Integer platformType;
/**
* 关联订单创建时间
*/
@NotNull(message = "关联订单创建时间不能为空", groups = {InitiateApprovalValid.class})
private Date orderCreateTime;
/**
* 关联订单单据类型1:充值2:短信套餐3:服务订购4:拓展包5:套餐包
*/
@NotNull(message = "订单单据类型不能为空", groups = {InitiateApprovalValid.class})
private Integer orderType;
/**
* 发起方1：商户 2:运维后台
*/
@NotNull(message = "发起方类型不能为空", groups = {InitiateApprovalValid.class})
private Integer initiatorType;
/**
* 发起方
*/
@NotBlank(message = "发起方ID不能为空", groups = {InitiateApprovalValid.class})
private String initiatorId;
/**
* 发起方姓名
*/
@NotBlank(message = "发起方姓名不能为空", groups = {InitiateApprovalValid.class})
private String initiatorName;
/**
* 发起方手机号码国际区号，如 86
*/
@NotBlank(message = "发起方手机号码国际区号不能为空", groups = {InitiateApprovalValid.class})
private String initiatorPhoneAreaCode;
/**
* 发起方手机号码
*/
@NotBlank(message = "发起方手机号码不能为空", groups = {InitiateApprovalValid.class})
private String initiatorPhone;
/**
*
*/
@NotNull(message = "商户ID不能为空", groups = {InitiateApprovalValid.class})
private Integer enterpriseId;
/**
* 计划金额
*/
@NotNull(message = "计划金额不能为空", groups = {InitiateApprovalValid.class})
private Double plannedAmount;
/**
* 坏账金额
*/
@NotNull(message = "坏账金额不能为空", groups = {InitiateApprovalValid.class})
private Double badAmount;
/**
* 到账金额
*/
private Double accountAmount;
/**
* 验证码
*/
@NotBlank(message = "验证码不能为空", groups = {InitiateApprovalValid.class})
private String verifyCode;
/**
* 审批流水号
*/
private String approvalNumber;
/**
* 审批状态 1:待审批 2:已取消 3:已驳回 4:审批通过
*/
private Integer approvalStatus;
/**
* 审批人
*/
private String approvalId;
/**
* 审批人姓名
*/
private String approvalName;
/**
* 审批时间
*/
private Date approvalTime;
/**
* 审批人手机号
*/
private String approvalPhone;
/**
*
*/
private Date createTime;
/**
*
*/
private Date updateTime;
/**
* 审批人手机号码国际区号，如 86
*/
private String approvalPhoneAreaCode;
public Integer getTransferApprovalId() {
return transferApprovalId;
}
public void setTransferApprovalId(Integer transferApprovalId) {
this.transferApprovalId = transferApprovalId;
}
public String getOrderNumber() {
return orderNumber;
}
public void setOrderNumber(String orderNumber) {
this.orderNumber = orderNumber;
}
public Integer getPlatformType() {
return platformType;
}
public void setPlatformType(Integer platformType) {
this.platformType = platformType;
}
public Date getOrderCreateTime() {
return orderCreateTime;
}
public void setOrderCreateTime(Date orderCreateTime) {
this.orderCreateTime = orderCreateTime;
}
public Integer getOrderType() {
return orderType;
}
public void setOrderType(Integer orderType) {
this.orderType = orderType;
}
public Integer getInitiatorType() {
return initiatorType;
}
public void setInitiatorType(Integer initiatorType) {
this.initiatorType = initiatorType;
}
public String getInitiatorId() {
return initiatorId;
}
public void setInitiatorId(String initiatorId) {
this.initiatorId = initiatorId;
}
public String getInitiatorName() {
return initiatorName;
}
public void setInitiatorName(String initiatorName) {
this.initiatorName = initiatorName;
}
public String getInitiatorPhoneAreaCode() {
return initiatorPhoneAreaCode;
}
public void setInitiatorPhoneAreaCode(String initiatorPhoneAreaCode) {
this.initiatorPhoneAreaCode = initiatorPhoneAreaCode;
}
public String getInitiatorPhone() {
return initiatorPhone;
}
public void setInitiatorPhone(String initiatorPhone) {
this.initiatorPhone = initiatorPhone;
}
public Integer getEnterpriseId() {
return enterpriseId;
}
public void setEnterpriseId(Integer enterpriseId) {
this.enterpriseId = enterpriseId;
}
public Double getPlannedAmount() {
return plannedAmount;
}
public void setPlannedAmount(Double plannedAmount) {
this.plannedAmount = plannedAmount;
}
public Double getBadAmount() {
return badAmount;
}
public void setBadAmount(Double badAmount) {
this.badAmount = badAmount;
}
public Double getAccountAmount() {
return accountAmount;
}
public void setAccountAmount(Double accountAmount) {
this.accountAmount = accountAmount;
}
public String getVerifyCode() {
return verifyCode;
}
public void setVerifyCode(String verifyCode) {
this.verifyCode = verifyCode;
}
public String getApprovalNumber() {
return approvalNumber;
}
public void setApprovalNumber(String approvalNumber) {
this.approvalNumber = approvalNumber;
}
public Integer getApprovalStatus() {
return approvalStatus;
}
public void setApprovalStatus(Integer approvalStatus) {
this.approvalStatus = approvalStatus;
}
public String getApprovalId() {
return approvalId;
}
public void setApprovalId(String approvalId) {
this.approvalId = approvalId;
}
public String getApprovalName() {
return approvalName;
}
public void setApprovalName(String approvalName) {
this.approvalName = approvalName;
}
public Date getApprovalTime() {
return approvalTime;
}
public void setApprovalTime(Date approvalTime) {
this.approvalTime = approvalTime;
}
public Date getCreateTime() {
return createTime;
}
public void setCreateTime(Date createTime) {
this.createTime = createTime;
}
public Date getUpdateTime() {
return updateTime;
}
public void setUpdateTime(Date updateTime) {
this.updateTime = updateTime;
}
public String getApprovalPhone() {
return approvalPhone;
}
public void setApprovalPhone(String approvalPhone) {
this.approvalPhone = approvalPhone;
}
public String getApprovalPhoneAreaCode() {
return approvalPhoneAreaCode;
}
public void setApprovalPhoneAreaCode(String approvalPhoneAreaCode) {
this.approvalPhoneAreaCode = approvalPhoneAreaCode;
}
}
gic-platform-enterprise-api/src/main/java/com/gic/enterprise/dto/TransferAccountsApprovalDetailDTO.java deleted 100644 → 0
package com.gic.enterprise.dto;
import com.gic.enterprise.constant.OrderTypeEnum;
import com.gic.enterprise.constant.TransferAccountApprovalStatusEnum;
import java.io.Serializable;
import java.util.Date;
/**
* @author guojx
* @date 2019/7/22 10:28 AM
*/
public class TransferAccountsApprovalDetailDTO implements Serializable{
private static final long serialVersionUID = -5774379828764249597L;
/**
* 审批人姓名
*/
private String approvalName;
/**
* 审批时间
*/
private Date approvalTime;
/**
* 审批人手机号
*/
private String approvalPhone;
/**
* 审批人手机号码国际区号，如 86
*/
private String approvalPhoneAreaCode;
/**
*
*/
private Date createTime;
/**
* 审批流水号
*/
private String approvalNumber;
/**
* 审批状态 1:待审批 2:已取消 3:已驳回 4:审批通过
*/
private Integer approvalStatus;
private String approvalStatusName;
/**
* 到账金额
*/
private Double accountAmount;
/**
* 验证码
*/
private String verifyCode;
/**
* 计划金额
*/
private Double plannedAmount;
/**
* 发起方手机号码
*/
private String initiatorPhone;
/**
* 发起方姓名
*/
private String initiatorName;
/**
* 发起方手机号码国际区号，如 86
*/
private String initiatorPhoneAreaCode;
/**
* 发起方1：商户 2:运维后台
*/
private Integer initiatorType;
/**
*
*/
private Integer transferApprovalId;
/**
* 关联订单流水号
*/
private String orderNumber;
/**
* 关联订单平台方1:GIC
*/
private Integer platformType;
/**
* 关联订单创建时间
*/
private Date orderCreateTime;
/**
* 关联订单单据类型1:充值2:短信套餐3:服务订购4:拓展包5:套餐包
*/
private Integer orderType;
private String orderTypeName;
private String enterpriseName;
private String companyName;
public String getApprovalName() {
return approvalName;
}
public void setApprovalName(String approvalName) {
this.approvalName = approvalName;
}
public Date getApprovalTime() {
return approvalTime;
}
public void setApprovalTime(Date approvalTime) {
this.approvalTime = approvalTime;
}
public String getApprovalPhone() {
return approvalPhone;
}
public void setApprovalPhone(String approvalPhone) {
this.approvalPhone = approvalPhone;
}
public Date getCreateTime() {
return createTime;
}
public void setCreateTime(Date createTime) {
this.createTime = createTime;
}
public String getApprovalNumber() {
return approvalNumber;
}
public void setApprovalNumber(String approvalNumber) {
this.approvalNumber = approvalNumber;
}
public Integer getApprovalStatus() {
return approvalStatus;
}
public void setApprovalStatus(Integer approvalStatus) {
this.approvalStatus = approvalStatus;
}
public Double getAccountAmount() {
return accountAmount;
}
public void setAccountAmount(Double accountAmount) {
this.accountAmount = accountAmount;
}
public String getVerifyCode() {
return verifyCode;
}
public void setVerifyCode(String verifyCode) {
this.verifyCode = verifyCode;
}
public Double getPlannedAmount() {
return plannedAmount;
}
public void setPlannedAmount(Double plannedAmount) {
this.plannedAmount = plannedAmount;
}
public String getInitiatorPhone() {
return initiatorPhone;
}
public void setInitiatorPhone(String initiatorPhone) {
this.initiatorPhone = initiatorPhone;
}
public String getInitiatorName() {
return initiatorName;
}
public void setInitiatorName(String initiatorName) {
this.initiatorName = initiatorName;
}
public String getInitiatorPhoneAreaCode() {
return initiatorPhoneAreaCode;
}
public void setInitiatorPhoneAreaCode(String initiatorPhoneAreaCode) {
this.initiatorPhoneAreaCode = initiatorPhoneAreaCode;
}
public Integer getInitiatorType() {
return initiatorType;
}
public void setInitiatorType(Integer initiatorType) {
this.initiatorType = initiatorType;
}
public Integer getTransferApprovalId() {
return transferApprovalId;
}
public void setTransferApprovalId(Integer transferApprovalId) {
this.transferApprovalId = transferApprovalId;
}
public String getOrderNumber() {
return orderNumber;
}
public void setOrderNumber(String orderNumber) {
this.orderNumber = orderNumber;
}
public Integer getPlatformType() {
return platformType;
}
public void setPlatformType(Integer platformType) {
this.platformType = platformType;
}
public Date getOrderCreateTime() {
return orderCreateTime;
}
public void setOrderCreateTime(Date orderCreateTime) {
this.orderCreateTime = orderCreateTime;
}
public Integer getOrderType() {
return orderType;
}
public void setOrderType(Integer orderType) {
this.orderType = orderType;
}
public String getEnterpriseName() {
return enterpriseName;
}
public void setEnterpriseName(String enterpriseName) {
this.enterpriseName = enterpriseName;
}
public String getCompanyName() {
return companyName;
}
public void setCompanyName(String companyName) {
this.companyName = companyName;
}
public String getApprovalStatusName() {
return TransferAccountApprovalStatusEnum.getMessageBuCode(approvalStatus);
}
public void setApprovalStatusName(String approvalStatusName) {
this.approvalStatusName = approvalStatusName;
}
public String getApprovalPhoneAreaCode() {
return approvalPhoneAreaCode;
}
public void setApprovalPhoneAreaCode(String approvalPhoneAreaCode) {
this.approvalPhoneAreaCode = approvalPhoneAreaCode;
}
public String getOrderTypeName() {
return OrderTypeEnum.getMessageBuCode(orderType);
}
public void setOrderTypeName(String orderTypeName) {
this.orderTypeName = orderTypeName;
}
}
gic-platform-enterprise-api/src/main/java/com/gic/enterprise/dto/TransferAccountsApprovalListDTO.java deleted 100644 → 0
package com.gic.enterprise.dto;
import com.gic.enterprise.constant.TransferAccountApprovalStatusEnum;
import java.io.Serializable;
import java.util.Date;
/**
* @author guojx
* @date 2019/7/19 1:49 PM
*/
public class TransferAccountsApprovalListDTO implements Serializable{
private static final long serialVersionUID = -8410855068398177651L;
private Integer transferApprovalId;
private String enterpriseName;
private String companyName;
private String logo;
/**
* 验证码
*/
private String verifyCode;
/**
* 审批流水号
*/
private String approvalNumber;
/**
* 发起人类型
*/
private Integer initiatorType;
/**
* 发起人名称
*/
private String initiatorName;
/**
* 计划金额
*/
private Double plannedAmount;
/**
* 坏账金额
*/
private Double badAmount;
/**
* 审批状态 1:待审批 2:已取消 3:已驳回 4:审批通过
*/
private Integer approvalStatus;
private String approvalStatusName;
/**
* 审批时间
*/
private Date approvalTime;
/**
* 审批人姓名
*/
private String approvalName;
/**
*
*/
private Date createTime;
public Date getCreateTime() {
return createTime;
}
public void setCreateTime(Date createTime) {
this.createTime = createTime;
}
public Integer getTransferApprovalId() {
return transferApprovalId;
}
public void setTransferApprovalId(Integer transferApprovalId) {
this.transferApprovalId = transferApprovalId;
}
public String getEnterpriseName() {
return enterpriseName;
}
public void setEnterpriseName(String enterpriseName) {
this.enterpriseName = enterpriseName;
}
public String getCompanyName() {
return companyName;
}
public void setCompanyName(String companyName) {
this.companyName = companyName;
}
public String getLogo() {
return logo;
}
public void setLogo(String logo) {
this.logo = logo;
}
public String getVerifyCode() {
return verifyCode;
}
public void setVerifyCode(String verifyCode) {
this.verifyCode = verifyCode;
}
public String getApprovalNumber() {
return approvalNumber;
}
public void setApprovalNumber(String approvalNumber) {
this.approvalNumber = approvalNumber;
}
public Integer getInitiatorType() {
return initiatorType;
}
public void setInitiatorType(Integer initiatorType) {
this.initiatorType = initiatorType;
}
public String getInitiatorName() {
return initiatorName;
}
public void setInitiatorName(String initiatorName) {
this.initiatorName = initiatorName;
}
public Double getPlannedAmount() {
return plannedAmount;
}
public void setPlannedAmount(Double plannedAmount) {
this.plannedAmount = plannedAmount;
}
public Double getBadAmount() {
return badAmount;
}
public void setBadAmount(Double badAmount) {
this.badAmount = badAmount;
}
public Integer getApprovalStatus() {
return approvalStatus;
}
public void setApprovalStatus(Integer approvalStatus) {
this.approvalStatus = approvalStatus;
}
public Date getApprovalTime() {
return approvalTime;
}
public void setApprovalTime(Date approvalTime) {
this.approvalTime = approvalTime;
}
public String getApprovalName() {
return approvalName;
}
public void setApprovalName(String approvalName) {
this.approvalName = approvalName;
}
public String getApprovalStatusName() {
return TransferAccountApprovalStatusEnum.getMessageBuCode(approvalStatus);
}
public void setApprovalStatusName(String approvalStatusName) {
this.approvalStatusName = approvalStatusName;
}
}
gic-platform-enterprise-api/src/main/java/com/gic/enterprise/service/TransferAccountsApprovalApiService.java deleted 100644 → 0
package com.gic.enterprise.service;
import com.gic.api.base.commons.Page;
import com.gic.api.base.commons.ServiceResponse;
import com.gic.enterprise.dto.TransferAccountsApprovalDTO;
import com.gic.enterprise.dto.TransferAccountsApprovalDetailDTO;
import com.gic.enterprise.dto.TransferAccountsApprovalListDTO;
/**
* @author guojx
* @date 2019/7/19 9:47 AM
*/
public interface TransferAccountsApprovalApiService {
/**
* 发起审批
* @param transferAccountsApprovalDTO
* @return
*/
ServiceResponse<Integer> initiateApproval(TransferAccountsApprovalDTO transferAccountsApprovalDTO);
/**
* 主键查询
* @param transferApprovalId
* @return
*/
ServiceResponse<TransferAccountsApprovalDTO> getById(Integer transferApprovalId);
/**
* 审批通过操作
* @param transferApprovalId 主键
* @param accountAmount 到账金额
* @return
*/
ServiceResponse agreeApproval(Integer transferApprovalId, Double accountAmount);
/**
* 回驳
* @param transferApprovalId
* @return
*/
ServiceResponse rejectApproval(Integer transferApprovalId);
ServiceResponse<Page<TransferAccountsApprovalListDTO>> listTransferAccountsApproval(String search, Integer approvalStatus,
Integer enterpriseId,
Integer pageNum, Integer pageSize);
ServiceResponse<TransferAccountsApprovalDetailDTO> getDetailById(Integer transferApprovalId);
}
gic-platform-enterprise-service/src/main/java/com/gic/enterprise/dao/mapper/TabTransferAccountsApprovalMapper.java deleted 100644 → 0
package com.gic.enterprise.dao.mapper;
import com.gic.enterprise.dto.TransferAccountsApprovalDetailDTO;
import com.gic.enterprise.dto.TransferAccountsApprovalListDTO;
import com.gic.enterprise.entity.TabTransferAccountsApproval;
import org.apache.ibatis.annotations.Param;
import java.util.List;
public interface TabTransferAccountsApprovalMapper {
/**
* 根据主键删除
*
* @param transferApprovalId 主键
* @return 更新条目数
*/
int deleteByPrimaryKey(Integer transferApprovalId);
/**
* 插入一条记录
*
* @param record 实体对象
* @return 更新条目数
*/
int insert(TabTransferAccountsApproval record);
/**
* 动态插入一条记录
*
* @param record 实体对象
* @return 更新条目数
*/
int insertSelective(TabTransferAccountsApproval record);
/**
* 根据主键查询
*
* @param transferApprovalId 主键
* @return 实体对象
*/
TabTransferAccountsApproval selectByPrimaryKey(Integer transferApprovalId);
/**
* 根据主键动态更新记录
*
* @param record 实体对象
* @return 更新条目数
*/
int updateByPrimaryKeySelective(TabTransferAccountsApproval record);
/**
* 根据主键更新记录
*
* @param record 实体对象
* @return 更新条目数
*/
int updateByPrimaryKey(TabTransferAccountsApproval record);
List<TransferAccountsApprovalListDTO> listTransferAccountsApproval(@Param("search") String search,
@Param("approvalStatus") Integer approvalStatus,
@Param("enterpriseId") Integer enterpriseId);
TransferAccountsApprovalDetailDTO getTransferAccountsApproval(@Param("id") Integer id);
}
\ No newline at end of file
gic-platform-enterprise-service/src/main/java/com/gic/enterprise/entity/TabTransferAccountsApproval.java deleted 100644 → 0
package com.gic.enterprise.entity;
import java.util.Date;
/**
* tab_transfer_accounts_approval
*/
public class TabTransferAccountsApproval {
/**
*
*/
private Integer transferApprovalId;
/**
* 关联订单流水号
*/
private String orderNumber;
/**
* 关联订单平台方1:GIC
*/
private Integer platformType;
/**
* 关联订单创建时间
*/
private Date orderCreateTime;
/**
* 关联订单单据类型1:充值2:短信套餐3:服务订购4:拓展包5:套餐包
*/
private Integer orderType;
/**
* 发起方1：商户 2:运维后台
*/
private Integer initiatorType;
/**
* 发起方
*/
private String initiatorId;
/**
* 发起方姓名
*/
private String initiatorName;
/**
* 发起方手机号码国际区号，如 86
*/
private String initiatorPhoneAreaCode;
/**
* 发起方手机号码
*/
private String initiatorPhone;
/**
*
*/
private Integer enterpriseId;
/**
* 计划金额
*/
private Double plannedAmount;
/**
* 坏账金额
*/
private Double badAmount;
/**
* 到账金额
*/
private Double accountAmount;
/**
* 验证码
*/
private String verifyCode;
/**
* 审批流水号
*/
private String approvalNumber;
/**
* 审批状态 1:待审批 2:已取消 3:已驳回 4:审批通过
*/
private Integer approvalStatus;
/**
* 审批人
*/
private String approvalId;
/**
* 审批人姓名
*/
private String approvalName;
/**
* 审批时间
*/
private Date approvalTime;
/**
*
*/
private Date createTime;
/**
*
*/
private Date updateTime;
/**
* 审批人手机号码国际区号，如 86
*/
private String approvalPhoneAreaCode;
/**
* 审批人手机号
*/
private String approvalPhone;
public Integer getTransferApprovalId() {
return transferApprovalId;
}
public void setTransferApprovalId(Integer transferApprovalId) {
this.transferApprovalId = transferApprovalId;
}
public String getOrderNumber() {
return orderNumber;
}
public void setOrderNumber(String orderNumber) {
this.orderNumber = orderNumber;
}
public Integer getPlatformType() {
return platformType;
}
public void setPlatformType(Integer platformType) {
this.platformType = platformType;
}
public Date getOrderCreateTime() {
return orderCreateTime;
}
public void setOrderCreateTime(Date orderCreateTime) {
this.orderCreateTime = orderCreateTime;
}
public Integer getOrderType() {
return orderType;
}
public void setOrderType(Integer orderType) {
this.orderType = orderType;
}
public Integer getInitiatorType() {
return initiatorType;
}
public void setInitiatorType(Integer initiatorType) {
this.initiatorType = initiatorType;
}
public String getInitiatorId() {
return initiatorId;
}
public void setInitiatorId(String initiatorId) {
this.initiatorId = initiatorId;
}
public String getInitiatorName() {
return initiatorName;
}
public void setInitiatorName(String initiatorName) {
this.initiatorName = initiatorName;
}
public String getInitiatorPhoneAreaCode() {
return initiatorPhoneAreaCode;
}
public void setInitiatorPhoneAreaCode(String initiatorPhoneAreaCode) {
this.initiatorPhoneAreaCode = initiatorPhoneAreaCode;
}
public String getInitiatorPhone() {
return initiatorPhone;
}
public void setInitiatorPhone(String initiatorPhone) {
this.initiatorPhone = initiatorPhone;
}
public Integer getEnterpriseId() {
return enterpriseId;
}
public void setEnterpriseId(Integer enterpriseId) {
this.enterpriseId = enterpriseId;
}
public Double getPlannedAmount() {
return plannedAmount;
}
public void setPlannedAmount(Double plannedAmount) {
this.plannedAmount = plannedAmount;
}
public Double getBadAmount() {
return badAmount;
}
public void setBadAmount(Double badAmount) {
this.badAmount = badAmount;
}
public Double getAccountAmount() {
return accountAmount;
}
public void setAccountAmount(Double accountAmount) {
this.accountAmount = accountAmount;
}
public String getVerifyCode() {
return verifyCode;
}
public void setVerifyCode(String verifyCode) {
this.verifyCode = verifyCode;
}
public String getApprovalNumber() {
return approvalNumber;
}
public void setApprovalNumber(String approvalNumber) {
this.approvalNumber = approvalNumber;
}
public Integer getApprovalStatus() {
return approvalStatus;
}
public void setApprovalStatus(Integer approvalStatus) {
this.approvalStatus = approvalStatus;
}
public String getApprovalId() {
return approvalId;
}
public void setApprovalId(String approvalId) {
this.approvalId = approvalId;
}
public String getApprovalName() {
return approvalName;
}
public void setApprovalName(String approvalName) {
this.approvalName = approvalName;
}
public Date getApprovalTime() {
return approvalTime;
}
public void setApprovalTime(Date approvalTime) {
this.approvalTime = approvalTime;
}
public Date getCreateTime() {
return createTime;
}
public void setCreateTime(Date createTime) {
this.createTime = createTime;
}
public Date getUpdateTime() {
return updateTime;
}
public void setUpdateTime(Date updateTime) {
this.updateTime = updateTime;
}
public String getApprovalPhoneAreaCode() {
return approvalPhoneAreaCode;
}
public void setApprovalPhoneAreaCode(String approvalPhoneAreaCode) {
this.approvalPhoneAreaCode = approvalPhoneAreaCode;
}
public String getApprovalPhone() {
return approvalPhone;
}
public void setApprovalPhone(String approvalPhone) {
this.approvalPhone = approvalPhone;
}
}
\ No newline at end of file
gic-platform-enterprise-service/src/main/java/com/gic/enterprise/service/TransferAccountsApprovalService.java deleted 100644 → 0
package com.gic.enterprise.service;
import com.gic.enterprise.dto.TransferAccountsApprovalDTO;
import com.gic.enterprise.dto.TransferAccountsApprovalDetailDTO;
import com.gic.enterprise.dto.TransferAccountsApprovalListDTO;
import com.gic.enterprise.entity.TabTransferAccountsApproval;
import com.github.pagehelper.Page;
/**
* @author guojx
* @date 2019/7/19 9:55 AM
*/
public interface TransferAccountsApprovalService {
/**
* 发起审批
* @param transferAccountsApprovalDTO
* @return
*/
int initiateApproval(TransferAccountsApprovalDTO transferAccountsApprovalDTO);
/**
* 主键查询
* @param transferApprovalId
* @return
*/
TabTransferAccountsApproval getById(Integer transferApprovalId);
void updateTransferAccountsApproval(TransferAccountsApprovalDTO transferAccountsApprovalDTO);
Page<TransferAccountsApprovalListDTO> listTransferAccountsApproval(String search, Integer approvalStatus,
Integer enterpriseId,
Integer pageNum, Integer pageSize);
TransferAccountsApprovalDetailDTO getDetailById(Integer transferApprovalId);
}
gic-platform-enterprise-service/src/main/java/com/gic/enterprise/service/impl/TransferAccountsApprovalServiceImpl.java deleted 100644 → 0
package com.gic.enterprise.service.impl;
import com.gic.commons.util.EntityUtil;
import com.gic.enterprise.dao.mapper.TabTransferAccountsApprovalMapper;
import com.gic.enterprise.dto.TransferAccountsApprovalDTO;
import com.gic.enterprise.dto.TransferAccountsApprovalDetailDTO;
import com.gic.enterprise.dto.TransferAccountsApprovalListDTO;
import com.gic.enterprise.entity.TabTransferAccountsApproval;
import com.gic.enterprise.service.TransferAccountsApprovalService;
import com.github.pagehelper.Page;
import com.github.pagehelper.PageHelper;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.util.Date;
import java.util.List;
/**
* @author guojx
* @date 2019/7/19 9:56 AM
*/
@Service("transferAccountsApprovalService")
public class TransferAccountsApprovalServiceImpl implements TransferAccountsApprovalService{
@Autowired
private TabTransferAccountsApprovalMapper tabTransferAccountsApprovalMapper;
@Override
public int initiateApproval(TransferAccountsApprovalDTO transferAccountsApprovalDTO) {
TabTransferAccountsApproval transfer = EntityUtil.changeEntityNew(TabTransferAccountsApproval.class, transferAccountsApprovalDTO);
tabTransferAccountsApprovalMapper.insertSelective(transfer);
return 1;
}
@Override
public TabTransferAccountsApproval getById(Integer transferApprovalId) {
return tabTransferAccountsApprovalMapper.selectByPrimaryKey(transferApprovalId);
}
@Override
public void updateTransferAccountsApproval(TransferAccountsApprovalDTO transferAccountsApprovalDTO) {
transferAccountsApprovalDTO.setUpdateTime(new Date());
TabTransferAccountsApproval transfer = EntityUtil.changeEntityNew(TabTransferAccountsApproval.class, transferAccountsApprovalDTO);
tabTransferAccountsApprovalMapper.updateByPrimaryKeySelective(transfer);
}
@Override
public Page<TransferAccountsApprovalListDTO> listTransferAccountsApproval(String search, Integer approvalStatus,
Integer enterpriseId,
Integer pageNum, Integer pageSize) {
PageHelper.startPage(pageNum, pageSize);
List<TransferAccountsApprovalListDTO> list = tabTransferAccountsApprovalMapper.listTransferAccountsApproval(search, approvalStatus, enterpriseId);
return (Page<TransferAccountsApprovalListDTO>) list;
}
@Override
public TransferAccountsApprovalDetailDTO getDetailById(Integer transferApprovalId) {
return tabTransferAccountsApprovalMapper.getTransferAccountsApproval(transferApprovalId);
}
}
gic-platform-enterprise-service/src/main/java/com/gic/enterprise/service/outer/TransferAccountsApprovalApiServiceImpl.java deleted 100644 → 0
package com.gic.enterprise.service.outer;
import com.gic.api.base.commons.Page;
import com.gic.api.base.commons.ServiceResponse;
import com.gic.commons.util.EntityUtil;
import com.gic.commons.util.PageHelperUtils;
import com.gic.enterprise.constant.TransferAccountApprovalStatusEnum;
import com.gic.enterprise.dto.TransferAccountsApprovalDTO;
import com.gic.enterprise.dto.TransferAccountsApprovalDetailDTO;
import com.gic.enterprise.dto.TransferAccountsApprovalListDTO;
import com.gic.enterprise.entity.TabTransferAccountsApproval;
import com.gic.enterprise.error.ErrorCode;
import com.gic.enterprise.service.TransferAccountsApprovalApiService;
import com.gic.enterprise.service.TransferAccountsApprovalService;
import com.gic.store.utils.valid.ValidUtil;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.util.Date;
/**
* @author guojx
* @date 2019/7/19 10:03 AM
*/
@Service("transferAccountsApprovalApiService")
public class TransferAccountsApprovalApiServiceImpl implements TransferAccountsApprovalApiService{
private static final Logger LOGGER = LoggerFactory.getLogger(TransferAccountsApprovalApiServiceImpl.class);
@Autowired
private TransferAccountsApprovalService transferAccountsApprovalService;
@Override
public ServiceResponse<Integer> initiateApproval(TransferAccountsApprovalDTO transferAccountsApprovalDTO) {
//valid param
ServiceResponse paramValid = ValidUtil.allCheckValidate(transferAccountsApprovalDTO, TransferAccountsApprovalDTO.InitiateApprovalValid.class);
if (!paramValid.isSuccess()) {
return paramValid;
}
transferAccountsApprovalDTO.setCreateTime(new Date());
transferAccountsApprovalDTO.setUpdateTime(new Date());
transferAccountsApprovalDTO.setApprovalStatus(TransferAccountApprovalStatusEnum.TO_BE_APPROVED.getCode());
//审批流水号生成
//时间+用户ID+几个随机数
String approvalSerialNumber = transferAccountsApprovalDTO.getInitiatorId() + System.currentTimeMillis() + Math.random();
LOGGER.info("转账审批-发起审批-审批流水号：{}", approvalSerialNumber);
transferAccountsApprovalDTO.setApprovalNumber(approvalSerialNumber);
transferAccountsApprovalService.initiateApproval(transferAccountsApprovalDTO);
return ServiceResponse.success();
}
@Override
public ServiceResponse<TransferAccountsApprovalDTO> getById(Integer transferApprovalId) {
TabTransferAccountsApproval tab = transferAccountsApprovalService.getById(transferApprovalId);
if (tab == null) {
return ServiceResponse.failure(ErrorCode.PARAMETER_ERROR.getCode(), "转账审批主键有误");
}
return ServiceResponse.success(EntityUtil.changeEntityNew(TransferAccountsApprovalDTO.class, tab));
}
@Override
public ServiceResponse agreeApproval(Integer transferApprovalId, Double accountAmount) {
TabTransferAccountsApproval tab = transferAccountsApprovalService.getById(transferApprovalId);
if (tab == null) {
return ServiceResponse.failure(ErrorCode.PARAMETER_ERROR.getCode(), "转账审批主键有误");
}
TransferAccountsApprovalDTO dto = new TransferAccountsApprovalDTO();
dto.setTransferApprovalId(transferApprovalId);
dto.setAccountAmount(accountAmount);
dto.setApprovalStatus(TransferAccountApprovalStatusEnum.AGREE.getCode());
dto.setApprovalTime(new Date());
//todo 审批人等信息获取插入
transferAccountsApprovalService.updateTransferAccountsApproval(dto);
return ServiceResponse.success();
}
@Override
public ServiceResponse rejectApproval(Integer transferApprovalId) {
TabTransferAccountsApproval tab = transferAccountsApprovalService.getById(transferApprovalId);
if (tab == null) {
return ServiceResponse.failure(ErrorCode.PARAMETER_ERROR.getCode(), "转账审批主键有误");
}
TransferAccountsApprovalDTO dto = new TransferAccountsApprovalDTO();
dto.setTransferApprovalId(transferApprovalId);
dto.setApprovalStatus(TransferAccountApprovalStatusEnum.REJECT.getCode());
dto.setApprovalTime(new Date());
//todo 审批人等信息获取插入
transferAccountsApprovalService.updateTransferAccountsApproval(dto);
return ServiceResponse.success();
}
@Override
public ServiceResponse<Page<TransferAccountsApprovalListDTO>> listTransferAccountsApproval(String search, Integer approvalStatus,
Integer enterpriseId,
Integer pageNum, Integer pageSize) {
com.github.pagehelper.Page page = transferAccountsApprovalService.listTransferAccountsApproval(search, approvalStatus, enterpriseId, pageNum, pageSize);
Page<TransferAccountsApprovalListDTO> resultPage = PageHelperUtils.changePageHelperToCurrentPage(page);
return ServiceResponse.success(resultPage);
}
@Override
public ServiceResponse<TransferAccountsApprovalDetailDTO> getDetailById(Integer transferApprovalId) {
TransferAccountsApprovalDetailDTO tab = transferAccountsApprovalService.getDetailById(transferApprovalId);
if (tab == null) {
return ServiceResponse.failure(ErrorCode.PARAMETER_ERROR.getCode(), "转账审批主键有误");
}
return ServiceResponse.success(tab);
}
}
gic-platform-enterprise-service/src/main/resources/dubbo-gic-platform-enterprise-service.xml
......@@ -18,8 +18,6 @@
<dubbo:service interface="com.gic.enterprise.service.EnterpriseApiService" ref="enterpriseApiService" timeout="60000" />
<dubbo:service interface="com.gic.enterprise.service.EnterpriseInitApiService" ref="enterpriseInitApiService" timeout="60000" />
<!--转账审批-->
<dubbo:service interface="com.gic.enterprise.service.TransferAccountsApprovalApiService" ref="transferAccountsApprovalApiService" timeout="60000" />
<dubbo:reference interface="com.gic.log.api.service.LogApiService" id="logApiService" timeout="60000" />
<!--用户-->
......
gic-platform-operation-web/src/main/java/com/gic/operation/web/controller/TransferAccountsApprovalController.java deleted 100644 → 0
package com.gic.operation.web.controller;
import com.gic.api.base.commons.Page;
import com.gic.api.base.commons.ServiceResponse;
import com.gic.commons.webapi.reponse.RestResponse;
import com.gic.enterprise.dto.TransferAccountsApprovalDTO;
import com.gic.enterprise.dto.TransferAccountsApprovalDetailDTO;
import com.gic.enterprise.dto.TransferAccountsApprovalListDTO;
import com.gic.enterprise.response.EnterpriseRestResponse;
import com.gic.enterprise.service.TransferAccountsApprovalApiService;
import com.gic.operation.web.qo.PageQO;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
/**
* @author guojx
* @date 2019/7/22 9:13 AM
*/
@RestController
@RequestMapping("/transfer-accounts-approval")
public class TransferAccountsApprovalController {
private static final Logger LOGGER = LoggerFactory.getLogger(TransferAccountsApprovalController.class);
@Autowired
private TransferAccountsApprovalApiService transferAccountsApprovalApiService;
/**
* 发起审批
* @param dto
* @return
*/
@RequestMapping("/initiate-approval")
public RestResponse initiateApproval(TransferAccountsApprovalDTO dto) {
ServiceResponse result = transferAccountsApprovalApiService.initiateApproval(dto);
if (result.isSuccess()) {
return RestResponse.success();
} else {
return EnterpriseRestResponse.failure(result);
}
}
@RequestMapping("/get-approval")
public RestResponse getById(Integer id) {
ServiceResponse<TransferAccountsApprovalDetailDTO> result = transferAccountsApprovalApiService.getDetailById(id);
if (result.isSuccess()) {
return RestResponse.success(result.getResult());
} else {
return EnterpriseRestResponse.failure(result);
}
}
@RequestMapping("/agree-approval")
public RestResponse agreeApproval(Integer id, Double accountAmount) {
ServiceResponse result = transferAccountsApprovalApiService.agreeApproval(id, accountAmount);
if (result.isSuccess()) {
return RestResponse.success();
} else {
return EnterpriseRestResponse.failure(result);
}
}
@RequestMapping("/reject-approval")
public RestResponse rejectApproval(Integer id) {
ServiceResponse result = transferAccountsApprovalApiService.rejectApproval(id);
if (result.isSuccess()) {
return RestResponse.success();
} else {
return EnterpriseRestResponse.failure(result);
}
}
@RequestMapping("/list-approval")
public RestResponse listTransferAccountsApproval(String search, Integer approvalStatus,
Integer enterpriseId, PageQO pageQO) {
ServiceResponse<Page<TransferAccountsApprovalListDTO>> result = transferAccountsApprovalApiService.listTransferAccountsApproval(search,
approvalStatus, enterpriseId, pageQO.getCurrentPage(), pageQO.getPageSize());
if (result.isSuccess()) {
return RestResponse.success(result.getResult());
} else {
return EnterpriseRestResponse.failure(result);
}
}
}
gic-platform-operation-web/src/main/resources/dubbo-gic-platform-operation-web.xml
......@@ -41,8 +41,6 @@
<!--商户-->
<dubbo:reference interface="com.gic.enterprise.service.EnterpriseApiService" id="enterpriseApiService" timeout="60000" />
<dubbo:reference interface="com.gic.enterprise.service.EnterpriseInitApiService" id="enterpriseInitApiService" timeout="60000" />
<!--转账审批-->
<dubbo:reference interface="com.gic.enterprise.service.TransferAccountsApprovalApiService" id="transferAccountsApprovalApiService" timeout="60000" />
<!-- 平台品牌库 -->
<dubbo:reference interface="com.gic.enterprise.service.PlatformBrandApiService" id="platformBrandApiService" timeout="60000" />
<!--字典 -->
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment