modify

Helius

2021-04-06 30c2ee7f4e4404063f99b7d6b8d05e5d4cd51e21

modify

 zq-erp/src/main/java/com/matrix/system/hive/bean/AchieveNew.java

@@ -80,6 +80,8 @@
     */
    private Double  goodsCash;
    
    private Double cardCash;
	
    /**
     * 赠送消耗
     */
@@ -247,6 +249,14 @@

    private String cateName;

    public Double getCardCash() {
        return cardCash;
    }

    public void setCardCash(Double cardCash) {
        this.cardCash = cardCash;
    }

    public String getCateName() {
        return cateName;
    }

 zq-erp/src/main/resources/mybatis/mapper/hive/AchieveNewDao.xml

@@ -18,6 +18,7 @@
        <result property="freeConsume" column="free_consume" />
        <result property="hisConsume" column="his_consume" />
        <result property="goodsCash" column="goods_cash" />
        <result property="cardCash" column="card_cash" />
        <result property="projNum" column="proj_num" />
        <result property="numberOfPeople" column="number_of_people" />
        <result property="shopName" column="shop_name" />
@@ -66,7 +67,6 @@
        c.vip_name,
        e.name as pro_name,
        b.ZK_TOTAL as zk_total,
        a.goods_cash,
        a.his_consume,
        a.free_consume,
        f.su_name meiliao,
@@ -79,6 +79,8 @@
        h.shop_short_name shop_name,
        a.order_type,
        a.achieveType,
        case when a.pay_method = '现金' then goods_cash end goods_cash,
        case when a.pay_method = '划扣' then goods_cash end card_cash,
        j.pay_method
        from
        achieve_new a

 zq-erp/src/main/resources/templates/views/admin/hive-erp/statistics/daily-list-new.html

@@ -113,6 +113,8 @@
            <el-table-column prop="proName" label="产品" width="200"></el-table-column>
            <el-table-column prop="cateName" label="产品分类"></el-table-column>
            <el-table-column prop="zkTotal" label="订单金额"></el-table-column>
            <el-table-column prop="goodsCash" label="现金"></el-table-column>
            <el-table-column prop="cardCash" label="划扣"></el-table-column>
<!--            <el-table-column prop="goodsCash" label="订单业绩"></el-table-column>-->
            <el-table-column prop="meiliao" label="员工"></el-table-column>
            <el-table-column v-for="(item, index) in customColumns" width="120" :key="index" :label="item.value">

 zq-erp/src/main/resources/templates/views/admin/hive/statistics/daily-list-new.html

@@ -113,6 +113,8 @@
            <el-table-column prop="proName" label="产品" width="200"></el-table-column>
            <el-table-column prop="cateName" label="产品分类"></el-table-column>
            <el-table-column prop="zkTotal" label="订单金额"></el-table-column>
            <el-table-column prop="goodsCash" label="现金"></el-table-column>
            <el-table-column prop="cardCash" label="划扣"></el-table-column>
<!--            <el-table-column prop="goodsCash" label="订单业绩"></el-table-column>-->
            <el-table-column prop="meiliao" label="员工"></el-table-column>
            <el-table-column v-for="(item, index) in customColumns" width="120" :key="index" :label="item.value">