From d5b3e5a413bcfccba294793ee093722f31b2448a Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期三, 16 八月 2023 17:02:13 +0800
Subject: [PATCH] 添加推单日志

---
 management/guns-admin/src/main/webapp/static/modular/system/tAppUser/tAppUserException.js |   38 ++++++++++++++++++++++++++++++--------
 1 files changed, 30 insertions(+), 8 deletions(-)

diff --git a/management/guns-admin/src/main/webapp/static/modular/system/tAppUser/tAppUserException.js b/management/guns-admin/src/main/webapp/static/modular/system/tAppUser/tAppUserException.js
index 2627ee3..55d1770 100644
--- a/management/guns-admin/src/main/webapp/static/modular/system/tAppUser/tAppUserException.js
+++ b/management/guns-admin/src/main/webapp/static/modular/system/tAppUser/tAppUserException.js
@@ -18,12 +18,22 @@
             {title: '用户ID', field: 'id', visible: true, align: 'center', valign: 'middle'},
             {title: '用户昵称', field: 'nickname', visible: true, align: 'center', valign: 'middle'},
             {title: '手机号', field: 'phone', visible: true, align: 'center', valign: 'middle'},
-            {title: '剩余优惠券', field: 'sex', visible: true, align: 'center', valign: 'middle'},
-            {title: '优惠券总数', field: 'avatar', visible: true, align: 'center', valign: 'middle'},
-            {title: '消费次数', field: 'openid', visible: true, align: 'center', valign: 'middle'},
-            {title: '历史消费', field: 'unionid', visible: true, align: 'center', valign: 'middle'},
-            {title: '最后一次消费时间', field: 'emergencyContact', visible: true, align: 'center', valign: 'middle'},
-            {title: '状态', field: 'status', visible: true, align: 'center', valign: 'middle'},
+            {title: '剩余优惠券', field: 'notUsedCount', visible: true, align: 'center', valign: 'middle'},
+            {title: '优惠券总数', field: 'couponSum', visible: true, align: 'center', valign: 'middle'},
+            {title: '消费次数', field: 'consumeSum', visible: true, align: 'center', valign: 'middle'},
+            {title: '历史消费', field: 'consumePrice', visible: true, align: 'center', valign: 'middle'},
+            {title: '最后一次消费时间', field: 'lastConsumptionTime', visible: true, align: 'center', valign: 'middle'},
+            {title: '状态', field: 'status', visible: true, align: 'center', valign: 'middle',
+                formatter: function (value, row) {
+                    if (row.status === 1){
+                        return '<span>正常</span>'
+                    }else if (row.status === 2){
+                        return '<span>冻结</span>'
+                    }else if (row.status === 3){
+                        return '<span>已删除</span>'
+                    }
+                }
+            },
             {title: '操作', visible: true, align: 'center', valign: 'middle',width:150,
                 formatter: function (value, row) {
                     if (row.status === 1){
@@ -92,7 +102,7 @@
     var index = layer.open({
         type: 2,
         title: '停用',
-        area: ['45%', '50%'], //宽高
+        area: ['800px', '420px'], //宽高
         fix: false, //不固定
         maxmin: true,
         content: Feng.ctxPath + '/tAppUser/tAppUserException_start_and_stop?id='+id
@@ -107,7 +117,7 @@
     var index = layer.open({
         type: 2,
         title: '启用',
-        area: ['45%', '50%'], //宽高
+        area: ['800px', '420px'], //宽高
         fix: false, //不固定
         maxmin: true,
         content: Feng.ctxPath + '/tAppUser/tAppUserException_start_and_stop?id='+id
@@ -119,6 +129,16 @@
  * 提交启用冻结
  */
 TAppUserException.updateStatus = function () {
+    var status = $("#status").val();
+    if(status == 1 && ($("#stopRemark").val() == '' || $("#stopRemark").val() == null)){
+        Feng.info("请输入冻结理由!")
+        return;
+    }
+    if(status == 2 && ($("#startRemark").val() == '' || $("#startRemark").val() == null)){
+        Feng.info("请输入启用理由!")
+        return;
+    }
+
     var ajax = new $ax(Feng.ctxPath + "/tAppUser/update-status", function (data) {
         Feng.success("修改成功!");
         TAppUserInfoDlg.closeException();
@@ -249,6 +269,7 @@
         });
         ajax.setData({
             userIds:$("#userIds").val(),
+            couponId:TCoupon.seItem.id,
             couponName:TCoupon.seItem.couponName
         })
         ajax.start();
@@ -264,6 +285,7 @@
     $("#createTime").val('');
     $("#id").val('');
     $("#status").val('');
+    this.search();
 }
 
 $(function () {

--
Gitblit v1.7.1