Commit 75c7219f by 程裕兵

feat:remove vo enums

parent 0e80182f
package com.jiejing.fitness.finance.api.bank; package com.jiejing.fitness.finance.api.bank;
import com.jiejing.common.model.JsonResult;
import com.jiejing.common.model.PageVO;
import com.jiejing.fitness.finance.api.bank.request.PageBankRequest;
import com.jiejing.fitness.finance.api.bank.request.PageBranchBankRequest;
import com.jiejing.fitness.finance.api.bank.vo.BankVO;
import com.jiejing.fitness.finance.api.bank.vo.BranchBankVO;
import feign.hystrix.FallbackFactory; import feign.hystrix.FallbackFactory;
import org.springframework.stereotype.Component; import org.springframework.stereotype.Component;
...@@ -12,6 +18,16 @@ public class BankApiFallback implements FallbackFactory<BankApi> { ...@@ -12,6 +18,16 @@ public class BankApiFallback implements FallbackFactory<BankApi> {
@Override @Override
public BankApi create(Throwable throwable) { public BankApi create(Throwable throwable) {
return null; return new BankApi() {
@Override
public JsonResult<PageVO<BankVO>> pageBank(PageBankRequest request) {
return JsonResult.rpcError();
}
@Override
public JsonResult<PageVO<BranchBankVO>> pageBranchBank(PageBranchBankRequest request) {
return JsonResult.rpcError();
}
};
} }
} }
...@@ -2,6 +2,7 @@ package com.jiejing.fitness.finance.api.cashier.request; ...@@ -2,6 +2,7 @@ package com.jiejing.fitness.finance.api.cashier.request;
import com.jiejing.fitness.enums.finance.BrandCashierTransStateEnum; import com.jiejing.fitness.enums.finance.BrandCashierTransStateEnum;
import com.jiejing.fitness.enums.finance.BrandCashierTransTypeEnum; import com.jiejing.fitness.enums.finance.BrandCashierTransTypeEnum;
import com.jiejing.fitness.enums.finance.PayOrderTypeEnum;
import com.jiejing.paycenter.common.enums.merchant.SubChannelEnums; import com.jiejing.paycenter.common.enums.merchant.SubChannelEnums;
import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
...@@ -45,7 +46,7 @@ public class PageStudioCashierRequest { ...@@ -45,7 +46,7 @@ public class PageStudioCashierRequest {
private BrandCashierTransStateEnum transState; private BrandCashierTransStateEnum transState;
@ApiModelProperty("业务订单类型(来源)") @ApiModelProperty("业务订单类型(来源)")
private Integer orderType; private PayOrderTypeEnum orderType;
@ApiModelProperty("交易类型:PAY-收款;REFUND-退款;") @ApiModelProperty("交易类型:PAY-收款;REFUND-退款;")
private BrandCashierTransTypeEnum transType; private BrandCashierTransTypeEnum transType;
......
...@@ -16,7 +16,7 @@ import com.jiejing.fitness.finance.api.merchant.vo.StudioMerchantApplyVO; ...@@ -16,7 +16,7 @@ import com.jiejing.fitness.finance.api.merchant.vo.StudioMerchantApplyVO;
import com.jiejing.fitness.finance.api.merchant.vo.StudioMerchantAuthSubChannelVO; import com.jiejing.fitness.finance.api.merchant.vo.StudioMerchantAuthSubChannelVO;
import com.jiejing.fitness.finance.api.merchant.vo.StudioMerchantBindXcxAppIdVO; import com.jiejing.fitness.finance.api.merchant.vo.StudioMerchantBindXcxAppIdVO;
import com.jiejing.fitness.finance.api.merchant.vo.StudioMerchantVO; import com.jiejing.fitness.finance.api.merchant.vo.StudioMerchantVO;
import com.jiejing.paycenter.api.pay.vo.PayVO; import com.jiejing.paycenter.common.model.vo.PayVO;
import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiOperation;
import java.util.List; import java.util.List;
import org.springframework.cloud.openfeign.FeignClient; import org.springframework.cloud.openfeign.FeignClient;
......
...@@ -16,7 +16,7 @@ import com.jiejing.fitness.finance.api.merchant.vo.StudioMerchantApplyVO; ...@@ -16,7 +16,7 @@ import com.jiejing.fitness.finance.api.merchant.vo.StudioMerchantApplyVO;
import com.jiejing.fitness.finance.api.merchant.vo.StudioMerchantAuthSubChannelVO; import com.jiejing.fitness.finance.api.merchant.vo.StudioMerchantAuthSubChannelVO;
import com.jiejing.fitness.finance.api.merchant.vo.StudioMerchantBindXcxAppIdVO; import com.jiejing.fitness.finance.api.merchant.vo.StudioMerchantBindXcxAppIdVO;
import com.jiejing.fitness.finance.api.merchant.vo.StudioMerchantVO; import com.jiejing.fitness.finance.api.merchant.vo.StudioMerchantVO;
import com.jiejing.paycenter.api.pay.vo.PayVO; import com.jiejing.paycenter.common.model.vo.PayVO;
import feign.hystrix.FallbackFactory; import feign.hystrix.FallbackFactory;
import java.util.List; import java.util.List;
import org.springframework.stereotype.Component; import org.springframework.stereotype.Component;
......
package com.jiejing.fitness.finance.api.merchant.vo; package com.jiejing.fitness.finance.api.merchant.vo;
import com.jiejing.common.swagger.EnumMapping; import com.jiejing.common.swagger.EnumMapping;
import com.jiejing.paycenter.api.merchant.vo.SubChannelConfigVO;
import com.jiejing.paycenter.common.enums.common.OpenStateEnums; import com.jiejing.paycenter.common.enums.common.OpenStateEnums;
import com.jiejing.paycenter.common.enums.merchant.CompanyTypeEnums; import com.jiejing.paycenter.common.enums.merchant.CompanyTypeEnums;
import com.jiejing.paycenter.common.model.vo.SubChannelConfigVO;
import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import java.util.List; import java.util.List;
......
...@@ -2,9 +2,9 @@ package com.jiejing.fitness.finance.api.merchant.vo; ...@@ -2,9 +2,9 @@ package com.jiejing.fitness.finance.api.merchant.vo;
import com.jiejing.common.swagger.EnumMapping; import com.jiejing.common.swagger.EnumMapping;
import com.jiejing.fitness.finance.api.merchant.request.model.BrandResourceInfo; import com.jiejing.fitness.finance.api.merchant.request.model.BrandResourceInfo;
import com.jiejing.paycenter.api.merchant.vo.SubChannelConfigVO;
import com.jiejing.paycenter.common.enums.common.OpenStateEnums; import com.jiejing.paycenter.common.enums.common.OpenStateEnums;
import com.jiejing.paycenter.common.enums.merchant.CompanyTypeEnums; import com.jiejing.paycenter.common.enums.merchant.CompanyTypeEnums;
import com.jiejing.paycenter.common.model.vo.SubChannelConfigVO;
import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import java.util.List; import java.util.List;
......
...@@ -23,7 +23,7 @@ import com.jiejing.fitness.finance.service.merchant.params.ApplyStudioMerchantPa ...@@ -23,7 +23,7 @@ import com.jiejing.fitness.finance.service.merchant.params.ApplyStudioMerchantPa
import com.jiejing.fitness.finance.service.merchant.params.PageStudioMerchantApplyParams; import com.jiejing.fitness.finance.service.merchant.params.PageStudioMerchantApplyParams;
import com.jiejing.fitness.finance.service.pay.PayService; import com.jiejing.fitness.finance.service.pay.PayService;
import com.jiejing.fitness.finance.service.pay.params.StudioMerchantPayParams; import com.jiejing.fitness.finance.service.pay.params.StudioMerchantPayParams;
import com.jiejing.paycenter.api.pay.vo.PayVO; import com.jiejing.paycenter.common.model.vo.PayVO;
import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiOperation;
import java.util.List; import java.util.List;
import javax.annotation.Resource; import javax.annotation.Resource;
......
...@@ -66,8 +66,10 @@ public class StudioMerchantApply implements Serializable { ...@@ -66,8 +66,10 @@ public class StudioMerchantApply implements Serializable {
/** /**
* 申请类型:OPEN-进件;RE_OPEN-重进件; * 申请类型:OPEN-进件;RE_OPEN-重进件;
*
* @see ApplyTypeEnum
*/ */
private ApplyTypeEnum applyType; private String applyType;
/** /**
* 渠道号 * 渠道号
...@@ -96,13 +98,17 @@ public class StudioMerchantApply implements Serializable { ...@@ -96,13 +98,17 @@ public class StudioMerchantApply implements Serializable {
/** /**
* 企业类型 * 企业类型
*
* @see CompanyTypeEnums
*/ */
private CompanyTypeEnums companyType; private String companyType;
/** /**
* 开通状态:I-初始态;P-处理中;S-成功;F-失败 默认值: I * 开通状态:I-初始态;P-处理中;S-成功;F-失败 默认值: I
*
* @see OpenStateEnums
*/ */
private OpenStateEnums openState; private String openState;
/** /**
* 开通失败原因 * 开通失败原因
...@@ -111,13 +117,17 @@ public class StudioMerchantApply implements Serializable { ...@@ -111,13 +117,17 @@ public class StudioMerchantApply implements Serializable {
/** /**
* 支付宝开通状态:I-初始态;S-成功;F-失败 默认值: I * 支付宝开通状态:I-初始态;S-成功;F-失败 默认值: I
*
* @see OpenStateEnums
*/ */
private OpenStateEnums aliOpenState; private String aliOpenState;
/** /**
* 支付宝认证状态 * 支付宝认证状态
*
* @see OpenStateEnums
*/ */
private OpenStateEnums aliAuthState; private String aliAuthState;
/** /**
* 支付宝商户号 * 支付宝商户号
...@@ -131,13 +141,17 @@ public class StudioMerchantApply implements Serializable { ...@@ -131,13 +141,17 @@ public class StudioMerchantApply implements Serializable {
/** /**
* 微信线下通道开通状态:I-初始态;S-成功;F-失败 默认值: I * 微信线下通道开通状态:I-初始态;S-成功;F-失败 默认值: I
*
* @see OpenStateEnums
*/ */
private OpenStateEnums wxOfflineOpenState; private String wxOfflineOpenState;
/** /**
* 微信线下通道认证状态:I-初始态;S-成功;F-失败 默认值: I * 微信线下通道认证状态:I-初始态;S-成功;F-失败 默认值: I
*
* @see OpenStateEnums
*/ */
private OpenStateEnums wxOfflineAuthState; private String wxOfflineAuthState;
/** /**
* 微信线下通道商户号 * 微信线下通道商户号
...@@ -151,13 +165,17 @@ public class StudioMerchantApply implements Serializable { ...@@ -151,13 +165,17 @@ public class StudioMerchantApply implements Serializable {
/** /**
* 微信线上通道开通状态:I-初始态;S-成功;F-失败 默认值: I * 微信线上通道开通状态:I-初始态;S-成功;F-失败 默认值: I
*
* @see OpenStateEnums
*/ */
private OpenStateEnums wxOnlineOpenState; private String wxOnlineOpenState;
/** /**
* 微信线上通道认证状态:I-初始态;S-成功;F-失败 默认值: I * 微信线上通道认证状态:I-初始态;S-成功;F-失败 默认值: I
*
* @see OpenStateEnums
*/ */
private OpenStateEnums wxOnlineAuthState; private String wxOnlineAuthState;
/** /**
* 微信线上通道商户号 * 微信线上通道商户号
......
...@@ -2,6 +2,7 @@ package com.jiejing.fitness.finance.repository.query; ...@@ -2,6 +2,7 @@ package com.jiejing.fitness.finance.repository.query;
import com.jiejing.fitness.enums.finance.BrandCashierTransStateEnum; import com.jiejing.fitness.enums.finance.BrandCashierTransStateEnum;
import com.jiejing.fitness.enums.finance.BrandCashierTransTypeEnum; import com.jiejing.fitness.enums.finance.BrandCashierTransTypeEnum;
import com.jiejing.fitness.enums.finance.PayOrderTypeEnum;
import com.jiejing.paycenter.common.enums.merchant.SubChannelEnums; import com.jiejing.paycenter.common.enums.merchant.SubChannelEnums;
import java.util.Date; import java.util.Date;
import lombok.Data; import lombok.Data;
...@@ -53,7 +54,7 @@ public class PageBrandCashierRecordQuery { ...@@ -53,7 +54,7 @@ public class PageBrandCashierRecordQuery {
/** /**
* 业务订单类型(来源) * 业务订单类型(来源)
*/ */
private Integer orderType; private PayOrderTypeEnum orderType;
/** /**
* 交易类型:PAY-收款;REFUND-退款; * 交易类型:PAY-收款;REFUND-退款;
......
...@@ -67,7 +67,7 @@ public class StudioCashierRecordRpService extends ...@@ -67,7 +67,7 @@ public class StudioCashierRecordRpService extends
wrapper.eq(StudioCashierRecord.TRANS_STATE, query.getTransState()); wrapper.eq(StudioCashierRecord.TRANS_STATE, query.getTransState());
} }
if (null != query.getOrderType()) { if (null != query.getOrderType()) {
wrapper.eq(StudioCashierRecord.ORDER_TYPE, query.getOrderType()); wrapper.eq(StudioCashierRecord.ORDER_TYPE, query.getOrderType().getCode());
} }
if (null != query.getTransType()) { if (null != query.getTransType()) {
wrapper.eq(StudioCashierRecord.TRANS_TYPE, query.getTransType()); wrapper.eq(StudioCashierRecord.TRANS_TYPE, query.getTransType());
......
...@@ -2,6 +2,7 @@ package com.jiejing.fitness.finance.service.cashier.params; ...@@ -2,6 +2,7 @@ package com.jiejing.fitness.finance.service.cashier.params;
import com.jiejing.fitness.enums.finance.BrandCashierTransStateEnum; import com.jiejing.fitness.enums.finance.BrandCashierTransStateEnum;
import com.jiejing.fitness.enums.finance.BrandCashierTransTypeEnum; import com.jiejing.fitness.enums.finance.BrandCashierTransTypeEnum;
import com.jiejing.fitness.enums.finance.PayOrderTypeEnum;
import com.jiejing.paycenter.common.enums.merchant.SubChannelEnums; import com.jiejing.paycenter.common.enums.merchant.SubChannelEnums;
import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
...@@ -45,7 +46,7 @@ public class PageStudioCashierParams { ...@@ -45,7 +46,7 @@ public class PageStudioCashierParams {
private BrandCashierTransStateEnum transState; private BrandCashierTransStateEnum transState;
@ApiModelProperty("业务订单类型(来源)") @ApiModelProperty("业务订单类型(来源)")
private Integer orderType; private PayOrderTypeEnum orderType;
@ApiModelProperty("交易类型:PAY-收款;REFUND-退款;") @ApiModelProperty("交易类型:PAY-收款;REFUND-退款;")
private BrandCashierTransTypeEnum transType; private BrandCashierTransTypeEnum transType;
......
package com.jiejing.fitness.finance.service.global.dto; package com.jiejing.fitness.finance.service.global.dto;
import com.jiejing.paycenter.common.model.SubChannelConfigInfo; import com.jiejing.paycenter.common.model.request.SubChannelConfigInfo;
import com.jiejing.paycenter.common.model.SubChannelInfo; import com.jiejing.paycenter.common.model.request.SubChannelInfo;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import java.util.List; import java.util.List;
import lombok.Data; import lombok.Data;
......
...@@ -11,7 +11,7 @@ import com.jiejing.fitness.finance.service.merchant.BrandMerchantService; ...@@ -11,7 +11,7 @@ import com.jiejing.fitness.finance.service.merchant.BrandMerchantService;
import com.jiejing.fitness.finance.service.merchant.convert.MerchantConvert; import com.jiejing.fitness.finance.service.merchant.convert.MerchantConvert;
import com.jiejing.fitness.finance.service.rpc.MerchantRpcService; import com.jiejing.fitness.finance.service.rpc.MerchantRpcService;
import com.jiejing.fitness.finance.service.rpc.StudioRpcService; import com.jiejing.fitness.finance.service.rpc.StudioRpcService;
import com.jiejing.paycenter.api.merchant.vo.MerchantVO; import com.jiejing.paycenter.common.model.vo.MerchantVO;
import com.jiejing.studio.api.studio.vo.StudioVO; import com.jiejing.studio.api.studio.vo.StudioVO;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
......
...@@ -29,17 +29,17 @@ import com.jiejing.fitness.finance.service.rpc.MessageRpcService; ...@@ -29,17 +29,17 @@ import com.jiejing.fitness.finance.service.rpc.MessageRpcService;
import com.jiejing.fitness.finance.service.rpc.ResourceRpcService; import com.jiejing.fitness.finance.service.rpc.ResourceRpcService;
import com.jiejing.fitness.finance.service.rpc.StudioRpcService; import com.jiejing.fitness.finance.service.rpc.StudioRpcService;
import com.jiejing.paycenter.api.merchant.request.ApplyMerchantRequest; import com.jiejing.paycenter.api.merchant.request.ApplyMerchantRequest;
import com.jiejing.paycenter.api.merchant.vo.AuthSubChannelVO; import com.jiejing.paycenter.common.model.vo.AuthSubChannelVO;
import com.jiejing.paycenter.api.merchant.vo.ConfigSubChannelVO; import com.jiejing.paycenter.common.model.vo.ConfigSubChannelVO;
import com.jiejing.paycenter.api.merchant.vo.MerchantVO; import com.jiejing.paycenter.common.model.vo.MerchantVO;
import com.jiejing.paycenter.api.merchant.vo.SubChannelAuthVO; import com.jiejing.paycenter.common.model.vo.SubChannelAuthVO;
import com.jiejing.paycenter.common.enums.common.OpenStateEnums; import com.jiejing.paycenter.common.enums.common.OpenStateEnums;
import com.jiejing.paycenter.common.enums.merchant.ResourceTypeEnums; import com.jiejing.paycenter.common.enums.merchant.ResourceTypeEnums;
import com.jiejing.paycenter.common.enums.merchant.SubChannelAuthTypeEnums; import com.jiejing.paycenter.common.enums.merchant.SubChannelAuthTypeEnums;
import com.jiejing.paycenter.common.enums.merchant.SubChannelConfigTypeEnums; import com.jiejing.paycenter.common.enums.merchant.SubChannelConfigTypeEnums;
import com.jiejing.paycenter.common.enums.merchant.SubChannelEnums; import com.jiejing.paycenter.common.enums.merchant.SubChannelEnums;
import com.jiejing.paycenter.common.event.MerchantEvent; import com.jiejing.paycenter.common.event.MerchantEvent;
import com.jiejing.paycenter.common.model.ResourceInfo; import com.jiejing.paycenter.common.model.request.ResourceInfo;
import com.jiejing.studio.api.studio.vo.StudioVO; import com.jiejing.studio.api.studio.vo.StudioVO;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
...@@ -153,7 +153,7 @@ public class StudioMerchantServiceImpl implements StudioMerchantService { ...@@ -153,7 +153,7 @@ public class StudioMerchantServiceImpl implements StudioMerchantService {
@Transactional(propagation = Propagation.REQUIRED, rollbackFor = Exception.class) @Transactional(propagation = Propagation.REQUIRED, rollbackFor = Exception.class)
@Override @Override
public void callback(MerchantEvent event) { public void callback(MerchantEvent event) {
switch (event.getState()) { switch (OpenStateEnums.getByCode(event.getState())) {
case PROCESS: case PROCESS:
this.doOpenMerchantProcess(Long.parseLong(event.getApplyNo())); this.doOpenMerchantProcess(Long.parseLong(event.getApplyNo()));
break; break;
...@@ -250,7 +250,7 @@ public class StudioMerchantServiceImpl implements StudioMerchantService { ...@@ -250,7 +250,7 @@ public class StudioMerchantServiceImpl implements StudioMerchantService {
StudioMerchantApply toModify = MerchantConvert.convertApply(apply, event, StudioMerchantApply toModify = MerchantConvert.convertApply(apply, event,
configService.getDefaultBrandSubChannelInfo().getSubChannels()); configService.getDefaultBrandSubChannelInfo().getSubChannels());
studioMerchantApplyRpService.updateById(toModify); studioMerchantApplyRpService.updateById(toModify);
if (OpenStateEnums.SUCCESS != toModify.getOpenState()) { if (!OpenStateEnums.SUCCESS.getCode().equals(toModify.getOpenState())) {
return; return;
} }
// 所有子通道全部开通成功 // 所有子通道全部开通成功
...@@ -312,7 +312,7 @@ public class StudioMerchantServiceImpl implements StudioMerchantService { ...@@ -312,7 +312,7 @@ public class StudioMerchantServiceImpl implements StudioMerchantService {
private List<Long> getResourceIds(MerchantVO merchant) { private List<Long> getResourceIds(MerchantVO merchant) {
return merchant.getResourceMap().values().stream() return merchant.getResourceMap().values().stream()
.map(com.jiejing.paycenter.api.merchant.vo.ResourceInfoVO::getResourceId) .map(com.jiejing.paycenter.common.model.vo.ResourceInfoVO::getResourceId)
.filter(Objects::nonNull) .filter(Objects::nonNull)
.distinct() .distinct()
.collect(Collectors.toList()); .collect(Collectors.toList());
...@@ -320,13 +320,13 @@ public class StudioMerchantServiceImpl implements StudioMerchantService { ...@@ -320,13 +320,13 @@ public class StudioMerchantServiceImpl implements StudioMerchantService {
private void doOpenMerchantFail(Long id, String failMessage) { private void doOpenMerchantFail(Long id, String failMessage) {
studioMerchantApplyRpService.updateById( studioMerchantApplyRpService.updateById(
StudioMerchantApply.builder().id(id).openState(OpenStateEnums.FAIL) StudioMerchantApply.builder().id(id).openState(OpenStateEnums.FAIL.getCode())
.openFailMessage(failMessage).build()); .openFailMessage(failMessage).build());
} }
private void doOpenMerchantProcess(Long id) { private void doOpenMerchantProcess(Long id) {
studioMerchantApplyRpService.updateById( studioMerchantApplyRpService.updateById(
StudioMerchantApply.builder().id(id).openState(OpenStateEnums.PROCESS).build()); StudioMerchantApply.builder().id(id).openState(OpenStateEnums.PROCESS.getCode()).build());
} }
private void validSmsCode(String phone, String smsCode) { private void validSmsCode(String phone, String smsCode) {
......
...@@ -2,7 +2,7 @@ package com.jiejing.fitness.finance.service.pay; ...@@ -2,7 +2,7 @@ package com.jiejing.fitness.finance.service.pay;
import com.jiejing.fitness.finance.service.pay.params.StudioMerchantPayParams; import com.jiejing.fitness.finance.service.pay.params.StudioMerchantPayParams;
import com.jiejing.fitness.finance.service.pay.params.BrandMerchantRefundParams; import com.jiejing.fitness.finance.service.pay.params.BrandMerchantRefundParams;
import com.jiejing.paycenter.api.pay.vo.PayVO; import com.jiejing.paycenter.common.model.vo.PayVO;
import com.jiejing.paycenter.api.pay.vo.RefundVO; import com.jiejing.paycenter.api.pay.vo.RefundVO;
import com.jiejing.paycenter.common.event.PayEvent; import com.jiejing.paycenter.common.event.PayEvent;
import com.jiejing.paycenter.common.event.RefundEvent; import com.jiejing.paycenter.common.event.RefundEvent;
......
...@@ -14,8 +14,8 @@ import com.jiejing.fitness.finance.service.pay.params.BrandMerchantRefundParams; ...@@ -14,8 +14,8 @@ import com.jiejing.fitness.finance.service.pay.params.BrandMerchantRefundParams;
import com.jiejing.fitness.finance.service.pay.params.StudioMerchantPayParams; import com.jiejing.fitness.finance.service.pay.params.StudioMerchantPayParams;
import com.jiejing.fitness.finance.service.utils.FeeUtil; import com.jiejing.fitness.finance.service.utils.FeeUtil;
import com.jiejing.fitness.finance.service.utils.MoneyUtil; import com.jiejing.fitness.finance.service.utils.MoneyUtil;
import com.jiejing.paycenter.api.merchant.vo.MerchantVO; import com.jiejing.paycenter.common.model.vo.MerchantVO;
import com.jiejing.paycenter.api.merchant.vo.SubChannelVO; import com.jiejing.paycenter.common.model.vo.SubChannelVO;
import com.jiejing.paycenter.api.pay.request.PayRequest; import com.jiejing.paycenter.api.pay.request.PayRequest;
import com.jiejing.paycenter.api.pay.request.RefundPayRequest; import com.jiejing.paycenter.api.pay.request.RefundPayRequest;
import com.jiejing.paycenter.api.pay.vo.RefundVO; import com.jiejing.paycenter.api.pay.vo.RefundVO;
...@@ -145,7 +145,7 @@ public class PayConvert { ...@@ -145,7 +145,7 @@ public class PayConvert {
.id(record.getId()) .id(record.getId())
.successTime(event.getFinishTime()) .successTime(event.getFinishTime())
.channelNo(event.getChannelNo()) .channelNo(event.getChannelNo())
.transState(convertTransState(event.getPayState())) .transState(convertTransState(PayStateEnums.getByCode(event.getPayState())))
.failMessage(event.getFailMsg()) .failMessage(event.getFailMsg())
.thirdTransNo(event.getThirdTransNo()) .thirdTransNo(event.getThirdTransNo())
.updateTime(new Date()) .updateTime(new Date())
...@@ -218,7 +218,7 @@ public class PayConvert { ...@@ -218,7 +218,7 @@ public class PayConvert {
public static StudioCashierRecord convertRefund(StudioCashierRecord record, RefundEvent event) { public static StudioCashierRecord convertRefund(StudioCashierRecord record, RefundEvent event) {
return StudioCashierRecord.builder() return StudioCashierRecord.builder()
.id(record.getId()) .id(record.getId())
.transState(convertTransState(event.getRefundState())) .transState(convertTransState(TransStateEnums.getByCode(event.getRefundState())))
.failMessage(event.getFailMessage()) .failMessage(event.getFailMessage())
.successTime(event.getSuccessTime()) .successTime(event.getSuccessTime())
.updateTime(new Date()) .updateTime(new Date())
......
...@@ -13,10 +13,10 @@ import com.jiejing.fitness.finance.service.pay.params.StudioMerchantPayParams; ...@@ -13,10 +13,10 @@ import com.jiejing.fitness.finance.service.pay.params.StudioMerchantPayParams;
import com.jiejing.fitness.finance.service.rpc.MerchantRpcService; import com.jiejing.fitness.finance.service.rpc.MerchantRpcService;
import com.jiejing.fitness.finance.service.rpc.PayRpcService; import com.jiejing.fitness.finance.service.rpc.PayRpcService;
import com.jiejing.fitness.finance.service.rpc.StudioRpcService; import com.jiejing.fitness.finance.service.rpc.StudioRpcService;
import com.jiejing.paycenter.api.merchant.vo.MerchantVO; import com.jiejing.paycenter.common.model.vo.MerchantVO;
import com.jiejing.paycenter.api.pay.request.PayRequest; import com.jiejing.paycenter.api.pay.request.PayRequest;
import com.jiejing.paycenter.api.pay.request.RefundPayRequest; import com.jiejing.paycenter.api.pay.request.RefundPayRequest;
import com.jiejing.paycenter.api.pay.vo.PayVO; import com.jiejing.paycenter.common.model.vo.PayVO;
import com.jiejing.paycenter.api.pay.vo.RefundVO; import com.jiejing.paycenter.api.pay.vo.RefundVO;
import com.jiejing.paycenter.common.event.PayEvent; import com.jiejing.paycenter.common.event.PayEvent;
import com.jiejing.paycenter.common.event.RefundEvent; import com.jiejing.paycenter.common.event.RefundEvent;
......
...@@ -10,11 +10,11 @@ import com.jiejing.paycenter.api.merchant.request.ConfigSubChannelRequest; ...@@ -10,11 +10,11 @@ import com.jiejing.paycenter.api.merchant.request.ConfigSubChannelRequest;
import com.jiejing.paycenter.api.merchant.request.GetMerchantByIdRequest; import com.jiejing.paycenter.api.merchant.request.GetMerchantByIdRequest;
import com.jiejing.paycenter.api.merchant.request.ListMerchantByIdsRequest; import com.jiejing.paycenter.api.merchant.request.ListMerchantByIdsRequest;
import com.jiejing.paycenter.api.merchant.request.UploadRequest; import com.jiejing.paycenter.api.merchant.request.UploadRequest;
import com.jiejing.paycenter.api.merchant.vo.ApplyMerchantResultVO; import com.jiejing.paycenter.common.model.vo.ApplyMerchantResultVO;
import com.jiejing.paycenter.api.merchant.vo.AuthSubChannelVO; import com.jiejing.paycenter.common.model.vo.AuthSubChannelVO;
import com.jiejing.paycenter.api.merchant.vo.ConfigSubChannelVO; import com.jiejing.paycenter.common.model.vo.ConfigSubChannelVO;
import com.jiejing.paycenter.api.merchant.vo.MerchantVO; import com.jiejing.paycenter.common.model.vo.MerchantVO;
import com.jiejing.paycenter.api.merchant.vo.UploadVO; import com.jiejing.paycenter.common.model.vo.UploadVO;
import com.jiejing.paycenter.common.enums.common.OpenStateEnums; import com.jiejing.paycenter.common.enums.common.OpenStateEnums;
import com.jiejing.paycenter.common.enums.merchant.AuthPhaseEnums; import com.jiejing.paycenter.common.enums.merchant.AuthPhaseEnums;
import com.jiejing.paycenter.common.enums.merchant.SubChannelAuthTypeEnums; import com.jiejing.paycenter.common.enums.merchant.SubChannelAuthTypeEnums;
......
...@@ -4,7 +4,7 @@ import com.jiejing.common.model.JsonResult; ...@@ -4,7 +4,7 @@ import com.jiejing.common.model.JsonResult;
import com.jiejing.paycenter.api.pay.PayApi; import com.jiejing.paycenter.api.pay.PayApi;
import com.jiejing.paycenter.api.pay.request.PayRequest; import com.jiejing.paycenter.api.pay.request.PayRequest;
import com.jiejing.paycenter.api.pay.request.RefundPayRequest; import com.jiejing.paycenter.api.pay.request.RefundPayRequest;
import com.jiejing.paycenter.api.pay.vo.PayVO; import com.jiejing.paycenter.common.model.vo.PayVO;
import com.jiejing.paycenter.api.pay.vo.RefundVO; import com.jiejing.paycenter.api.pay.vo.RefundVO;
import com.jiejing.paycenter.common.enums.common.TransStateEnums; import com.jiejing.paycenter.common.enums.common.TransStateEnums;
import com.jiejing.paycenter.common.enums.pay.PayStateEnums; import com.jiejing.paycenter.common.enums.pay.PayStateEnums;
......
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