20200709 代码提交

xiaoyong931011

2020-07-09 f5f828b22c5d9ae19991a5e14a5090df63e41f81

20200709  代码提交

 src/main/java/com/xcong/excoin/modules/member/service/impl/MemberServiceImpl.java

@@ -411,6 +411,7 @@
        
        MemberAccountMoneyChangeEntity memberAccountMoneyChangeEntity = selectByMap2.get(0);
        memberAccountMoneyChangeEntity.setStatus(MemberAccountMoneyChangeEntity.STATUS_SUCCESS_INTEGER);
        memberAccountMoneyChangeEntity.setAmount(selectById.getAmount().negate());
        memberAccountMoneyChangeMapper.updateById(memberAccountMoneyChangeEntity);
        
        selectById.setStatus(MemberCoinWithdrawEntity.IS_STATUS_Y);
@@ -455,7 +456,7 @@
        
        MemberAccountMoneyChangeEntity memberAccountMoneyChangeEntity = selectByMap2.get(0);
        memberAccountMoneyChangeEntity.setStatus(MemberAccountMoneyChangeEntity.STATUS_FAIL_INTEGER);
        memberAccountMoneyChangeEntity.setAmount(selectById.getAmount().negate());
        memberAccountMoneyChangeEntity.setAmount(selectById.getAmount());
        memberAccountMoneyChangeMapper.updateById(memberAccountMoneyChangeEntity);
        
        selectById.setStatus(MemberCoinWithdrawEntity.IS_STATUS_N);

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

@@ -15,7 +15,7 @@
                <if test="record.isInside!=null and record.isInside!=''">

                    and s.is_inside= #{record.isInside}

                </if>

                <if test="record.status!=null and record.status!='' and record.status!='0'">

                <if test="record.status!=null and record.status!=''">

                    and s.status= #{record.status}

                </if>

            </if>


 src/main/resources/templates/febs/views/modules/member/member.html

@@ -168,7 +168,8 @@
                    {title: '操作', 
                        templet: function (d) {
                            if (d.certifyStatus === 1) {
                                return '<a lay-event="edit" shiro:hasPermission="user:update">确认</a>'
                                return '<a lay-event="edit" shiro:hasPermission="user:update">审核认证</a>'
                                +'<i class="layui-icon febs-edit-area febs-blue">&#xe7a4;</i>'
                                +'<a lay-event="addCoin" shiro:hasPermission="user:update">拨币</a>'
                            }else if(d.certifyStatus === 2){
                                return '<a lay-event="see" shiro:hasPermission="user:update">'

 src/main/resources/templates/febs/views/modules/member/withdrawCoin.html

@@ -16,7 +16,7 @@
                                        <label class="layui-form-label layui-form-label-sm">状态</label>

                                        <div class="layui-input-inline">

                                            <select name="statusOption">

                                                 <option value=""></option>

                                                 <option value="0"></option>

                                                 <option value="1">等待审核</option>

                                                 <option value="2">同意</option>

                                                 <option value="3">拒绝</option>