数据修改

xiaoyong931011

2023-08-11 163ee7c4bd868557fb7d7399feaa03d6d9660526

数据修改

 src/main/java/cc/mrbird/febs/dapp/controller/ApiDappOrderController.java

@@ -89,7 +89,7 @@
    }

    @ApiOperation(value = "支付订单", notes = "支付订单")
    @PostMapping(value = "/payOrder")
    @PostMapping(value = "/payOrder/{id}")
    public FebsResponse payOrder(@PathVariable("id") Long id) {
        dappMemberService.payOrder(id);
        return new FebsResponse().success().message("操作成功");

 src/main/java/cc/mrbird/febs/dapp/enumerate/AccountFlowEnum.java

New file
@@ -0,0 +1,27 @@
package cc.mrbird.febs.dapp.enumerate;

import lombok.Getter;

/**
 * 流水类型
 */
@Getter
public enum AccountFlowEnum {

    //每日获取金额(前端提示记录)
    AMOUNT_RECORD("AMOUNT_RECORD", 3),

    //支付订单
    SCORE("SCORE", 2),
    //赠送积分
    AMOUNT("AMOUNT", 1);

    private String type;

    private int code;

    AccountFlowEnum(String type, int code) {
        this.type = type;
        this.code = code;
    }
}

 src/main/java/cc/mrbird/febs/dapp/mapper/DappAccountMoneyChangeDao.java

@@ -1,6 +1,8 @@
package cc.mrbird.febs.dapp.mapper;

import cc.mrbird.febs.dapp.entity.DappAccountMoneyChangeEntity;
import cc.mrbird.febs.dapp.entity.DappMemberEntity;
import cc.mrbird.febs.dapp.vo.MemberMoneyFlowVo;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -9,4 +11,6 @@
public interface DappAccountMoneyChangeDao extends BaseMapper<DappAccountMoneyChangeEntity> {

    IPage<DappAccountMoneyChangeEntity> selectInPage(@Param("record") DappAccountMoneyChangeEntity record, Page<DappAccountMoneyChangeEntity> page);

    IPage<MemberMoneyFlowVo> selectMemberMoneyFlowInPage(Page<MemberMoneyFlowVo> page, @Param("record") DappMemberEntity dappMemberEntity);
}

 src/main/java/cc/mrbird/febs/dapp/service/impl/DappMemberServiceImpl.java

@@ -69,6 +69,7 @@
    private final MallOrderInfoMapper mallOrderInfoMapper;
    private final MallOrderItemMapper mallOrderItemMapper;
    private final MallAchieveRecordMapper mallAchieveRecordMapper;
    private final DappAccountMoneyChangeDao dappAccountMoneyChangeDao;

    @Override
    @Transactional(rollbackFor = Exception.class)
@@ -879,7 +880,9 @@

    @Override
    public IPage<MemberMoneyFlowVo> memberMoneyFlow(QueryRequest request, DappMemberEntity dappMemberEntity) {
        return null;
        Page<MemberMoneyFlowVo> page = new Page<>(request.getPageNum(), request.getPageSize());
        IPage<MemberMoneyFlowVo> memberMoneyFlowVos = dappAccountMoneyChangeDao.selectMemberMoneyFlowInPage(page, dappMemberEntity);
        return memberMoneyFlowVos;
    }

    public static List<List<String>> partitionList(List<String> originalList, int partitionSize) {

 src/main/java/cc/mrbird/febs/dapp/service/impl/DappSystemServiceImpl.java

@@ -2996,7 +2996,7 @@
                    totalScore,
                    amountMagic.negate(),
                    localTotalAchieve.negate(),
                    FundFlowEnum.REDUCE_SCORE.getCode(),
                    AccountFlowEnum.SCORE.getCode(),
                    null);
            dappAccountMoneyChangeDao.insert(reduceScoreAMC);

@@ -3027,7 +3027,7 @@
                    totalAmount,
                    amountMagic,
                    localTotalAchieve,
                    FundFlowEnum.ADD_AMOUNT_REAL.getCode(),
                    AccountFlowEnum.AMOUNT.getCode(),
                    null);
            dappAccountMoneyChangeDao.insert(addAmountAMC);
            //插入余额流水
@@ -3051,7 +3051,7 @@
                    amountMagic,
                    maxReleaseMember,
                    localTotalAchieve,
                    FundFlowEnum.AMOUNT_RECORD.getCode(),
                    AccountFlowEnum.AMOUNT_RECORD.getCode(),
                    null);
            dappAccountMoneyChangeDao.insert(record);


 src/main/java/cc/mrbird/febs/dapp/vo/MemberMoneyFlowVo.java

@@ -10,6 +10,7 @@
@Data
@ApiModel(value = "MemberMoneyFlowVo", description = "个人流水")
public class MemberMoneyFlowVo {
    private Integer type;
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    private Date createTime;
    //原有积分

 src/main/resources/mapper/dapp/DappAccountMoneyChangeDao.xml

@@ -16,4 +16,11 @@
        order by a.create_time desc
    </select>

    <select id="selectMemberMoneyFlowInPage" resultType="cc.mrbird.febs.dapp.vo.MemberMoneyFlowVo">
        select a.*
        from dapp_account_money_change a
        where a.member_id = #{record.id}
        order by a.create_time desc
    </select>

</mapper>

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

@@ -184,7 +184,7 @@
                    {field: 'inviteId', title: '邀请码', minWidth: 100},
                    {field: 'refererId', title: '上级邀请码', minWidth: 100},
                    {field: 'createTime', title: '创建时间', minWidth: 180},
                    {title: '操作', minWidth: 200 ,toolbar: '#mallmember-option',align:'left', fixed:'right'}
                    {title: '操作', minWidth: 300 ,toolbar: '#mallmember-option',align:'left', fixed:'right'}
                ]]
            });
        }

 src/main/resources/templates/febs/views/dapp/memberMoneyFlow.html

@@ -9,46 +9,12 @@
        </div>
    </div>
</div>

<script type="text/html" id="flow-type">
    {{#
    var type = {
    1: {title: '赠送积分', color: 'orange'},
    2: {title: '支付订单', color: 'green'},
    3: {title: '静态补贴', color: 'blue'},
    4: {title: '预期减少赠送积分', color: 'orange'},
    5: {title: '预期增加余额', color: 'green'},
    6: {title: '直推', color: 'blue'},
    7: {title: '团队静态收益V1', color: 'orange'},
    8: {title: '团队静态收益V2', color: 'green'},
    9: {title: '团队静态收益V3', color: 'blue'},
    10: {title: '团队静态收益V4', color: 'orange'},
    11: {title: '团队静态收益V5', color: 'green'},
    12: {title: '团队静态收益V6', color: 'blue'},
    13: {title: '团队静态收益V7', color: 'orange'},
    14: {title: '共享加速V1', color: 'green'},
    15: {title: '共享加速V2', color: 'blue'},
    16: {title: '共享加速V3', color: 'orange'},
    17: {title: '共享加速V4', color: 'green'},
    18: {title: '共享加速V5', color: 'blue'},
    19: {title: '共享加速V6', color: 'orange'},
    20: {title: '共享加速V7', color: 'green'},
    21: {title: '实际减少赠送积分', color: 'blue'},
    22: {title: '实际增加余额', color: 'orange'},
    23: {title: '卖出资产', color: 'green'},
    24: {title: '卖出资产获得余额', color: 'blue'},
    25: {title: '卖出资产手续费', color: 'orange'},
    26: {title: '每日获取金额(前端提示记录)', color: 'orange'},
    27: {title: '系统拨付余额', color: 'green'},
    28: {title: '系统拨付赠送积分', color: 'blue'},
    29: {title: '系统拨付资产包', color: 'orange'},
    30: {title: '新增业绩', color: 'green'},
    31: {title: '全网分红V1', color: 'green'},
    32: {title: '全网分红V2', color: 'green'},
    33: {title: '全网分红V3', color: 'green'},
    34: {title: '全网分红V4', color: 'green'},
    35: {title: '全网分红V5', color: 'green'},
    36: {title: '全网分红V6', color: 'green'},
    37: {title: '全网分红V7', color: 'green'},
    1: {title: '余额', color: 'orange'},
    2: {title: '赠送积分', color: 'green'},
    }[d.type];
    }}
    <span class="layui-badge febs-bg-{{type.color}}">{{ type.title }}</span>
@@ -80,11 +46,12 @@
            tableIns = febs.table.init({
                elem: $view.find('table'),
                id: 'memberMoneyFlowChild',
                url: ctx + 'admin/goods/orderMoneyFlow?parentId=1',
                url: ctx + 'member/orderMoneyFlow?parentId=1',
                cols: [[
                    {field: 'address', title: '用户', minWidth: 80,align:'center'},
                    {field: 'amount', title: '金额', minWidth: 80,align:'center'},
                    {field: 'preAmount', title: '变化前余额', minWidth: 80,align:'center'},
                    {title: '类型', minWidth: 100,templet: '#flow-type',align:'center'},
                    {field: 'amount', title: '预期获得', minWidth: 80,align:'center'},
                    {field: 'afterAmount', title: '实际获取', minWidth: 80,align:'center'},
                    {field: 'createTime', title: '时间', minWidth: 150,align:'left'}
                ]]
            });