Commit 88522f68 by 陶光胜

Merge branch 'developer' of…

Merge branch 'developer' of http://115.159.76.241/base_platform_enterprise/gic-platform-finance into developer
parents 811bc91d 2bb08e3c
......@@ -11,6 +11,8 @@ import com.gic.api.base.commons.ServiceResponse;
import com.gic.commons.util.EntityUtil;
import com.gic.commons.util.PageHelperUtils;
import com.gic.enterprise.error.ErrorCode;
import com.gic.enterprise.utils.AsyncCallbackUtils;
import com.gic.enterprise.utils.CreateRandomUtils;
import com.gic.enterprise.utils.valid.ValidParamsUtils;
import com.gic.finance.constant.WithdrawalApplyTypeEnum;
import com.gic.finance.constant.WithdrawalStatusEnum;
......@@ -22,8 +24,6 @@ import com.gic.finance.qo.CashWithdrawalQueryListQO;
import com.gic.finance.service.CashWithdrawalApiService;
import com.gic.finance.service.CashWithdrawalService;
import com.gic.finance.service.PayAccountService;
import com.gic.finance.util.AsynCallbackUtils;
import com.gic.store.utils.CreateSerialNumberUtils;
@Service("cashWithdrawalApiService")
public class CashWithdrawalApiServiceImpl implements CashWithdrawalApiService{
......@@ -48,7 +48,7 @@ public class CashWithdrawalApiServiceImpl implements CashWithdrawalApiService{
dto.setUpdateTime(new Date());
dto.setCashWithdrawalStatus(WithdrawalStatusEnum.TO_BE_EXAMINE.getCode());
//流水号
dto.setCashWithdrawalSerialNumber(CreateSerialNumberUtils.createSerialNumber());
dto.setCashWithdrawalSerialNumber(CreateRandomUtils.createSerialNumber());
cashWithdrawalService.save(dto);
return ServiceResponse.success(dto.getCashWithdrawalSerialNumber());
}
......@@ -105,7 +105,7 @@ public class CashWithdrawalApiServiceImpl implements CashWithdrawalApiService{
cashWithdrawalService.update(record);
//回调
AsynCallbackUtils.callBack(record, "com.gic.open.api.service.market.PayCallbackApiService", "callbackWithdraw");
AsyncCallbackUtils.callBack(record, "com.gic.open.api.service.market.PayCallbackApiService", "callbackWithdraw");
return ServiceResponse.success();
}
......@@ -135,7 +135,7 @@ public class CashWithdrawalApiServiceImpl implements CashWithdrawalApiService{
cashWithdrawalService.update(record);
//回调
AsynCallbackUtils.callBack(record, "com.gic.open.api.service.market.PayCallbackApiService", "callbackWithdraw");
AsyncCallbackUtils.callBack(record, "com.gic.open.api.service.market.PayCallbackApiService", "callbackWithdraw");
return ServiceResponse.success();
}
......
......@@ -2,9 +2,6 @@ package com.gic.finance.service.outer.impl;
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.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
......@@ -16,10 +13,13 @@ import com.gic.api.base.commons.ServiceResponse;
import com.gic.commons.util.EntityUtil;
import com.gic.commons.util.PageHelperUtils;
import com.gic.enterprise.error.ErrorCode;
import com.gic.enterprise.utils.AsyncCallbackUtils;
import com.gic.enterprise.utils.CreateRandomUtils;
import com.gic.enterprise.utils.valid.ValidParamsUtils;
import com.gic.finance.constant.InvoiceInitiateTypeConstants;
import com.gic.finance.constant.InvoiceStatusEnum;
import com.gic.finance.dto.InvoiceManageDTO;
import com.gic.finance.dto.OperationUserInfoDTO;
import com.gic.finance.dto.callback.InvoiceCallbackDTO;
import com.gic.finance.entity.TabInvoiceAccount;
import com.gic.finance.entity.TabInvoiceManage;
......@@ -27,8 +27,6 @@ import com.gic.finance.qo.InvoiceManageListQueryQO;
import com.gic.finance.service.InvoiceAccountService;
import com.gic.finance.service.InvoiceManageApiService;
import com.gic.finance.service.InvoiceManageService;
import com.gic.finance.util.AsynCallbackUtils;
import com.gic.store.utils.CreateSerialNumberUtils;
@Service("invoiceManageApiService")
public class InvoiceManageApiServiceImpl implements InvoiceManageApiService {
......@@ -51,7 +49,7 @@ public class InvoiceManageApiServiceImpl implements InvoiceManageApiService {
invoiceManageDTO.setCreateTime(new Date());
invoiceManageDTO.setUpdateTime(new Date());
invoiceManageDTO.setInvoiceStatus(InvoiceStatusEnum.TO_BE_ISSUED.getCode());
invoiceManageDTO.setInvoiceApplySerial(CreateSerialNumberUtils.createSerialNumber());
invoiceManageDTO.setInvoiceApplySerial(CreateRandomUtils.createSerialNumber());
if (StringUtils.isBlank(invoiceManageDTO.getEnterpriseName())) {
invoiceManageDTO.setEnterpriseName("暂无商户名称");
}
......@@ -118,7 +116,7 @@ public class InvoiceManageApiServiceImpl implements InvoiceManageApiService {
//回调
if (tabInvoiceManage.getInitiateType().intValue() == InvoiceInitiateTypeConstants.APP) {
InvoiceCallbackDTO callbackDTO = EntityUtil.changeEntityNew(InvoiceCallbackDTO.class, tabInvoiceManage);
AsynCallbackUtils.callBack(callbackDTO, "com.gic.open.api.service.market.InvoiceCallbackApiService",
AsyncCallbackUtils.callBack(callbackDTO, "com.gic.open.api.service.market.InvoiceCallbackApiService",
"invoiceCallback");
}
return ServiceResponse.success();
......@@ -146,7 +144,7 @@ public class InvoiceManageApiServiceImpl implements InvoiceManageApiService {
tabInvoiceManage.setInvoiceStatus(InvoiceStatusEnum.REJECT.getCode());
tabInvoiceManage.setRejectReason(rejectReason);
InvoiceCallbackDTO callbackDTO = EntityUtil.changeEntityNew(InvoiceCallbackDTO.class, tabInvoiceManage);
AsynCallbackUtils.callBack(callbackDTO, "com.gic.open.api.service.market.InvoiceCallbackApiService",
AsyncCallbackUtils.callBack(callbackDTO, "com.gic.open.api.service.market.InvoiceCallbackApiService",
"invoiceCallback");
}
return ServiceResponse.success();
......
package com.gic.finance.service.outer.impl;
import java.text.SimpleDateFormat;
import java.util.Date;
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.dubbo.config.ReferenceConfig;
import org.apache.dubbo.config.RegistryConfig;
import org.apache.dubbo.rpc.service.GenericService;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
......@@ -22,14 +15,16 @@ import com.gic.api.base.commons.ServiceResponse;
import com.gic.commons.util.EntityUtil;
import com.gic.commons.util.PageHelperUtils;
import com.gic.enterprise.error.ErrorCode;
import com.gic.enterprise.utils.AsyncCallbackUtils;
import com.gic.enterprise.utils.CreateRandomUtils;
import com.gic.finance.constant.OrderTypeEnum;
import com.gic.finance.constant.TransferAccountApprovalStatusEnum;
import com.gic.finance.dto.OperationUserInfoDTO;
import com.gic.finance.dto.TransferAccountsApprovalDTO;
import com.gic.finance.entity.TabTransferAccountsApproval;
import com.gic.finance.qo.TransferListQueryQO;
import com.gic.finance.service.TransferAccountsApprovalApiService;
import com.gic.finance.service.TransferAccountsApprovalService;
import com.gic.store.utils.CreateSerialNumberUtils;
import com.gic.store.utils.valid.ValidUtil;
/**
......@@ -77,7 +72,7 @@ public class TransferAccountsApprovalApiServiceImpl implements TransferAccountsA
transferAccountsApprovalDTO.setInitiatorName("暂无发起方名称");
}
//审批流水号生成
String approvalSerialNumber = CreateSerialNumberUtils.createSerialNumber();
String approvalSerialNumber = CreateRandomUtils.createSerialNumber();
LOGGER.info("转账审批-发起审批-审批流水号:{}", approvalSerialNumber);
transferAccountsApprovalDTO.setApprovalNumber(approvalSerialNumber);
......@@ -255,16 +250,8 @@ public class TransferAccountsApprovalApiServiceImpl implements TransferAccountsA
method = "payCallbackTransfer";
}
RegistryConfig registry = new RegistryConfig();
registry.setAddress("zookeeper://10.105.220.75:2199");
registry.setCheck(false);
ReferenceConfig<GenericService> reference = new ReferenceConfig<>();
reference.setInterface(interfaceUrl);
reference.setRegistry(registry);
reference.setGeneric(true);
GenericService genericService = reference.get();
genericService.$invoke(method, new String[]{String.class.getName()}, new String[]{JSONObject.toJSONString(tab)});
//回调
AsyncCallbackUtils.callBack(tab, interfaceUrl, method);
}
private void operationUserInfo(TransferAccountsApprovalDTO dto, OperationUserInfoDTO userInfoDTO) {
......
package com.gic.finance.util;
import org.apache.dubbo.config.ReferenceConfig;
import org.apache.dubbo.config.RegistryConfig;
import org.apache.dubbo.rpc.service.GenericService;
import com.alibaba.fastjson.JSONObject;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
/**
* 回调方法工具
* @ClassName: AsynCallbackUtils

* @Description: 

* @author guojuxing

* @date 2019/9/12 1:52 PM

*/
public class AsynCallbackUtils {
private static Logger logger = LogManager.getLogger(AsynCallbackUtils.class);
/**
* 回调
* @Title: callBack

* @Description:

 * @author guojuxing
* @param obj 需要传递的参数对象
* @param interfaceUrl 接口路径 例如com.gic.open.api.service.market.PayCallbackApiService
* @param method
 方法名称 payCallbackTransfer
* @return void


 */
public static void callBack(Object obj, String interfaceUrl, String method) {
logger.info("转账审批回调:{},接口路径:{},接口方法名称:{}" ,JSONObject.toJSONString(obj), interfaceUrl, method);
RegistryConfig registry = new RegistryConfig();
//todo 上线修改zookeeper地址
registry.setAddress("zookeeper://10.105.220.75:2199");
registry.setCheck(false);
ReferenceConfig<GenericService> reference = new ReferenceConfig<>();
reference.setInterface(interfaceUrl);
reference.setRegistry(registry);
reference.setGeneric(true);
GenericService genericService = reference.get();
genericService.$invoke(method, new String[]{String.class.getName()}, new String[]{JSONObject.toJSONString(obj)});
}
}
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