套餐订单新增是否赠送的字段

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

@@ -67,6 +67,9 @@ layui.config({
                     return "线下下单";
                 }
             }},
+            { field: 'whetherGive', title: '是否赠送', width: 100, align: "center", rowspan: '2', templet: function(d){
+                return shopUtil.getMealOrderWhetherGiveName(d);
+            }},
             { field: 'createName', title: '服务顾问', width: 120, rowspan: '2' },
             { field: 'createTime', title: '操作时间', align: 'center', width: 150, rowspan: '2' },
         ],[

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

@@ -21,6 +21,7 @@ layui.config({
                 json.bean.remark = stringManipulation.textAreaShow(json.bean.remark);
                 json.bean.userType = json.bean.userType == 1 ? '匿名客户' : '会员';
                 json.bean.state = shopUtil.getKeepFitOrderStateName(json.bean);
+                json.bean.whetherGive = shopUtil.getMealOrderWhetherGiveName(json.bean);
                 json.bean.type = json.bean.type == 1 ? '线上下单' : '线下下单';
             },
             ajaxSendAfter:function(json){

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

@@ -63,6 +63,9 @@ layui.config({
                     return "线下下单";
                 }
             }},
+            { field: 'whetherGive', title: '是否赠送', width: 100, align: "center", rowspan: '2', templet: function(d){
+                return shopUtil.getMealOrderWhetherGiveName(d);
+            }},
             { field: 'createName', title: '服务顾问', width: 120 },
             { field: 'createTime', title: '操作时间', align: 'center', width: 150 },
             { title: systemLanguage["com.skyeye.operation"][languageType], fixed: 'right', align: 'center', width: 200, toolbar: '#tableBar'}

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

@@ -55,6 +55,9 @@ layui.config({
                     return "线下下单";
                 }
             }},
+            { field: 'whetherGive', title: '是否赠送', width: 100, align: "center", rowspan: '2', templet: function(d){
+                return shopUtil.getMealOrderWhetherGiveName(d);
+            }},
             { field: 'createName', title: '专属顾问', width: 120, rowspan: '2' },
             { field: 'createTime', title: '创建时间', align: 'center', width: 150, rowspan: '2' },
         ],[

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

@@ -46,6 +46,9 @@ layui.config({
                     return "线下下单";
                 }
             }},
+            { field: 'whetherGive', title: '是否赠送', width: 100, align: "center", templet: function(d){
+                return shopUtil.getMealOrderWhetherGiveName(d);
+            }},
             { field: 'createName', title: '专属顾问', width: 120 },
             { field: 'createTime', title: '创建时间', align: 'center', width: 150 },
         ]],

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

@@ -20,6 +20,7 @@ layui.config({
             ajaxSendLoadBefore: function(hdb, json){
                 json.bean.remark = stringManipulation.textAreaShow(json.bean.remark);
                 json.bean.state = shopUtil.getMealOrderStateName(json.bean);
+                json.bean.whetherGive = shopUtil.getMealOrderWhetherGiveName(json.bean);
                 json.bean.type = json.bean.type == 1 ? '线上下单' : '线下下单';
             },
             ajaxSendAfter:function(json){

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

@@ -50,6 +50,9 @@ layui.config({
                     return "线下下单";
                 }
             }},
+            { field: 'whetherGive', title: '是否赠送', width: 100, align: "center", templet: function(d){
+                return shopUtil.getMealOrderWhetherGiveName(d);
+            }},
             { field: 'createName', title: '专属顾问', width: 120 },
             { field: 'createTime', title: '创建时间', align: 'center', width: 150 },
             { title: systemLanguage["com.skyeye.operation"][languageType], fixed: 'right', align: 'center', width: 200, toolbar: '#tableBar'}

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

@@ -111,6 +111,12 @@
                 {{payTime}}
             </div>
         </div>-->
+        <div class="layui-form-item layui-col-xs6">
+            <label class="layui-form-label">套餐内消耗：</label>
+            <div class="layui-input-block ver-center">
+                {{mealSinglePrice}}
+            </div>
+        </div>
         <div class="layui-form-item layui-col-xs12">
             <label class="layui-form-label">备注：</label>
             <div class="layui-input-block ver-center">
@@ -127,9 +133,9 @@
             </div>
         </div>
         <div class="layui-form-item layui-col-xs6">
-            <label class="layui-form-label">套餐内消耗：</label>
+            <label class="layui-form-label">是否赠送：</label>
             <div class="layui-input-block ver-center">
-                {{mealSinglePrice}}
+                {{whetherGive}}
             </div>
         </div>
         <div class="layui-form-item layui-col-xs12">

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

@@ -98,6 +98,12 @@
                 {{payTime}}
             </div>
         </div>
+        <div class="layui-form-item layui-col-xs6">
+            <label class="layui-form-label">是否赠送：</label>
+            <div class="layui-input-block ver-center">
+                {{whetherGive}}
+            </div>
+        </div>
         <div class="layui-form-item layui-col-xs12">
             <label class="layui-form-label">备注：</label>
             <div class="layui-input-block ver-center">

web/src/main/resources/template/assets/lib/layui/customer/shopUtil.js

@@ -24,6 +24,22 @@ var shopUtil = {
         }
     },
 
+    /**
+     * 获取套餐订单是否赠送的字段信息
+     *
+     * @param data
+     * @returns {string}
+     */
+    getMealOrderWhetherGiveName: function (data){
+        if (data.whetherGive == 1) {
+            return "是";
+        } else if (data.whetherGive == 2) {
+            return "否";
+        } else {
+            return "";
+        }
+    },
+
     /**
      * 套餐订单获取状态名称
      *