分页查询账户充值记--/api/v3/app/accInfo/queryTradeAppPage
This commit is contained in:
parent
c5914155ad
commit
8215d52f92
|
|
@ -0,0 +1,40 @@
|
|||
package com.bonus.core.account.v3.app.controller;
|
||||
|
||||
|
||||
import com.bonus.common.core.web.domain.AjaxResult;
|
||||
import com.bonus.core.account.v3.app.dto.AppTradeDetailListDTO;
|
||||
import com.bonus.core.account.v3.app.service.AppAccService;
|
||||
import io.swagger.annotations.Api;
|
||||
import io.swagger.annotations.ApiOperation;
|
||||
import org.springframework.web.bind.annotation.PostMapping;
|
||||
import org.springframework.web.bind.annotation.RequestBody;
|
||||
import org.springframework.web.bind.annotation.RequestMapping;
|
||||
import org.springframework.web.bind.annotation.RestController;
|
||||
import org.slf4j.Logger;
|
||||
import org.slf4j.LoggerFactory;
|
||||
import javax.annotation.Resource;
|
||||
import javax.validation.Valid;
|
||||
|
||||
@RestController
|
||||
@Api(
|
||||
value = "ly_小程序账户控制器V3",
|
||||
tags = {"ly_小程序账户控制器V3"}
|
||||
)
|
||||
@RequestMapping({"/api/v3/app/accInfo"})
|
||||
public class AppAccController {
|
||||
private static final Logger log = LoggerFactory.getLogger(AppAccController.class);
|
||||
@Resource
|
||||
private AppAccService appAccService;
|
||||
|
||||
|
||||
@ApiOperation("分页查询账户充值记录")
|
||||
@PostMapping({"/queryTradeAppPage"})
|
||||
public AjaxResult queryTradeAppPage(@RequestBody @Valid AppTradeDetailListDTO dto) {
|
||||
try {
|
||||
return AjaxResult.success(this.appAccService.queryTradeAppPage(dto));
|
||||
} catch (Exception e) {
|
||||
log.error(e.toString(), e);
|
||||
return AjaxResult.error("查询账户充值记录失败");
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -0,0 +1,105 @@
|
|||
package com.bonus.core.account.v3.app.dto;
|
||||
|
||||
import cn.hutool.core.util.ObjectUtil;
|
||||
import com.baomidou.mybatisplus.extension.plugins.pagination.PageDTO;
|
||||
import com.bonus.core.pay.common.constants.PayStateEnum;
|
||||
import com.google.common.collect.Lists;
|
||||
import io.swagger.annotations.ApiModelProperty;
|
||||
|
||||
import javax.validation.constraints.NotNull;
|
||||
import java.time.LocalDateTime;
|
||||
import java.util.ArrayList;
|
||||
import java.util.Arrays;
|
||||
import java.util.Collections;
|
||||
import java.util.List;
|
||||
|
||||
public class AppTradeDetailListDTO extends PageDTO {
|
||||
@ApiModelProperty("人员id")
|
||||
private @NotNull(
|
||||
message = "{acc_single_null_custid_exception}"
|
||||
) Long custId;
|
||||
@ApiModelProperty("开始时间")
|
||||
private LocalDateTime startDateTime;
|
||||
@ApiModelProperty("结束时间")
|
||||
private LocalDateTime endDateTime;
|
||||
@ApiModelProperty("充值状态 1-充值成功 2-充值失败 3-充值超时")
|
||||
private Integer rechargeState;
|
||||
@ApiModelProperty(
|
||||
value = "充值交易类型",
|
||||
hidden = true
|
||||
)
|
||||
private List<Integer> tradeTypeList;
|
||||
@ApiModelProperty(
|
||||
value = "支付状态集合 充值超时(1,2) 充值成功(3) 充值失败(4,5) ",
|
||||
hidden = true
|
||||
)
|
||||
private List<Integer> payStateList;
|
||||
|
||||
public List<Integer> convertPayStateList() {
|
||||
if (ObjectUtil.isNull(this.getRechargeState())) {
|
||||
return Lists.newArrayList();
|
||||
} else {
|
||||
List<Integer> result = new ArrayList();
|
||||
switch (this.getRechargeState()) {
|
||||
case 1:
|
||||
result = Collections.singletonList(PayStateEnum.PAY_SUCC.getKey());
|
||||
break;
|
||||
case 2:
|
||||
result = Arrays.asList(PayStateEnum.PAY_FAIL.getKey(), PayStateEnum.PAY_CLOSE.getKey());
|
||||
break;
|
||||
case 3:
|
||||
result = Arrays.asList(PayStateEnum.UN_PAY.getKey(), PayStateEnum.PAY_INPROCESS.getKey());
|
||||
}
|
||||
|
||||
return (List) result;
|
||||
}
|
||||
}
|
||||
|
||||
public Long getCustId() {
|
||||
return this.custId;
|
||||
}
|
||||
|
||||
public LocalDateTime getStartDateTime() {
|
||||
return this.startDateTime;
|
||||
}
|
||||
|
||||
public LocalDateTime getEndDateTime() {
|
||||
return this.endDateTime;
|
||||
}
|
||||
|
||||
public Integer getRechargeState() {
|
||||
return this.rechargeState;
|
||||
}
|
||||
|
||||
public List<Integer> getTradeTypeList() {
|
||||
return this.tradeTypeList;
|
||||
}
|
||||
|
||||
public List<Integer> getPayStateList() {
|
||||
return this.payStateList;
|
||||
}
|
||||
|
||||
public void setCustId(final Long custId) {
|
||||
this.custId = custId;
|
||||
}
|
||||
|
||||
public void setStartDateTime(final LocalDateTime startDateTime) {
|
||||
this.startDateTime = startDateTime;
|
||||
}
|
||||
|
||||
public void setEndDateTime(final LocalDateTime endDateTime) {
|
||||
this.endDateTime = endDateTime;
|
||||
}
|
||||
|
||||
public void setRechargeState(final Integer rechargeState) {
|
||||
this.rechargeState = rechargeState;
|
||||
}
|
||||
|
||||
public void setTradeTypeList(final List<Integer> tradeTypeList) {
|
||||
this.tradeTypeList = tradeTypeList;
|
||||
}
|
||||
|
||||
public void setPayStateList(final List<Integer> payStateList) {
|
||||
this.payStateList = payStateList;
|
||||
}
|
||||
}
|
||||
|
|
@ -0,0 +1,10 @@
|
|||
package com.bonus.core.account.v3.app.service;
|
||||
|
||||
import com.bonus.core.account.v3.app.dto.AppTradeDetailListDTO;
|
||||
import com.bonus.core.account.v3.app.vo.AppAccTradePageVO;
|
||||
import com.github.pagehelper.Page;
|
||||
|
||||
public interface AppAccService {
|
||||
|
||||
Page<AppAccTradePageVO> queryTradeAppPage(AppTradeDetailListDTO dto);
|
||||
}
|
||||
|
|
@ -0,0 +1,37 @@
|
|||
package com.bonus.core.account.v3.app.service.impl;
|
||||
|
||||
import com.bonus.core.account.v3.app.dto.AppTradeDetailListDTO;
|
||||
import com.bonus.core.account.v3.app.service.AppAccService;
|
||||
import com.bonus.core.account.v3.app.vo.AppAccTradePageVO;
|
||||
import com.bonus.core.account.v3.constants.AccTradeTypeEnum;
|
||||
import com.bonus.core.account.v3.custom.AccForAppCustomBusiness;
|
||||
import com.bonus.core.account.v3.metadata.service.AccMetadataService;
|
||||
import com.bonus.core.account.v3.service.AccInfoService;
|
||||
import com.bonus.core.account.v3.service.AccTradeService;
|
||||
import com.bonus.core.account.v3.service.AccTradeWalletDetailService;
|
||||
import com.bonus.core.allocation.api.AllocMetadataApi;
|
||||
import com.github.pagehelper.Page;
|
||||
import org.slf4j.Logger;
|
||||
import org.slf4j.LoggerFactory;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.context.annotation.Lazy;
|
||||
import org.springframework.core.task.AsyncTaskExecutor;
|
||||
import org.springframework.stereotype.Service;
|
||||
|
||||
import javax.annotation.Resource;
|
||||
|
||||
@Service
|
||||
public class AppAccServiceImpl implements AppAccService {
|
||||
private static final Logger log = LoggerFactory.getLogger(AppAccServiceImpl.class);
|
||||
@Resource
|
||||
@Lazy
|
||||
private AccTradeService accTradeService;
|
||||
|
||||
|
||||
@Override
|
||||
public Page<AppAccTradePageVO> queryTradeAppPage(AppTradeDetailListDTO dto) {
|
||||
dto.setTradeTypeList(AccTradeTypeEnum.getRechargeListForApp());
|
||||
dto.setPayStateList(dto.convertPayStateList());
|
||||
return this.accTradeService.queryTradeAppPage(dto);
|
||||
}
|
||||
}
|
||||
|
|
@ -0,0 +1,171 @@
|
|||
package com.bonus.core.account.v3.app.vo;
|
||||
|
||||
import cn.hutool.core.date.DateUtil;
|
||||
import cn.hutool.core.util.ObjectUtil;
|
||||
import com.bonus.core.account.v3.constants.AccTradeTypeEnum;
|
||||
import com.bonus.core.pay.common.constants.PayStateEnum;
|
||||
import com.bonus.core.pay.common.constants.PayTypeEnum;
|
||||
import io.swagger.annotations.ApiModelProperty;
|
||||
|
||||
import java.math.BigDecimal;
|
||||
import java.time.LocalDateTime;
|
||||
|
||||
public class AppAccTradePageVO {
|
||||
@ApiModelProperty("交易订单号")
|
||||
private Long tradeId;
|
||||
@ApiModelProperty("钱包交易金额/分")
|
||||
private BigDecimal amount;
|
||||
@ApiModelProperty("钱包总余额/分")
|
||||
private BigDecimal walletBalTotal;
|
||||
@ApiModelProperty("交易类型id")
|
||||
private Integer tradeType;
|
||||
@ApiModelProperty("交易类型名称")
|
||||
private String tradeTypeName;
|
||||
@ApiModelProperty("交易时间")
|
||||
private LocalDateTime tradeTime;
|
||||
@ApiModelProperty("支付状态 1-待支付 2-支付中 3-支付成功 4-支付失败 5-支付关闭")
|
||||
private Integer payState;
|
||||
@ApiModelProperty("支付状态名称")
|
||||
private String payStateName;
|
||||
@ApiModelProperty("支付方式类型")
|
||||
private Integer payType;
|
||||
@ApiModelProperty("支付方式名称")
|
||||
private String payTypeName;
|
||||
@ApiModelProperty("备注")
|
||||
private String remark;
|
||||
@ApiModelProperty(
|
||||
value = "失败原因",
|
||||
hidden = true
|
||||
)
|
||||
private String failReason;
|
||||
@ApiModelProperty("补贴有效期")
|
||||
private LocalDateTime validityTime;
|
||||
@ApiModelProperty("补贴有效期(展示)")
|
||||
private String validityTimeTitle;
|
||||
|
||||
public String getTradeTypeName() {
|
||||
return AccTradeTypeEnum.getDesc(this.tradeType);
|
||||
}
|
||||
|
||||
public String getPayStateName() {
|
||||
String payStateName;
|
||||
if (PayStateEnum.isPaidState(this.getPayState())) {
|
||||
payStateName = "充值成功";
|
||||
} else if (PayStateEnum.isFailedState(this.getPayState())) {
|
||||
payStateName = "充值失败";
|
||||
} else {
|
||||
payStateName = "充值超时";
|
||||
}
|
||||
|
||||
return payStateName;
|
||||
}
|
||||
|
||||
public String getPayTypeName() {
|
||||
return PayTypeEnum.getDesc(this.getPayType());
|
||||
}
|
||||
|
||||
public String getRemark() {
|
||||
return PayStateEnum.isFailedState(this.getPayState()) ? this.failReason : this.remark;
|
||||
}
|
||||
|
||||
public String getValidityTimeTitle() {
|
||||
if (ObjectUtil.isNotNull(this.getValidityTime())) {
|
||||
String format = DateUtil.format(this.getValidityTime(), "yyyy-MM-dd");
|
||||
return "有效期至" + format;
|
||||
} else {
|
||||
return this.validityTimeTitle;
|
||||
}
|
||||
}
|
||||
|
||||
public Long getTradeId() {
|
||||
return this.tradeId;
|
||||
}
|
||||
|
||||
public BigDecimal getAmount() {
|
||||
return this.amount;
|
||||
}
|
||||
|
||||
public BigDecimal getWalletBalTotal() {
|
||||
return this.walletBalTotal;
|
||||
}
|
||||
|
||||
public Integer getTradeType() {
|
||||
return this.tradeType;
|
||||
}
|
||||
|
||||
public LocalDateTime getTradeTime() {
|
||||
return this.tradeTime;
|
||||
}
|
||||
|
||||
public Integer getPayState() {
|
||||
return this.payState;
|
||||
}
|
||||
|
||||
public Integer getPayType() {
|
||||
return this.payType;
|
||||
}
|
||||
|
||||
public String getFailReason() {
|
||||
return this.failReason;
|
||||
}
|
||||
|
||||
public LocalDateTime getValidityTime() {
|
||||
return this.validityTime;
|
||||
}
|
||||
|
||||
public void setTradeId(final Long tradeId) {
|
||||
this.tradeId = tradeId;
|
||||
}
|
||||
|
||||
public void setAmount(final BigDecimal amount) {
|
||||
this.amount = amount;
|
||||
}
|
||||
|
||||
public void setWalletBalTotal(final BigDecimal walletBalTotal) {
|
||||
this.walletBalTotal = walletBalTotal;
|
||||
}
|
||||
|
||||
public void setTradeType(final Integer tradeType) {
|
||||
this.tradeType = tradeType;
|
||||
}
|
||||
|
||||
public void setTradeTypeName(final String tradeTypeName) {
|
||||
this.tradeTypeName = tradeTypeName;
|
||||
}
|
||||
|
||||
public void setTradeTime(final LocalDateTime tradeTime) {
|
||||
this.tradeTime = tradeTime;
|
||||
}
|
||||
|
||||
public void setPayState(final Integer payState) {
|
||||
this.payState = payState;
|
||||
}
|
||||
|
||||
public void setPayStateName(final String payStateName) {
|
||||
this.payStateName = payStateName;
|
||||
}
|
||||
|
||||
public void setPayType(final Integer payType) {
|
||||
this.payType = payType;
|
||||
}
|
||||
|
||||
public void setPayTypeName(final String payTypeName) {
|
||||
this.payTypeName = payTypeName;
|
||||
}
|
||||
|
||||
public void setRemark(final String remark) {
|
||||
this.remark = remark;
|
||||
}
|
||||
|
||||
public void setFailReason(final String failReason) {
|
||||
this.failReason = failReason;
|
||||
}
|
||||
|
||||
public void setValidityTime(final LocalDateTime validityTime) {
|
||||
this.validityTime = validityTime;
|
||||
}
|
||||
|
||||
public void setValidityTimeTitle(final String validityTimeTitle) {
|
||||
this.validityTimeTitle = validityTimeTitle;
|
||||
}
|
||||
}
|
||||
|
|
@ -0,0 +1,205 @@
|
|||
package com.bonus.core.account.v3.constants;
|
||||
|
||||
import cn.hutool.core.collection.CollUtil;
|
||||
import cn.hutool.core.collection.ListUtil;
|
||||
import com.bonus.core.notice.notice.v2.constant.NoticeTemplateKeyEnum;
|
||||
import com.google.common.collect.Maps;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
import java.util.Objects;
|
||||
|
||||
public enum AccTradeTypeEnum {
|
||||
RECHARGE(10, "充值"),
|
||||
RECHARGE_GIFT(11, "赠送"),
|
||||
REVOKE_RECHARGE_GIFT(12, "撤销赠送"),
|
||||
REVOKE_RECHARGE(40, "撤销充值"),
|
||||
SUBSIDY(20, "补贴"),
|
||||
REVOKE_SUBSIDY(50, "撤销补贴"),
|
||||
CLEAR(100, "清空"),
|
||||
LUCK_MONEY(140, "红包发放"),
|
||||
WITHDRAW(30, "提现"),
|
||||
TRANSFER_OUT(60, "转出"),
|
||||
TRANSFER_IN(70, "转入"),
|
||||
FREEZE(80, "冻结"),
|
||||
UN_FREEZE(90, "解冻"),
|
||||
CONSUME(110, "消费"),
|
||||
CONSUME_REPAIR(120, "消费补扣"),
|
||||
CONSUME_REFUND(130, "消费退款");
|
||||
|
||||
private final Integer key;
|
||||
private final String desc;
|
||||
|
||||
private AccTradeTypeEnum(Integer key, String desc) {
|
||||
this.key = key;
|
||||
this.desc = desc;
|
||||
}
|
||||
|
||||
public static String getDesc(Integer key) {
|
||||
AccTradeTypeEnum[] var1 = values();
|
||||
int var2 = var1.length;
|
||||
|
||||
for(int var3 = 0; var3 < var2; ++var3) {
|
||||
AccTradeTypeEnum temp = var1[var3];
|
||||
if (temp.getKey().equals(key)) {
|
||||
return temp.getDesc();
|
||||
}
|
||||
}
|
||||
|
||||
return "";
|
||||
}
|
||||
|
||||
public static AccTradeTypeEnum getEnum(Integer key) {
|
||||
AccTradeTypeEnum[] var1 = values();
|
||||
int var2 = var1.length;
|
||||
|
||||
for(int var3 = 0; var3 < var2; ++var3) {
|
||||
AccTradeTypeEnum temp = var1[var3];
|
||||
if (temp.getKey().equals(key)) {
|
||||
return temp;
|
||||
}
|
||||
}
|
||||
|
||||
return null;
|
||||
}
|
||||
|
||||
public static Map<String, String> noticeTemplateKey4TradeTypeDescMap() {
|
||||
Map<String, String> templateKeyMap = Maps.newHashMap();
|
||||
templateKeyMap.put(NoticeTemplateKeyEnum.ACC_RECHARGE.getKey(), RECHARGE.getDesc());
|
||||
templateKeyMap.put(NoticeTemplateKeyEnum.ACC_SUB.getKey(), SUBSIDY.getDesc());
|
||||
templateKeyMap.put(NoticeTemplateKeyEnum.ACC_WITHDRAW.getKey(), WITHDRAW.getDesc());
|
||||
templateKeyMap.put(NoticeTemplateKeyEnum.ACC_FROZEN.getKey(), FREEZE.getDesc());
|
||||
templateKeyMap.put(NoticeTemplateKeyEnum.ACC_UNFROZEN.getKey(), UN_FREEZE.getDesc());
|
||||
templateKeyMap.put(NoticeTemplateKeyEnum.ACC_SUB_CLEAR.getKey(), CLEAR.getDesc());
|
||||
templateKeyMap.put(NoticeTemplateKeyEnum.ACC_PAY.getKey(), CONSUME.getDesc());
|
||||
templateKeyMap.put(NoticeTemplateKeyEnum.ACC_REPAIR_DEDUCT.getKey(), CONSUME_REPAIR.getDesc());
|
||||
templateKeyMap.put(NoticeTemplateKeyEnum.ACC_REFUND.getKey(), CONSUME_REFUND.getDesc());
|
||||
templateKeyMap.put(NoticeTemplateKeyEnum.ACC_RED_SEND.getKey(), LUCK_MONEY.getDesc());
|
||||
templateKeyMap.put(NoticeTemplateKeyEnum.ACC_TRANSFER.getKey(), TRANSFER_IN.getDesc());
|
||||
return templateKeyMap;
|
||||
}
|
||||
|
||||
public static List<Integer> getRechargeTradeTypeList() {
|
||||
List<Integer> rechargeList = new ArrayList();
|
||||
rechargeList.add(RECHARGE.getKey());
|
||||
rechargeList.add(RECHARGE_GIFT.getKey());
|
||||
rechargeList.add(SUBSIDY.getKey());
|
||||
rechargeList.add(WITHDRAW.getKey());
|
||||
rechargeList.add(REVOKE_RECHARGE.getKey());
|
||||
rechargeList.add(REVOKE_SUBSIDY.getKey());
|
||||
rechargeList.add(CLEAR.getKey());
|
||||
return rechargeList;
|
||||
}
|
||||
|
||||
public static boolean getConvertFlag(Integer flowType) {
|
||||
AccTradeTypeEnum tradeEnum = getEnum(flowType);
|
||||
if (Objects.isNull(tradeEnum)) {
|
||||
return false;
|
||||
} else {
|
||||
boolean var10000;
|
||||
switch (tradeEnum.ordinal()) {
|
||||
case 2:
|
||||
case 3:
|
||||
case 5:
|
||||
case 6:
|
||||
case 8:
|
||||
case 9:
|
||||
case 11:
|
||||
case 13:
|
||||
case 14:
|
||||
var10000 = true;
|
||||
break;
|
||||
case 4:
|
||||
case 7:
|
||||
case 10:
|
||||
case 12:
|
||||
default:
|
||||
var10000 = false;
|
||||
}
|
||||
|
||||
return var10000;
|
||||
}
|
||||
}
|
||||
|
||||
public static List<Integer> getRechargeListForApp() {
|
||||
List<Integer> rechargeList = new ArrayList();
|
||||
rechargeList.add(RECHARGE.getKey());
|
||||
rechargeList.add(SUBSIDY.getKey());
|
||||
rechargeList.add(LUCK_MONEY.getKey());
|
||||
return rechargeList;
|
||||
}
|
||||
|
||||
public static List<Integer> incomeTypeList() {
|
||||
return ListUtil.toList(new Integer[]{RECHARGE.getKey(), SUBSIDY.getKey(), LUCK_MONEY.getKey(), CONSUME_REFUND.getKey()});
|
||||
}
|
||||
|
||||
public static List<Integer> expenditureTypeList() {
|
||||
return ListUtil.toList(new Integer[]{REVOKE_RECHARGE_GIFT.getKey(), REVOKE_RECHARGE.getKey(), REVOKE_SUBSIDY.getKey(), CONSUME.getKey(), CONSUME_REPAIR.getKey(), WITHDRAW.getKey(), CLEAR.getKey()});
|
||||
}
|
||||
|
||||
public static List<Integer> appSubTradeTypeList() {
|
||||
return (List)CollUtil.addAll(subIncomeTypeList(), subExpenditureTypeList());
|
||||
}
|
||||
|
||||
public static List<Integer> subIncomeTypeList() {
|
||||
return ListUtil.toList(new Integer[]{RECHARGE_GIFT.getKey(), SUBSIDY.getKey(), TRANSFER_IN.getKey(), CONSUME_REFUND.getKey()});
|
||||
}
|
||||
|
||||
public static List<Integer> subExpenditureTypeList() {
|
||||
return ListUtil.toList(new Integer[]{REVOKE_RECHARGE_GIFT.getKey(), REVOKE_SUBSIDY.getKey(), CLEAR.getKey(), WITHDRAW.getKey(), CONSUME.getKey(), CONSUME_REPAIR.getKey()});
|
||||
}
|
||||
|
||||
public static List<Integer> appWorkTradeTypeList() {
|
||||
return (List)CollUtil.addAll(expenditureTypeList(), incomeTypeList());
|
||||
}
|
||||
|
||||
public static AccTradeTypeEnum conversionRevoke(Integer key) {
|
||||
AccTradeTypeEnum tradeEnum = getEnum(key);
|
||||
if (Objects.isNull(tradeEnum)) {
|
||||
return null;
|
||||
} else {
|
||||
AccTradeTypeEnum result = null;
|
||||
switch (tradeEnum.ordinal()) {
|
||||
case 0:
|
||||
result = REVOKE_RECHARGE;
|
||||
break;
|
||||
case 1:
|
||||
result = REVOKE_RECHARGE_GIFT;
|
||||
case 2:
|
||||
case 3:
|
||||
default:
|
||||
break;
|
||||
case 4:
|
||||
result = REVOKE_SUBSIDY;
|
||||
}
|
||||
|
||||
return result;
|
||||
}
|
||||
}
|
||||
|
||||
public static List<Integer> getAccRechargeRepealList() {
|
||||
return ListUtil.toList(new Integer[]{REVOKE_RECHARGE.getKey(), REVOKE_RECHARGE_GIFT.getKey()});
|
||||
}
|
||||
|
||||
public static List<Integer> listExpiredSubsidyExpend() {
|
||||
return ListUtil.toList(new Integer[]{CLEAR.getKey(), WITHDRAW.getKey(), CONSUME.getKey(), CONSUME_REPAIR.getKey()});
|
||||
}
|
||||
|
||||
public static List<Integer> listExpiredSubsidyIncome() {
|
||||
return ListUtil.toList(new Integer[]{CONSUME_REFUND.getKey()});
|
||||
}
|
||||
|
||||
public Integer getKey() {
|
||||
return this.key;
|
||||
}
|
||||
|
||||
public String getDesc() {
|
||||
return this.desc;
|
||||
}
|
||||
|
||||
// $FF: synthetic method
|
||||
private static AccTradeTypeEnum[] $values() {
|
||||
return new AccTradeTypeEnum[]{RECHARGE, RECHARGE_GIFT, REVOKE_RECHARGE_GIFT, REVOKE_RECHARGE, SUBSIDY, REVOKE_SUBSIDY, CLEAR, LUCK_MONEY, WITHDRAW, TRANSFER_OUT, TRANSFER_IN, FREEZE, UN_FREEZE, CONSUME, CONSUME_REPAIR, CONSUME_REFUND};
|
||||
}
|
||||
}
|
||||
|
|
@ -0,0 +1,15 @@
|
|||
package com.bonus.core.account.v3.mapper;
|
||||
|
||||
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
|
||||
import com.bonus.core.account.v3.app.dto.AppTradeDetailListDTO;
|
||||
import com.bonus.core.account.v3.app.vo.AppAccTradePageVO;
|
||||
import com.bonus.core.account.v3.model.AccTrade;
|
||||
import com.github.pagehelper.Page;
|
||||
import org.apache.ibatis.annotations.Mapper;
|
||||
import org.apache.ibatis.annotations.Param;
|
||||
|
||||
@Mapper
|
||||
public interface AccTradeMapper extends BaseMapper<AccTrade> {
|
||||
|
||||
Page<AppAccTradePageVO> queryTradeAppPage(Page<AccTrade> page, @Param("infoParam") AppTradeDetailListDTO dto);
|
||||
}
|
||||
|
|
@ -0,0 +1,324 @@
|
|||
package com.bonus.core.account.v3.model;
|
||||
|
||||
import com.baomidou.mybatisplus.annotation.TableField;
|
||||
import com.baomidou.mybatisplus.annotation.TableId;
|
||||
import com.baomidou.mybatisplus.annotation.TableName;
|
||||
|
||||
import java.io.Serializable;
|
||||
import java.math.BigDecimal;
|
||||
import java.time.LocalDateTime;
|
||||
|
||||
@TableName("acc_trade")
|
||||
public class AccTrade implements Serializable {
|
||||
@TableId
|
||||
private Long id;
|
||||
private LocalDateTime tradeTime;
|
||||
private Long custId;
|
||||
private Long orgId;
|
||||
private Integer psnType;
|
||||
private Integer tradeType;
|
||||
private BigDecimal actualAmount;
|
||||
private BigDecimal amount;
|
||||
private BigDecimal walletBalTotal;
|
||||
private BigDecimal accAllBal;
|
||||
private Integer payChannel;
|
||||
private Integer payType;
|
||||
private Integer payState;
|
||||
private Integer tradeState;
|
||||
private String thirdTradeNo;
|
||||
private String machineSn;
|
||||
private String batchNum;
|
||||
private Long leOrdNo;
|
||||
private Long originTradeId;
|
||||
private Long subTimeRuleId;
|
||||
private BigDecimal manageCost;
|
||||
private String crby;
|
||||
private LocalDateTime crtime;
|
||||
private String upby;
|
||||
private LocalDateTime uptime;
|
||||
private String remark;
|
||||
private Integer withdrawSource;
|
||||
private Integer rechargeSource;
|
||||
private Long canteenId;
|
||||
private Integer machineType;
|
||||
private String failReason;
|
||||
private Integer rechargeOperate;
|
||||
private Integer operateSource;
|
||||
private Long batchImportId;
|
||||
@TableField(
|
||||
exist = false
|
||||
)
|
||||
private static final long serialVersionUID = 1L;
|
||||
|
||||
public Long getId() {
|
||||
return this.id;
|
||||
}
|
||||
|
||||
public LocalDateTime getTradeTime() {
|
||||
return this.tradeTime;
|
||||
}
|
||||
|
||||
public Long getCustId() {
|
||||
return this.custId;
|
||||
}
|
||||
|
||||
public Long getOrgId() {
|
||||
return this.orgId;
|
||||
}
|
||||
|
||||
public Integer getPsnType() {
|
||||
return this.psnType;
|
||||
}
|
||||
|
||||
public Integer getTradeType() {
|
||||
return this.tradeType;
|
||||
}
|
||||
|
||||
public BigDecimal getActualAmount() {
|
||||
return this.actualAmount;
|
||||
}
|
||||
|
||||
public BigDecimal getAmount() {
|
||||
return this.amount;
|
||||
}
|
||||
|
||||
public BigDecimal getWalletBalTotal() {
|
||||
return this.walletBalTotal;
|
||||
}
|
||||
|
||||
public BigDecimal getAccAllBal() {
|
||||
return this.accAllBal;
|
||||
}
|
||||
|
||||
public Integer getPayChannel() {
|
||||
return this.payChannel;
|
||||
}
|
||||
|
||||
public Integer getPayType() {
|
||||
return this.payType;
|
||||
}
|
||||
|
||||
public Integer getPayState() {
|
||||
return this.payState;
|
||||
}
|
||||
|
||||
public Integer getTradeState() {
|
||||
return this.tradeState;
|
||||
}
|
||||
|
||||
public String getThirdTradeNo() {
|
||||
return this.thirdTradeNo;
|
||||
}
|
||||
|
||||
public String getMachineSn() {
|
||||
return this.machineSn;
|
||||
}
|
||||
|
||||
public String getBatchNum() {
|
||||
return this.batchNum;
|
||||
}
|
||||
|
||||
public Long getLeOrdNo() {
|
||||
return this.leOrdNo;
|
||||
}
|
||||
|
||||
public Long getOriginTradeId() {
|
||||
return this.originTradeId;
|
||||
}
|
||||
|
||||
public Long getSubTimeRuleId() {
|
||||
return this.subTimeRuleId;
|
||||
}
|
||||
|
||||
public BigDecimal getManageCost() {
|
||||
return this.manageCost;
|
||||
}
|
||||
|
||||
public String getCrby() {
|
||||
return this.crby;
|
||||
}
|
||||
|
||||
public LocalDateTime getCrtime() {
|
||||
return this.crtime;
|
||||
}
|
||||
|
||||
public String getUpby() {
|
||||
return this.upby;
|
||||
}
|
||||
|
||||
public LocalDateTime getUptime() {
|
||||
return this.uptime;
|
||||
}
|
||||
|
||||
public String getRemark() {
|
||||
return this.remark;
|
||||
}
|
||||
|
||||
public Integer getWithdrawSource() {
|
||||
return this.withdrawSource;
|
||||
}
|
||||
|
||||
public Integer getRechargeSource() {
|
||||
return this.rechargeSource;
|
||||
}
|
||||
|
||||
public Long getCanteenId() {
|
||||
return this.canteenId;
|
||||
}
|
||||
|
||||
public Integer getMachineType() {
|
||||
return this.machineType;
|
||||
}
|
||||
|
||||
public String getFailReason() {
|
||||
return this.failReason;
|
||||
}
|
||||
|
||||
public Integer getRechargeOperate() {
|
||||
return this.rechargeOperate;
|
||||
}
|
||||
|
||||
public Integer getOperateSource() {
|
||||
return this.operateSource;
|
||||
}
|
||||
|
||||
public Long getBatchImportId() {
|
||||
return this.batchImportId;
|
||||
}
|
||||
|
||||
public void setId(final Long id) {
|
||||
this.id = id;
|
||||
}
|
||||
|
||||
public void setTradeTime(final LocalDateTime tradeTime) {
|
||||
this.tradeTime = tradeTime;
|
||||
}
|
||||
|
||||
public void setCustId(final Long custId) {
|
||||
this.custId = custId;
|
||||
}
|
||||
|
||||
public void setOrgId(final Long orgId) {
|
||||
this.orgId = orgId;
|
||||
}
|
||||
|
||||
public void setPsnType(final Integer psnType) {
|
||||
this.psnType = psnType;
|
||||
}
|
||||
|
||||
public void setTradeType(final Integer tradeType) {
|
||||
this.tradeType = tradeType;
|
||||
}
|
||||
|
||||
public void setActualAmount(final BigDecimal actualAmount) {
|
||||
this.actualAmount = actualAmount;
|
||||
}
|
||||
|
||||
public void setAmount(final BigDecimal amount) {
|
||||
this.amount = amount;
|
||||
}
|
||||
|
||||
public void setWalletBalTotal(final BigDecimal walletBalTotal) {
|
||||
this.walletBalTotal = walletBalTotal;
|
||||
}
|
||||
|
||||
public void setAccAllBal(final BigDecimal accAllBal) {
|
||||
this.accAllBal = accAllBal;
|
||||
}
|
||||
|
||||
public void setPayChannel(final Integer payChannel) {
|
||||
this.payChannel = payChannel;
|
||||
}
|
||||
|
||||
public void setPayType(final Integer payType) {
|
||||
this.payType = payType;
|
||||
}
|
||||
|
||||
public void setPayState(final Integer payState) {
|
||||
this.payState = payState;
|
||||
}
|
||||
|
||||
public void setTradeState(final Integer tradeState) {
|
||||
this.tradeState = tradeState;
|
||||
}
|
||||
|
||||
public void setThirdTradeNo(final String thirdTradeNo) {
|
||||
this.thirdTradeNo = thirdTradeNo;
|
||||
}
|
||||
|
||||
public void setMachineSn(final String machineSn) {
|
||||
this.machineSn = machineSn;
|
||||
}
|
||||
|
||||
public void setBatchNum(final String batchNum) {
|
||||
this.batchNum = batchNum;
|
||||
}
|
||||
|
||||
public void setLeOrdNo(final Long leOrdNo) {
|
||||
this.leOrdNo = leOrdNo;
|
||||
}
|
||||
|
||||
public void setOriginTradeId(final Long originTradeId) {
|
||||
this.originTradeId = originTradeId;
|
||||
}
|
||||
|
||||
public void setSubTimeRuleId(final Long subTimeRuleId) {
|
||||
this.subTimeRuleId = subTimeRuleId;
|
||||
}
|
||||
|
||||
public void setManageCost(final BigDecimal manageCost) {
|
||||
this.manageCost = manageCost;
|
||||
}
|
||||
|
||||
public void setCrby(final String crby) {
|
||||
this.crby = crby;
|
||||
}
|
||||
|
||||
public void setCrtime(final LocalDateTime crtime) {
|
||||
this.crtime = crtime;
|
||||
}
|
||||
|
||||
public void setUpby(final String upby) {
|
||||
this.upby = upby;
|
||||
}
|
||||
|
||||
public void setUptime(final LocalDateTime uptime) {
|
||||
this.uptime = uptime;
|
||||
}
|
||||
|
||||
public void setRemark(final String remark) {
|
||||
this.remark = remark;
|
||||
}
|
||||
|
||||
public void setWithdrawSource(final Integer withdrawSource) {
|
||||
this.withdrawSource = withdrawSource;
|
||||
}
|
||||
|
||||
public void setRechargeSource(final Integer rechargeSource) {
|
||||
this.rechargeSource = rechargeSource;
|
||||
}
|
||||
|
||||
public void setCanteenId(final Long canteenId) {
|
||||
this.canteenId = canteenId;
|
||||
}
|
||||
|
||||
public void setMachineType(final Integer machineType) {
|
||||
this.machineType = machineType;
|
||||
}
|
||||
|
||||
public void setFailReason(final String failReason) {
|
||||
this.failReason = failReason;
|
||||
}
|
||||
|
||||
public void setRechargeOperate(final Integer rechargeOperate) {
|
||||
this.rechargeOperate = rechargeOperate;
|
||||
}
|
||||
|
||||
public void setOperateSource(final Integer operateSource) {
|
||||
this.operateSource = operateSource;
|
||||
}
|
||||
|
||||
public void setBatchImportId(final Long batchImportId) {
|
||||
this.batchImportId = batchImportId;
|
||||
}
|
||||
}
|
||||
|
|
@ -0,0 +1,13 @@
|
|||
package com.bonus.core.account.v3.service;
|
||||
|
||||
|
||||
import com.baomidou.mybatisplus.extension.service.IService;
|
||||
import com.bonus.core.account.v3.app.dto.AppTradeDetailListDTO;
|
||||
import com.bonus.core.account.v3.app.vo.AppAccTradePageVO;
|
||||
import com.bonus.core.account.v3.model.AccTrade;
|
||||
import com.github.pagehelper.Page;
|
||||
|
||||
public interface AccTradeService extends IService<AccTrade> {
|
||||
|
||||
Page<AppAccTradePageVO> queryTradeAppPage(AppTradeDetailListDTO dto);
|
||||
}
|
||||
|
|
@ -0,0 +1,24 @@
|
|||
package com.bonus.core.account.v3.service.impl;
|
||||
|
||||
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
||||
import com.bonus.core.account.v3.app.dto.AppTradeDetailListDTO;
|
||||
import com.bonus.core.account.v3.app.vo.AppAccTradePageVO;
|
||||
import com.bonus.core.account.v3.mapper.AccTradeMapper;
|
||||
import com.bonus.core.account.v3.model.AccTrade;
|
||||
import com.bonus.core.account.v3.service.AccTradeService;
|
||||
import com.github.pagehelper.Page;
|
||||
import org.slf4j.Logger;
|
||||
import org.slf4j.LoggerFactory;
|
||||
import org.springframework.stereotype.Service;
|
||||
|
||||
@Service
|
||||
public class AccTradeServiceImpl extends ServiceImpl<AccTradeMapper, AccTrade> implements AccTradeService {
|
||||
private static final Logger log = LoggerFactory.getLogger(AccTradeServiceImpl.class);
|
||||
|
||||
|
||||
@Override
|
||||
public Page<AppAccTradePageVO> queryTradeAppPage(AppTradeDetailListDTO dto) {
|
||||
Page<AccTrade> page = new Page((int) dto.getCurrent(), (int) dto.getSize());
|
||||
return ((AccTradeMapper)this.baseMapper).queryTradeAppPage(page, dto);
|
||||
}
|
||||
}
|
||||
|
|
@ -0,0 +1,94 @@
|
|||
package com.bonus.core.notice.notice.v2.constant;
|
||||
|
||||
import com.bonus.core.account.v3.constants.AccTradeTypeEnum;
|
||||
import com.google.common.collect.Maps;
|
||||
|
||||
import java.util.Map;
|
||||
|
||||
public enum NoticeTemplateKeyEnum {
|
||||
REGISTRATION_VERIFICATION_CODE("001001", "注册验证通知"),
|
||||
ORDER_CREATED("002001", "下单成功通知"),
|
||||
ORDER_DISH_COMPLETED("002002", "菜品制作通知"),
|
||||
ACC_PAY("003001", "消费成功通知"),
|
||||
ACC_RECHARGE("003002", "充值成功通知"),
|
||||
ACC_WITHDRAW("003003", "提现成功通知"),
|
||||
ACC_REFUND("003004", "退款成功通知"),
|
||||
ACC_REPAIR_DEDUCT("003005", "消费补扣通知"),
|
||||
ACC_FROZEN("003006", "冻结金额通知"),
|
||||
ACC_UNFROZEN("003007", "解冻金额通知"),
|
||||
ACC_SUB_CLEAR("003008", "补贴清空通知"),
|
||||
ACC_SUB("003009", "补贴发放通知"),
|
||||
ACC_BALANCE_INSUFFICIENT("003010", "余额不足通知"),
|
||||
ACC_RED_SEND("003011", "红包发放通知"),
|
||||
ACC_TRANSFER("003012", "转账通知"),
|
||||
ACC_STATUS_DEACTIVATE("003014", "账户停用通知"),
|
||||
ACC_STATUS_OVERDUE("003015", "账户过期通知"),
|
||||
VISIT_TAKE("004001", "到店取餐通知"),
|
||||
CABINET_TAKE("004002", "取餐柜取餐通知"),
|
||||
CABINET_TAKE_OVER_TIME("004003", "取餐超时通知"),
|
||||
CABINET_TAKE_CLEAN("004004", "取餐超时清理通知"),
|
||||
ORDER_REFUND_SUCCESS("005001", "退单成功通知"),
|
||||
ORDER_REFUND_FAIL("005002", "退单失败通知"),
|
||||
BINDING_PLATE_SUCCESS("006001", "绑盘成功通知"),
|
||||
MEAL_FINISHED("006002", "就餐结束通知"),
|
||||
ERROR_CORRECTION_REFUND_SUCCESS("006003", "纠错退款成功通知"),
|
||||
ERROR_CORRECTION_REFUND_FAIL("006004", "纠错退款失败通知"),
|
||||
RECIPE_CUSTOMIZATION("007001", "菜谱定制通知"),
|
||||
DOOR_CONTROL_OFFLINE("008001", "门禁离线通知"),
|
||||
STRANGER_SCAN("008002", "陌生人扫脸通知"),
|
||||
DEVICE_OFFLINE("009001", "到店取餐通知"),
|
||||
MENUAI_REGISTER("010001", "注册菜品识别通知"),
|
||||
DRP_SINGLE_SUPPLY("011001", "供货单通知"),
|
||||
DRP_OFFER_SUPPLY("011002", "报价通知"),
|
||||
DRP_GOODS_QUOTE("011003", "询价单报价通知"),
|
||||
DRP_SUPPLIER_BJ("011004", "供应商报价通知"),
|
||||
DRP_ADMIN_JB("011005", "采购员决标通知"),
|
||||
DRP_AGAIN_QUOTE("011006", "采购员发起再次报价"),
|
||||
DRP_AGREE_QUOTE("011007", "采购员发起意向中标价"),
|
||||
DRP_SUPPLIER_AGREE("011008", "供应商接受/拒绝意向中标价"),
|
||||
DRP_PUR_PLAN_SUPPLY("011009", "采购订单"),
|
||||
DRP_SUPPLIER_QUOTE("011010", "供应商报价"),
|
||||
DRP_SUPPLIER_JB("011011", "供应商决标"),
|
||||
BACK_FIELD_ALARM("012001", "违规报警通知"),
|
||||
INTERVIEWEE_AUDIT("013001", "预约待审核通知审核对象"),
|
||||
INTERVIEWEE_VISITOR_SIGN_IN("013002", "访客到达通知被放对象"),
|
||||
VISITOR_AUDIT_PASS("014001", "访客预约审核通过通知"),
|
||||
VISITOR_INVITATION("014002", "访客邀约通知被放对象");
|
||||
|
||||
private final String key;
|
||||
private final String desc;
|
||||
|
||||
private NoticeTemplateKeyEnum(String key, String desc) {
|
||||
this.key = key;
|
||||
this.desc = desc;
|
||||
}
|
||||
|
||||
public static Map<Integer, String> accTrade4TemplateKeyMap() {
|
||||
Map<Integer, String> templateKeyMap = Maps.newHashMap();
|
||||
templateKeyMap.put(AccTradeTypeEnum.RECHARGE.getKey(), ACC_RECHARGE.getKey());
|
||||
templateKeyMap.put(AccTradeTypeEnum.SUBSIDY.getKey(), ACC_SUB.getKey());
|
||||
templateKeyMap.put(AccTradeTypeEnum.WITHDRAW.getKey(), ACC_WITHDRAW.getKey());
|
||||
templateKeyMap.put(AccTradeTypeEnum.FREEZE.getKey(), ACC_FROZEN.getKey());
|
||||
templateKeyMap.put(AccTradeTypeEnum.UN_FREEZE.getKey(), ACC_UNFROZEN.getKey());
|
||||
templateKeyMap.put(AccTradeTypeEnum.CLEAR.getKey(), ACC_SUB_CLEAR.getKey());
|
||||
templateKeyMap.put(AccTradeTypeEnum.CONSUME.getKey(), ACC_PAY.getKey());
|
||||
templateKeyMap.put(AccTradeTypeEnum.CONSUME_REPAIR.getKey(), ACC_REPAIR_DEDUCT.getKey());
|
||||
templateKeyMap.put(AccTradeTypeEnum.CONSUME_REFUND.getKey(), ACC_REFUND.getKey());
|
||||
templateKeyMap.put(AccTradeTypeEnum.LUCK_MONEY.getKey(), ACC_RED_SEND.getKey());
|
||||
templateKeyMap.put(AccTradeTypeEnum.TRANSFER_IN.getKey(), ACC_TRANSFER.getKey());
|
||||
return templateKeyMap;
|
||||
}
|
||||
|
||||
public String getKey() {
|
||||
return this.key;
|
||||
}
|
||||
|
||||
public String getDesc() {
|
||||
return this.desc;
|
||||
}
|
||||
|
||||
// $FF: synthetic method
|
||||
private static NoticeTemplateKeyEnum[] $values() {
|
||||
return new NoticeTemplateKeyEnum[]{REGISTRATION_VERIFICATION_CODE, ORDER_CREATED, ORDER_DISH_COMPLETED, ACC_PAY, ACC_RECHARGE, ACC_WITHDRAW, ACC_REFUND, ACC_REPAIR_DEDUCT, ACC_FROZEN, ACC_UNFROZEN, ACC_SUB_CLEAR, ACC_SUB, ACC_BALANCE_INSUFFICIENT, ACC_RED_SEND, ACC_TRANSFER, ACC_STATUS_DEACTIVATE, ACC_STATUS_OVERDUE, VISIT_TAKE, CABINET_TAKE, CABINET_TAKE_OVER_TIME, CABINET_TAKE_CLEAN, ORDER_REFUND_SUCCESS, ORDER_REFUND_FAIL, BINDING_PLATE_SUCCESS, MEAL_FINISHED, ERROR_CORRECTION_REFUND_SUCCESS, ERROR_CORRECTION_REFUND_FAIL, RECIPE_CUSTOMIZATION, DOOR_CONTROL_OFFLINE, STRANGER_SCAN, DEVICE_OFFLINE, MENUAI_REGISTER, DRP_SINGLE_SUPPLY, DRP_OFFER_SUPPLY, DRP_GOODS_QUOTE, DRP_SUPPLIER_BJ, DRP_ADMIN_JB, DRP_AGAIN_QUOTE, DRP_AGREE_QUOTE, DRP_SUPPLIER_AGREE, DRP_PUR_PLAN_SUPPLY, DRP_SUPPLIER_QUOTE, DRP_SUPPLIER_JB, BACK_FIELD_ALARM, INTERVIEWEE_AUDIT, INTERVIEWEE_VISITOR_SIGN_IN, VISITOR_AUDIT_PASS, VISITOR_INVITATION};
|
||||
}
|
||||
}
|
||||
|
|
@ -0,0 +1,89 @@
|
|||
package com.bonus.core.pay.common.constants;
|
||||
|
||||
import cn.hutool.core.collection.ListUtil;
|
||||
import com.bonus.core.common.converter.LeExcelFieldConvertor;
|
||||
import com.bonus.core.common.converter.LeExcelFieldEnum;
|
||||
|
||||
public enum PayStateEnum implements LeExcelFieldEnum<PayStateEnum> {
|
||||
UN_PAY(1, "未支付"),
|
||||
PAY_INPROCESS(2, "支付中"),
|
||||
PAY_SUCC(3, "支付成功"),
|
||||
PAY_FAIL(4, "支付失败"),
|
||||
PAY_CLOSE(5, "支付关闭"),
|
||||
PART_PAY(6, "部分支付");
|
||||
|
||||
private final Integer key;
|
||||
private final String desc;
|
||||
|
||||
public static String getDesc(Integer key) {
|
||||
PayStateEnum[] var1 = values();
|
||||
int var2 = var1.length;
|
||||
|
||||
for(int var3 = 0; var3 < var2; ++var3) {
|
||||
PayStateEnum temp = var1[var3];
|
||||
if (temp.getKey().equals(key)) {
|
||||
return temp.getDesc();
|
||||
}
|
||||
}
|
||||
|
||||
return "";
|
||||
}
|
||||
|
||||
private PayStateEnum(Integer key, String desc) {
|
||||
this.key = key;
|
||||
this.desc = desc;
|
||||
}
|
||||
|
||||
public static boolean isFinishedState(Integer key) {
|
||||
return ListUtil.toList(new Integer[]{PAY_SUCC.getKey(), PART_PAY.getKey(), PAY_FAIL.getKey(), PAY_CLOSE.getKey()}).contains(key);
|
||||
}
|
||||
|
||||
public static boolean isPaidState(Integer key) {
|
||||
return ListUtil.toList(new Integer[]{PAY_SUCC.getKey(), PART_PAY.getKey()}).contains(key);
|
||||
}
|
||||
|
||||
public static boolean isPaySuccessState(Integer key) {
|
||||
return ListUtil.toList(new Integer[]{PAY_SUCC.getKey()}).contains(key);
|
||||
}
|
||||
|
||||
public static boolean isPartPayState(Integer key) {
|
||||
return ListUtil.toList(new Integer[]{PART_PAY.getKey()}).contains(key);
|
||||
}
|
||||
|
||||
public static boolean isFailedState(Integer key) {
|
||||
return ListUtil.toList(new Integer[]{PAY_FAIL.getKey(), PAY_CLOSE.getKey()}).contains(key);
|
||||
}
|
||||
|
||||
public static boolean isCloseState(Integer key) {
|
||||
return ListUtil.toList(new Integer[]{PAY_CLOSE.getKey()}).contains(key);
|
||||
}
|
||||
|
||||
public static boolean isPayingState(Integer key) {
|
||||
return PAY_INPROCESS.getKey().equals(key);
|
||||
}
|
||||
|
||||
public static boolean isUnPayState(Integer key) {
|
||||
return UN_PAY.getKey().equals(key);
|
||||
}
|
||||
|
||||
@Override
|
||||
public Integer getKey() {
|
||||
return this.key;
|
||||
}
|
||||
|
||||
@Override
|
||||
public String getDesc() {
|
||||
return this.desc;
|
||||
}
|
||||
|
||||
// $FF: synthetic method
|
||||
private static PayStateEnum[] $values() {
|
||||
return new PayStateEnum[]{UN_PAY, PAY_INPROCESS, PAY_SUCC, PAY_FAIL, PAY_CLOSE, PART_PAY};
|
||||
}
|
||||
|
||||
public static class ExcelConvertor extends LeExcelFieldConvertor<PayStateEnum> {
|
||||
public ExcelConvertor() {
|
||||
super(PayStateEnum.class);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -0,0 +1,191 @@
|
|||
package com.bonus.core.pay.common.constants;
|
||||
|
||||
import cn.hutool.core.collection.CollUtil;
|
||||
import com.bonus.core.common.converter.LeExcelFieldConvertor;
|
||||
import com.bonus.core.common.converter.LeExcelFieldEnum;
|
||||
|
||||
import java.util.*;
|
||||
import java.util.stream.Collectors;
|
||||
|
||||
public enum PayTypeEnum implements LeExcelFieldEnum<PayTypeEnum> {
|
||||
MEAL_CARD(1, "账户支付"),
|
||||
CASH(2, "现金支付"),
|
||||
COUPON(3, "餐券支付"),
|
||||
CASH_MACHINE(4, "设备现金支付"),
|
||||
SUB_GRANT(5, "补贴"),
|
||||
RED_GRANT(6, "红包"),
|
||||
WX_RCB_NATIVE(7, "无锡农商行原生"),
|
||||
ALI_QRCODE(10, "支付宝扫码"),
|
||||
ALI_FACE(11, "支付宝人脸"),
|
||||
ALI_NATIVE(12, "支付宝原生"),
|
||||
OFFLINE_ALI_QRCODE(13, "支付宝线下扫码"),
|
||||
ALI_APP_PAY(14, "支付宝app"),
|
||||
ALI_DING_ACC_PAY(15, "钉工牌账户支付"),
|
||||
ALI_DING_PAY(16, "钉工牌支付宝支付"),
|
||||
ALI_PAY_WITHHOLD(17, "支付宝代扣"),
|
||||
ALI_H5_PAY(18, "支付宝移动网页支付"),
|
||||
WECHAT_QRCODE(20, "微信扫码"),
|
||||
WECHAT_FACE(21, "微信k12人脸"),
|
||||
WECHAT_NATIVE(22, "微信原生"),
|
||||
WECHAT_WITHHOLD(23, "微信代扣"),
|
||||
OFFLINE_WECHAT_QRCODE(24, "微信线下扫码"),
|
||||
WECHAT_H5(25, "微信移动网页支付"),
|
||||
UNION_PAY_QRCODE(30, "银联付款码"),
|
||||
CLOUD_UNION_PAY(31, "云闪付"),
|
||||
JINGDONG_PAY(40, "京东支付"),
|
||||
CCB_PAY(41, "建行龙支付"),
|
||||
BUSINESS_UNIFY_PAY(50, "商家统一支付"),
|
||||
OTHER_QRCODE(60, "小程序二维码支付"),
|
||||
OTHER_PAY(61, "其他支付"),
|
||||
MIXTURE_PAY_ALI_QRCODE(70, "支付宝扫码（混合支付）"),
|
||||
MIXTURE_PAY_WECHAT_QRCODE(71, "微信扫码（混合支付）"),
|
||||
MIXTURE_PAY_ALI_NATIVE(72, "支付宝原生（混合支付）"),
|
||||
MIXTURE_PAY_WECHAT_NATIVE(73, "微信原生（混合支付）"),
|
||||
SHOU_QIAN_BA_PAY(80, "收钱吧支付"),
|
||||
SHOU_QIAN_BA_MOBILE_H5(81, "收钱吧移动端h5支付"),
|
||||
THIRD_DEVICE(98, "第三方设备支付"),
|
||||
THIRD_ACC(99, "第三方账户支付"),
|
||||
ABC_PAY_CODE(100, "农行付款码支付"),
|
||||
ABC_ID_CODE(101, "农行身份码支付"),
|
||||
ABC_ACCOUNT_PAY(102, "农行账户支付"),
|
||||
ABC_QR_CODE_PAY(103, "农行扫码支付"),
|
||||
ABC_CREDIT_PAY(104, "农行信用卡支付"),
|
||||
ABC_AGENT_PAY(105, "农行授权免密支付"),
|
||||
ICBC_PAY_CODE(110, "工行付款码支付"),
|
||||
CMB_PAY_CODE(120, "招行扫码支付"),
|
||||
CIB_PAY_CODE(121, "兴业银行扫码支付"),
|
||||
ABC_DCEP_CODE_PAY(122, "数字人民币扫码支付"),
|
||||
ECITIC_H5_PAY(123, "中信H5支付"),
|
||||
ECITIC_PAY_CODE(124, "中信付款码支付"),
|
||||
BOC_ACCOUNT_PAY(125, "中国银行账户支付"),
|
||||
CHINA_PAY_CODE(126, "银联线上支付"),
|
||||
BOC_AREA_CODE_ACCOUNT_PAY(127, "中国银行园区码-小牛账户支付"),
|
||||
BOC_LENIU_CODE_ACCOUNT_PAY(128, "中国银行-小牛二维码账户支付"),
|
||||
BOC_LENIU_CARD_ACCOUNT_PAY(129, "中国银行-小牛刷卡账户支付"),
|
||||
BOC_LENIU_FACE_ACCOUNT_PAY(130, "中国银行-小牛刷脸账户支付"),
|
||||
CIB_DCEP_CONTRACT(131, "数字人民币协议免密支付"),
|
||||
FUIOU_PAY_H5(132, "富友支付"),
|
||||
TCRCB_PAY_H5(133, "太仓农商行支付"),
|
||||
ACC_BNJ_PAY(134, "南京银行免密支付"),
|
||||
WECHAT_CARD_QR_CODE(135, "腾讯微卡电子码"),
|
||||
WECHAT_CARD_H5(136, "腾讯微卡在线支付"),
|
||||
CCB_PAY_H5(137, "建设银行H5支付"),
|
||||
KSRCB_PAY_CODE(138, "昆山农商行付款码支付"),
|
||||
CIB_DCEP_AUTH(139, "兴业银行数币密码支付"),
|
||||
SZRCB_PAY_H5(140, "苏州农商行支付"),
|
||||
BNJ_WECHAT_MINI(141, "微信小程序南京银行免密支付"),
|
||||
NBCB_SETTLEMENT_PAY(142, "宁波银行结算支付"),
|
||||
ABC_NATIVE(143, "农行页面下单"),
|
||||
ABC_POS_MACHINE_PAY(144, "农行POS机刷卡支付"),
|
||||
BNJ_H5_PAY(145, "南京银行H5支付"),
|
||||
ABC_PAY_H5(146, "农行H5支付"),
|
||||
ALI_ENTERPRISE_FACE(147, "支付宝企业刷脸"),
|
||||
ALI_ENTERPRISE_QRCODE(148, "支付宝企业扫码"),
|
||||
ALI_ENTERPRISE_WITHHOLD(149, "支付宝企业免密支付"),
|
||||
ACC_SCAN(150, "收款码（账户）"),
|
||||
ALI_SCAN(151, "收款码（支付宝）"),
|
||||
WECHAT_SCAN(152, "收款码（微信）"),
|
||||
ECITIC_H5_WECHAT_PAY(153, "微信支付(中信)"),
|
||||
ECITIC_H5_UNCONSCIOUS_PAY(154, "中信无感支付"),
|
||||
ABC_PAY_H5_WECHAT(155, "农行H5微信支付"),
|
||||
ABC_PAY_H5_ALI(156, "农行H5支付宝支付"),
|
||||
DIANDI_PAY_H5(157, "点滴支付H5支付"),
|
||||
HMS_CAMPUS_CODE(158, "银联园区二维码支付"),
|
||||
CIB_NATIVE(159, "兴业银行客户端支付"),
|
||||
UMS_ENTRUST_PAY(160, "云闪付授权支付"),
|
||||
HUAGENG_WECHAT_PAY(161, "华耕微信收款"),
|
||||
HUAGENG_ALI_PAY(162, "华耕支付宝收款"),
|
||||
HUAGENG_SUBSIDY_PAY(163, "华耕补贴消费"),
|
||||
HUAGENG_POLYMERIZE_PAY(164, "华耕聚合收款"),
|
||||
HUAGENG_CASH_PAY(165, "华耕手填现金"),
|
||||
HUAGENG_SIGNING_PAY(166, "华耕手填签单"),
|
||||
HUAGENG_COUPON_PAY(167, "华耕手填餐券"),
|
||||
SODEXO_QRCODE(168, "索迪斯二维码支付"),
|
||||
TC_SSC_CARD_PAY(169, "太仓社保卡支付"),
|
||||
CMB_H5_CARD_PAY(170, "招行一网通支付"),
|
||||
ZY_WECHAT_PAY(171, "正元微信支付"),
|
||||
ZY_ALI_PAY(172, "正元支付宝支付"),
|
||||
ZY_ACC_PAY(173, "正元账户支付"),
|
||||
ZY_CCB_PAY(174, "正元建行支付"),
|
||||
ICBC_JFT_H5(175, "工行聚富通支付"),
|
||||
ABC_WECHAT_BRIDGE(176, "微信支付(农行)");
|
||||
|
||||
private final Integer key;
|
||||
private final String desc;
|
||||
private static final Map<Integer, String> keyMap = (Map)Arrays.stream(values()).collect(Collectors.toMap(PayTypeEnum::getKey, PayTypeEnum::getDesc, (k1, k2) -> {
|
||||
return k2;
|
||||
}));
|
||||
|
||||
private PayTypeEnum(Integer key, String desc) {
|
||||
this.key = key;
|
||||
this.desc = desc;
|
||||
}
|
||||
|
||||
public static String getDesc(Integer key) {
|
||||
return (String)keyMap.getOrDefault(key, "");
|
||||
}
|
||||
|
||||
public static PayTypeEnum getEnum(Integer key) {
|
||||
PayTypeEnum[] var1 = values();
|
||||
int var2 = var1.length;
|
||||
|
||||
for(int var3 = 0; var3 < var2; ++var3) {
|
||||
PayTypeEnum temp = var1[var3];
|
||||
if (temp.getKey().equals(key)) {
|
||||
return temp;
|
||||
}
|
||||
}
|
||||
|
||||
return null;
|
||||
}
|
||||
|
||||
public static List<Map<String, Object>> getAllEnumsList() {
|
||||
PayTypeEnum[] payTypeEnums = values();
|
||||
List<Map<String, Object>> payTypeList = new ArrayList();
|
||||
PayTypeEnum[] var2 = payTypeEnums;
|
||||
int var3 = payTypeEnums.length;
|
||||
|
||||
for(int var4 = 0; var4 < var3; ++var4) {
|
||||
PayTypeEnum payTypeEnum = var2[var4];
|
||||
Map<String, Object> payTypeMap = new HashMap();
|
||||
payTypeMap.put("key", payTypeEnum.getKey());
|
||||
payTypeMap.put("value", payTypeEnum.getDesc());
|
||||
payTypeList.add(payTypeMap);
|
||||
}
|
||||
|
||||
return payTypeList;
|
||||
}
|
||||
|
||||
public static boolean isAlipayChannel(Integer payType) {
|
||||
return CollUtil.toList(new Integer[]{ALI_QRCODE.getKey(), ALI_FACE.getKey(), ALI_NATIVE.getKey(), ALI_APP_PAY.getKey(), ALI_DING_PAY.getKey(), ALI_PAY_WITHHOLD.getKey(), MIXTURE_PAY_ALI_QRCODE.getKey(), MIXTURE_PAY_ALI_NATIVE.getKey(), ALI_ENTERPRISE_FACE.getKey(), ALI_ENTERPRISE_QRCODE.getKey(), ALI_ENTERPRISE_WITHHOLD.getKey(), ALI_SCAN.getKey()}).contains(payType);
|
||||
}
|
||||
|
||||
public static boolean isWechatChannel(Integer payType) {
|
||||
return CollUtil.toList(new Integer[]{WECHAT_QRCODE.getKey(), WECHAT_FACE.getKey(), WECHAT_NATIVE.getKey(), WECHAT_WITHHOLD.getKey(), MIXTURE_PAY_WECHAT_QRCODE.getKey(), MIXTURE_PAY_WECHAT_NATIVE.getKey(), WECHAT_CARD_QR_CODE.getKey()}).contains(payType);
|
||||
}
|
||||
|
||||
public static boolean isOtherChannel(Integer payType) {
|
||||
return CASH.getKey().equals(payType) || OFFLINE_ALI_QRCODE.getKey().equals(payType) || OFFLINE_WECHAT_QRCODE.getKey().equals(payType) || OTHER_PAY.getKey().equals(payType) || THIRD_DEVICE.getKey().equals(payType);
|
||||
}
|
||||
|
||||
@Override
|
||||
public Integer getKey() {
|
||||
return this.key;
|
||||
}
|
||||
|
||||
@Override
|
||||
public String getDesc() {
|
||||
return this.desc;
|
||||
}
|
||||
|
||||
// $FF: synthetic method
|
||||
private static PayTypeEnum[] $values() {
|
||||
return new PayTypeEnum[]{MEAL_CARD, CASH, COUPON, CASH_MACHINE, SUB_GRANT, RED_GRANT, WX_RCB_NATIVE, ALI_QRCODE, ALI_FACE, ALI_NATIVE, OFFLINE_ALI_QRCODE, ALI_APP_PAY, ALI_DING_ACC_PAY, ALI_DING_PAY, ALI_PAY_WITHHOLD, ALI_H5_PAY, WECHAT_QRCODE, WECHAT_FACE, WECHAT_NATIVE, WECHAT_WITHHOLD, OFFLINE_WECHAT_QRCODE, WECHAT_H5, UNION_PAY_QRCODE, CLOUD_UNION_PAY, JINGDONG_PAY, CCB_PAY, BUSINESS_UNIFY_PAY, OTHER_QRCODE, OTHER_PAY, MIXTURE_PAY_ALI_QRCODE, MIXTURE_PAY_WECHAT_QRCODE, MIXTURE_PAY_ALI_NATIVE, MIXTURE_PAY_WECHAT_NATIVE, SHOU_QIAN_BA_PAY, SHOU_QIAN_BA_MOBILE_H5, THIRD_DEVICE, THIRD_ACC, ABC_PAY_CODE, ABC_ID_CODE, ABC_ACCOUNT_PAY, ABC_QR_CODE_PAY, ABC_CREDIT_PAY, ABC_AGENT_PAY, ICBC_PAY_CODE, CMB_PAY_CODE, CIB_PAY_CODE, ABC_DCEP_CODE_PAY, ECITIC_H5_PAY, ECITIC_PAY_CODE, BOC_ACCOUNT_PAY, CHINA_PAY_CODE, BOC_AREA_CODE_ACCOUNT_PAY, BOC_LENIU_CODE_ACCOUNT_PAY, BOC_LENIU_CARD_ACCOUNT_PAY, BOC_LENIU_FACE_ACCOUNT_PAY, CIB_DCEP_CONTRACT, FUIOU_PAY_H5, TCRCB_PAY_H5, ACC_BNJ_PAY, WECHAT_CARD_QR_CODE, WECHAT_CARD_H5, CCB_PAY_H5, KSRCB_PAY_CODE, CIB_DCEP_AUTH, SZRCB_PAY_H5, BNJ_WECHAT_MINI, NBCB_SETTLEMENT_PAY, ABC_NATIVE, ABC_POS_MACHINE_PAY, BNJ_H5_PAY, ABC_PAY_H5, ALI_ENTERPRISE_FACE, ALI_ENTERPRISE_QRCODE, ALI_ENTERPRISE_WITHHOLD, ACC_SCAN, ALI_SCAN, WECHAT_SCAN, ECITIC_H5_WECHAT_PAY, ECITIC_H5_UNCONSCIOUS_PAY, ABC_PAY_H5_WECHAT, ABC_PAY_H5_ALI, DIANDI_PAY_H5, HMS_CAMPUS_CODE, CIB_NATIVE, UMS_ENTRUST_PAY, HUAGENG_WECHAT_PAY, HUAGENG_ALI_PAY, HUAGENG_SUBSIDY_PAY, HUAGENG_POLYMERIZE_PAY, HUAGENG_CASH_PAY, HUAGENG_SIGNING_PAY, HUAGENG_COUPON_PAY, SODEXO_QRCODE, TC_SSC_CARD_PAY, CMB_H5_CARD_PAY, ZY_WECHAT_PAY, ZY_ALI_PAY, ZY_ACC_PAY, ZY_CCB_PAY, ICBC_JFT_H5, ABC_WECHAT_BRIDGE};
|
||||
}
|
||||
|
||||
public static class ExcelConvertor extends LeExcelFieldConvertor<PayTypeEnum> {
|
||||
public ExcelConvertor() {
|
||||
super(PayTypeEnum.class);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -0,0 +1,43 @@
|
|||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<!DOCTYPE mapper
|
||||
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
||||
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
|
||||
<mapper namespace="com.bonus.core.account.v3.mapper.AccTradeMapper">
|
||||
<!-- 移动端分页查询充值记录 -->
|
||||
<select id="queryTradeAppPage" resultType="com.bonus.core.account.v3.app.vo.AppAccTradePageVO">
|
||||
SELECT
|
||||
id AS tradeId,
|
||||
amount,
|
||||
acc_all_bal as walletBalTotal,
|
||||
trade_type,
|
||||
trade_time,
|
||||
pay_state,
|
||||
pay_type,
|
||||
remark,
|
||||
fail_reason
|
||||
FROM acc_trade
|
||||
<where>
|
||||
cust_id = #{infoParam.custId}
|
||||
<if test="infoParam.startDateTime != null">
|
||||
and trade_time <![CDATA[ >= ]]> #{infoParam.startDateTime}
|
||||
</if>
|
||||
<if test="infoParam.endDateTime != null">
|
||||
and trade_time <![CDATA[ <= ]]> #{infoParam.endDateTime}
|
||||
</if>
|
||||
<if test="infoParam.tradeTypeList != null and infoParam.tradeTypeList.size()>0 ">
|
||||
and trade_type in
|
||||
<foreach collection="infoParam.tradeTypeList" item="tradeType" separator="," open="(" close=")">
|
||||
#{tradeType}
|
||||
</foreach>
|
||||
</if>
|
||||
<if test="infoParam.payStateList != null and infoParam.payStateList.size()>0 ">
|
||||
and pay_state in
|
||||
<foreach collection="infoParam.payStateList" item="payState" separator="," open="(" close=")">
|
||||
#{payState}
|
||||
</foreach>
|
||||
</if>
|
||||
</where>
|
||||
ORDER BY trade_time DESC
|
||||
</select>
|
||||
|
||||
</mapper>
|
||||
Reference in New Issue