## 提现添加身份证号；调整导出与列表对齐；
This commit is contained in:
parent
bfacb495c4
commit
a1c9f83862
|
|
@ -35,30 +35,23 @@ import java.util.*;
|
|||
|
||||
/**
|
||||
* 会员提现表 前端控制器
|
||||
*
|
||||
* @author hzs
|
||||
* @since 2022-09-06
|
||||
*/
|
||||
@RestController
|
||||
@RequestMapping("/manager/withdraw")
|
||||
public class CuMemberWithdrawController extends BaseController {
|
||||
|
||||
|
||||
@Autowired
|
||||
private UserTokenService userTokenService;
|
||||
@Autowired
|
||||
private ICuMemberBaseService iCuMemberBaseService;
|
||||
@Autowired
|
||||
private ICuMemberWithdrawService iCuMemberWithdrawService;
|
||||
|
||||
@Autowired
|
||||
private ICuMemberBaseService baseService;
|
||||
|
||||
@Autowired
|
||||
ICuMemberWithdrawService cuMemberWithdrawService;
|
||||
|
||||
@Autowired
|
||||
ITransactionCommonService iTransactionCommonService;
|
||||
private ITransactionCommonService iTransactionCommonService;
|
||||
|
||||
@DubboReference
|
||||
IMenuColumnServiceApi menuColumnServiceApi;
|
||||
|
||||
IMenuColumnServiceApi iMenuColumnServiceApi;
|
||||
|
||||
/**
|
||||
* 发起签呈显示
|
||||
|
|
@ -72,11 +65,11 @@ public class CuMemberWithdrawController extends BaseController {
|
|||
if (CollUtil.isEmpty(pkIds)) {
|
||||
return AjaxResult.error(TransactionUtils.getContent(FinanceMsgConstants.SELECT_INITIATING_SIGNATURE_RECORD));
|
||||
}
|
||||
List<CuMemberWithdrawVO> cuMemberWithdrawList = cuMemberWithdrawService.checkWithdrawPetitionByState(pkIds, EApproveStatus.WAIT_SUBMIT.getValue());
|
||||
List<CuMemberWithdrawVO> cuMemberWithdrawList = iCuMemberWithdrawService.checkWithdrawPetitionByState(pkIds, EApproveStatus.WAIT_SUBMIT.getValue());
|
||||
if (CollUtil.isNotEmpty(cuMemberWithdrawList)) {
|
||||
return AjaxResult.error(TransactionUtils.getContent(FinanceMsgConstants.SELECTED_RECORD_DUPLICATE_SIGNATURE_RECORD));
|
||||
}
|
||||
return AjaxResult.success(cuMemberWithdrawService.showMemberWithdrawPetition(pkIds, null));
|
||||
return AjaxResult.success(iCuMemberWithdrawService.showMemberWithdrawPetition(pkIds, null));
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
@ -91,10 +84,9 @@ public class CuMemberWithdrawController extends BaseController {
|
|||
LoginUser loginUser = userTokenService.getLoginUser();
|
||||
cuMemberPetitionVO.setLoginUser(loginUser);
|
||||
cuMemberPetitionVO.setPkCreat(SecurityUtils.getUserId());
|
||||
return AjaxResult.success(cuMemberWithdrawService.confirmWithdrawPetition(cuMemberPetitionVO));
|
||||
return AjaxResult.success(iCuMemberWithdrawService.confirmWithdrawPetition(cuMemberPetitionVO));
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* 查询列表
|
||||
*
|
||||
|
|
@ -116,14 +108,13 @@ public class CuMemberWithdrawController extends BaseController {
|
|||
}
|
||||
}
|
||||
startPage();
|
||||
Object[] objects = cuMemberWithdrawService.selectMemberWithdrawList(cuMemberWithdrawVO);
|
||||
Object[] objects = iCuMemberWithdrawService.selectMemberWithdrawList(cuMemberWithdrawVO);
|
||||
//处理分页
|
||||
TableDataInfo tableDataInfo = getDataTable((List<CuMemberWithdrawExt>) objects[0]);
|
||||
tableDataInfo.setRows((List<CuMemberWithdrawVO>) objects[1]);
|
||||
return tableDataInfo;
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* 充值明细列表导出
|
||||
*
|
||||
|
|
@ -135,18 +126,18 @@ public class CuMemberWithdrawController extends BaseController {
|
|||
public void export(HttpServletResponse response, CuMemberWithdrawVO cuMemberWithdrawVO) {
|
||||
Integer pkCountry = SecurityUtils.getPkCountry();
|
||||
cuMemberWithdrawVO.setPkCountry(pkCountry);
|
||||
List<CuMemberWithdrawVO> cuMemberWithdrawList = (List<CuMemberWithdrawVO>) cuMemberWithdrawService.selectMemberWithdrawList(cuMemberWithdrawVO)[1];
|
||||
List<CuMemberWithdrawVO> cuMemberWithdrawList = (List<CuMemberWithdrawVO>) iCuMemberWithdrawService.selectMemberWithdrawList(cuMemberWithdrawVO)[1];
|
||||
//枚举翻译
|
||||
Map<String, String> transactionMap = iTransactionCommonService.exportEnumTransaction(EApproveStatus.values(), EWithdrawStatus.values());
|
||||
Map<String, String> transactionMap = iTransactionCommonService.exportEnumTransaction(EApproveStatus.values());
|
||||
if (CollUtil.isNotEmpty(cuMemberWithdrawList)) {
|
||||
for (CuMemberWithdrawVO memberWithdraw : cuMemberWithdrawList) {
|
||||
Integer pkAccount = memberWithdraw.getPkAccount();
|
||||
memberWithdraw.setPkAccountVal(baseService.getAccountTranslateFromDataBase(pkAccount));
|
||||
memberWithdraw.setPkAccountVal(iCuMemberBaseService.getAccountTranslateFromDataBase(pkAccount));
|
||||
memberWithdraw.setApproveStateVal(transactionMap.get(EnumsPrefixConstants.APPROVE_STATUS + memberWithdraw.getApproveState()));
|
||||
memberWithdraw.setStatusVal(transactionMap.get(EnumsPrefixConstants.ENU_WITHDRAW_STATUS + memberWithdraw.getStatus()));
|
||||
memberWithdraw.setStatusVal(EWithdrawStatus.getLabelByValue(memberWithdraw.getStatus()));
|
||||
}
|
||||
}
|
||||
ExcelUtil<CuMemberWithdrawVO> util = new ExcelUtil<>(CuMemberWithdrawVO.class, menuColumnServiceApi.queryMenuColumn("CashDetails", SecurityUtils.getUserId()).getData());
|
||||
ExcelUtil<CuMemberWithdrawVO> util = new ExcelUtil<>(CuMemberWithdrawVO.class, iMenuColumnServiceApi.queryMenuColumn("CashDetails", SecurityUtils.getUserId()).getData());
|
||||
util.exportExcel(response, cuMemberWithdrawList, TransactionUtils.getContent(FinanceMsgConstants.WITHDRAWAL_DETAILS_EXPORT));
|
||||
}
|
||||
|
||||
|
|
@ -160,11 +151,10 @@ public class CuMemberWithdrawController extends BaseController {
|
|||
@GetMapping("/details")
|
||||
public AjaxResult findWithdrawDetails(Long pkId) {
|
||||
Assert.notNull(pkId, TransactionUtils.getContent(FinanceMsgConstants.SELECT_WITHDRAWAL_RECORD));
|
||||
CuMemberWithdrawVO cuMemberRechargeDetailVO = cuMemberWithdrawService.queryCuMemberWithdrawDetail(pkId);
|
||||
CuMemberWithdrawVO cuMemberRechargeDetailVO = iCuMemberWithdrawService.queryCuMemberWithdrawDetail(pkId);
|
||||
return AjaxResult.success(cuMemberRechargeDetailVO);
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* 打款
|
||||
*
|
||||
|
|
@ -176,7 +166,7 @@ public class CuMemberWithdrawController extends BaseController {
|
|||
public AjaxResult withdrawPayment(@RequestBody CuMemberWithdrawVO memberWithdrawVO) {
|
||||
List<Long> pkIds = memberWithdrawVO.getPkIds();
|
||||
Assert.notNull(pkIds, TransactionUtils.getContent(FinanceMsgConstants.SELECT_PAID_RECORD));
|
||||
List<CuMemberWithdraw> withdrawApproveStateByIds = cuMemberWithdrawService.getWithdrawApproveStateByIds(pkIds, EApproveStatus.FINISH.getValue());
|
||||
List<CuMemberWithdraw> withdrawApproveStateByIds = iCuMemberWithdrawService.getWithdrawApproveStateByIds(pkIds, EApproveStatus.FINISH.getValue());
|
||||
if (CollUtil.isNotEmpty(withdrawApproveStateByIds)) {
|
||||
return AjaxResult.error(TransactionUtils.getContent(FinanceMsgConstants.DATA_UNAPPROVED_DATA));
|
||||
}
|
||||
|
|
@ -186,10 +176,9 @@ public class CuMemberWithdrawController extends BaseController {
|
|||
memberWithdrawVO.setPayer(pkMember);
|
||||
memberWithdrawVO.setPaymentTime(new Date());
|
||||
memberWithdrawVO.setPkModified(pkMember);
|
||||
return toAjax(cuMemberWithdrawService.withdrawPaymentByPkId(memberWithdrawVO));
|
||||
return toAjax(iCuMemberWithdrawService.withdrawPaymentByPkId(memberWithdrawVO));
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* 打款充正
|
||||
*
|
||||
|
|
@ -205,13 +194,13 @@ public class CuMemberWithdrawController extends BaseController {
|
|||
memberWithdrawVO.setPayer(SecurityUtils.getUserId());
|
||||
memberWithdrawVO.setPayerRemarks(memberWithdrawVO.getPayerRemarks());
|
||||
memberWithdrawVO.setPaymentTime(new Date());
|
||||
return toAjax(cuMemberWithdrawService.withdrawPaymentPositiveByPkId(memberWithdrawVO));
|
||||
return toAjax(iCuMemberWithdrawService.withdrawPaymentPositiveByPkId(memberWithdrawVO));
|
||||
}
|
||||
|
||||
@Log(module = EOperationModule.WITHDRAWAL_DETAIL, business = EOperationBusiness.WITHDRAWAL_DETAIL, method = EOperationMethod.REJECT)
|
||||
@PostMapping("/reject")
|
||||
public AjaxResult reject(@RequestBody CuMemberWithdrawRejectParam param) {
|
||||
cuMemberWithdrawService.withdrawReject(param);
|
||||
iCuMemberWithdrawService.withdrawReject(param);
|
||||
return AjaxResult.success();
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -23,8 +23,6 @@ public interface CuMemberWithdrawMapper extends BaseMapper<CuMemberWithdraw> {
|
|||
List<CuMemberWithdraw> getWithdrawTimes(@Param("pkMember") Long pkMember);
|
||||
|
||||
|
||||
List<CuMemberWithdrawExt> getWithdrawTimesByPkCountry(@Param("pkCountry") Integer pkCountry);
|
||||
|
||||
/**
|
||||
* 按周期查询个税
|
||||
*
|
||||
|
|
|
|||
|
|
@ -63,8 +63,6 @@ public class CuMemberWithdrawServiceImpl extends ServiceImpl<CuMemberWithdrawMap
|
|||
private ICuMemberAccountService iCuMemberAccountService;
|
||||
@Autowired
|
||||
private ICuMemberBaseService iCuMemberBaseService;
|
||||
@Autowired
|
||||
private ICuMemberTradeService cuMemberTradeService;
|
||||
|
||||
@DubboReference
|
||||
IWithdrawalTaxServiceApi iWithdrawalTaxServiceApi;
|
||||
|
|
@ -200,6 +198,7 @@ public class CuMemberWithdrawServiceImpl extends ServiceImpl<CuMemberWithdrawMap
|
|||
cuMemberWithdrawVO = new CuMemberWithdrawVO();
|
||||
BeanUtils.copyProperties(cuMemberWithdrawExt, cuMemberWithdrawVO);
|
||||
this.setPublicParam(cuMemberWithdrawVO, cuMemberWithdrawExt);
|
||||
cuMemberWithdrawVO.setStatusVal(EWithdrawStatus.getLabelByValue(cuMemberWithdrawVO.getStatus()));
|
||||
cuMemberWithdrawVoS.add(cuMemberWithdrawVO);
|
||||
}
|
||||
//总计
|
||||
|
|
@ -209,6 +208,15 @@ public class CuMemberWithdrawServiceImpl extends ServiceImpl<CuMemberWithdrawMap
|
|||
return new Object[]{cuMemberWithdrawExts, cuMemberWithdrawVoS};
|
||||
}
|
||||
|
||||
@Override
|
||||
public CuMemberWithdrawVO queryCuMemberWithdrawDetail(Long pkId) {
|
||||
CuMemberWithdrawVO memberRechargeDetailVo = new CuMemberWithdrawVO();
|
||||
CuMemberWithdrawExt memberWithdrawExt = baseMapper.queryCuMemberWithdrawDetail(pkId);
|
||||
BeanUtils.copyProperties(memberWithdrawExt, memberRechargeDetailVo);
|
||||
setPublicParam(memberRechargeDetailVo, memberWithdrawExt);
|
||||
return memberRechargeDetailVo;
|
||||
}
|
||||
|
||||
/**
|
||||
* 页面显示公用参数
|
||||
*
|
||||
|
|
@ -266,15 +274,6 @@ public class CuMemberWithdrawServiceImpl extends ServiceImpl<CuMemberWithdrawMap
|
|||
cuMemberWithdrawVO.setPkAccount(iCuMemberBaseService.translateAccountValue(pkAccount));
|
||||
}
|
||||
|
||||
@Override
|
||||
public CuMemberWithdrawVO queryCuMemberWithdrawDetail(Long pkId) {
|
||||
CuMemberWithdrawVO memberRechargeDetailVo = new CuMemberWithdrawVO();
|
||||
CuMemberWithdrawExt memberWithdrawExt = baseMapper.queryCuMemberWithdrawDetail(pkId);
|
||||
BeanUtils.copyProperties(memberWithdrawExt, memberRechargeDetailVo);
|
||||
setPublicParam(memberRechargeDetailVo, memberWithdrawExt);
|
||||
return memberRechargeDetailVo;
|
||||
}
|
||||
|
||||
@Override
|
||||
public Integer withdrawPaymentByPkId(CuMemberWithdrawVO memberWithdrawVO) {
|
||||
CuMemberWithdrawExt cuMemberWithdraw = new CuMemberWithdrawExt();
|
||||
|
|
@ -657,7 +656,7 @@ public class CuMemberWithdrawServiceImpl extends ServiceImpl<CuMemberWithdrawMap
|
|||
.tradeCode(cuMemberWithdraw.getWithdrawCode()).pkCountry(pkCountry)
|
||||
.tradeType(EApprovalBusiness.WITHDRAWAL.getValue())
|
||||
.pkCreator(SecurityUtils.getUserId()).build();
|
||||
cuMemberTradeService.businessCommissionReject(businessCommissionDTO);
|
||||
iCuMemberTradeService.businessCommissionReject(businessCommissionDTO);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -13,15 +13,8 @@ import java.util.Date;
|
|||
import java.util.List;
|
||||
|
||||
/**
|
||||
* <p>
|
||||
* 会员提现表
|
||||
* </p>
|
||||
*
|
||||
* @author hzs
|
||||
* @since 2022-09-06
|
||||
*/
|
||||
|
||||
|
||||
@EqualsAndHashCode(callSuper = true)
|
||||
@Data
|
||||
@Builder
|
||||
|
|
@ -203,7 +196,6 @@ public class CuMemberWithdrawVO extends CuMemberBaseVO {
|
|||
/**
|
||||
* 状态（0=未打款，1=已打款，2=已充正，3=撤消）
|
||||
*/
|
||||
@Transaction(transactionKey = EnumsPrefixConstants.ENU_WITHDRAW_STATUS)
|
||||
private Integer status;
|
||||
|
||||
@Excel(name = "打款状态")
|
||||
|
|
@ -293,7 +285,7 @@ public class CuMemberWithdrawVO extends CuMemberBaseVO {
|
|||
/**
|
||||
* 查询状态
|
||||
*/
|
||||
private Integer queryStatus;
|
||||
private Integer queryStatus;
|
||||
|
||||
/**
|
||||
* 会员编号集合
|
||||
|
|
|
|||
|
|
@ -34,33 +34,20 @@
|
|||
<result column="BATCH" property="batch"/>
|
||||
</resultMap>
|
||||
|
||||
<!-- 通用查询结果列 -->
|
||||
<sql id="Base_Column_List">
|
||||
DEL_FLAG
|
||||
,
|
||||
PK_COUNTRY,
|
||||
PK_CREATOR,
|
||||
CREATION_TIME,
|
||||
PK_MODIFIED,
|
||||
MODIFIED_TIME,
|
||||
PK_ID, PK_MEMBER, WITHDRAW_CODE, PK_ACCOUNT, PK_BANK, PK_RATE, CASH_AMOUNT, SERVICE_CHARGE, INCOME_TAX,
|
||||
ISSUED_AMOUNT,APPROVE_STATE, PAYMENT_TIME, PAYER, REMARKS, APPROVER, APPROVE_TIME, PK_ROLE, ROLE_NAME,STATUS,PAYER_REMARKS,APPROVE_REMARKS
|
||||
</sql>
|
||||
|
||||
<sql id="select_base">
|
||||
SELECT r.*,
|
||||
m.member_code memberCode,
|
||||
m.member_name memberName,
|
||||
bb.bank_name bankName,
|
||||
b.sub_bank_name subBankName,
|
||||
b.card_number cardNumber,
|
||||
b.account_name accountName,
|
||||
b.id_card idCard,
|
||||
m.member_code memberCode,
|
||||
m.member_name memberName,
|
||||
bb.bank_name bankName,
|
||||
b.sub_bank_name subBankName,
|
||||
b.card_number cardNumber,
|
||||
b.account_name accountName,
|
||||
nvl(m.id_card, b.id_card) idCard,
|
||||
b.phone,
|
||||
b.pk_id pkBdBank,
|
||||
u.user_name paymentName,
|
||||
su.user_name approveName,
|
||||
ver.VERTEX_NAME vertexName
|
||||
b.pk_id pkBdBank,
|
||||
u.user_name paymentName,
|
||||
su.user_name approveName,
|
||||
ver.VERTEX_NAME vertexName
|
||||
FROM cu_member_withdraw r
|
||||
LEFT JOIN cu_member_bank b
|
||||
ON r.pk_Bank = b.pk_id
|
||||
|
|
@ -146,7 +133,6 @@
|
|||
<if test="withdrawCode != null and withdrawCode != ''">
|
||||
and r.WITHDRAW_CODE = #{withdrawCode}
|
||||
</if>
|
||||
|
||||
<if test="status != null">
|
||||
and r.status = #{status}
|
||||
</if>
|
||||
|
|
@ -197,17 +183,6 @@
|
|||
AND STATUS = 0
|
||||
</select>
|
||||
|
||||
|
||||
<select id="getWithdrawTimesByPkCountry" resultType="com.hzs.common.domain.member.account.CuMemberWithdrawExt">
|
||||
select w.pk_member, count(1) times
|
||||
from cu_member_withdraw w
|
||||
where w.del_flag = 0
|
||||
and w.pk_country = #{pkCountry}
|
||||
AND (APPROVE_STATE = 1 OR APPROVE_STATE = 2 OR APPROVE_STATE = 3)
|
||||
and w.status != 3
|
||||
group by w.pk_member
|
||||
</select>
|
||||
|
||||
<update id="updateWithdrawByCode" parameterType="com.hzs.common.domain.member.account.CuMemberWithdraw">
|
||||
update cu_member_withdraw
|
||||
<set>
|
||||
|
|
|
|||
|
|
@ -2361,7 +2361,7 @@ public class EnumsController extends BaseController {
|
|||
public AjaxResult getPaymentStatus() {
|
||||
List<EnumEntity> enumEntityList = new ArrayList<>();
|
||||
for (EWithdrawStatus value : EWithdrawStatus.values()) {
|
||||
enumEntityList.add(new EnumEntity(value.getValue(), value.getLabel(), EnumsPrefixConstants.ENU_WITHDRAW_STATUS));
|
||||
enumEntityList.add(new EnumEntity(value.getValue(), value.getLabel()));
|
||||
}
|
||||
return AjaxResult.success(enumEntityList);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -514,10 +514,6 @@ public class EnumsInitController {
|
|||
initList.add(this.createData(value.getKey(), value.getLabel()));
|
||||
}
|
||||
|
||||
for (EWithdrawStatus value : EWithdrawStatus.values()) {
|
||||
initList.add(this.createData(value.getKey(), value.getLabel()));
|
||||
}
|
||||
|
||||
/**
|
||||
* 站内信类型
|
||||
*/
|
||||
|
|
|
|||
|
|
@ -595,11 +595,6 @@ public class EnumsPrefixConstants {
|
|||
*/
|
||||
public static final String CYCLE = "ENU_CYCLE_";
|
||||
|
||||
/**
|
||||
* 提现状态
|
||||
*/
|
||||
public static final String ENU_WITHDRAW_STATUS = "ENU_WITHDRAW_S_";
|
||||
|
||||
/**
|
||||
* 服务类型枚举
|
||||
*/
|
||||
|
|
|
|||
|
|
@ -1,13 +1,10 @@
|
|||
package com.hzs.common.core.enums;
|
||||
|
||||
import com.hzs.common.core.constant.EnumsPrefixConstants;
|
||||
import lombok.AllArgsConstructor;
|
||||
import lombok.Getter;
|
||||
|
||||
/**
|
||||
* 提现状态枚举
|
||||
*
|
||||
* @author: hzs
|
||||
*/
|
||||
@AllArgsConstructor
|
||||
@Getter
|
||||
|
|
@ -16,20 +13,20 @@ public enum EWithdrawStatus {
|
|||
/**
|
||||
* 正常
|
||||
*/
|
||||
NORMAL(0, "未打款", 0, EnumsPrefixConstants.ENU_WITHDRAW_STATUS + "0"),
|
||||
NORMAL(0, "未打款", 0),
|
||||
|
||||
/**
|
||||
* 打款
|
||||
*/
|
||||
PAYMENT(1, "已打款", 0, EnumsPrefixConstants.ENU_WITHDRAW_STATUS + "1"),
|
||||
PAYMENT(1, "已打款", 0),
|
||||
/**
|
||||
* 充正
|
||||
*/
|
||||
CHARGING(2, "已充正", 0, EnumsPrefixConstants.ENU_WITHDRAW_STATUS + "2"),
|
||||
CHARGING(2, "已充正", 0),
|
||||
/**
|
||||
* 取消
|
||||
*/
|
||||
CANCEL(3, "取消", 0, EnumsPrefixConstants.ENU_WITHDRAW_STATUS + "3"),
|
||||
CANCEL(3, "取消", 0),
|
||||
;
|
||||
|
||||
/**
|
||||
|
|
@ -44,9 +41,18 @@ public enum EWithdrawStatus {
|
|||
* 是否启用（0=是,1=否） -- 来源EYesNo
|
||||
*/
|
||||
private final int enable;
|
||||
/**
|
||||
* 国际化翻译key值
|
||||
*/
|
||||
private final String key;
|
||||
|
||||
|
||||
public static String getLabelByValue(Integer value) {
|
||||
if (null == value) {
|
||||
return "";
|
||||
}
|
||||
for (EWithdrawStatus enums : EWithdrawStatus.values()) {
|
||||
if (enums.getValue() == value) {
|
||||
return enums.getLabel();
|
||||
}
|
||||
}
|
||||
return "";
|
||||
}
|
||||
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in New Issue