Merge remote-tracking branch 'origin/dev' into dev

src/main/java/com/uas/platform/b2b/controller/PagingReleaseController.java

@@ -18,8 +18,6 @@ import com.uas.platform.core.model.PageParams;
 import com.uas.platform.core.util.serializer.FlexJsonUtils;
 import com.uas.platform.core.web.bind.RequestState;
 import com.uas.search.b2b.model.SPage;
-import com.uas.search.b2b.model.Sort;
-import com.uas.search.b2b.util.SearchConstants;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.ModelMap;
@@ -30,7 +28,6 @@ import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.ResponseBody;
 
-import java.util.ArrayList;
 import java.util.List;
 
 
@@ -54,47 +51,47 @@ public class PagingReleaseController {
 
     private final static UsageBufferedLogger logger = BufferedLoggerManager.getLogger(UsageBufferedLogger.class);
 
-    /**
-     *  分页查找消息(未读)
-     * @param params
-     * @return
-     */
-    @RequestMapping(params = RequestState.TODO, method = RequestMethod.GET)
-    @ResponseBody
-    public SPage<PagingReleaseDetail> getTodoPagingRelease(PageParams params, String searchFilter) {
-        JSONObject jsonObject = JSONObject.parseObject(searchFilter);
-        String keyword = jsonObject.getString("keyword");
-//        logger.log("查看消息", "查看收到的消息（未读）");
-        com.uas.search.b2b.model.PageParams pageParams = searchService.convertPageParams(params, null);
-        pageParams.getFilters().put("prd_readstatus", Constant.NO);
-        pageParams.getFilters().put("prd_emuu", SystemSession.getUser().getUserUU());
-        pageParams.getFilters().put("prd_venduu", SystemSession.getUser().getEnterprise().getUu());
-        List<Sort> sortList = new ArrayList<>();
-        sortList.add(new Sort("prd_id", false, Sort.Type.LONG, new Long(1)));
-        pageParams.getFilters().put(SearchConstants.SORT_KEY, sortList);
-        return searchService.searchPagingReleaseDetailIds(keyword, pageParams);
-    }
-
-    /**
-     *  分页查找消息(已读)
-     * @param params
-     * @return
-     */
-    @RequestMapping(params = RequestState.DONE, method = RequestMethod.GET)
-    @ResponseBody
-    public SPage<PagingReleaseDetail> getDonePagingRelease(PageParams params, String searchFilter) {
-        JSONObject jsonObject = JSONObject.parseObject(searchFilter);
-        String keyword = jsonObject.getString("keyword");
-//        logger.log("查看消息", "查看收到的消息（已读）");
-        com.uas.search.b2b.model.PageParams pageParams = searchService.convertPageParams(params, null);
-        pageParams.getFilters().put("prd_readstatus", Constant.YES);
-        pageParams.getFilters().put("prd_emuu", SystemSession.getUser().getUserUU());
-        pageParams.getFilters().put("prd_venduu", SystemSession.getUser().getEnterprise().getUu());
-        List<Sort> sortList = new ArrayList<>();
-        sortList.add(new Sort("prd_id", false, Sort.Type.LONG, new Long(1)));
-        pageParams.getFilters().put(SearchConstants.SORT_KEY, sortList);
-        return searchService.searchPagingReleaseDetailIds(keyword, pageParams);
-    }
+//    /**
+//     *  分页查找消息(未读)
+//     * @param params
+//     * @return
+//     */
+//    @RequestMapping(params = RequestState.TODO, method = RequestMethod.GET)
+//    @ResponseBody
+//    public SPage<PagingReleaseDetail> getTodoPagingRelease(PageParams params, String searchFilter) {
+//        JSONObject jsonObject = JSONObject.parseObject(searchFilter);
+//        String keyword = jsonObject.getString("keyword");
+////        logger.log("查看消息", "查看收到的消息（未读）");
+//        com.uas.search.b2b.model.PageParams pageParams = searchService.convertPageParams(params, null);
+//        pageParams.getFilters().put("prd_readstatus", Constant.NO);
+//        pageParams.getFilters().put("prd_emuu", SystemSession.getUser().getUserUU());
+//        pageParams.getFilters().put("prd_venduu", SystemSession.getUser().getEnterprise().getUu());
+//        List<Sort> sortList = new ArrayList<>();
+//        sortList.add(new Sort("prd_id", false, Sort.Type.LONG, new Long(1)));
+//        pageParams.getFilters().put(SearchConstants.SORT_KEY, sortList);
+//        return searchService.searchPagingReleaseDetailIds(keyword, pageParams);
+//    }
+//
+//    /**
+//     *  分页查找消息(已读)
+//     * @param params
+//     * @return
+//     */
+//    @RequestMapping(params = RequestState.DONE, method = RequestMethod.GET)
+//    @ResponseBody
+//    public SPage<PagingReleaseDetail> getDonePagingRelease(PageParams params, String searchFilter) {
+//        JSONObject jsonObject = JSONObject.parseObject(searchFilter);
+//        String keyword = jsonObject.getString("keyword");
+////        logger.log("查看消息", "查看收到的消息（已读）");
+//        com.uas.search.b2b.model.PageParams pageParams = searchService.convertPageParams(params, null);
+//        pageParams.getFilters().put("prd_readstatus", Constant.YES);
+//        pageParams.getFilters().put("prd_emuu", SystemSession.getUser().getUserUU());
+//        pageParams.getFilters().put("prd_venduu", SystemSession.getUser().getEnterprise().getUu());
+//        List<Sort> sortList = new ArrayList<>();
+//        sortList.add(new Sort("prd_id", false, Sort.Type.LONG, new Long(1)));
+//        pageParams.getFilters().put(SearchConstants.SORT_KEY, sortList);
+//        return searchService.searchPagingReleaseDetailIds(keyword, pageParams);
+//    }
 
     /**
      *  分页查找消息(未读)
@@ -152,20 +149,39 @@ public class PagingReleaseController {
     /* 以上为之前B2B调用的消息接口，消息提出公共服务之后，调用下面的接口 */
 
     /**
-     * 获取所有消息（消息公共服务接口）
-     * @param params
-     * @param searchFilter
+     * 获取所有消息（未读）
+     * @param params  分页参数
+     * @param searchFilter  过滤器，此处目前仅有关键词
      * @return
      */
-    @RequestMapping(value = "/info", method = RequestMethod.GET)
+    @RequestMapping(params = RequestState.TODO, method = RequestMethod.GET)
     @ResponseBody
-    public Page<MessageModel> getMessageByMessagePublicService(PageParams params, String searchFilter) {
+    public Page<MessageModel> getNotReadMessageByMessagePublicService(PageParams params, String searchFilter) {
         JSONObject jsonObject = JSONObject.parseObject(searchFilter);
         String keyword = jsonObject.getString("keyword");
-        logger.log("查看消息", "查看收到的消息");
-        PageInfo pageInfo = new PageInfo(params);
+        logger.log("查看消息", "查看未读消息列表");
         try {
-            return pagingReleaseService.getPublicMessage(keyword, pageInfo);
+            return pagingReleaseService.getPublicMessage(keyword, params, Constant.NO);
+        } catch (Exception e) {
+            e.printStackTrace();
+            return null;
+        }
+    }
+
+    /**
+     * 获取所有消息（已读）
+     * @param params  分页参数
+     * @param searchFilter  过滤器，此处目前仅有关键词
+     * @return
+     */
+    @RequestMapping(params = RequestState.DONE, method = RequestMethod.GET)
+    @ResponseBody
+    public Page<MessageModel> getReadMessageByMessagePublicService(PageParams params, String searchFilter) {
+        JSONObject jsonObject = JSONObject.parseObject(searchFilter);
+        String keyword = jsonObject.getString("keyword");
+        logger.log("查看消息", "查看已读消息列表");
+        try {
+            return pagingReleaseService.getPublicMessage(keyword, params, Constant.YES);
         } catch (Exception e) {
             e.printStackTrace();
             return null;
@@ -190,9 +206,6 @@ public class PagingReleaseController {
     @ResponseBody
     public ModelMap setPageMessageRead(@RequestBody String ids) throws Exception {
         List<Long> messageIds = JSON.parseArray(ids, Long.class);
-        for (Long id : messageIds) {
-            pagingReleaseService.setMessageRead(id);
-        }
-        return new ModelMap("success", "设置成功");
+        return pagingReleaseService.setMessageReadByBatch(messageIds);
     }
 }

src/main/java/com/uas/platform/b2b/controller/SnapshotController.java

@@ -2,6 +2,7 @@ package com.uas.platform.b2b.controller;
 
 import com.uas.platform.b2b.core.util.ThreadUtils;
 import com.uas.platform.b2b.model.User;
+import com.uas.platform.b2b.ps.MessageUtils;
 import com.uas.platform.b2b.service.AddPartnerService;
 import com.uas.platform.b2b.service.CartService;
 import com.uas.platform.b2b.service.MakeAcceptService;
@@ -842,13 +843,13 @@ public class SnapshotController {
 	@ResponseBody
 	@ResponseStatus(value = HttpStatus.OK)
 	public ModelMap getMessages() {
-//		// TODO 调用公共消息服务接口
-//		try {
-//			return new ModelMap("toRead", MessageUtils.getMessageNotReadNum(SystemSession.getUser().getEnterprise().getUu(), SystemSession.getUser().getUserUU()));
-//		} catch (Exception e) {
-//			e.printStackTrace();
-//		}
-		return new ModelMap("toRead", pagingReleaseService.getToReadCount());
+		try {
+			return new ModelMap("toRead", MessageUtils.getMessageNotReadNum(SystemSession.getUser().getEnterprise().getUu(), SystemSession.getUser().getUserUU()));
+		} catch (Exception e) {
+			e.printStackTrace();
+			return null;
+		}
+//		return new ModelMap("toRead", pagingReleaseService.getToReadCount());
 	}
 
 }

src/main/java/com/uas/platform/b2b/ps/MessageUtils.java

@@ -1,5 +1,6 @@
 package com.uas.platform.b2b.ps;
 
+import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.alibaba.fastjson.TypeReference;
 import com.alibaba.fastjson.parser.Feature;
@@ -8,11 +9,14 @@ import com.uas.platform.b2b.core.util.ContextUtils;
 import com.uas.platform.b2b.support.MessageConf;
 import com.uas.platform.b2b.support.SystemSession;
 import com.uas.platform.b2b.temporary.model.MessageModel;
+import com.uas.platform.core.model.PageParams;
 import com.uas.platform.core.util.HttpUtil;
+import com.uas.platform.core.util.serializer.FlexJsonUtils;
 import org.springframework.http.HttpStatus;
 import org.springframework.ui.ModelMap;
 
 import java.util.HashMap;
+import java.util.List;
 
 /**
  * 对接公共消息服务的接口
@@ -29,18 +33,22 @@ public class MessageUtils {
      * 获取公共消息的方法
      *
      * @author dongbw
-     * @param page 页码
-     * @param size 每页条数
+     * @param pageParams 分页参数
+     * @param isRead 阅读状态 1已读 0 未读
+     * @param keyword 关键词
      * @return
      * @throws Exception
      */
-    public static Page<MessageModel> getMessage(int page, int size) throws Exception {
+    public static Page<MessageModel> getMessage(PageParams pageParams, Short isRead, String keyword) throws Exception {
         HashMap<String, Object> params = new HashMap<>();
         params.put("receiverUu", SystemSession.getUser().getUserUU());
         params.put("receiverEnuu", SystemSession.getUser().getEnterprise().getUu());
         params.put("consumerApp", "B2B");
-        params.put("page", page);
-        params.put("size", size);
+        params.put("pageParams", pageParams);
+        params.put("isRead", isRead);
+        if (null != keyword && !"".equals(keyword)) {
+            params.put("keyword", keyword);
+        }
         HttpUtil.Response res = HttpUtil.sendGetRequest(MESSAGE_PUBLIC_SERVICE_URL + "/messages", params);
         if (HttpStatus.OK.value() == res.getStatusCode()) {
             if (null != res.getResponseText()) {
@@ -64,11 +72,13 @@ public class MessageUtils {
      */
     public static ModelMap setRead(Long id) throws Exception {
         ModelMap map = new ModelMap();
-        HashMap<String, String> params = new HashMap<>();
+        HashMap<String, Object> params = new HashMap<>();
+        params.put("receiverUu", SystemSession.getUser().getUserUU());
+        params.put("receiverEnuu", SystemSession.getUser().getEnterprise().getUu());
         params.put("messageId", String.valueOf(id));
         params.put("consumerApp", "B2B");
-        HttpUtil.Response res = HttpUtil.sendPostRequest(MESSAGE_PUBLIC_SERVICE_URL + "/messages/read", params);
-        if (HttpStatus.OK.value() == res.getStatusCode()) {
+        String res = HttpUtil.doPost(MESSAGE_PUBLIC_SERVICE_URL + "/messages/read", FlexJsonUtils.toJsonDeep(params));
+        if (null != res) {
             map.put("success", "成功设为已读");
             return map;
         } else {
@@ -76,6 +86,32 @@ public class MessageUtils {
         }
     }
 
+    /**
+     * 批量设置消息已读
+     *
+     * @author dongbw
+     * @param ids 消息ids
+     * @return
+     * @throws Exception
+     */
+    public static ModelMap setReadByBatch(List<Long> ids) throws Exception {
+        ModelMap map = new ModelMap();
+        String idString = ids.toString().replace("[", "");
+        idString = idString.replace("]", "");
+        HashMap<String, Object> params = new HashMap<>();
+        params.put("receiverUu", SystemSession.getUser().getUserUU());
+        params.put("receiverEnuu", SystemSession.getUser().getEnterprise().getUu());
+        params.put("messageId", idString);
+        params.put("consumerApp", "B2B");
+        String res = HttpUtil.doPost(MESSAGE_PUBLIC_SERVICE_URL + "/messages/read", FlexJsonUtils.toJsonDeep(params));
+        if (null != res) {
+            map.put("success", "批量设置已读成功");
+            return map;
+        } else {
+            throw new RuntimeException("批量设置已读失败");
+        }
+    }
+
     /**
      * 获取当前企业当前用户未读消息数量
      *
@@ -90,15 +126,13 @@ public class MessageUtils {
         params.put("receiverUu", enUU);
         params.put("receiverEnuu", userUU);
         params.put("consumerApp", "B2B");
-        try {
-            HttpUtil.Response res = HttpUtil.sendGetRequest(MESSAGE_PUBLIC_SERVICE_URL + "/messages/notReadNum", params);
-            if (null != res.getResponseText()) {
-                return Integer.valueOf(res.getResponseText());
-            }
-        } catch (Exception e) {
+        HttpUtil.Response res = HttpUtil.sendGetRequest(MESSAGE_PUBLIC_SERVICE_URL + "/messages/count/unread", params);
+        if (res.getStatusCode() == HttpStatus.OK.value() && null != res.getResponseText()) {
+            JSONObject jsonObject = JSON.parseObject(res.getResponseText());
+            return (Integer) jsonObject.get("count");
+        } else {
             throw new RuntimeException("获取消息失败");
         }
-        return null;
     }
 
 }

src/main/java/com/uas/platform/b2b/service/PagingReleaseService.java

@@ -4,9 +4,12 @@ import com.uas.platform.b2b.model.PagingReleaseDetail;
 import com.uas.platform.b2b.model.SearchFilter;
 import com.uas.platform.b2b.temporary.model.MessageModel;
 import com.uas.platform.core.model.PageInfo;
+import com.uas.platform.core.model.PageParams;
 import com.uas.search.b2b.model.SPage;
 import org.springframework.ui.ModelMap;
 
+import java.util.List;
+
 /**
  * Created by dongbw
  * 17/03/23 9:41.
@@ -32,14 +35,22 @@ public interface PagingReleaseService {
     /**
      * 从公共消息服务获取消息
      * @param keyword  关键词
-     * @param pageInfo  分页信息
+     * @param params  分页信息
+     * @param isRead 是否已阅读 1 为已阅读 0为未阅读
      * @return
      */
-    com.uas.account.support.Page<MessageModel> getPublicMessage(String keyword, PageInfo pageInfo) throws Exception;
+    com.uas.account.support.Page<MessageModel> getPublicMessage(String keyword, PageParams params, Short isRead) throws Exception;
 
     /**
      * 消息标为已读
      * @param id 消息id
      */
     ModelMap setMessageRead(Long id) throws Exception;
+
+    /**
+     * 消息批量设为已读
+     * @param messageIds 需要设置已读的消息ids
+     * @return
+     */
+    ModelMap setMessageReadByBatch(List<Long> messageIds) throws Exception;
 }

src/main/java/com/uas/platform/b2b/service/impl/PagingReleaseServiceImpl.java

@@ -9,6 +9,7 @@ import com.uas.platform.b2b.service.PagingReleaseService;
 import com.uas.platform.b2b.support.SystemSession;
 import com.uas.platform.b2b.temporary.model.MessageModel;
 import com.uas.platform.core.model.PageInfo;
+import com.uas.platform.core.model.PageParams;
 import com.uas.platform.core.persistence.criteria.PredicateUtils;
 import com.uas.search.b2b.model.SPage;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -45,7 +46,9 @@ public class PagingReleaseServiceImpl implements PagingReleaseService {
     @Override
     public Integer getToReadCount() {
         Integer count = commonDao.queryForObject(
-                "select count(*) from purc$pagingrelease pr left join purc$pagingreleasedetail prd on pr.pr_id = prd.prd_prid where prd.prd_emuu = " + SystemSession.getUser().getUserUU() + " and prd.prd_venduu = " + SystemSession.getUser().getEnterprise().getUu() + " and prd.prd_readstatus = 0",
+                "select count(*) from purc$pagingrelease pr left join purc$pagingreleasedetail prd on pr.pr_id = prd.prd_prid " +
+                        "where prd.prd_emuu = " + SystemSession.getUser().getUserUU() + " and prd.prd_venduu = " +
+                        SystemSession.getUser().getEnterprise().getUu() + " and prd.prd_readstatus = 0",
                 Integer.class);
         return count;
     }
@@ -76,18 +79,19 @@ public class PagingReleaseServiceImpl implements PagingReleaseService {
      * 从公共消息服务获取消息
      *
      * @param keyword  关键词
-     * @param pageInfo 分页信息
+     * @param params 分页信息
      * @return
      */
     @Override
-    public com.uas.account.support.Page<MessageModel> getPublicMessage(String keyword, PageInfo pageInfo) throws Exception {
-        com.uas.account.support.Page<MessageModel> page =  MessageUtils.getMessage(pageInfo.getPageNumber(), pageInfo.getPageSize());
+    public com.uas.account.support.Page<MessageModel> getPublicMessage(String keyword, PageParams params, Short isRead) throws Exception {
+        com.uas.account.support.Page<MessageModel> page =  MessageUtils.getMessage(params, isRead, keyword);
         List<MessageModel> messageModelList = new ArrayList<>();
         if (page != null) {
             for (MessageModel messageModel : page.getContent()) {
                 // 拼接公共询价链接
                 if ("公共询价".equals(messageModel.getType())) {
-                    messageModel.setUrl("#/baseInfo/inquiryList/" + messageModel.getId());
+
+                    messageModel.setUrl("#/baseInfo/inquiryList/" + messageModel.getSourceId());
                 }
                 messageModelList.add(messageModel);
             }
@@ -105,4 +109,15 @@ public class PagingReleaseServiceImpl implements PagingReleaseService {
     public ModelMap setMessageRead(Long id) throws Exception {
         return MessageUtils.setRead(id);
     }
+
+    /**
+     * 消息批量设为已读
+     *
+     * @param messageIds 需要设置已读的消息ids
+     * @return
+     */
+    @Override
+    public ModelMap setMessageReadByBatch(List<Long> messageIds) throws Exception {
+        return MessageUtils.setReadByBatch(messageIds);
+    }
 }

src/main/java/com/uas/platform/b2b/service/impl/PurcOrderServiceImpl.java

@@ -207,6 +207,7 @@ public class PurcOrderServiceImpl implements PurcOrderService {
 						product.setUnit("PCS");
 						//为了同步商城数据标准，标准字段也赋值
 						product.setPcmpcode(product.getCmpCode());
+						product.setPbranden(product.getPbranden() == null ? product.getBrand() : product.getPbranden());
 						// 新增数据时间
 						product.setErpDate(new Date());
 						product.setStandard(Constant.NO);
@@ -215,7 +216,8 @@ public class PurcOrderServiceImpl implements PurcOrderService {
 						if(product.getCode() != null) {
 							List<Product> prods = productDao.findByEnUUAndCode(SystemSession.getUser().getEnterprise().getUu(), product.getCode());
 							if (CollectionUtils.isEmpty(prods)) {
-								ProductUtils.updateOne(product);
+								Long prId = ProductUtils.updateOne(product);
+								product.setId(prId);
 							} else {
 								product = prods.get(0);
 							}
@@ -226,7 +228,8 @@ public class PurcOrderServiceImpl implements PurcOrderService {
 								//生成随机编码
 								SimpleDateFormat sdf = new SimpleDateFormat("yymmddhhmm_sss");
 								product.setCode("prod" + sdf.format(new Date()));
-								ProductUtils.updateOne(product);
+								Long prId = ProductUtils.updateOne(product);
+								product.setId(prId);
 							} else {
 								product = prods.get(0);
 							}

src/main/java/com/uas/platform/b2b/temporary/model/MessageModel.java

@@ -30,7 +30,12 @@ public class MessageModel{
     private String url;
 
     /**
-     * 消息备注（保存用于拼接跳转链接的参数）
+     * 来源id （拼接跳转详情URL）
+     */
+    private Long sourceId;
+
+    /**
+     * 消息备注（保存用于短信模版的单号参数）
      */
     private String remark;
 
@@ -237,4 +242,12 @@ public class MessageModel{
     public void setConsumerApp(String consumerApp) {
         this.consumerApp = consumerApp;
     }
+
+    public Long getSourceId() {
+        return sourceId;
+    }
+
+    public void setSourceId(Long sourceId) {
+        this.sourceId = sourceId;
+    }
 }

src/main/webapp/resources/js/index/app.js

@@ -1061,7 +1061,35 @@ define(['toaster', 'charts', 'ngTable', 'common/services', 'common/directives',
      * 新消息提醒（调用公共服务接口）  -2018-01-22 19:36:50
      * @author dongbw
      */
-    app.controller('PagingReleaseCtrl', ['$scope', 'PagingRelease', 'BaseService', 'ngTableParams', 'toaster', '$modalInstance', 'PagingReleaseInfo', function ($scope, PagingRelease, BaseService, ngTableParams, toaster, $modalInstance, PagingReleaseInfo) {
+    app.controller('PagingReleaseCtrl', ['$scope', 'PagingRelease', 'BaseService', 'ngTableParams', 'toaster', '$modalInstance', 'PagingReleaseInfo',
+        function ($scope, PagingRelease, BaseService, ngTableParams, toaster, $modalInstance, PagingReleaseInfo) {
+
+        $scope.active = "todo";
+        $scope.setActive = function (state) {
+            if ($scope.active != state) {
+                $scope.active = state;
+                if ($scope.tableParams.page() == 1)
+                    $scope.tableParams.reload();
+                else
+                    $scope.tableParams.page(1);
+            }
+        };
+
+        /**
+         * 页面状态按钮过滤
+         */
+        var getMessageState = function (active) {
+            var fn = 'get';
+            switch (active) {
+                case 'done':
+                    fn = 'getDone';
+                    break;
+                case 'todo':
+                    fn = 'getTodo';
+                    break;
+            }
+            return fn;
+        };
 
         $scope.tableParams = new ngTableParams({
             page: 1,
@@ -1081,7 +1109,7 @@ define(['toaster', 'charts', 'ngTable', 'common/services', 'common/directives',
                     // fromDate: getDateTime($scope.condition.dateFrom),
                     // endDate: getDateTime($scope.condition.dateTo)
                 };
-                PagingRelease.getMessage.call(null, BaseService.parseParams(pageParams), function (page) {
+                PagingRelease[getMessageState($scope.active)].call(null, BaseService.parseParams(pageParams), function (page) {
                     $scope.loading = false;
                     if (page) {
                         params.total(page.totalElements);
@@ -1154,9 +1182,12 @@ define(['toaster', 'charts', 'ngTable', 'common/services', 'common/directives',
 
         // 点击内容连接之后，信息标为已读
         $scope.setOneRead = function (id) {
+            $scope.loading = true;
             $modalInstance.close();
             PagingRelease.setMessageRead({id: id}, {}, function (data) {
+                $scope.loading = false;
             }, function (response) {
+                $scope.loading = false;
                 toaster.pop('error', '提示', response.data);
             });
         };
@@ -3053,6 +3084,7 @@ define(['toaster', 'charts', 'ngTable', 'common/services', 'common/directives',
             $scope.isUser = data.isUser;
         });
         var loadData = function () {
+            $scope.loading = true;
             PurcOrdersInfo.getAll({id: $stateParams.id}, function (data) {
                 $scope.order = data;
                 var sum = 0;

src/main/webapp/resources/js/index/services/Purc.js

@@ -1266,10 +1266,6 @@ define([ 'ngResource'], function() {
                     _state: 'done'
                 }
 			},
-			getMessage: {
-				url: 'api/paging/info',
-				method: 'GET'
-			},
 			// 设置消息已读（公共消息服务）
 			setMessageRead: {
 				url: 'api/paging/message/setRead',

src/main/webapp/resources/tpl/index/home/pagingRelease.html

@@ -31,7 +31,7 @@
 
     .menu-status {
         height: 36px;
-        margin-bottom: 36px;
+        margin-bottom: 18px;
     }
 
     .menu-status .btn-select:hover {
@@ -137,19 +137,30 @@
             <a ng-click="close()"><i class="fa fa-close fa-lg"></i></a>
         </div>
     </div>
-    <!--<div class="menu-message">-->
-        <!--<div class="input-group search-group col-xs-4 pull-right" style="margin-right: 48px;">-->
-            <!--<input id="search_input" type="search" class="form-control input-sm" ng-model="keyword" ng-search="onSearch()" placeholder="输入查询信息" />-->
-            <!--<span class="input-group-btn">-->
-                <!--<button id="search_btn" class="btn x-rss-btn x-background-whiteblue" ng-click="onSearch()">&nbsp;&nbsp;搜索&nbsp;&nbsp;</button>-->
-            <!--</span>-->
-        <!--</div>-->
-    <!--</div>-->
-    <div class="footer-click">
-        <div>
-            <a ng-click="setRead()" style="color: #5078cb;">此页标为已读</a>
+    <div class="menu-message">
+        <div style="font-size: 14px; color: rgb(102,102,102); float: left; margin-top: 6px;margin-left: 6px;">
+            <span>消息状态:</span>
+        </div>
+        <div class="btn-group menu-status">
+            <div class="btn-group">
+                <button type="button" class="btn btn-select"
+                        ng-class="{'btn-selected':active=='todo'}" ng-click="setActive('todo')">未读</button>
+            </div>
+            <div class="btn-group">
+                <button type="button" class="btn btn-select"
+                        ng-class="{'btn-selected':active=='done'}" ng-click="setActive('done')">已读</button>
+            </div>
+        </div>
+        <div class="input-group search-group col-xs-4 pull-right" style="margin-right: 48px;">
+            <input id="search_input" type="search" class="form-control input-sm" ng-model="keyword" ng-search="onSearch()" placeholder="输入查询信息" />
+            <span class="input-group-btn">
+                <button id="search_btn" class="btn x-rss-btn x-background-whiteblue" ng-click="onSearch()">&nbsp;&nbsp;搜索&nbsp;&nbsp;</button>
+            </span>
         </div>
     </div>
+    <div class="footer-click">
+        <a ng-if="active == 'todo' && tableParams.total() != 0 " ng-click="setRead()" style="color: #5078cb;">此页标为已读</a>
+    </div>
     <table class="block table release-table"
            ng-table="tableParams">
         <thead>