20210928

xiaoyong931011

2021-09-29 81d826f455491f18f64c4032fc07be5c6abdd009

20210928

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

@@ -4,6 +4,7 @@
import cc.mrbird.febs.common.entity.QueryRequest;
import cc.mrbird.febs.common.enumerates.AgentLevelEnum;
import cc.mrbird.febs.common.enumerates.MoneyFlowTypeEnum;
import cc.mrbird.febs.common.utils.MallUtils;
import cc.mrbird.febs.mall.dto.*;
import cc.mrbird.febs.mall.entity.*;
import cc.mrbird.febs.mall.entity.MallNewsInfo;
@@ -382,6 +383,7 @@
    }

    @Override
    @Transactional
    public FebsResponse updateSystemPay(MallSystemPayDto mallSystemPayDto) {
        Long memberId = mallSystemPayDto.getId();
        MallMember mallMember = mallMemberMapper.selectById(memberId);
@@ -398,17 +400,14 @@
        mallMemberWallet.setBalance(mallMemberWallet.getBalance().add(bigDecimal));
        mallMemberWalletMapper.updateBalanceWithId(mallMemberWallet);

//        MallMoneyFlow flow = new MallMoneyFlow();
//        flow.setMemberId(memberId);
//        flow.setAmount(bigDecimal);
//        flow.setType(MoneyFlowTypeEnum.SYSTEM_PAY.getValue());
//        flow.setOrderNo(orderNo);
//        flow.setDescription(description);
//        flow.setRemark(remark);
//        flow.setRtMemberId(rtMemberId);
//        flow.setStatus(status);
//        mallMoneyFlowMapper.insert(flow);
        return null;
        MallMoneyFlow flow = new MallMoneyFlow();
        flow.setMemberId(memberId);
        flow.setAmount(bigDecimal);
        flow.setType(MoneyFlowTypeEnum.SYSTEM_PAY.getValue());
        flow.setOrderNo("SYS"+MallUtils.getOrderNum());
        flow.setStatus(2);
        mallMoneyFlowMapper.insert(flow);
        return new FebsResponse().success();
    }

}

 src/main/resources/mapper/modules/MallMemberMapper.xml

@@ -29,7 +29,8 @@
    </select>

    <select id="getMallMemberInfoById" resultType="cc.mrbird.febs.mall.vo.MallMemberVo">
        SELECT a.name,
        SELECT a.id,
               a.name,
               a.phone,
               a.email,
               a.sex,

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

@@ -25,7 +25,7 @@
        <div class="layui-form-item febs-hide">
            <label class="layui-form-label febs-form-item-require">id：</label>
            <div class="layui-input-block">
                <input type="text" name="id" data-th-value="${systemPay.id}">
                <input type="text" name="id">
            </div>
        </div>
        <div class="layui-form-item">

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

@@ -60,6 +60,10 @@
                                return '<span>提现</span>'
                            }else if (d.type === 7) {
                                return '<span>排名奖励</span>'
                            }else if (d.type === 8) {
                                return '<span>利润分红</span>'
                            }else if (d.type === 9) {
                                return '<span>系统拨付</span>'
                            }else{
                                return ''
                            }

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

@@ -30,6 +30,7 @@
                                                <option value="6">提现</option>
                                                <option value="7">排名奖励</option>
                                                <option value="8">利润分红</option>
                                                <option value="9">系统拨付</option>
                                            </select>
                                        </div>
                                    </div>
@@ -118,6 +119,8 @@
                                return '<span>排名奖励</span>'
                            }else if (d.type === 8) {
                                return '<span>利润分红</span>'
                            }else if (d.type === 9) {
                                return '<span>系统拨付</span>'
                            }else{
                                return ''
                            }