充值优惠和存酒推送

wdn127929
1 parent 60cb3c2c
Showing 8 changed files with 75 additions and 61 deletions
lib/models/recharge_notice_model.dart
lib/pages/message/message_dialog_item_f.dart
lib/pages/message/message_item_f.dart
lib/pages/message/message_treated_page.dart
lib/pages/message/message_untreated_page.dart
lib/provider/message_dialog_model.dart
lib/provider/message_model.dart
lib/utils/utils.dart
--- a/lib/models/recharge_notice_model.dart
View file @32ab29c
+++ b/lib/models/recharge_notice_model.dart
View file @32ab29c
@@ -163,17 +163,17 @@ class Guest {
   String rname;
   String sex;
   String phone;
-  Null company;
-  Null section;
+  String company;
+  String section;
   String label;
-  Null position;
-  Null taboos;
-  Null like;
-  Null serve;
+  String position;
+  String taboos;
+  String like;
+  String serve;
   String cDay;
   String isMember;
-  Null cdate;
-  Null udate;
+  String cdate;
+  String udate;
   String get rnameStr {
     if (rname == null || rname == '' || rname == ' ') return "";
--- a/lib/pages/message/message_dialog_item_f.dart
View file @32ab29c
+++ b/lib/pages/message/message_dialog_item_f.dart
View file @32ab29c
@@ -78,7 +78,7 @@ class MessageDialogItemF extends StatelessWidget {
       btnname = 'online_order_go';
     } else if (message.message_type == "18") {
       titleText = "存酒\n超期";
-      bgcolor = MyColours.color_F2995F;
+      bgcolor = MyColours.color_F78D94;
       btnname = 'order_go';
     }
     if (isTreated) {
@@ -198,7 +198,7 @@ class MessageDialogItemF extends StatelessWidget {
               "status": "is_read"
             };
             await messageDialogModel.setMessageStatus(context, params);
-            
+
             bus.emit("refresh_untreated_num"); //刷新未读消息数目
           } else if (message.message_type == "18") {
             //存酒超期
@@ -225,7 +225,6 @@ class MessageDialogItemF extends StatelessWidget {
                 context, userHistoryEntity, FromPage.FromPageMessagePage);
             bus.emit("remove_untreated_message", message.id);
-            
             Map<String, String> params1 = {
               "sid":
                   Provider.of<UserModel>(context, listen: false).user.sellerid,
@@ -667,7 +666,7 @@ class MessageDialogItemF extends StatelessWidget {
                       };
                       await messageDialogModel.setMessageStatus(
                           context, params);
-                      
+
                       bus.emit("refresh_untreated_num"); //刷新未读消息数目
                     } else if (message.message_type == "18") {
                       //存酒超期
@@ -694,7 +693,6 @@ class MessageDialogItemF extends StatelessWidget {
                           userHistoryEntity, FromPage.FromPageMessagePage);
                       bus.emit("remove_untreated_message", message.id);
-                  
                       Map<String, String> params1 = {
                         "sid": Provider.of<UserModel>(context, listen: false)
                             .user
--- a/lib/pages/message/message_item_f.dart
View file @32ab29c
+++ b/lib/pages/message/message_item_f.dart
View file @32ab29c
@@ -75,7 +75,7 @@ class MessageItemF extends StatelessWidget {
       btnname = 'online_order_go';
     } else if (message.message_type == "18") {
       titleText = "存酒\n超期";
-      bgcolor = MyColours.color_F2995F;
+      bgcolor = MyColours.color_F78D94;
       btnname = 'order_go';
     }
     if (isTreated) {
--- a/lib/pages/message/message_treated_page.dart
View file @32ab29c
+++ b/lib/pages/message/message_treated_page.dart
View file @32ab29c
@@ -99,10 +99,10 @@ class MessageTreatedPageState extends State<MessageTreatedPage> {
   }
   //三种分类各自的未读消息数目
-  _getUnMsgNum() async {
-    Map<String, String> params = {"sid": userModel.user.sellerid};
-    await messageModel.getUnMsgNum(context, params);
-  }
+  // _getUnMsgNum() async {
+  //   Map<String, String> params = {"sid": userModel.user.sellerid};
+  //   await messageModel.getUnMsgNum(context, params);
+  // }
   //获取在线预订消息status 0未处理 1已处理
   getMessage(String typeid, {bool showLoading = true}) async {
@@ -117,7 +117,7 @@ class MessageTreatedPageState extends State<MessageTreatedPage> {
     }
     await messageModel.getMessages(context, params, showLoading: showLoading);
-    _getUnMsgNum();
+    // _getUnMsgNum();
   }
   @override
--- a/lib/pages/message/message_untreated_page.dart
View file @32ab29c
+++ b/lib/pages/message/message_untreated_page.dart
View file @32ab29c
@@ -85,7 +85,7 @@ class MessageUntreatedPageState extends State<MessageUntreatedPage> {
       // "type_id": "10", //1提前点餐2内部预订10在线预订
       // "status": '0',
       "offset": offset.toString(),
-      "limit": "1000",
+      "limit": "100000",
     };
     await messageModel.getNewGetUntreatedMsgList(context, params,
@@ -184,8 +184,8 @@ class MessageUntreatedPageState extends State<MessageUntreatedPage> {
                 getMessage(showLoading: false);
               },
               onLoad: () async {
-                offset++;
-                getMessage(showLoading: false);
+                // offset++;
+                // getMessage(showLoading: false);
               },
             );
           }
--- a/lib/provider/message_dialog_model.dart
View file @32ab29c
+++ b/lib/provider/message_dialog_model.dart
View file @32ab29c
@@ -53,6 +53,18 @@ class MessageDialogModel extends ChangeNotifier {
       case "1": //提前点餐
         _player.play("tts_order.mp3");
         break;
+      case "15": //店内消息
+
+        break;
+      case "16": //其他经理取消在线预订
+        _player.play("tts_new.mp3");
+        break;
+      case "17": //充值会员
+        _player.play("tts_recharge.mp3");
+        break;
+      case "18": //存酒过期
+        _player.play("tts_wine_remind.mp3");
+        break;
       case "-1": //>3
         _player.play("tts_all.mp3");
         break;
--- a/lib/provider/message_model.dart
View file @32ab29c
+++ b/lib/provider/message_model.dart
View file @32ab29c
@@ -25,12 +25,14 @@ class MessageModel extends ChangeNotifier {
   int allUnNum = 0; //全部未读
-  initData() {
-    messagesHas = []; //消息
-    messagesUn = [];
-    pageStateUn = PageState.Loading; //未处理
-    pageState = PageState.Loading; //已处理
-  }
+  List<NewUnmessage> messagesUnTemp = [];
+
+  // initData() {
+  //   messagesHas = []; //消息
+  //   messagesUn = [];
+  //   pageStateUn = PageState.Loading; //未处理
+  //   pageState = PageState.Loading; //已处理
+  // }
   //获取已处理消息
   getMessages(BuildContext context, Map<String, String> params,
@@ -143,27 +145,28 @@ class MessageModel extends ChangeNotifier {
       int tempnum = 0;
       String uid = Provider.of<UserModel>(context, listen: false).user.openid;
       List<NewUnmessage> temp = [];
-      List<NewUnmessage> messages = [];
+      // List<NewUnmessage> messages = [];
       if (params['offset'] == "0") {
-        messages = baseResp.data['list'].map<NewUnmessage>((value) {
+        messagesUnTemp = baseResp.data['list'].map<NewUnmessage>((value) {
           return NewUnmessage.fromJson(value);
         }).toList();
       } else {
-        messages.addAll(baseResp.data['list'].map<NewUnmessage>((value) {
+        messagesUnTemp.addAll(baseResp.data['list'].map<NewUnmessage>((value) {
           return NewUnmessage.fromJson(value);
         }).toList());
       }
-      temp.addAll(messages);
-      messages = [];
+      temp.addAll(messagesUnTemp);
+      messagesUnTemp = [];
       temp.forEach((element) {
         if (element.uid == uid && element.message_type == '16') {
           tempnum++;
         } else {
-          messages.add(element);
+          messagesUnTemp.add(element);
         }
       });
-      messagesUn.addAll(messages);
+      messagesUn = [];
+      messagesUn.addAll(messagesUnTemp);
       if (tempnum > 0) {
         allUnNum = baseResp.data['count'] - tempnum;
       } else {
@@ -205,31 +208,31 @@ class MessageModel extends ChangeNotifier {
       notifyListeners();
     });
     if (baseResp != null && baseResp.code == Constant.status_success) {
-      List<NewUnmessage> messages = [];
+      // List<NewUnmessage> messages = [];
       int tempnum = 0;
       String uid = Provider.of<UserModel>(context, listen: false).user.openid;
       List<NewUnmessage> temp = [];
       if (params['offset'] == "0") {
-        messages = baseResp.data['list'].map<NewUnmessage>((value) {
+        messagesUnTemp = baseResp.data['list'].map<NewUnmessage>((value) {
           return NewUnmessage.fromJson(value);
         }).toList();
       } else {
-        messages.addAll(baseResp.data['list'].map<NewUnmessage>((value) {
+        messagesUnTemp.addAll(baseResp.data['list'].map<NewUnmessage>((value) {
           return NewUnmessage.fromJson(value);
         }).toList());
       }
-      temp.addAll(messages);
-      messages = [];
+      temp.addAll(messagesUnTemp);
+      messagesUnTemp = [];
       messagesUn = [];
       temp.forEach((element) {
         if (element.uid == uid && element.message_type == '16') {
           tempnum++;
         } else {
-          messages.add(element);
+          messagesUnTemp.add(element);
         }
       });
-      messagesUn.addAll(messages);
+      messagesUn.addAll(messagesUnTemp);
       if (tempnum > 0) {
         allUnNum = baseResp.data['count'] - tempnum;
       } else {
@@ -249,34 +252,35 @@ class MessageModel extends ChangeNotifier {
       //     return true;
       //   });
       // }
-      if (messages.isEmpty) {
+      if (messagesUnTemp.isEmpty) {
         //未处理
         pageStateUn = PageState.Empty;
       } else {
         //未处理
         pageStateUn = PageState.Success;
       }
+      print(messagesUn);
       notifyListeners();
     }
   }
   //获取未处理消息数目
-  getUnMsgNum(BuildContext context, Map<String, String> params) async {
-    BaseResp<Map<String, dynamic>> baseResp = await DioUtil()
-        .request<Map<String, dynamic>>(
-            context, Method.get, HttpUrl.get_message_num,
-            data: params, showLoading: false)
-        .catchError((error) {
-      print(error.toString());
-    });
-    if (baseResp != null && baseResp.code == Constant.status_success) {
-      onlineTotal = int.parse(baseResp.data['online_total'].toString());
-      inlineTotal = int.parse(baseResp.data['inline_total'].toString());
-      orderTotal = int.parse(baseResp.data['order_total'].toString());
-      checkTotal = int.parse(baseResp.data['check_total'].toString());
-      notifyListeners();
-    }
-  }
+  // getUnMsgNum(BuildContext context, Map<String, String> params) async {
+  //   BaseResp<Map<String, dynamic>> baseResp = await DioUtil()
+  //       .request<Map<String, dynamic>>(
+  //           context, Method.get, HttpUrl.get_message_num,
+  //           data: params, showLoading: false)
+  //       .catchError((error) {
+  //     print(error.toString());
+  //   });
+  //   if (baseResp != null && baseResp.code == Constant.status_success) {
+  //     onlineTotal = int.parse(baseResp.data['online_total'].toString());
+  //     inlineTotal = int.parse(baseResp.data['inline_total'].toString());
+  //     orderTotal = int.parse(baseResp.data['order_total'].toString());
+  //     checkTotal = int.parse(baseResp.data['check_total'].toString());
+  //     notifyListeners();
+  //   }
+  // }
   //设置消息状态
   setMessageStatus(BuildContext context, Map<String, String> params) async {
--- a/lib/utils/utils.dart
View file @32ab29c
+++ b/lib/utils/utils.dart
View file @32ab29c
@@ -1842,8 +1842,8 @@ class Utils {
         title: _title,
         path: _path,
         description: _description,
-        // miniProgramType: WXMiniProgramType.PREVIEW, //体验版
-        miniProgramType: WXMiniProgramType.RELEASE, //正式版
+        miniProgramType: WXMiniProgramType.PREVIEW, //体验版
+        // miniProgramType: WXMiniProgramType.RELEASE, //正式版
         // miniProgramType: WXMiniProgramType.TEST //开发版
         // thumbnail: WeChatImage.binary(source)
         thumbnail: WeChatImage.network(_thumbnail)