Commit e2b9b21e by guojuxing

流水号调整

parent f16bfada
...@@ -11,6 +11,7 @@ import com.gic.api.base.commons.ServiceResponse; ...@@ -11,6 +11,7 @@ import com.gic.api.base.commons.ServiceResponse;
import com.gic.commons.util.EntityUtil; import com.gic.commons.util.EntityUtil;
import com.gic.commons.util.PageHelperUtils; import com.gic.commons.util.PageHelperUtils;
import com.gic.enterprise.error.ErrorCode; import com.gic.enterprise.error.ErrorCode;
import com.gic.enterprise.utils.CreateRandomUtils;
import com.gic.enterprise.utils.valid.ValidParamsUtils; import com.gic.enterprise.utils.valid.ValidParamsUtils;
import com.gic.finance.constant.WithdrawalApplyTypeEnum; import com.gic.finance.constant.WithdrawalApplyTypeEnum;
import com.gic.finance.constant.WithdrawalStatusEnum; import com.gic.finance.constant.WithdrawalStatusEnum;
...@@ -23,7 +24,6 @@ import com.gic.finance.service.CashWithdrawalApiService; ...@@ -23,7 +24,6 @@ import com.gic.finance.service.CashWithdrawalApiService;
import com.gic.finance.service.CashWithdrawalService; import com.gic.finance.service.CashWithdrawalService;
import com.gic.finance.service.PayAccountService; import com.gic.finance.service.PayAccountService;
import com.gic.finance.util.AsynCallbackUtils; import com.gic.finance.util.AsynCallbackUtils;
import com.gic.store.utils.CreateSerialNumberUtils;
@Service("cashWithdrawalApiService") @Service("cashWithdrawalApiService")
public class CashWithdrawalApiServiceImpl implements CashWithdrawalApiService{ public class CashWithdrawalApiServiceImpl implements CashWithdrawalApiService{
...@@ -48,7 +48,7 @@ public class CashWithdrawalApiServiceImpl implements CashWithdrawalApiService{ ...@@ -48,7 +48,7 @@ public class CashWithdrawalApiServiceImpl implements CashWithdrawalApiService{
dto.setUpdateTime(new Date()); dto.setUpdateTime(new Date());
dto.setCashWithdrawalStatus(WithdrawalStatusEnum.TO_BE_EXAMINE.getCode()); dto.setCashWithdrawalStatus(WithdrawalStatusEnum.TO_BE_EXAMINE.getCode());
//流水号 //流水号
dto.setCashWithdrawalSerialNumber(CreateSerialNumberUtils.createSerialNumber()); dto.setCashWithdrawalSerialNumber(CreateRandomUtils.createSerialNumber());
cashWithdrawalService.save(dto); cashWithdrawalService.save(dto);
return ServiceResponse.success(dto.getCashWithdrawalSerialNumber()); return ServiceResponse.success(dto.getCashWithdrawalSerialNumber());
} }
......
...@@ -2,9 +2,6 @@ package com.gic.finance.service.outer.impl; ...@@ -2,9 +2,6 @@ package com.gic.finance.service.outer.impl;
import java.util.Date; import java.util.Date;
import com.gic.enterprise.base.UserInfo;
import com.gic.enterprise.utils.UserDetailUtils;
import com.gic.finance.dto.OperationUserInfoDTO;
import org.apache.commons.lang.StringUtils; import org.apache.commons.lang.StringUtils;
import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger; import org.apache.logging.log4j.Logger;
...@@ -16,10 +13,12 @@ import com.gic.api.base.commons.ServiceResponse; ...@@ -16,10 +13,12 @@ import com.gic.api.base.commons.ServiceResponse;
import com.gic.commons.util.EntityUtil; import com.gic.commons.util.EntityUtil;
import com.gic.commons.util.PageHelperUtils; import com.gic.commons.util.PageHelperUtils;
import com.gic.enterprise.error.ErrorCode; import com.gic.enterprise.error.ErrorCode;
import com.gic.enterprise.utils.CreateRandomUtils;
import com.gic.enterprise.utils.valid.ValidParamsUtils; import com.gic.enterprise.utils.valid.ValidParamsUtils;
import com.gic.finance.constant.InvoiceInitiateTypeConstants; import com.gic.finance.constant.InvoiceInitiateTypeConstants;
import com.gic.finance.constant.InvoiceStatusEnum; import com.gic.finance.constant.InvoiceStatusEnum;
import com.gic.finance.dto.InvoiceManageDTO; import com.gic.finance.dto.InvoiceManageDTO;
import com.gic.finance.dto.OperationUserInfoDTO;
import com.gic.finance.dto.callback.InvoiceCallbackDTO; import com.gic.finance.dto.callback.InvoiceCallbackDTO;
import com.gic.finance.entity.TabInvoiceAccount; import com.gic.finance.entity.TabInvoiceAccount;
import com.gic.finance.entity.TabInvoiceManage; import com.gic.finance.entity.TabInvoiceManage;
...@@ -28,7 +27,6 @@ import com.gic.finance.service.InvoiceAccountService; ...@@ -28,7 +27,6 @@ import com.gic.finance.service.InvoiceAccountService;
import com.gic.finance.service.InvoiceManageApiService; import com.gic.finance.service.InvoiceManageApiService;
import com.gic.finance.service.InvoiceManageService; import com.gic.finance.service.InvoiceManageService;
import com.gic.finance.util.AsynCallbackUtils; import com.gic.finance.util.AsynCallbackUtils;
import com.gic.store.utils.CreateSerialNumberUtils;
@Service("invoiceManageApiService") @Service("invoiceManageApiService")
public class InvoiceManageApiServiceImpl implements InvoiceManageApiService { public class InvoiceManageApiServiceImpl implements InvoiceManageApiService {
...@@ -51,7 +49,7 @@ public class InvoiceManageApiServiceImpl implements InvoiceManageApiService { ...@@ -51,7 +49,7 @@ public class InvoiceManageApiServiceImpl implements InvoiceManageApiService {
invoiceManageDTO.setCreateTime(new Date()); invoiceManageDTO.setCreateTime(new Date());
invoiceManageDTO.setUpdateTime(new Date()); invoiceManageDTO.setUpdateTime(new Date());
invoiceManageDTO.setInvoiceStatus(InvoiceStatusEnum.TO_BE_ISSUED.getCode()); invoiceManageDTO.setInvoiceStatus(InvoiceStatusEnum.TO_BE_ISSUED.getCode());
invoiceManageDTO.setInvoiceApplySerial(CreateSerialNumberUtils.createSerialNumber()); invoiceManageDTO.setInvoiceApplySerial(CreateRandomUtils.createSerialNumber());
if (StringUtils.isBlank(invoiceManageDTO.getEnterpriseName())) { if (StringUtils.isBlank(invoiceManageDTO.getEnterpriseName())) {
invoiceManageDTO.setEnterpriseName("暂无商户名称"); invoiceManageDTO.setEnterpriseName("暂无商户名称");
} }
......
package com.gic.finance.service.outer.impl; package com.gic.finance.service.outer.impl;
import java.text.SimpleDateFormat;
import java.util.Date; import java.util.Date;
import java.util.List; import java.util.List;
import com.gic.enterprise.base.UserInfo;
import com.gic.enterprise.utils.UserDetailUtils;
import com.gic.finance.dto.OperationUserInfoDTO;
import org.apache.commons.lang.StringUtils; import org.apache.commons.lang.StringUtils;
import org.apache.dubbo.config.ReferenceConfig; import org.apache.dubbo.config.ReferenceConfig;
import org.apache.dubbo.config.RegistryConfig; import org.apache.dubbo.config.RegistryConfig;
...@@ -22,14 +18,15 @@ import com.gic.api.base.commons.ServiceResponse; ...@@ -22,14 +18,15 @@ import com.gic.api.base.commons.ServiceResponse;
import com.gic.commons.util.EntityUtil; import com.gic.commons.util.EntityUtil;
import com.gic.commons.util.PageHelperUtils; import com.gic.commons.util.PageHelperUtils;
import com.gic.enterprise.error.ErrorCode; import com.gic.enterprise.error.ErrorCode;
import com.gic.enterprise.utils.CreateRandomUtils;
import com.gic.finance.constant.OrderTypeEnum; import com.gic.finance.constant.OrderTypeEnum;
import com.gic.finance.constant.TransferAccountApprovalStatusEnum; import com.gic.finance.constant.TransferAccountApprovalStatusEnum;
import com.gic.finance.dto.OperationUserInfoDTO;
import com.gic.finance.dto.TransferAccountsApprovalDTO; import com.gic.finance.dto.TransferAccountsApprovalDTO;
import com.gic.finance.entity.TabTransferAccountsApproval; import com.gic.finance.entity.TabTransferAccountsApproval;
import com.gic.finance.qo.TransferListQueryQO; import com.gic.finance.qo.TransferListQueryQO;
import com.gic.finance.service.TransferAccountsApprovalApiService; import com.gic.finance.service.TransferAccountsApprovalApiService;
import com.gic.finance.service.TransferAccountsApprovalService; import com.gic.finance.service.TransferAccountsApprovalService;
import com.gic.store.utils.CreateSerialNumberUtils;
import com.gic.store.utils.valid.ValidUtil; import com.gic.store.utils.valid.ValidUtil;
/** /**
...@@ -77,7 +74,7 @@ public class TransferAccountsApprovalApiServiceImpl implements TransferAccountsA ...@@ -77,7 +74,7 @@ public class TransferAccountsApprovalApiServiceImpl implements TransferAccountsA
transferAccountsApprovalDTO.setInitiatorName("暂无发起方名称"); transferAccountsApprovalDTO.setInitiatorName("暂无发起方名称");
} }
//审批流水号生成 //审批流水号生成
String approvalSerialNumber = CreateSerialNumberUtils.createSerialNumber(); String approvalSerialNumber = CreateRandomUtils.createSerialNumber();
LOGGER.info("转账审批-发起审批-审批流水号:{}", approvalSerialNumber); LOGGER.info("转账审批-发起审批-审批流水号:{}", approvalSerialNumber);
transferAccountsApprovalDTO.setApprovalNumber(approvalSerialNumber); transferAccountsApprovalDTO.setApprovalNumber(approvalSerialNumber);
......
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