20221221

xiaoyong931011

2022-12-22 6d774fb3fe75aa382947ab373595c59b104a56bf

20221221

 src/main/java/cc/mrbird/febs/common/enumerates/MallMoneyFlowTypeEnum.java

@@ -6,6 +6,7 @@
public enum MallMoneyFlowTypeEnum {

    SYSTEM_CHARGE("系统拨付",100),
    WITHDRAW_INSIDE("转账",11),
    CHARGE("充值",10),
    WITHDRAW("提现",9),
    RETURN_MARKET_STAR("星级保证金返还",8),

 src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallMemberServiceImpl.java

@@ -394,11 +394,34 @@
        }

        walletService.reduceBalance(transferDto.getAmount(), memberId);
        String orderNo = MallUtils.getOrderNum("T");
        this.addMoneyFlow(memberId, transferDto.getAmount().negate(), MoneyFlowTypeEnum.TRANSFER.getValue(), orderNo, null, null, mallMember.getId(), null, FlowTypeEnum.BALANCE.getValue());

        String orderNo = MallUtils.getOrderNum("NZ");
//        this.addMoneyFlow(memberId, transferDto.getAmount().negate(), MoneyFlowTypeEnum.TRANSFER.getValue(), orderNo, null, null, mallMember.getId(), null, FlowTypeEnum.BALANCE.getValue());
        //生成流水
        Long outFlowId = mallMoneyFlowService.addMoneyFlow(
                memberId,
                orderNo,
                transferDto.getAmount().negate(),
                MallMoneyFlowTypeEnum.WITHDRAW_INSIDE.getCode(),
                MallMoneyFlow.STATUS_SUCCESS,
                MallMoneyFlow.IS_RETURN_Y,
                memberId,
                FlowTypeEnum.BALANCE.getValue(),
                MallMoneyFlowTypeEnum.WITHDRAW_INSIDE.getName()
        );
        walletService.addBalance(transferDto.getAmount(), mallMember.getId());
        this.addMoneyFlow(mallMember.getId(), transferDto.getAmount(), MoneyFlowTypeEnum.TRANSFER.getValue(), orderNo, null, null, memberId, null, FlowTypeEnum.BALANCE.getValue());
        //生成流水
        Long inFlowId = mallMoneyFlowService.addMoneyFlow(
                mallMember.getId(),
                orderNo,
                transferDto.getAmount(),
                MallMoneyFlowTypeEnum.WITHDRAW_INSIDE.getCode(),
                MallMoneyFlow.STATUS_SUCCESS,
                MallMoneyFlow.IS_RETURN_Y,
                mallMember.getId(),
                FlowTypeEnum.BALANCE.getValue(),
                MallMoneyFlowTypeEnum.WITHDRAW_INSIDE.getName()
        );
//        this.addMoneyFlow(mallMember.getId(), transferDto.getAmount(), MoneyFlowTypeEnum.TRANSFER.getValue(), orderNo, null, null, memberId, null, FlowTypeEnum.BALANCE.getValue());
    }

    @Override

 src/main/resources/templates/febs/views/modules/mallMember/moneyFlow.html

@@ -66,6 +66,8 @@
                                return '<span>提现</span>'
                            }else if (d.type === 10) {
                                return '<span>充值</span>'
                            }else if (d.type === 11) {
                                return '<span>转账</span>'
                            }else if (d.type === 100) {
                                return '<span>系统拨付</span>'
                            }else{

 src/main/resources/templates/febs/views/modules/mallMember/moneyFlowList.html

@@ -32,6 +32,7 @@
                                                <option value="8">星级保证金返还</option>
                                                <option value="9">提现</option>
                                                <option value="10">充值</option>
                                                <option value="11">转账</option>
                                                <option value="100">系统拨付</option>
                                            </select>
                                        </div>
@@ -136,6 +137,8 @@
                                return '<span>提现</span>'
                            }else if (d.type === 10) {
                                return '<span>充值</span>'
                            }else if (d.type === 11) {
                                return '<span>转账</span>'
                            }else if (d.type === 100) {
                                return '<span>系统拨付</span>'
                            }else{