新增取消订单功能

shop/src/main/resources/template/js/keepFitOrder/allKeepFitOrderList.js

@@ -53,12 +53,16 @@ layui.config({
             { field: 'servicePrice', title: '服务费', width: 100, align: "left", rowspan: '2'},
             { title: '下单地址', align: 'center', colspan: '2'},
             { field: 'state', title: '支付状态', width: 150, align: "center", rowspan: '2', templet: function(d){
-                if(d.state == 1){
-                    return "<span class='state-down'>待支付</span>";
-                }else if(d.state == 2){
-                    return "<span class='state-up'>已支付(待核销)</span>";
-                }else if(d.state == 3){
-                    return "<span class='state-up'>已支付(已核销)</span>";
+                if(d.cancleState == 1){
+                    if(d.state == 1){
+                        return "<span class='state-down'>待支付</span>";
+                    }else if(d.state == 2){
+                        return "<span class='state-up'>已支付(待核销)</span>";
+                    }else if(d.state == 3){
+                        return "<span class='state-up'>已支付(已核销)</span>";
+                    }
+                }else{
+                    return '已取消';
                 }
             }},
             { field: 'payPrice', title: '实付金额', width: 100, align: "left", rowspan: '2' },

shop/src/main/resources/template/js/keepFitOrder/keepFitOrderDetails.js

@@ -20,7 +20,11 @@ layui.config({
             ajaxSendLoadBefore: function(hdb, json){
                 json.bean.remark = stringManipulation.textAreaShow(json.bean.remark);
                 json.bean.userType = json.bean.userType == 1 ? '匿名客户' : '会员';
-                json.bean.state = json.bean.state == 1 ? '待支付' : '已支付';
+                if(json.bean.cancleState == 1){
+                    json.bean.state = json.bean.state == 1 ? '待支付' : '已支付';
+                }else{
+                    json.bean.state = '已取消';
+                }
                 json.bean.type = json.bean.type == 1 ? '线上下单' : '线下下单';
             },
             ajaxSendAfter:function(json){

shop/src/main/resources/template/js/keepFitOrder/storeKeepFitOrderList.js

@@ -49,12 +49,16 @@ layui.config({
             { field: 'servicePrice', title: '服务费', width: 100, align: "left"},
             { field: 'storeName', title: '所属门店', align: 'left', width: 120 },
             { field: 'state', title: '支付状态', width: 150, align: "center", templet: function(d){
-                if(d.state == 1){
-                    return "<span class='state-down'>待支付</span>";
-                }else if(d.state == 2){
-                    return "<span class='state-up'>已支付(待核销)</span>";
-                }else if(d.state == 3){
-                    return "<span class='state-up'>已支付(已核销)</span>";
+                if(d.cancleState == 1){
+                    if(d.state == 1){
+                        return "<span class='state-down'>待支付</span>";
+                    }else if(d.state == 2){
+                        return "<span class='state-up'>已支付(待核销)</span>";
+                    }else if(d.state == 3){
+                        return "<span class='state-up'>已支付(已核销)</span>";
+                    }
+                }else{
+                    return '已取消';
                 }
             }},
             { field: 'payPrice', title: '实付金额', width: 100, align: "left"},
@@ -68,7 +72,7 @@ layui.config({
             }},
             { field: 'createName', title: '录入人', width: 120 },
             { field: 'createTime', title: '单据日期', align: 'center', width: 150 },
-            { title: systemLanguage["com.skyeye.operation"][languageType], fixed: 'right', align: 'center', width: 150, toolbar: '#tableBar'}
+            { title: systemLanguage["com.skyeye.operation"][languageType], fixed: 'right', align: 'center', width: 200, toolbar: '#tableBar'}
         ]],
         done: function(){
             matchingLanguage();
@@ -86,6 +90,8 @@ layui.config({
             complatePay(data)
         }else if(layEvent == 'verification'){ // 核销
             verification(data)
+        }else if(layEvent == 'cancleOrder'){ // 取消订单
+            cancleOrder(data)
         }
     });
 
@@ -119,6 +125,21 @@ layui.config({
         });
     }
 
+    // 取消订单
+    function cancleOrder(data){
+        layer.confirm('确认取消该订单吗？', {icon: 3, title: '取消确认'}, function(index){
+            layer.close(index);
+            AjaxPostUtil.request({url: shopBasePath + "cancleKeepFitOrder", params: {id: data.id}, type: 'json', method: "PUT", callback: function(json){
+                if(json.returnCode == 0){
+                    winui.window.msg('取消成功.', {icon: 1, time: 2000});
+                    loadTable();
+                }else{
+                    winui.window.msg(json.returnMessage, {icon: 2, time: 2000});
+                }
+            }});
+        });
+    }
+
     // 详情
     function select(data){
         rowId = data.id;

shop/src/main/resources/template/js/mealOrder/allMealOrderList.js

@@ -44,10 +44,14 @@ layui.config({
             { title: '下单地址', align: 'center', colspan: '2'},
             { field: 'payablePrice', title: '应付金额', width: 100, align: "left", rowspan: '2'},
             { field: 'state', title: '支付状态', width: 80, align: "center", rowspan: '2', templet: function(d){
-                if(d.state == 1){
-                    return "<span class='state-down'>待支付</span>";
-                }else{
-                    return "<span class='state-up'>已支付</span>";
+                if(d.cancleState == 1) {
+                    if (d.state == 1) {
+                        return "<span class='state-down'>待支付</span>";
+                    } else {
+                        return "<span class='state-up'>已支付</span>";
+                    }
+                } else {
+                    return '已取消';
                 }
             }},
             { field: 'payPrice', title: '实付金额', width: 100, align: "left", rowspan: '2'},

shop/src/main/resources/template/js/mealOrder/memberMealOrderList.js

@@ -35,10 +35,14 @@ layui.config({
             { field: 'phone', title: '会员手机号', width: 100, align: "center"},
             { field: 'payablePrice', title: '应付金额', width: 100, align: "left"},
             { field: 'state', title: '支付状态', width: 80, align: "center", templet: function(d){
-                if(d.state == 1){
-                    return "待支付";
-                }else{
-                    return "已支付";
+                if(d.cancleState == 1) {
+                    if (d.state == 1) {
+                        return "<span class='state-down'>待支付</span>";
+                    } else {
+                        return "<span class='state-up'>已支付</span>";
+                    }
+                } else {
+                    return '已取消';
                 }
             }},
             { field: 'payPrice', title: '实付金额', width: 100, align: "left"},
@@ -52,7 +56,6 @@ layui.config({
             }},
             { field: 'createName', title: '录入人', width: 120 },
             { field: 'createTime', title: '单据日期', align: 'center', width: 150 },
-            { title: systemLanguage["com.skyeye.operation"][languageType], fixed: 'right', align: 'center', width: 150, toolbar: '#tableBar'}
         ]],
         done: function(){
             matchingLanguage();
@@ -62,28 +65,11 @@ layui.config({
     table.on('tool(messageTable)', function (obj) {
         var data = obj.data;
         var layEvent = obj.event;
-        if (layEvent === 'delete') { // 删除
-            delet(data);
-        }else if(layEvent == 'select'){ // 详情
+        if(layEvent == 'select'){ // 详情
             select(data)
         }
     });
 
-    // 删除
-    function delet(data){
-        layer.confirm(systemLanguage["com.skyeye.deleteOperationMsg"][languageType], {icon: 3, title: systemLanguage["com.skyeye.deleteOperation"][languageType]}, function(index){
-            layer.close(index);
-            AjaxPostUtil.request({url: shopBasePath + "deleteMealOrder", params: {id: data.id}, type: 'json', method: "DELETE", callback: function(json){
-                if(json.returnCode == 0){
-                    winui.window.msg(systemLanguage["com.skyeye.deleteOperationSuccessMsg"][languageType], {icon: 1, time: 2000});
-                    loadTable();
-                }else{
-                    winui.window.msg(json.returnMessage, {icon: 2, time: 2000});
-                }
-            }});
-        });
-    }
-
     // 详情
     function select(data){
         rowId = data.id;

shop/src/main/resources/template/js/mealOrder/storeMealOrderDetails.js

@@ -19,7 +19,11 @@ layui.config({
             template: $("#simpleTemplate").html(),
             ajaxSendLoadBefore: function(hdb, json){
                 json.bean.remark = stringManipulation.textAreaShow(json.bean.remark);
-                json.bean.state = json.bean.state == 1 ? '待支付' : '已支付';
+                if(json.bean.cancleState == 1){
+                    json.bean.state = json.bean.state == 1 ? '待支付' : '已支付';
+                }else{
+                    json.bean.state = '已取消';
+                }
                 json.bean.type = json.bean.type == 1 ? '线上下单' : '线下下单';
             },
             ajaxSendAfter:function(json){

shop/src/main/resources/template/js/mealOrder/storeMealOrderList.js

@@ -39,10 +39,14 @@ layui.config({
             { field: 'phone', title: '会员手机号', width: 100, align: "center"},
             { field: 'payablePrice', title: '应付金额', width: 100, align: "left"},
             { field: 'state', title: '支付状态', width: 80, align: "center", templet: function(d){
-                if(d.state == 1){
-                    return "<span class='state-down'>待支付</span>";
-                }else{
-                    return "<span class='state-up'>已支付</span>";
+                if(d.cancleState == 1) {
+                    if (d.state == 1) {
+                        return "<span class='state-down'>待支付</span>";
+                    } else {
+                        return "<span class='state-up'>已支付</span>";
+                    }
+                } else {
+                    return '已取消';
                 }
             }},
             { field: 'payPrice', title: '实付金额', width: 100, align: "left"},
@@ -56,7 +60,7 @@ layui.config({
             }},
             { field: 'createName', title: '录入人', width: 120 },
             { field: 'createTime', title: '单据日期', align: 'center', width: 150 },
-            { title: systemLanguage["com.skyeye.operation"][languageType], fixed: 'right', align: 'center', width: 150, toolbar: '#tableBar'}
+            { title: systemLanguage["com.skyeye.operation"][languageType], fixed: 'right', align: 'center', width: 200, toolbar: '#tableBar'}
         ]],
         done: function(){
             matchingLanguage();
@@ -72,6 +76,8 @@ layui.config({
             select(data)
         }else if(layEvent == 'complatePay'){ // 完成支付
             complatePay(data)
+        }else if(layEvent == 'cancleOrder'){ // 取消订单
+            cancleOrder(data)
         }
     });
 
@@ -90,6 +96,21 @@ layui.config({
         });
     }
 
+    // 取消订单
+    function cancleOrder(data){
+        layer.confirm('确认取消该订单吗？', {icon: 3, title: '取消确认'}, function(index){
+            layer.close(index);
+            AjaxPostUtil.request({url: shopBasePath + "cancleMealOrder", params: {id: data.id}, type: 'json', method: "PUT", callback: function(json){
+                if(json.returnCode == 0){
+                    winui.window.msg('取消成功.', {icon: 1, time: 2000});
+                    loadTable();
+                }else{
+                    winui.window.msg(json.returnMessage, {icon: 2, time: 2000});
+                }
+            }});
+        });
+    }
+
     // 详情
     function select(data){
         rowId = data.id;

shop/src/main/resources/template/tpl/keepFitOrder/storeKeepFitOrderList.html

@@ -58,15 +58,18 @@
         <table id="messageTable" lay-filter="messageTable"></table>
 
         <script type="text/html" id="tableBar">
-            {{# if(d.state == 1 && auth('1644317759940')){ }}
+            {{# if(d.cancleState == 1 && d.state == 1 && auth('1644317759940')){ }}
                 <a class="layui-btn layui-btn-danger layui-btn-xs" lay-event="delete"><language showName="com.skyeye.deleteBtn"></language></a>
             {{# } }}
-            {{# if(d.state == 1 && auth('1644317746790')){ }}
+            {{# if(d.cancleState == 1 && d.state == 1 && auth('1644317746790')){ }}
                 <a class="layui-btn layui-btn-xs layui-btn-normal" lay-event="complatePay">完成支付</a>
             {{# } }}
-            {{# if(d.state == 2 && auth('1644378387049')){ }}
+            {{# if(d.cancleState == 1 && d.state == 2 && auth('1644378387049')){ }}
                 <a class="layui-btn layui-btn-xs layui-btn-normal" lay-event="verification">核销</a>
             {{# } }}
+            {{# if(d.cancleState == 1 && d.state == 1 && auth('1644842786855')){ }}
+                <a class="layui-btn layui-btn-xs layui-btn-normal" lay-event="cancleOrder">取消订单</a>
+            {{# } }}
         </script>
     </div>
 

shop/src/main/resources/template/tpl/mealOrder/memberMealOrderList.html

@@ -29,12 +29,6 @@
     </div>
     <div style="margin:auto 10px;">
         <table id="messageTable" lay-filter="messageTable"></table>
-
-        <script type="text/html" id="tableBar">
-            {{# if(d.state == 1 && auth('1644239549850')){ }}
-                <a class="layui-btn layui-btn-danger layui-btn-xs" lay-event="delete"><language showName="com.skyeye.deleteBtn"></language></a>
-            {{# } }}
-        </script>
     </div>
 
     <script src="../../assets/lib/layui/layui.js"></script>

shop/src/main/resources/template/tpl/mealOrder/storeMealOrderList.html

@@ -53,12 +53,15 @@
         <table id="messageTable" lay-filter="messageTable"></table>
 
         <script type="text/html" id="tableBar">
-            {{# if(d.state == 1 && auth('1644239605004')){ }}
+            {{# if(d.cancleState == 1 && d.state == 1 && auth('1644239605004')){ }}
                 <a class="layui-btn layui-btn-danger layui-btn-xs" lay-event="delete"><language showName="com.skyeye.deleteBtn"></language></a>
             {{# } }}
-            {{# if(d.state == 1 && auth('1644250434164')){ }}
+            {{# if(d.cancleState == 1 && d.state == 1 && auth('1644250434164')){ }}
                 <a class="layui-btn layui-btn-xs layui-btn-normal" lay-event="complatePay">完成支付</a>
             {{# } }}
+            {{# if(d.cancleState == 1 && d.state == 1 && auth('1644842735595')){ }}
+                <a class="layui-btn layui-btn-xs layui-btn-normal" lay-event="cancleOrder">取消订单</a>
+            {{# } }}
         </script>
     </div>