KKSU
2023-12-13 81431a597324933b0cee2da494b5c947a82d8055
微信小程序配置
5 files modified
68 ■■■■ changed files
src/main/java/cc/mrbird/febs/common/enumerates/FlowTypeNewEnum.java 4 ●●●● patch | view | raw | blame | history
src/main/java/cc/mrbird/febs/common/enumerates/MoneyFlowTypeNewEnum.java 18 ●●●● patch | view | raw | blame | history
src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallMemberServiceImpl.java 2 ●●● patch | view | raw | blame | history
src/main/resources/templates/febs/views/modules/mallMember/mallMemberList.html 6 ●●●● patch | view | raw | blame | history
src/main/resources/templates/febs/views/modules/mallMember/moneyFlowList.html 38 ●●●● patch | view | raw | blame | history
src/main/java/cc/mrbird/febs/common/enumerates/FlowTypeNewEnum.java
@@ -6,8 +6,8 @@
public enum FlowTypeNewEnum {
    NFT(3,"NFT"),
    TOKEN(2,"令牌"),
    FCM_COIN(1,"FCM代币")//
    TOKEN(2,"门票"),
    FCM_COIN(1,"GFA代币")//
    ;
    private int value;
src/main/java/cc/mrbird/febs/common/enumerates/MoneyFlowTypeNewEnum.java
@@ -11,19 +11,19 @@
@Getter
public enum MoneyFlowTypeNewEnum {
    SYSTEM_PEY(15,"系统拨付"),
    NFT_OUT_FEE_FCM(14,"NFT提现FCM手续费"),
    TOKEN_BUY_FROZEN_RETURN(13,"预约令牌"),
    NFT_OUT_FEE_FCM(14,"NFT提现GFA手续费"),
    TOKEN_BUY_FROZEN_RETURN(13,"预约门票"),
    PAY(12,"支付"),
    NFT_OUT_FEE(11,"NFT提现手续费"),
    NFT_OUT(10,"NFT提现"),
    NFT_IN(9,"FCM动态兑换"),
    NFT_IN(9,"GFA动态兑换"),
    FCM_OUT_FEE(8,"动态兑换手续费"),
    FCM_OUT(7,"FCM动态兑换"),
    TOKEN_BUY_FROZEN(6,"预约冻结令牌"),
    TOKEN_INSIDE_IN(5,"令牌转入"),
    TOKEN_INSIDE_OUT(4,"令牌转出"),
    FCM_INSIDE_IN(3,"代币转入"),
    FCM_INSIDE_OUT(2,"代币转出"),
    FCM_OUT(7,"GFA动态兑换"),
    TOKEN_BUY_FROZEN(6,"预约冻结门票"),
    TOKEN_INSIDE_IN(5,"门票转入"),
    TOKEN_INSIDE_OUT(4,"门票转出"),
    FCM_INSIDE_IN(3,"GFA代币转入"),
    FCM_INSIDE_OUT(2,"GFA代币转出"),
    UNFREEZE_USER(1,"解除冻结")//解除冻结
    ;
src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallMemberServiceImpl.java
@@ -468,7 +468,7 @@
        }
        if(2 == type){
            if (amount.compareTo(mallMemberAmountLogin.getTokenAva()) > 0) {
                throw new FebsException("令牌不足");
                throw new FebsException("门票不足");
            }
            mallMemberAmountLogin.setTokenAva(mallMemberAmountLogin.getTokenAva().subtract(amount));
            mallMemberAmountMapper.updateTokenAvaById(mallMemberAmountLogin);
src/main/resources/templates/febs/views/modules/mallMember/mallMemberList.html
@@ -323,8 +323,8 @@
                    {field: 'frozenNft', title: '冻结NFT', minWidth: 120,align:'left'},
                    {field: 'fcmCntAva', title: '代币可用', minWidth: 120,align:'left'},
                    {field: 'fcmCntFrozen', title: '代币冻结', minWidth: 120,align:'left'},
                    {field: 'tokenAva', title: '令牌可用', minWidth: 120,align:'left'},
                    {field: 'tokenFrozen', title: '令牌冻结', minWidth: 120,align:'left'},
                    {field: 'tokenAva', title: '门票可用', minWidth: 120,align:'left'},
                    {field: 'tokenFrozen', title: '门票冻结', minWidth: 120,align:'left'},
                    // {field: 'levelName', title: '会员类型', minWidth: 100,align:'left'},
                    // {field: 'storeMaster', title: '线下服务中心', templet:'#switchStoreMaster', minWidth: 120,align:'left',hide:toolbarMallmember},
                    // {field: 'director', title: '代理商', templet:'#switchDirector', minWidth: 120,align:'left' ,hide:toolbarMallmember},
@@ -467,7 +467,7 @@
                    febs.alert.warn('请选择一个用户');
                    return;
                }
                systemPay("令牌可用", checkData[0].id, 3);
                systemPay("门票可用", checkData[0].id, 3);
            }
            if (layEvent === 'agentLevel') {
src/main/resources/templates/febs/views/modules/mallMember/moneyFlowList.html
@@ -21,17 +21,17 @@
                                                <option value="1">解除冻结</option>
                                                <option value="2">代币转出</option>
                                                <option value="3">代币转入</option>
                                                <option value="4">令牌转出</option>
                                                <option value="5">令牌转入</option>
                                                <option value="6">预约冻结令牌</option>
                                                <option value="7">FCM动态兑换</option>
                                                <option value="4">门票转出</option>
                                                <option value="5">门票转入</option>
                                                <option value="6">预约冻结门票</option>
                                                <option value="7">GFA动态兑换</option>
                                                <option value="8">动态兑换手续费</option>
                                                <option value="9">FCM动态兑换</option>
                                                <option value="9">GFA动态兑换</option>
                                                <option value="10">NFT提现</option>
                                                <option value="11">NFT提现手续费</option>
                                                <option value="12">支付</option>
                                                <option value="13">预约令牌</option>
                                                <option value="14">NFT提现FCM手续费</option>
                                                <option value="13">预约门票</option>
                                                <option value="14">NFT提现GFA手续费</option>
                                                <option value="15">系统拨付</option>
                                            </select>
                                        </div>
@@ -42,8 +42,8 @@
                                            <select name="flowType">
                                                <option value="">请选择</option>
                                                <option value="3">NFT</option>
                                                <option value="2">令牌</option>
                                                <option value="1">FCM代币</option>
                                                <option value="2">门票</option>
                                                <option value="1">GFA代币</option>
                                            </select>
                                        </div>
                                    </div>
@@ -68,11 +68,11 @@
<script type="text/html" id="isFlowType">
    {{# if(d.flowType === 1) { }}
    <span class="layui-badge febs-bg-red">FCM代币</span>
    <span class="layui-badge febs-bg-red">GFA代币</span>
    {{# } else if(d.flowType === 2) { }}
    <span class="layui-badge febs-bg-blue">令牌</span>
    <span class="layui-badge febs-bg-blue">门票</span>
    {{# } else if(d.flowType === 3) { }}
    <span class="layui-badge febs-bg-orange">FCM代币</span>
    <span class="layui-badge febs-bg-orange">NFT</span>
    {{# } else { }}
    {{# } }}
</script>
@@ -85,17 +85,17 @@
    {{# } else if(d.type === 3) { }}
    <span class="layui-badge febs-bg-orange">代币转入</span>
    {{# } else if(d.type === 4) { }}
    <span class="layui-badge febs-bg-orange">令牌转出</span>
    <span class="layui-badge febs-bg-orange">门票转出</span>
    {{# } else if(d.type === 5) { }}
    <span class="layui-badge febs-bg-orange">令牌转入</span>
    <span class="layui-badge febs-bg-orange">门票转入</span>
    {{# } else if(d.type === 6) { }}
    <span class="layui-badge febs-bg-orange">预约冻结令牌</span>
    <span class="layui-badge febs-bg-orange">预约冻结门票</span>
    {{# } else if(d.type === 7) { }}
    <span class="layui-badge febs-bg-orange">FCM动态兑换</span>
    <span class="layui-badge febs-bg-orange">GFA动态兑换</span>
    {{# } else if(d.type === 8) { }}
    <span class="layui-badge febs-bg-orange">动态兑换手续费</span>
    {{# } else if(d.type === 9) { }}
    <span class="layui-badge febs-bg-orange">FCM动态兑换</span>
    <span class="layui-badge febs-bg-orange">GFA动态兑换</span>
    {{# } else if(d.type === 10) { }}
    <span class="layui-badge febs-bg-orange">NFT提现</span>
    {{# } else if(d.type === 11) { }}
@@ -103,9 +103,9 @@
    {{# } else if(d.type === 12) { }}
    <span class="layui-badge febs-bg-orange">支付</span>
    {{# } else if(d.type === 13) { }}
    <span class="layui-badge febs-bg-orange">预约令牌</span>
    <span class="layui-badge febs-bg-orange">预约门票</span>
    {{# } else if(d.type === 14) { }}
    <span class="layui-badge febs-bg-orange">NFT提现FCM手续费</span>
    <span class="layui-badge febs-bg-orange">NFT提现GFA手续费</span>
    {{# } else if(d.type === 15) { }}
    <span class="layui-badge febs-bg-orange">系统拨付</span>
    {{# } else { }}