## 后台充值添加调拨(57);
This commit is contained in:
parent
6e6841136a
commit
faf73334c7
|
@ -219,11 +219,11 @@ public class CuMemberRechargeController extends BaseController {
|
||||||
//多语言翻译
|
//多语言翻译
|
||||||
if (CollUtil.isNotEmpty(cuMemberRechargeVOList)) {
|
if (CollUtil.isNotEmpty(cuMemberRechargeVOList)) {
|
||||||
//枚举翻译
|
//枚举翻译
|
||||||
Map<String, String> transactionMap = iTransactionCommonService.exportEnumTransaction(EPaymentType.values(), EApproveRechargeStatus.values());
|
Map<String, String> transactionMap = iTransactionCommonService.exportEnumTransaction(EApproveRechargeStatus.values());
|
||||||
for (CuMemberRechargeVO memberRecharge : cuMemberRechargeVOList) {
|
for (CuMemberRechargeVO memberRecharge : cuMemberRechargeVOList) {
|
||||||
Integer pkAccount = memberRecharge.getPkAccount();
|
Integer pkAccount = memberRecharge.getPkAccount();
|
||||||
memberRecharge.setPkAccountVal(baseService.getAccountTranslateFromDataBase(pkAccount));
|
memberRecharge.setPkAccountVal(baseService.getAccountTranslateFromDataBase(pkAccount));
|
||||||
memberRecharge.setPaymentMethodVal(transactionMap.get(EnumsPrefixConstants.PAYMENT_TYPE + memberRecharge.getPaymentMethod()));
|
memberRecharge.setPaymentMethodVal(EPaymentType.getEnumLabel(memberRecharge.getPaymentMethod()));
|
||||||
memberRecharge.setApproveStateVal(transactionMap.get(EnumsPrefixConstants.APPROVE_RECHARGE_OPERATION + memberRecharge.getApproveState()));
|
memberRecharge.setApproveStateVal(transactionMap.get(EnumsPrefixConstants.APPROVE_RECHARGE_OPERATION + memberRecharge.getApproveState()));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -1176,7 +1176,7 @@ public class EnumsController extends BaseController {
|
||||||
public AjaxResult getEPaymentType() {
|
public AjaxResult getEPaymentType() {
|
||||||
List<EnumEntity> enumEntityList = new ArrayList<>();
|
List<EnumEntity> enumEntityList = new ArrayList<>();
|
||||||
for (EPaymentType value : EPaymentType.values()) {
|
for (EPaymentType value : EPaymentType.values()) {
|
||||||
enumEntityList.add(new EnumEntity(value.getValue(), value.getLabel(), EnumsPrefixConstants.PAYMENT_TYPE));
|
enumEntityList.add(new EnumEntity(value.getValue(), value.getLabel()));
|
||||||
}
|
}
|
||||||
return AjaxResult.success(enumEntityList);
|
return AjaxResult.success(enumEntityList);
|
||||||
}
|
}
|
||||||
|
|
|
@ -6,16 +6,10 @@ import lombok.Getter;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 充值页面 审核状态
|
* 充值页面 审核状态
|
||||||
*
|
|
||||||
* @Description:
|
|
||||||
* @Author: ljc
|
|
||||||
* @Time: 2023/2/28 16:34
|
|
||||||
* @Classname: EApproveRechargeStatus
|
|
||||||
* @Package_name: com.hzs.common.core.enums
|
|
||||||
*/
|
*/
|
||||||
@Getter
|
@Getter
|
||||||
@AllArgsConstructor
|
@AllArgsConstructor
|
||||||
public enum EApproveRechargeStatus {
|
public enum EApproveRechargeStatus {
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 待提交
|
* 待提交
|
||||||
|
@ -51,9 +45,9 @@ public enum EApproveRechargeStatus {
|
||||||
*/
|
*/
|
||||||
private final String key;
|
private final String key;
|
||||||
|
|
||||||
public static EApproveRechargeStatus getApproveRechargeStatus(int value ){
|
public static EApproveRechargeStatus getApproveRechargeStatus(int value) {
|
||||||
for (EApproveRechargeStatus approveRechargeStatus : EApproveRechargeStatus.values()) {
|
for (EApproveRechargeStatus approveRechargeStatus : EApproveRechargeStatus.values()) {
|
||||||
if (approveRechargeStatus.getValue() == value){
|
if (approveRechargeStatus.getValue() == value) {
|
||||||
return approveRechargeStatus;
|
return approveRechargeStatus;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -6,8 +6,6 @@ import lombok.Getter;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 交款方式
|
* 交款方式
|
||||||
*
|
|
||||||
* @author: hzs
|
|
||||||
*/
|
*/
|
||||||
@AllArgsConstructor
|
@AllArgsConstructor
|
||||||
@Getter
|
@Getter
|
||||||
|
@ -53,6 +51,12 @@ public enum EPaymentType {
|
||||||
* 调换货
|
* 调换货
|
||||||
*/
|
*/
|
||||||
EXCHANGE_GOODS(8, "调换货", 0, EnumsPrefixConstants.PAYMENT_TYPE + "8"),
|
EXCHANGE_GOODS(8, "调换货", 0, EnumsPrefixConstants.PAYMENT_TYPE + "8"),
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 调拨
|
||||||
|
*/
|
||||||
|
ALLOT(9, "调拨", 0, EnumsPrefixConstants.PAYMENT_TYPE + "9"),
|
||||||
|
|
||||||
;
|
;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@ -87,4 +91,13 @@ public enum EPaymentType {
|
||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public static String getEnumLabel(int value) {
|
||||||
|
for (EPaymentType enums : EPaymentType.values()) {
|
||||||
|
if (enums.getValue() == value) {
|
||||||
|
return enums.getLabel();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return "";
|
||||||
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue