Skip to content

F
fit-finance
Commit f0dbb1b5 by 程裕兵
Options

feat:finance enums -> fitness-share enums

parent d8766612
Showing with 216 additions and 297 deletions
api/pom.xml
......@@ -18,6 +18,11 @@
</dependency>
<dependency>
<groupId>com.jiejing.fitness</groupId>
<artifactId>fitness-share</artifactId>
</dependency>
<dependency>
<groupId>org.projectlombok</groupId>
<artifactId>lombok</artifactId>
<scope>provided</scope>
......
api/src/main/java/com/jiejing/fitness/finance/api/cashier/request/PageStudioCashierRequest.java
package com.jiejing.fitness.finance.api.cashier.request;
import com.jiejing.fitness.finance.api.enums.BrandCashierTransStateEnums;
import com.jiejing.fitness.finance.api.enums.BrandCashierTransTypeEnums;
import com.jiejing.fitness.enums.finance.BrandCashierTransStateEnum;
import com.jiejing.fitness.enums.finance.BrandCashierTransTypeEnum;
import com.jiejing.paycenter.common.enums.merchant.SubChannelEnums;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
......@@ -39,13 +39,13 @@ public class PageStudioCashierRequest {
private String buyerName;
@ApiModelProperty("交易状态")
private BrandCashierTransStateEnums transState;
private BrandCashierTransStateEnum transState;
@ApiModelProperty("业务订单类型（来源）")
private Integer orderType;
@ApiModelProperty("交易类型：PAY-收款；REFUND-退款；")
private BrandCashierTransTypeEnums transType;
private BrandCashierTransTypeEnum transType;
@ApiModelProperty("交易方式")
private SubChannelEnums subChannel;
......
api/src/main/java/com/jiejing/fitness/finance/api/cashier/vo/StudioCashierRecordVO.java
package com.jiejing.fitness.finance.api.cashier.vo;
import com.jiejing.fitness.finance.api.enums.BrandCashierTransStateEnums;
import com.jiejing.fitness.finance.api.enums.BrandCashierTransTypeEnums;
import com.jiejing.common.swagger.EnumMapping;
import com.jiejing.fitness.enums.finance.BrandCashierTransStateEnum;
import com.jiejing.fitness.enums.finance.BrandCashierTransTypeEnum;
import com.jiejing.paycenter.common.enums.common.OpenStateEnums;
import com.jiejing.paycenter.common.enums.merchant.SubChannelEnums;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
......@@ -35,8 +37,9 @@ public class StudioCashierRecordVO {
@ApiModelProperty("业务订单类型")
private Integer orderType;
@EnumMapping(enumClass = BrandCashierTransTypeEnum.class)
@ApiModelProperty("交易类型：PAY-收款；REFUND-退款；")
private BrandCashierTransTypeEnums transType;
private String transType;
@ApiModelProperty("品牌ID")
private Long brandId;
......@@ -53,8 +56,9 @@ public class StudioCashierRecordVO {
@ApiModelProperty("渠道号")
private String channelNo;
@EnumMapping(enumClass = SubChannelEnums.class)
@ApiModelProperty("支付子渠道：ALI-支付宝、WX-微信")
private SubChannelEnums subChannel;
private String subChannel;
@ApiModelProperty("交易金额（元）")
private BigDecimal transAmount;
......@@ -68,8 +72,9 @@ public class StudioCashierRecordVO {
@ApiModelProperty("实际金额（元）")
private BigDecimal actualAmount;
@ApiModelProperty("交易状态：0-支付初始态；1-支付中；2-支付失败；3-入账中（支付成功）；4-入账成功；5-退款中；6-退款成功；7-退款失败")
private BrandCashierTransStateEnums transState;
@EnumMapping(enumClass = BrandCashierTransStateEnum.class)
@ApiModelProperty("交易状态")
private String transState;
@ApiModelProperty("付款人姓名")
private String buyerName;
......
api/src/main/java/com/jiejing/fitness/finance/api/enums/ApplyTypeEnums.java deleted 100644 → 0
package com.jiejing.fitness.finance.api.enums;
import com.baomidou.mybatisplus.annotation.EnumValue;
import lombok.AllArgsConstructor;
import lombok.Getter;
/**
* @author chengyubing
* @since 2024/2/20 16:56
*/
@Getter
@AllArgsConstructor
public enum ApplyTypeEnums {
/**
* 申请类型
*/
OPEN("OPEN", "进件"),
RE_OPEN("RE_OPEN", "重进件"),
;
@EnumValue
private final String code;
private final String desc;
}
api/src/main/java/com/jiejing/fitness/finance/api/enums/BrandCashierTransStateEnums.java deleted 100644 → 0
package com.jiejing.fitness.finance.api.enums;
import com.baomidou.mybatisplus.annotation.EnumValue;
import lombok.AllArgsConstructor;
import lombok.Getter;
/**
* @author chengyubing
* @since 2024/2/27 12:00
*/
@Getter
@AllArgsConstructor
public enum BrandCashierTransStateEnums {
/**
* 交易状态：0-支付初始态；1-支付中；2-支付失败；3-入账中（支付成功）；4-入账成功；5-退款中；6-退款成功；7-退款失败
*/
PAY_INIT(0, "支付初始态"),
PAYING(1, "支付中"),
PAY_FAIL(2, "支付失败"),
PAY_SUCCESS(3, "支付成功（入账中）"),
PAY_IN(4, "入账成功"),
REFUND_INIT(5, "退款初始态"),
REFUNDING(6, "退款中"),
REFUND_SUCCESS(7, "退款成功"),
REFUND_FAIL(8, "退款失败"),
;
@EnumValue
private final Integer code;
private final String desc;
}
api/src/main/java/com/jiejing/fitness/finance/api/enums/BrandCashierTransTypeEnums.java deleted 100644 → 0
package com.jiejing.fitness.finance.api.enums;
import com.baomidou.mybatisplus.annotation.EnumValue;
import lombok.AllArgsConstructor;
import lombok.Getter;
/**
* @author chengyubing
* @since 2024/2/27 12:00
*/
@Getter
@AllArgsConstructor
public enum BrandCashierTransTypeEnums {
/**
* 交易类型：PAY-收款；REFUND-退款；
*/
PAY("PAY"),
REFUND("REFUND"),
;
@EnumValue
private final String code;
}
api/src/main/java/com/jiejing/fitness/finance/api/enums/PartyTypeEnums.java deleted 100644 → 0
package com.jiejing.fitness.finance.api.enums;
import com.baomidou.mybatisplus.annotation.EnumValue;
import java.util.Arrays;
import lombok.AllArgsConstructor;
import lombok.Getter;
/**
* @author chengyubing
* @since 2024/3/4 18:22
*/
@Getter
@AllArgsConstructor
public enum PartyTypeEnums {
/**
* 业务方类型
*/
STUDIO("STUDIO", "场馆"),
BRAND("BRAND", "品牌"),
UNKNOWN("UNKNOWN", "未知"),
;
@EnumValue
private final String code;
private final String desc;
public static PartyTypeEnums getByCode(String code) {
return Arrays.stream(PartyTypeEnums.values()).filter(e -> e.getCode().equals(code)).findFirst()
.orElse(UNKNOWN);
}
}
api/src/main/java/com/jiejing/fitness/finance/api/merchant/request/PageStudioMerchantApplyRequest.java
package com.jiejing.fitness.finance.api.merchant.request;
import com.jiejing.fitness.finance.api.enums.ApplyTypeEnums;
import com.jiejing.fitness.enums.finance.ApplyTypeEnum;
import com.jiejing.paycenter.common.enums.common.OpenStateEnums;
import com.jiejing.paycenter.common.enums.merchant.CompanyTypeEnums;
import io.swagger.annotations.ApiModel;
......@@ -26,7 +26,7 @@ public class PageStudioMerchantApplyRequest {
private String shortName;
@ApiModelProperty(value = "操作类型")
private ApplyTypeEnums applyType;
private ApplyTypeEnum applyType;
@ApiModelProperty(value = "场馆ID")
private Long studioId;
......
api/src/main/java/com/jiejing/fitness/finance/api/merchant/vo/BrandBankCardVO.java
package com.jiejing.fitness.finance.api.merchant.vo;
import com.jiejing.common.swagger.EnumMapping;
import com.jiejing.paycenter.common.enums.merchant.CardTypeEnums;
import com.jiejing.paycenter.common.enums.merchant.CertTypeEnums;
import com.jiejing.paycenter.common.enums.merchant.ExpireTypeEnums;
......@@ -22,9 +23,7 @@ import lombok.NoArgsConstructor;
@ApiModel(description = "银行卡信息VO")
public class BrandBankCardVO {
/**
* @see CardTypeEnums
*/
@EnumMapping(enumClass = CardTypeEnums.class)
@ApiModelProperty(value = "银行卡类型")
private String cardType;
......@@ -40,18 +39,14 @@ public class BrandBankCardVO {
@ApiModelProperty(value = "证件号（对私卡：持卡人身份证；对公卡：营业执照号）")
private String certNo;
/**
* @see CertTypeEnums
*/
@EnumMapping(enumClass = CertTypeEnums.class)
@ApiModelProperty(value = "证件类型")
private String certType;
@ApiModelProperty(value = "基本存款账户编号或开户许可证核准号", notes = "对公卡必填")
private String baseDepositNo;
/**
* @see ExpireTypeEnums
*/
@EnumMapping(enumClass = ExpireTypeEnums.class)
@ApiModelProperty(value = "证件有效期类型", notes = "对私卡必填")
private String certExpireType;
......
api/src/main/java/com/jiejing/fitness/finance/api/merchant/vo/BrandLegalVO.java
package com.jiejing.fitness.finance.api.merchant.vo;
import com.jiejing.common.swagger.EnumMapping;
import com.jiejing.paycenter.common.enums.merchant.CertTypeEnums;
import com.jiejing.paycenter.common.enums.merchant.ExpireTypeEnums;
import io.swagger.annotations.ApiModel;
......@@ -24,9 +25,7 @@ import lombok.NoArgsConstructor;
@ApiModel(description = "品牌商户：法人信息")
public class BrandLegalVO {
/**
* @see CertTypeEnums
*/
@EnumMapping(enumClass = CertTypeEnums.class)
@ApiModelProperty(value = "法人证件类型")
private String legalCertType;
......@@ -36,9 +35,7 @@ public class BrandLegalVO {
@ApiModelProperty(value = "法人证件号")
private String legalCertNo;
/**
* @see ExpireTypeEnums
*/
@EnumMapping(enumClass = ExpireTypeEnums.class)
@ApiModelProperty(value = "法人证件有效期类型")
private String legalCertExpireType;
......
api/src/main/java/com/jiejing/fitness/finance/api/merchant/vo/BrandLicenseVO.java
package com.jiejing.fitness.finance.api.merchant.vo;
import com.jiejing.common.swagger.EnumMapping;
import com.jiejing.paycenter.common.enums.merchant.ExpireTypeEnums;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
......@@ -25,9 +26,7 @@ public class BrandLicenseVO {
@ApiModelProperty(value = "营业执照编号")
private String licenseCode;
/**
* @see ExpireTypeEnums
*/
@EnumMapping(enumClass = ExpireTypeEnums.class)
@ApiModelProperty(value = "营业执照有效期类型")
private String licenseExpireType;
......
api/src/main/java/com/jiejing/fitness/finance/api/merchant/vo/BrandMerchantVO.java
package com.jiejing.fitness.finance.api.merchant.vo;
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.merchant.CompanyTypeEnums;
import com.jiejing.paycenter.common.enums.merchant.ExpireTypeEnums;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import java.util.List;
......@@ -43,21 +45,15 @@ public class BrandMerchantVO {
@ApiModelProperty("商户简称")
private String shortName;
/**
* @see CompanyTypeEnums
*/
@EnumMapping(enumClass = CompanyTypeEnums.class)
@ApiModelProperty("企业类型")
private String companyType;
/**
* @see OpenStateEnums
*/
@ApiModelProperty("支付宝开通状态：I-初始态；S-成功；F-失败 默认值: I")
@EnumMapping(enumClass = OpenStateEnums.class)
@ApiModelProperty("支付宝开通状态")
private String aliOpenState;
/**
* @see OpenStateEnums
*/
@EnumMapping(enumClass = OpenStateEnums.class)
@ApiModelProperty("支付宝认证状态")
private String aliAuthState;
......@@ -67,16 +63,12 @@ public class BrandMerchantVO {
@ApiModelProperty("支付宝开通失败原因")
private String aliOpenFailMessage;
/**
* @see OpenStateEnums
*/
@ApiModelProperty("微信线下通道开通状态：I-初始态；S-成功；F-失败 默认值: I")
@EnumMapping(enumClass = OpenStateEnums.class)
@ApiModelProperty("微信线下通道开通状态")
private String wxOfflineOpenState;
/**
* @see OpenStateEnums
*/
@ApiModelProperty("微信线下通道认证状态：I-初始态；S-成功；F-失败 默认值: I")
@EnumMapping(enumClass = OpenStateEnums.class)
@ApiModelProperty("微信线下通道认证状态")
private String wxOfflineAuthState;
@ApiModelProperty("微信线下通道商户号")
......@@ -85,16 +77,12 @@ public class BrandMerchantVO {
@ApiModelProperty("微信线下通道开通失败原因")
private String wxOfflineOpenFailMessage;
/**
* @see OpenStateEnums
*/
@ApiModelProperty("微信线上通道开通状态：I-初始态；S-成功；F-失败 默认值: I")
@EnumMapping(enumClass = OpenStateEnums.class)
@ApiModelProperty("微信线上通道开通状态")
private String wxOnlineOpenState;
/**
* @see OpenStateEnums
*/
@ApiModelProperty("微信线上通道认证状态：I-初始态；S-成功；F-失败 默认值: I")
@EnumMapping(enumClass = OpenStateEnums.class)
@ApiModelProperty("微信线上通道认证状态")
private String wxOnlineAuthState;
@ApiModelProperty("微信线上通道商户号")
......
api/src/main/java/com/jiejing/fitness/finance/api/merchant/vo/StudioMerchantApplyVO.java
package com.jiejing.fitness.finance.api.merchant.vo;
import com.jiejing.fitness.finance.api.enums.ApplyTypeEnums;
import com.jiejing.common.swagger.EnumMapping;
import com.jiejing.fitness.enums.finance.ApplyTypeEnum;
import com.jiejing.fitness.finance.api.merchant.request.model.BrandBankCardInfo;
import com.jiejing.fitness.finance.api.merchant.request.model.BrandLegalInfo;
import com.jiejing.fitness.finance.api.merchant.request.model.BrandLicenseInfo;
......@@ -38,8 +39,9 @@ public class StudioMerchantApplyVO {
@ApiModelProperty("申请单号")
private String applyNo;
@EnumMapping(enumClass = ApplyTypeEnum.class)
@ApiModelProperty("申请类型：OPEN-进件；RE_OPEN-重进件；")
private ApplyTypeEnums applyType;
private String applyType;
@ApiModelProperty("渠道号")
private String channelNo;
......@@ -56,20 +58,24 @@ public class StudioMerchantApplyVO {
@ApiModelProperty("商户简称")
private String shortName;
@EnumMapping(enumClass = CompanyTypeEnums.class)
@ApiModelProperty("企业类型")
private CompanyTypeEnums companyType;
private String companyType;
@ApiModelProperty("开通状态：I-初始态；P-处理中；S-成功；F-失败 默认值: I")
private OpenStateEnums openState;
@EnumMapping(enumClass = OpenStateEnums.class)
@ApiModelProperty("开通状态")
private String openState;
@ApiModelProperty("开通失败原因")
private String openFailMessage;
@ApiModelProperty("支付宝开通状态：I-初始态；S-成功；F-失败 默认值: I")
private OpenStateEnums aliOpenState;
@EnumMapping(enumClass = OpenStateEnums.class)
@ApiModelProperty("支付宝开通状态")
private String aliOpenState;
@EnumMapping(enumClass = OpenStateEnums.class)
@ApiModelProperty("支付宝认证状态")
private OpenStateEnums aliAuthState;
private String aliAuthState;
@ApiModelProperty("支付宝商户号")
private String aliMerchantNo;
......@@ -77,11 +83,13 @@ public class StudioMerchantApplyVO {
@ApiModelProperty("支付宝开通失败原因")
private String aliOpenFailMessage;
@ApiModelProperty("微信线下通道开通状态：I-初始态；S-成功；F-失败 默认值: I")
private OpenStateEnums wxOfflineOpenState;
@EnumMapping(enumClass = OpenStateEnums.class)
@ApiModelProperty("微信线下通道开通状态")
private String wxOfflineOpenState;
@ApiModelProperty("微信线下通道认证状态：I-初始态；S-成功；F-失败 默认值: I")
private OpenStateEnums wxOfflineAuthState;
@EnumMapping(enumClass = OpenStateEnums.class)
@ApiModelProperty("微信线下通道认证状态")
private String wxOfflineAuthState;
@ApiModelProperty("微信线下通道商户号")
private String wxOfflineMerchantNo;
......@@ -89,11 +97,13 @@ public class StudioMerchantApplyVO {
@ApiModelProperty("微信线下通道开通失败原因")
private String wxOfflineOpenFailMessage;
@ApiModelProperty("微信线上通道开通状态：I-初始态；S-成功；F-失败 默认值: I")
private OpenStateEnums wxOnlineOpenState;
@EnumMapping(enumClass = OpenStateEnums.class)
@ApiModelProperty("微信线上通道开通状态")
private String wxOnlineOpenState;
@ApiModelProperty("微信线上通道认证状态：I-初始态；S-成功；F-失败 默认值: I")
private OpenStateEnums wxOnlineAuthState;
@EnumMapping(enumClass = OpenStateEnums.class)
@ApiModelProperty("微信线上通道认证状态")
private String wxOnlineAuthState;
@ApiModelProperty("微信线上通道商户号")
private String wxOnlineMerchantNo;
......
api/src/main/java/com/jiejing/fitness/finance/api/merchant/vo/StudioMerchantAuthSubChannelVO.java
package com.jiejing.fitness.finance.api.merchant.vo;
import com.jiejing.common.swagger.EnumMapping;
import com.jiejing.paycenter.common.enums.common.OpenStateEnums;
import com.jiejing.paycenter.common.enums.merchant.AuthPhaseEnums;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.AllArgsConstructor;
......@@ -22,15 +24,11 @@ public class StudioMerchantAuthSubChannelVO {
@ApiModelProperty(value = "申请单")
private String applyNo;
/**
* @see OpenStateEnums
*/
@EnumMapping(enumClass = OpenStateEnums.class)
@ApiModelProperty(value = "授权状态")
private String state;
/**
* AuthPhaseEnums
*/
@EnumMapping(enumClass = AuthPhaseEnums.class)
@ApiModelProperty(value = "认证阶段")
private String phase;
......
api/src/main/java/com/jiejing/fitness/finance/api/merchant/vo/StudioMerchantBindXcxAppIdVO.java
package com.jiejing.fitness.finance.api.merchant.vo;
import com.jiejing.common.swagger.EnumMapping;
import com.jiejing.paycenter.common.enums.common.OpenStateEnums;
import com.jiejing.paycenter.common.enums.merchant.AuthPhaseEnums;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.AllArgsConstructor;
......@@ -19,9 +21,7 @@ import lombok.NoArgsConstructor;
@ApiModel(description = "场馆商户绑定小程序AppIdVO")
public class StudioMerchantBindXcxAppIdVO {
/**
* @see OpenStateEnums
*/
@EnumMapping(enumClass = OpenStateEnums.class)
@ApiModelProperty("绑定状态")
private String state;
......
api/src/main/java/com/jiejing/fitness/finance/api/merchant/vo/StudioMerchantVO.java
package com.jiejing.fitness.finance.api.merchant.vo;
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.merchant.CompanyTypeEnums;
......@@ -43,21 +44,15 @@ public class StudioMerchantVO {
@ApiModelProperty("商户简称")
private String shortName;
/**
* @see CompanyTypeEnums
*/
@EnumMapping(enumClass = CompanyTypeEnums.class)
@ApiModelProperty("企业类型")
private String companyType;
/**
* @see OpenStateEnums
*/
@ApiModelProperty("支付宝开通状态：I-初始态；S-成功；F-失败 默认值: I")
@EnumMapping(enumClass = OpenStateEnums.class)
@ApiModelProperty("支付宝开通状态")
private String aliOpenState;
/**
* @see OpenStateEnums
*/
@EnumMapping(enumClass = OpenStateEnums.class)
@ApiModelProperty("支付宝认证状态")
private String aliAuthState;
......@@ -67,16 +62,12 @@ public class StudioMerchantVO {
@ApiModelProperty("支付宝开通失败原因")
private String aliOpenFailMessage;
/**
* @see OpenStateEnums
*/
@ApiModelProperty("微信线下通道开通状态：I-初始态；S-成功；F-失败 默认值: I")
@EnumMapping(enumClass = OpenStateEnums.class)
@ApiModelProperty("微信线下通道开通状态")
private String wxOfflineOpenState;
/**
* @see OpenStateEnums
*/
@ApiModelProperty("微信线下通道认证状态：I-初始态；S-成功；F-失败 默认值: I")
@EnumMapping(enumClass = OpenStateEnums.class)
@ApiModelProperty("微信线下通道认证状态")
private String wxOfflineAuthState;
@ApiModelProperty("微信线下通道商户号")
......@@ -85,16 +76,12 @@ public class StudioMerchantVO {
@ApiModelProperty("微信线下通道开通失败原因")
private String wxOfflineOpenFailMessage;
/**
* @see OpenStateEnums
*/
@ApiModelProperty("微信线上通道开通状态：I-初始态；S-成功；F-失败 默认值: I")
@EnumMapping(enumClass = OpenStateEnums.class)
@ApiModelProperty("微信线上通道开通状态")
private String wxOnlineOpenState;
/**
* @see OpenStateEnums
*/
@ApiModelProperty("微信线上通道认证状态：I-初始态；S-成功；F-失败 默认值: I")
@EnumMapping(enumClass = OpenStateEnums.class)
@ApiModelProperty("微信线上通道认证状态")
private String wxOnlineAuthState;
@ApiModelProperty("微信线上通道商户号")
......
repository/src/main/java/com/jiejing/fitness/finance/repository/entity/PartyToMerchant.java
......@@ -15,7 +15,7 @@
package com.jiejing.fitness.finance.repository.entity;
import com.baomidou.mybatisplus.annotation.IdType;
import com.jiejing.fitness.finance.api.enums.PartyTypeEnums;
import com.jiejing.fitness.enums.finance.PartyTypeEnum;
import java.util.Date;
import com.baomidou.mybatisplus.annotation.TableId;
import java.io.Serializable;
......@@ -60,7 +60,7 @@ public class PartyToMerchant implements Serializable {
/**
* 备注: 业务方类型 是否允许为null: YES
*/
private PartyTypeEnums partyType;
private PartyTypeEnum partyType;
/**
* 备注: paycenter的商户ID 是否允许为null: YES
......
repository/src/main/java/com/jiejing/fitness/finance/repository/entity/StudioCashierRecord.java
......@@ -14,8 +14,8 @@
package com.jiejing.fitness.finance.repository.entity;
import com.jiejing.fitness.finance.api.enums.BrandCashierTransStateEnums;
import com.jiejing.fitness.finance.api.enums.BrandCashierTransTypeEnums;
import com.jiejing.fitness.enums.finance.BrandCashierTransStateEnum;
import com.jiejing.fitness.enums.finance.BrandCashierTransTypeEnum;
import com.jiejing.paycenter.common.enums.merchant.SubChannelEnums;
import java.math.BigDecimal;
import com.baomidou.mybatisplus.annotation.IdType;
......@@ -68,7 +68,7 @@ public class StudioCashierRecord implements Serializable {
/**
* 备注: 交易类型：PAY-收款；REFUND-退款； 默认值: 空字符串 是否允许为null: YES
*/
private BrandCashierTransTypeEnums transType;
private BrandCashierTransTypeEnum transType;
/**
* 备注: 品牌ID 是否允许为null: NO
......@@ -123,7 +123,7 @@ public class StudioCashierRecord implements Serializable {
/**
* 备注: 交易状态：0-支付初始态；1-支付中；2-支付失败；3-入账中（支付成功）；4-入账成功；5-退款中；6-退款成功；7-退款失败 默认值: 1 是否允许为null: YES
*/
private BrandCashierTransStateEnums transState;
private BrandCashierTransStateEnum transState;
/**
* 备注: 付款人姓名 是否允许为null: YES
......
repository/src/main/java/com/jiejing/fitness/finance/repository/entity/StudioMerchantApply.java
......@@ -15,7 +15,7 @@
package com.jiejing.fitness.finance.repository.entity;
import com.baomidou.mybatisplus.annotation.IdType;
import com.jiejing.fitness.finance.api.enums.ApplyTypeEnums;
import com.jiejing.fitness.enums.finance.ApplyTypeEnum;
import com.jiejing.paycenter.common.enums.common.OpenStateEnums;
import com.jiejing.paycenter.common.enums.merchant.CompanyTypeEnums;
import java.util.Date;
......@@ -67,7 +67,7 @@ public class StudioMerchantApply implements Serializable {
/**
* 申请类型：OPEN-进件；RE_OPEN-重进件；
*/
private ApplyTypeEnums applyType;
private ApplyTypeEnum applyType;
/**
* 渠道号
......
repository/src/main/java/com/jiejing/fitness/finance/repository/query/PageBrandCashierRecordQuery.java
package com.jiejing.fitness.finance.repository.query;
import com.jiejing.fitness.finance.api.enums.BrandCashierTransStateEnums;
import com.jiejing.fitness.finance.api.enums.BrandCashierTransTypeEnums;
import com.jiejing.fitness.enums.finance.BrandCashierTransStateEnum;
import com.jiejing.fitness.enums.finance.BrandCashierTransTypeEnum;
import com.jiejing.paycenter.common.enums.merchant.SubChannelEnums;
import java.util.Date;
import lombok.Data;
......@@ -43,7 +43,7 @@ public class PageBrandCashierRecordQuery {
/**
* 交易状态
*/
private BrandCashierTransStateEnums transState;
private BrandCashierTransStateEnum transState;
/**
* 业务订单类型（来源）
......@@ -53,7 +53,7 @@ public class PageBrandCashierRecordQuery {
/**
* 交易类型：PAY-收款；REFUND-退款；
*/
private BrandCashierTransTypeEnums transType;
private BrandCashierTransTypeEnum transType;
/**
* 交易方式
......
repository/src/main/java/com/jiejing/fitness/finance/repository/query/PageBrandMerchantApplyQuery.java
package com.jiejing.fitness.finance.repository.query;
import com.jiejing.fitness.finance.api.enums.ApplyTypeEnums;
import com.jiejing.fitness.enums.finance.ApplyTypeEnum;
import com.jiejing.paycenter.common.enums.common.OpenStateEnums;
import com.jiejing.paycenter.common.enums.merchant.CompanyTypeEnums;
import javax.validation.constraints.NotNull;
......@@ -21,7 +21,7 @@ public class PageBrandMerchantApplyQuery {
/**
* 操作类型
*/
private ApplyTypeEnums applyType;
private ApplyTypeEnum applyType;
/**
* 场馆ID
......
repository/src/main/java/com/jiejing/fitness/finance/repository/query/PageStudioMerchantApplyQuery.java
package com.jiejing.fitness.finance.repository.query;
import com.jiejing.fitness.finance.api.enums.ApplyTypeEnums;
import com.jiejing.fitness.enums.finance.ApplyTypeEnum;
import com.jiejing.paycenter.common.enums.common.OpenStateEnums;
import com.jiejing.paycenter.common.enums.merchant.CompanyTypeEnums;
import lombok.Data;
......@@ -20,7 +20,7 @@ public class PageStudioMerchantApplyQuery {
/**
* 操作类型
*/
private ApplyTypeEnums applyType;
private ApplyTypeEnum applyType;
/**
* 场馆ID
......
repository/src/main/java/com/jiejing/fitness/finance/repository/service/PartyToMerchantRpService.java
......@@ -16,7 +16,7 @@ package com.jiejing.fitness.finance.repository.service;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.jiejing.common.utils.collection.CollectionUtil;
import com.jiejing.fitness.finance.api.enums.PartyTypeEnums;
import com.jiejing.fitness.enums.finance.PartyTypeEnum;
import com.jiejing.fitness.finance.repository.entity.PartyToMerchant;
import com.jiejing.fitness.finance.repository.mapper.PartyToMerchantMapper;
import com.jiejing.mbp.MapperRepoService;
......@@ -34,7 +34,7 @@ import org.springframework.stereotype.Service;
public class PartyToMerchantRpService extends
MapperRepoService<Long, PartyToMerchant, PartyToMerchantMapper> {
public List<PartyToMerchant> listByParty(Long partyId, PartyTypeEnums partyType, String channelNo) {
public List<PartyToMerchant> listByParty(Long partyId, PartyTypeEnum partyType, String channelNo) {
QueryWrapper<PartyToMerchant> wrapper = new QueryWrapper<>();
wrapper.eq(PartyToMerchant.PARTY_ID, partyId);
wrapper.eq(PartyToMerchant.PARTY_TYPE, partyType);
......@@ -45,13 +45,13 @@ public class PartyToMerchantRpService extends
public PartyToMerchant getByStudioId(Long studioId, String channelNo) {
QueryWrapper<PartyToMerchant> wrapper = new QueryWrapper<>();
wrapper.eq(PartyToMerchant.PARTY_ID, studioId);
wrapper.eq(PartyToMerchant.PARTY_TYPE, PartyTypeEnums.STUDIO);
wrapper.eq(PartyToMerchant.PARTY_TYPE, PartyTypeEnum.STUDIO);
wrapper.eq(PartyToMerchant.CHANNEL_NO, channelNo);
List<PartyToMerchant> list = this.baseMapper.selectList(wrapper);
return CollectionUtil.isEmpty(list) ? null : list.get(0);
}
public PartyToMerchant getOneByPartyAndMerchantId(String channelNo, Long partyId, PartyTypeEnums partyType,
public PartyToMerchant getOneByPartyAndMerchantId(String channelNo, Long partyId, PartyTypeEnum partyType,
Long merchantId) {
QueryWrapper<PartyToMerchant> wrapper = new QueryWrapper<>();
wrapper.eq(PartyToMerchant.PARTY_ID, partyId);
......@@ -61,14 +61,14 @@ public class PartyToMerchantRpService extends
return this.baseMapper.selectOne(wrapper);
}
public void deleteByParty(Long partyId, PartyTypeEnums partyType) {
public void deleteByParty(Long partyId, PartyTypeEnum partyType) {
QueryWrapper<PartyToMerchant> wrapper = new QueryWrapper<>();
wrapper.eq(PartyToMerchant.PARTY_ID, partyId);
wrapper.eq(PartyToMerchant.PARTY_TYPE, partyType);
this.baseMapper.delete(wrapper);
}
public void deleteByPartyAndMerchantId(Long partyId, PartyTypeEnums partyType, Long merchantId) {
public void deleteByPartyAndMerchantId(Long partyId, PartyTypeEnum partyType, Long merchantId) {
QueryWrapper<PartyToMerchant> wrapper = new QueryWrapper<>();
wrapper.eq(PartyToMerchant.PARTY_ID, partyId);
wrapper.eq(PartyToMerchant.PARTY_TYPE, partyType);
......@@ -77,7 +77,7 @@ public class PartyToMerchantRpService extends
}
public List<PartyToMerchant> listByMerchantIdsAndPartyType(List<Long> merchantIds,
PartyTypeEnums partyType) {
PartyTypeEnum partyType) {
QueryWrapper<PartyToMerchant> wrapper = new QueryWrapper<>();
wrapper.in(PartyToMerchant.MERCHANT_ID, merchantIds);
wrapper.eq(PartyToMerchant.PARTY_TYPE, partyType);
......
service/src/main/java/com/jiejing/fitness/finance/service/cashier/convert/CashierConvert.java
......@@ -3,7 +3,6 @@ package com.jiejing.fitness.finance.service.cashier.convert;
import com.google.common.collect.Lists;
import com.jiejing.common.model.PageVO;
import com.jiejing.common.utils.collection.CollectionUtil;
import com.jiejing.common.utils.convert.BeanUtil;
import com.jiejing.fitness.finance.api.cashier.vo.StudioCashierRecordVO;
import com.jiejing.fitness.finance.repository.entity.StudioCashierRecord;
import java.util.List;
......@@ -17,7 +16,37 @@ import org.springframework.data.domain.Page;
public class CashierConvert {
public static StudioCashierRecordVO convertVO(StudioCashierRecord record) {
return BeanUtil.map(record, StudioCashierRecordVO.class);
return StudioCashierRecordVO.builder()
.id(record.getId())
.transNo(record.getTransNo())
.orderNo(record.getOrderNo())
.orderType(record.getOrderType())
.transType(record.getTransType().name())
.brandId(record.getBrandId())
.studioId(record.getStudioId())
.merchantId(record.getMerchantId())
.merchantNo(record.getMerchantNo())
.channelNo(record.getChannelNo())
.subChannel(record.getSubChannel().name())
.transAmount(record.getTransAmount())
.feeRate(record.getFeeRate())
.fee(record.getFee())
.actualAmount(record.getActualAmount())
.transState(record.getTransState().name())
.buyerName(record.getBuyerName())
.buyerPhone(record.getBuyerPhone())
.goods(record.getGoods())
.remark(record.getRemark())
.existRelatedTrans(record.getExistRelatedTrans())
.relatedTransNo(record.getRelatedTransNo())
.thirdTransNo(record.getThirdTransNo())
.failMessage(record.getFailMessage())
.tradingTime(record.getTradingTime())
.successTime(record.getSuccessTime())
.inTime(record.getInTime())
.createTime(record.getCreateTime())
.updateTime(record.getUpdateTime())
.build();
}
public static List<StudioCashierRecordVO> convertList(List<StudioCashierRecord> list) {
......
service/src/main/java/com/jiejing/fitness/finance/service/cashier/params/PageStudioCashierParams.java
package com.jiejing.fitness.finance.service.cashier.params;
import com.jiejing.fitness.finance.api.enums.BrandCashierTransStateEnums;
import com.jiejing.fitness.finance.api.enums.BrandCashierTransTypeEnums;
import com.jiejing.fitness.enums.finance.BrandCashierTransStateEnum;
import com.jiejing.fitness.enums.finance.BrandCashierTransTypeEnum;
import com.jiejing.paycenter.common.enums.merchant.SubChannelEnums;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
......@@ -39,13 +39,13 @@ public class PageStudioCashierParams {
private String buyerName;
@ApiModelProperty("交易状态")
private BrandCashierTransStateEnums transState;
private BrandCashierTransStateEnum transState;
@ApiModelProperty("业务订单类型（来源）")
private Integer orderType;
@ApiModelProperty("交易类型：PAY-收款；REFUND-退款；")
private BrandCashierTransTypeEnums transType;
private BrandCashierTransTypeEnum transType;
@ApiModelProperty("交易方式")
private SubChannelEnums subChannel;
......
service/src/main/java/com/jiejing/fitness/finance/service/event/ListenerService.java
......@@ -3,7 +3,7 @@ package com.jiejing.fitness.finance.service.event;
import static org.springframework.integration.IntegrationMessageHeaderAccessor.DELIVERY_ATTEMPT;
import com.alibaba.fastjson.JSON;
import com.jiejing.fitness.finance.api.enums.PartyTypeEnums;
import com.jiejing.fitness.enums.finance.PartyTypeEnum;
import com.jiejing.fitness.finance.service.merchant.StudioMerchantService;
import com.jiejing.fitness.finance.service.pay.PayService;
import com.jiejing.paycenter.common.event.MerchantEvent;
......@@ -42,7 +42,7 @@ public class ListenerService {
event.setSubChannels(Optional.ofNullable(event.getSubChannels()).orElse(new ArrayList<>(1)));
event.setSubChannelAuths(Optional.ofNullable(event.getSubChannelAuths()).orElse(new ArrayList<>(1)));
PartyTypeEnums type = PartyTypeEnums.getByCode(event.getBizCode());
PartyTypeEnum type = PartyTypeEnum.getByCode(event.getBizCode());
switch (type) {
case STUDIO:
studioMerchantService.callback(event);
......
service/src/main/java/com/jiejing/fitness/finance/service/merchant/convert/MerchantConvert.java
......@@ -8,8 +8,8 @@ import com.jiejing.common.utils.collection.CollectionUtil;
import com.jiejing.common.utils.convert.BeanUtil;
import com.jiejing.common.utils.crypt.AesUtil;
import com.jiejing.filecenter.api.resource.vo.ResourceInfoVO;
import com.jiejing.fitness.finance.api.enums.ApplyTypeEnums;
import com.jiejing.fitness.finance.api.enums.PartyTypeEnums;
import com.jiejing.fitness.enums.finance.ApplyTypeEnum;
import com.jiejing.fitness.enums.finance.PartyTypeEnum;
import com.jiejing.fitness.finance.api.merchant.request.model.AddressInfo;
import com.jiejing.fitness.finance.api.merchant.request.model.BrandResourceInfo;
import com.jiejing.fitness.finance.api.merchant.vo.BrandBankCardVO;
......@@ -66,7 +66,7 @@ public class MerchantConvert {
ApplyStudioMerchantParams params, StudioVO studio, Map<ResourceTypeEnums, ResourceInfo> resourceMap,
SubChannelInfoDTO subChannelInfo) {
return ApplyMerchantRequest.builder()
.bizCode(PartyTypeEnums.STUDIO.getCode())
.bizCode(PartyTypeEnum.STUDIO.getCode())
.applyNo(applyNo)
.channelNo(channelNo)
.companyType(params.getCompanyType())
......@@ -182,7 +182,7 @@ public class MerchantConvert {
.applyNo(Long.toString(id))
.brandId(studio.getBrandId())
.studioId(encrypt.getStudioId())
.applyType(exist == null ? ApplyTypeEnums.OPEN : ApplyTypeEnums.RE_OPEN)
.applyType(exist == null ? ApplyTypeEnum.OPEN : ApplyTypeEnum.RE_OPEN)
.channelNo(channel)
.merchantName(encrypt.getMerchantName())
.shortName(studio.getName())
......@@ -494,12 +494,40 @@ public class MerchantConvert {
public static StudioMerchantApplyVO convertApply(StudioMerchantApply apply) {
ApplyStudioMerchantParams info = JSON.parseObject(apply.getMerchantInfo(),
ApplyStudioMerchantParams.class).decrypt(apply.getSalt());
StudioMerchantApplyVO vo = BeanUtil.map(apply, StudioMerchantApplyVO.class);
vo.setLegal(info.getLegal());
vo.setResource(info.getResource());
vo.setLicense(info.getLicense());
vo.setBankCard(info.getBankCard());
return vo;
return StudioMerchantApplyVO.builder()
.id(apply.getId())
.brandId(apply.getBrandId())
.studioId(apply.getStudioId())
.applyNo(apply.getApplyNo())
.applyType(apply.getApplyType().name())
.channelNo(apply.getChannelNo())
.merchantId(apply.getMerchantId())
.merchantNo(apply.getMerchantNo())
.merchantName(apply.getMerchantName())
.shortName(apply.getShortName())
.companyType(apply.getCompanyType().name())
.openState(apply.getOpenState().name())
.openFailMessage(apply.getOpenFailMessage())
.aliOpenState(apply.getAliOpenState().name())
.aliAuthState(apply.getAliAuthState().name())
.aliMerchantNo(apply.getAliMerchantNo())
.aliOpenFailMessage(apply.getAliOpenFailMessage())
.wxOfflineOpenState(apply.getWxOfflineOpenState().name())
.wxOfflineAuthState(apply.getWxOfflineAuthState().name())
.wxOfflineMerchantNo(apply.getWxOfflineMerchantNo())
.wxOfflineOpenFailMessage(apply.getWxOfflineOpenFailMessage())
.wxOnlineOpenState(apply.getWxOnlineOpenState().name())
.wxOnlineAuthState(apply.getWxOnlineAuthState().name())
.wxOnlineMerchantNo(apply.getWxOnlineMerchantNo())
.wxOnlineOpenFailMessage(apply.getWxOnlineOpenFailMessage())
.license(info.getLicense())
.legal(info.getLegal())
.bankCard(info.getBankCard())
.resource(info.getResource())
.finishTime(apply.getFinishTime())
.createTime(apply.getCreateTime())
.updateTime(apply.getUpdateTime())
.build();
}
public static List<StudioMerchantApplyVO> convertApplyList(List<StudioMerchantApply> applies) {
......@@ -510,7 +538,7 @@ public class MerchantConvert {
.collect(Collectors.toList());
}
public static PartyToMerchant convertPartyToMerchant(String channelNo, Long partyId, PartyTypeEnums type,
public static PartyToMerchant convertPartyToMerchant(String channelNo, Long partyId, PartyTypeEnum type,
Long merchantId, String merchantNo) {
PartyToMerchant merchant = new PartyToMerchant();
merchant.setId(IdWorker.getId());
......
service/src/main/java/com/jiejing/fitness/finance/service/merchant/impl/BrandMerchantServiceImpl.java
package com.jiejing.fitness.finance.service.merchant.impl;
import com.jiejing.fitness.finance.api.enums.PartyTypeEnums;
import com.jiejing.fitness.enums.finance.PartyTypeEnum;
import com.jiejing.fitness.finance.api.merchant.vo.BrandMerchantVO;
import com.jiejing.fitness.finance.repository.entity.PartyToMerchant;
import com.jiejing.fitness.finance.repository.entity.StudioMerchantApply;
......@@ -52,30 +52,30 @@ public class BrandMerchantServiceImpl implements BrandMerchantService {
@Override
public void bind(Long brandId, Long merchantId) {
PartyToMerchant exist = partyToMerchantRpService.getOneByPartyAndMerchantId(channel, brandId,
PartyTypeEnums.BRAND, merchantId);
PartyTypeEnum.BRAND, merchantId);
if (null != exist) {
return;
}
StudioMerchantApply apply = studioMerchantApplyRpService.getLatestOneSuccessByMerchantId(merchantId);
partyToMerchantRpService.insert(
MerchantConvert.convertPartyToMerchant(apply.getChannelNo(), brandId, PartyTypeEnums.BRAND,
MerchantConvert.convertPartyToMerchant(apply.getChannelNo(), brandId, PartyTypeEnum.BRAND,
apply.getMerchantId(), apply.getMerchantNo()));
}
@Override
public void unbind(Long brandId, Long merchantId) {
partyToMerchantRpService.deleteByPartyAndMerchantId(brandId, PartyTypeEnums.BRAND, merchantId);
partyToMerchantRpService.deleteByPartyAndMerchantId(brandId, PartyTypeEnum.BRAND, merchantId);
}
@Override
public List<BrandMerchantVO> list(Long brandId) {
List<PartyToMerchant> relations = partyToMerchantRpService.listByParty(brandId, PartyTypeEnums.BRAND,
List<PartyToMerchant> relations = partyToMerchantRpService.listByParty(brandId, PartyTypeEnum.BRAND,
channel);
List<Long> merchantIds = relations.stream().map(PartyToMerchant::getMerchantId)
.collect(Collectors.toList());
List<PartyToMerchant> studioRelations = partyToMerchantRpService.listByMerchantIdsAndPartyType(
merchantIds, PartyTypeEnums.STUDIO);
merchantIds, PartyTypeEnum.STUDIO);
List<Long> studioIds = studioRelations.stream().map(PartyToMerchant::getPartyId)
.collect(Collectors.toList());
Map<Long, List<StudioVO>> studioMap = studioRpcService.mapStudioByBrandId(studioIds);
......
service/src/main/java/com/jiejing/fitness/finance/service/merchant/impl/StudioMerchantServiceImpl.java
......@@ -6,7 +6,7 @@ import com.jiejing.common.model.PageVO;
import com.jiejing.common.utils.collection.CollectionUtil;
import com.jiejing.common.utils.convert.BeanUtil;
import com.jiejing.filecenter.api.resource.vo.ResourceInfoVO;
import com.jiejing.fitness.finance.api.enums.PartyTypeEnums;
import com.jiejing.fitness.enums.finance.PartyTypeEnum;
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.StudioMerchantBindXcxAppIdVO;
......@@ -128,7 +128,7 @@ public class StudioMerchantServiceImpl implements StudioMerchantService {
StudioMerchantApply apply = studioMerchantApplyRpService.getLatestOneSuccessByMerchantId(merchantId);
if (null == relation) {
partyToMerchantRpService.insert(
MerchantConvert.convertPartyToMerchant(apply.getChannelNo(), studioId, PartyTypeEnums.STUDIO,
MerchantConvert.convertPartyToMerchant(apply.getChannelNo(), studioId, PartyTypeEnum.STUDIO,
apply.getMerchantId(), apply.getMerchantNo()));
} else {
partyToMerchantRpService.updateById(
......@@ -138,12 +138,12 @@ public class StudioMerchantServiceImpl implements StudioMerchantService {
@Override
public void unbind(Long studioId, Long merchantId) {
partyToMerchantRpService.deleteByPartyAndMerchantId(studioId, PartyTypeEnums.STUDIO, merchantId);
partyToMerchantRpService.deleteByPartyAndMerchantId(studioId, PartyTypeEnum.STUDIO, merchantId);
}
@Override
public void unbindAll(Long studioId) {
partyToMerchantRpService.deleteByParty(studioId, PartyTypeEnums.STUDIO);
partyToMerchantRpService.deleteByParty(studioId, PartyTypeEnum.STUDIO);
}
@Transactional(propagation = Propagation.REQUIRED, rollbackFor = Exception.class)
......@@ -205,7 +205,7 @@ public class StudioMerchantServiceImpl implements StudioMerchantService {
}
private PartyToMerchant getRelation(Long studioId) {
List<PartyToMerchant> relations = partyToMerchantRpService.listByParty(studioId, PartyTypeEnums.STUDIO,
List<PartyToMerchant> relations = partyToMerchantRpService.listByParty(studioId, PartyTypeEnum.STUDIO,
channel);
if (CollectionUtil.isEmpty(relations)) {
return null;
......
service/src/main/java/com/jiejing/fitness/finance/service/merchant/params/PageStudioMerchantApplyParams.java
package com.jiejing.fitness.finance.service.merchant.params;
import com.jiejing.fitness.finance.api.enums.ApplyTypeEnums;
import com.jiejing.fitness.enums.finance.ApplyTypeEnum;
import com.jiejing.paycenter.common.enums.common.OpenStateEnums;
import com.jiejing.paycenter.common.enums.merchant.CompanyTypeEnums;
import io.swagger.annotations.ApiModel;
......@@ -26,7 +26,7 @@ public class PageStudioMerchantApplyParams {
private String shortName;
@ApiModelProperty(value = "操作类型")
private ApplyTypeEnums applyType;
private ApplyTypeEnum applyType;
@ApiModelProperty(value = "场馆ID")
private Long studioId;
......
service/src/main/java/com/jiejing/fitness/finance/service/pay/convert/PayConvert.java
......@@ -6,8 +6,8 @@ import com.google.common.collect.Lists;
import com.jiejing.common.exception.BizException;
import com.jiejing.common.utils.convert.BeanUtil;
import com.jiejing.common.utils.text.StringUtil;
import com.jiejing.fitness.finance.api.enums.BrandCashierTransStateEnums;
import com.jiejing.fitness.finance.api.enums.BrandCashierTransTypeEnums;
import com.jiejing.fitness.enums.finance.BrandCashierTransStateEnum;
import com.jiejing.fitness.enums.finance.BrandCashierTransTypeEnum;
import com.jiejing.fitness.finance.repository.entity.StudioCashierRecord;
import com.jiejing.fitness.finance.service.enums.FinanceErrorEnums;
import com.jiejing.fitness.finance.service.pay.params.BrandMerchantRefundParams;
......@@ -70,7 +70,7 @@ public class PayConvert {
.transNo(id.toString())
.orderNo(params.getOrderNo())
.orderType(params.getOrderType())
.transType(BrandCashierTransTypeEnums.PAY)
.transType(BrandCashierTransTypeEnum.PAY)
.brandId(studio.getBrandId())
.studioId(params.getStudioId())
.merchantId(merchant.getId())
......@@ -81,7 +81,7 @@ public class PayConvert {
.feeRate(feeRate)
.fee(fee)
.actualAmount(MoneyUtil.subtract(params.getTransAmount(), fee))
.transState(BrandCashierTransStateEnums.PAY_INIT)
.transState(BrandCashierTransStateEnum.PAY_INIT)
.buyerName(params.getBuyerName())
.buyerPhone(params.getBuyerPhone())
.goods(params.getGoods())
......@@ -151,15 +151,15 @@ public class PayConvert {
.build();
}
private static BrandCashierTransStateEnums convertTransState(PayStateEnums state) {
private static BrandCashierTransStateEnum convertTransState(PayStateEnums state) {
switch (state) {
case SUCCESS:
return BrandCashierTransStateEnums.PAY_SUCCESS;
return BrandCashierTransStateEnum.PAY_SUCCESS;
case CLOSED:
case FAILED:
return BrandCashierTransStateEnums.PAY_FAIL;
return BrandCashierTransStateEnum.PAY_FAIL;
default:
return BrandCashierTransStateEnums.PAYING;
return BrandCashierTransStateEnum.PAYING;
}
}
......@@ -178,7 +178,7 @@ public class PayConvert {
record.setActualAmount(MoneyUtil.subtract(record.getTransAmount(), record.getFee()));
record.setRemark(params.getRefundReason());
record.setStudioId(params.getStudioId());
record.setTransState(BrandCashierTransStateEnums.REFUND_INIT);
record.setTransState(BrandCashierTransStateEnum.REFUND_INIT);
record.setTradingTime(new Date());
record.setCreateTime(new Date());
record.setUpdateTime(new Date());
......@@ -201,16 +201,16 @@ public class PayConvert {
.build();
}
private static BrandCashierTransStateEnums convertTransState(TransStateEnums state) {
private static BrandCashierTransStateEnum convertTransState(TransStateEnums state) {
switch (state) {
case SUCCESS:
return BrandCashierTransStateEnums.REFUND_SUCCESS;
return BrandCashierTransStateEnum.REFUND_SUCCESS;
case FAIL:
return BrandCashierTransStateEnums.REFUND_FAIL;
return BrandCashierTransStateEnum.REFUND_FAIL;
case PROCESS:
case INIT:
default:
return BrandCashierTransStateEnums.REFUNDING;
return BrandCashierTransStateEnum.REFUNDING;
}
}
......
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