增加活动公告

xiaoyong931011

2023-03-01 2169d81fc8225308a9b8dcce4d1858da29057187

增加活动公告

 src/main/java/cc/mrbird/febs/mall/vo/AdminMallAgentRecordVo.java

@@ -24,6 +24,8 @@
    private Integer orderCnt;
    //金额
    private BigDecimal orderAmount;
    //赠送金额
    private BigDecimal rechargeSendAmount;

    private List<String> cityList;


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

@@ -161,6 +161,13 @@
        a.phone,
        d.name nickname,
        (
            select ifnull(sum(e.amount),0)
            from mall_money_flow e
            where e.flow_type = 1
            and e.type = 20
            and e.member_id = a.member_id
        ) rechargeSendAmount,
        (
            select count(b.id)
            from mall_order_info b
            <where>

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

@@ -192,7 +192,8 @@
                    {field: 'name', title: '合伙人', minWidth: 100,align:'left'},
                    {field: 'phone', title: '电话', minWidth: 100,align:'left'},
                    {field: 'orderCnt', title: '订单数量', minWidth: 100,align:'left', totalRow:true},
                    {field: 'orderAmount', title: '金额', minWidth: 100,align:'left', totalRow:true}
                    {field: 'orderAmount', title: '金额', minWidth: 100,align:'left', totalRow:true},
                    {field: 'rechargeSendAmount', title: '赠送金额', minWidth: 180,align:'left', totalRow:true}
                ]]
            });
        }

 src/main/resources/templates/febs/views/modules/system/agentAmountSet.html

@@ -73,7 +73,6 @@
        form.render();

        function initagentAmountSetValue() {
            alert(agentAmountSet.giveState);
            form.val("agent-amount-set-form", {
                "agentAmountValue": agentAmountSet.agentAmountValue,
                "giveState": agentAmountSet.giveState,