Merge branch 'score_shop' into api_score_meger

jyy

2021-07-12 9b1860f14489c81a9dd581d29e83289a5e114ace

Merge branch 'score_shop' into api_score_meger

# Conflicts:
#	zq-erp/pom.xml
#	zq-erp/src/main/resources/config/mdprd/application.properties

 zq-erp/src/main/java/com/matrix/core/tools/MdcUtil.java

@@ -13,12 +13,12 @@
    private static final String TR_KEY = "Tr";

    public static void setRequestId() {
        MDC.clear();
        MDC.remove(TR_KEY);
        MDC.put(TR_KEY, "TR = " + StringUtils.getRandomString(16) + "");
    }

    public static void clearRequestId() {
        MDC.clear();
        MDC.remove(TR_KEY);
    }

    public static String getMdc() {

 zq-erp/src/main/resources/templates/views/admin/hive-erp/order/projService-list.html

@@ -79,6 +79,7 @@
        <div id="option-bar">
            <button matrix:btn="mdfwd-exportExcel"   onclick="exportExcel()" type="button" class="btn btn-info btn-sm"><i class="fa fa-download" ></i> 导出</button>
            <button  class="btn btn-info btn-sm" onClick="openEdit2()" title=""><i class="fa fa-lg fa-eye"></i> 查看详情</button>
            <button   matrix:btn="mdfwd-del"  onClick="removeOrder()" type="button" class="btn btn-danger btn-sm"><i class="fa fa-trash" ></i> 删除</button>
        </div>
        <!-- 数据表格部分 -->
        <table id="mgrid">
@@ -135,6 +136,24 @@
        });
    });

    function removeOrder(id) {
        var id=myGrid.getSelectItemId();
        layer.confirm('确定取消此订单？', {
            btn: ['确认', '取消'] //可以无限个按钮
        }, function(index, layero){
            $.post(basePath+'/admin/projService/cancelOrder?id='+id, {}, function(data){
                parent.layer.msg(data.info,{icon: 1});
                layer.closeAll();
                myGrid.serchData();
            });
            //按钮【按钮一】的回调
        }, function(index){
            // alert("2 = "+index);
            //按钮【按钮二】的回调
        });

    }

    /**
     超时
     **/

 zq-erp/src/main/resources/templates/views/admin/hive-erp/order/serviceOrderDetail.html

@@ -48,7 +48,7 @@
            </el-row>
            <el-row class="order-info" type="flex" justify="space-around"  style="height: 150px; padding: 30px 30px;">
                <el-col :span="5">
                    <p>会员姓名：{{serviceOrderInfo.vipInfo.staffName}}</p>
                    <p>会员姓名：{{serviceOrderInfo.vipInfo.vipName}}</p>
                    <p>会员电话：{{serviceOrderInfo.vipInfo.phone}}</p>
                </el-col>
                <el-col :span="5">

 zq-erp/src/main/resources/templates/views/admin/hive-erp/order/sysOrder-list.html

@@ -84,6 +84,7 @@
        <div id="option-bar">
            <button   class="btn btn-info btn-sm mr-5" onClick="openLook()"  ><i class="fa fa-eye fa-trash-o"></i> 查看详情</button>
            <button matrix:btn="mddd-exportExcel"  onclick="exportExcel()" type="button" class="btn btn-info btn-sm"><i class="fa fa-download" ></i> 导出</button>
            <button  matrix:btn="mddd-del"  class="btn btn-danger btn-sm mr-5" onClick="cancelOrder()"  ><i class="fa fa-trash-o fa-fw"></i> 取消</button>

        </div>
        <!-- 数据表格部分 -->
@@ -142,7 +143,25 @@
        });

    });

    function cancelOrder() {
        var id=myGrid.getSelectItemId();
        layer.confirm('确定取消此订单？', {
                btn: ['确认', '取消'] //可以无限个按钮
            }, function(index, layero){
                $.post(basePath+'/admin/order/cancelOrder?id='+id+'&del=0', {}, function(data){
                    if (data.status == '200') {
                        parent.layer.msg(data.info,{icon: 1});
                    } else {
                        parent.layer.msg(data.info,{icon: 2});
                    }
                    layer.closeAll();
                    myGrid.serchData();
                });
            },
            function(index){
                //按钮【按钮二】的回调
            });
    }

    /**
     * 跳转消费流水详情页面