Merge remote-tracking branch 'origin/feature_release-tomysql' into feature_release-tomysql

src/main/java/com/uas/platform/b2c/common/account/controller/AuthenticationController.java

@@ -4,16 +4,9 @@ import com.uas.platform.b2c.common.account.dao.UserLoginTimeDao;
 import com.uas.platform.b2c.common.account.model.User;
 import com.uas.platform.b2c.common.account.model.UserInfo;
 import com.uas.platform.b2c.common.account.model.UserLoginTime;
-import com.uas.platform.b2c.common.account.model.UserQuestion;
-import com.uas.platform.b2c.common.account.service.UserQuestionService;
-import com.uas.platform.b2c.common.account.model.UserQuestion;
 import com.uas.platform.b2c.common.account.service.UserQuestionService;
 import com.uas.platform.b2c.common.account.service.UserService;
 import com.uas.platform.b2c.core.support.SystemSession;
-
-import java.util.Collection;
-import java.util.List;
-
 import com.uas.platform.core.model.Constant;
 import net.sf.ehcache.CacheManager;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -22,6 +15,7 @@ import org.springframework.util.CollectionUtils;
 import org.springframework.web.bind.annotation.*;
 
 import javax.servlet.http.HttpServletRequest;
+import java.util.List;
 
 /**
  *

src/main/java/com/uas/platform/b2c/common/message/controller/InternalMessageController.java

@@ -56,31 +56,22 @@ public class InternalMessageController {
      * 获取url
      */
     @RequestMapping(value = "/getUrl",method = RequestMethod.GET)
-    public ModelMap getUrl() {
+    public ModelMap getUrl(PageParams pageParams, Short isRead, String keyword) {
         ModelMap map = new ModelMap();
         User user = SystemSession.getUser();
         map.put("url", messageServiceUrl);
         map.put("userUU", user.getUserUU());
         map.put("enUU", user.getEnterprise().getUu());
+        map.put("page", pageParams.getPage());
+        map.put("timeSorting", pageParams.getSorting() == null ? "{\"createTime\":\"DESC\"}" : pageParams.getSorting());
+        map.put("count", pageParams.getCount());
+        map.put("isRead", isRead == null ? "" : isRead);
+        if (null != keyword && !"".equals(keyword)) {
+            map.put("keyword", keyword);
+        }
         return map;
     }
 
-
-/*    *//**
-     * 分页获取消息 (用户)
-     * @param recRole 接收角色
-     * @param timeSorting 时间排序
-     * @param classes 消息分类
-     * @param page 分页参数
-     * @return
-     *//*
-    @RequestMapping(value = "/private", method = RequestMethod.GET)
-    public ModelMap getMessagePagePrivate(@RequestParam(value = "recRole", defaultValue = "BUYER") String recRole, @RequestParam("timeSorting") String timeSorting, @RequestParam("classes") String classes, PageParams page) {
-        ModelMap map = new ModelMap();
-        map.put("messages", internalMessageService.getMessagePage(SystemSession.getUser().getUserUU(), (SystemSession.getUser().getEnterprise() != null ? SystemSession.getUser().getEnterprise().getUu(): null), recRole, timeSorting, classes, page));
-        return map;
-    }*/
-
     /**
      * 获取消息的方法
      *
@@ -121,6 +112,7 @@ public class InternalMessageController {
 //		return new ModelMap("toRead", pagingReleaseService.getToReadCount());
     }
 
+
     /**
      * 阅读消息
      * @param id

src/main/java/com/uas/platform/b2c/core/filter/SSOInterceptor.java

@@ -211,6 +211,7 @@ public class SSOInterceptor extends AbstractSSOInterceptor {
                     if (user.getEnterprise().getUu().toString().equals(enUU)) {
                         if (!"登录商城后台进行运维管理".equals(needPermission)) {
                             throw new AccessDeniedException("无法访问，没有 " + needPermission + " 权限！");
+
                         }
                     }
                 }*/

src/main/resources/prod/message.properties

@@ -2,7 +2,6 @@ tplNotifySupplierAfterCommit=3c70dd8f-0e1e-4aec-bd7f-c360a506f35e
 plaformB2cAuditRemindTemplateId=774296f3-a260-4bb5-b4eb-6f01090dadf3
 plaformB2cBrandApprovedTemplateId=5b5effdf-5562-45f7-9021-18f21e29bec6
 plaformB2cBrandUnproveTemplateId=03b3d658-cd92-43a0-a53f-103492cfc595
-tplAfterBeAddedtoB2C=b9dee589-9fd8-45d3-9b2a-64b56d65e7e2
 plaformB2cComponentApprovedTemplateId=36812a85-d0f9-4d2a-a7aa-62319f092b6f
 plaformB2cComponentUnproveTemplateId=6228240a-93ba-405f-851c-f874a6c99864
 plaformB2cSupplyChainTemplateId=b28337ba-f115-4f11-b457-15d558443160

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

@@ -711,15 +711,16 @@ define([ 'angularAMD', 'ui.router', 'ui-bootstrap', 'ngLocal', 'ngTable', 'commo
 
 
     /**
-     * 卖家中心头部
+     * 买家中心头部
      */
     app.controller('UserCenterHeaderCtrl', ['$scope', '$rootScope', 'BaseService', 'InternalMessage', '$http', 'toaster', function ($scope, $rootScope, BaseService, InternalMessage, $http, toaster) {
-        $scope.homeUrl = BaseService.getRootPath();
+		$scope.homeUrl = BaseService.getRootPath();
+        console.info($rootScope.userInfo);
         InternalMessage.getUrl({}, function(data) {
             var url = data.url;
             if (url == "http://218.17.158.219:24000/message") {
-				url = 'http://192.168.253.6:24000/message';
-			}
+                url = 'http://192.168.253.6:24000/message';
+            }
             var param = {
                 'receiverUu': data.userUU,
                 'receiverEnuu': data.enUU,
@@ -732,7 +733,6 @@ define([ 'angularAMD', 'ui.router', 'ui-bootstrap', 'ngLocal', 'ngTable', 'commo
                 url: url + '/messages/count',
                 params: param
             }).success(function (data) {
-            	console.info(data.count);
                 $rootScope.unReadMessCount = data.count;
             }).error(function (err) {
                 toaster.pop('error', err || '获取未读消息数量失败');
@@ -744,6 +744,12 @@ define([ 'angularAMD', 'ui.router', 'ui-bootstrap', 'ngLocal', 'ngTable', 'commo
         //     toaster.pop('error', err || '获取未读消息数量失败');
         // })
     }]);
+        /*InternalMessage.getUnread({isRead: 0}, function (data) {
+            $rootScope.unReadMessCount = data.toRead;
+        }, function (err) {
+            toaster.pop('error', err || '获取未读消息数量失败');
+        })
+    }]);*/
 	/**
 	 * 采购单状态
 	 */

src/main/webapp/resources/js/usercenter/controllers/forstore/messagePersonalCtrl.js

@@ -2,15 +2,15 @@
  * Created by yangck on 2017/3/30.
  */
 define(['app/app'], function(app) {
-    app.register.controller('MessagePersonalCtrl', ['$scope', '$rootScope', 'InternalMessage', 'toaster', '$sce', function($scope, $rootScope, InternalMessage, toaster, $sce) {
+    app.register.controller('MessagePersonalCtrl', ['$scope', '$rootScope', 'InternalMessage', 'toaster', '$sce', '$http', function($scope, $rootScope, InternalMessage, toaster, $sce, $http) {
         $rootScope.active = 'message';
         $scope.message = {};
         $scope.params = {
             page: 1,
             count: 10,
-            timeSorting: 'DESC',
+            timeSorting: '{\"createTime\":\"DESC\"}',
             classes: '',
-            recRole: 'BUYER'
+            recRole: 'BUYER',
         };
         $scope.deleteIds = [];
         $scope.isChoosedAll = false;
@@ -203,8 +203,7 @@ define(['app/app'], function(app) {
         };*/
         // 时间排序
         $scope.orderTime = function () {
-            $scope.params.timeSorting = $scope.params.timeSorting == 'DESC' ? 'ASC' : 'DESC'
-            $scope.params.sorting = {createTime: $scope.params.timeSorting};
+            $scope.params.timeSorting = $scope.params.timeSorting == '{\"createTime\":\"DESC\"}' ? '{\"createTime\":\"ASC\"}' : '{\"createTime\":\"DESC\"}';
             getData();
         };
 
@@ -320,39 +319,111 @@ define(['app/app'], function(app) {
         $scope.unReadMessCount = $rootScope.unReadMessCount;
         $scope.allReadMessCount = 0;
         var getData = function () {
-            InternalMessage.getUnread({}, function (data) {
-                $scope.allReadMessCount = data.toRead;
+            InternalMessage.getUrl({}, function(data) {
+
+                var url = data.url;
+                if (url == "http://218.17.158.219:24000/message") {
+                    url = 'http://192.168.253.6:24000/message';
+                }
+                var param = {
+                    'receiverUu': data.userUU,
+                    'receiverEnuu': data.enUU,
+                    'consumerApp': 'MALL',
+                    isRead: null
+                };
+                $http({
+                    method: 'get',
+                    dataType: 'json',
+                    url: url + '/messages/count',
+                    params: param
+                }).success(function (data) {
+                    $scope.allReadMessCount = data.count;
+                }).error(function (err) {
+                    toaster.pop('error', err || '获取未读消息数量失败');
+                });
+            })
+              /*  $scope.allReadMessCount = data.toRead;
             }, function (err) {
                 toaster.pop('error', err || '获取未读消息数量失败');
-            })
-            InternalMessage.getMessagesPagePrivate($scope.params, function(data) {
-                if (data) {
-                    console.log(data);
-                    $scope.messageAllData = data;
-                    $scope.messageCurrent = data.content;
-                    angular.forEach($scope.messageCurrent, function(message) {
-                        message.content = $sce.trustAsHtml(message.content);
-                    });
-                    $scope.params.currentPage = data.number;
-                    $scope.acculatePages(data.number, data.totalPages);
+            })*/
+            InternalMessage.getUrl({}, function(info) {
+                if (info) {
+                    var url = info.url;
+                    if (url == "http://218.17.158.219:24000/message") {
+                        url = 'http://192.168.253.6:24000/message';
+                    }
+                    var param = {
+                        'receiverUu': info.userUU,
+                        'receiverEnuu': info.enUU,
+                        'consumerApp': 'MALL',
+                        isRead : $scope.params.isRead,
+                        page: $scope.params.page,
+                        count: 10,
+                        sorting: $scope.params.timeSorting ,
+                        classes: '',
+                        recRole: 'SELLER',
+                    }
+                    $http({
+                        method: 'get',
+                        dataType: 'json',
+                        url: url + '/messages',
+                        params: param
+                    }).success(function (data) {
+                        $scope.messageAllData = data;
+                        $scope.messageCurrent = data.content;
 
+                        var mess = new Array();
+                        var b = '';
+                        angular.forEach($scope.messageCurrent, function (message) {
+                            message.content = $sce.trustAsHtml(message.content);
+                            if(message.type =="MALL跳转卖家待报价页面"){
+                                message.url='/vendor#/seekPurchase';
+                            }else if (message.type =="MALL公共询价"){
+                                message.url='/user#/seekPurchase';
+                            }else if (message.type =="商城公共询价采纳结果"){
+                                message.url='/vendor#/vendorPurchaseOffer';
+                            }
+                            if(message.isRead !=1 ){
+                                b += message.id +",";
+                            }
+                        })
+                        mess = b.substring(0, b.length - 1);
+                        var param = {
+                            'receiverUu': info.userUU,
+                            'receiverEnuu': info.enUU,
+                            'messageId': mess,
+                            'consumerApp': 'MALL'
+
+                        };
+                        $http({
+                            method: 'post',
+                            dataType: 'json',
+                            url: url + '/messages/read',
+                            data:param
+                        });
+                        $scope.params.currentPage = data.number;
+                        $scope.acculatePages(data.number, data.totalPages);
+                    }).error(function (err) {
+                        toaster.pop('error', err || '获取未读消息数量失败');
+                    })
                     if ($scope.tab == 'no') {
                         // $rootScope.unReadMessCount = data.totalElements;
                     } else {
-                        var params = {
+                        var param = {
                             page: 1,
                             count: 10,
                             timeSorting: 'DESC',
                             classes: '',
                             recRole: 'SELLER',
-                            isRead: 0
+                            'isRead': 0
                         };
-                        InternalMessage.getMessagesPagePrivate(params, function(data) {
-                            InternalMessage.getUnread({isRead: 0}, function (data) {
-                                $rootScope.unReadMessCount = data.toRead;
-                                $scope.unReadMessCount = data.toRead
+
+                            /*InternalMessage.getUnread({isRead: 0}, function (data) {*/
+                                InternalMessage.getUrl({isRead: 0}, function (data) {
+                                $rootScope.unReadMessCount = data.count;
+                                $scope.unReadMessCount = data.count;
                             })
-                        })
+
                     }
                 }
             }, function(response) {

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

@@ -954,8 +954,9 @@ define([ 'angularAMD', 'ngLocal', 'common/services', 'common/directives', 'commo
 	/**
 	 * 卖家中心头部
 	 */
-	app.controller('VendorCenterHeaderCtrl', ['$scope', '$rootScope', 'BaseService', 'InternalMessage', '$http', 'toaster', function ($scope, $rootScope, BaseService, InternalMessage, $http, toaster) {
-		$scope.homeUrl = BaseService.getRootPath();
+    app.controller('VendorCenterHeaderCtrl', ['$scope', '$rootScope', 'BaseService', 'InternalMessage', '$http', 'toaster', function ($scope, $rootScope, BaseService, InternalMessage, $http, toaster) {
+        $scope.homeUrl = BaseService.getRootPath();
+        /*console.info($rootScope.userInfo);*/
         InternalMessage.getUrl({}, function(data) {
             var url = data.url;
             if (url == "http://218.17.158.219:24000/message") {
@@ -973,9 +974,9 @@ define([ 'angularAMD', 'ngLocal', 'common/services', 'common/directives', 'commo
                 url: url + '/messages/count',
                 params: param
             }).success(function (data) {
-            	console.info(data.count);
                 $rootScope.unReadMessCount = data.count;
-            }).error(function (err) {
+
+            }).error(function (response) {
                 toaster.pop('error', err || '获取未读消息数量失败');
             });
         });
@@ -984,7 +985,7 @@ define([ 'angularAMD', 'ngLocal', 'common/services', 'common/directives', 'commo
         // }, function (err) {
         //     toaster.pop('error', err || '获取未读消息数量失败');
         // })
-	}]);
+    }]);
 
 	/**
 	 * 卖家中心菜单控制器

src/main/webapp/resources/js/vendor/controllers/forstore/messagePersonalCtrl.js

@@ -2,13 +2,13 @@
  * Created by yangck on 2017/3/30.
  */
 define(['app/app'], function(app) {
-    app.register.controller('MessagePersonalCtrl', ['$scope', '$rootScope', 'InternalMessage', 'toaster', '$sce', function($scope, $rootScope, InternalMessage, toaster, $sce) {
+    app.register.controller('MessagePersonalCtrl', ['$scope', '$rootScope', 'InternalMessage', 'toaster', '$sce', '$http', function($scope, $rootScope, InternalMessage, toaster, $sce, $http) {
         $rootScope.active = 'message';
         $scope.message = {};
         $scope.params = {
             page: 1,
             count: 10,
-            timeSorting: 'DESC',
+            timeSorting: '{\"createTime\":\"DESC\"}',
             classes: '',
             recRole: 'SELLER'
         };
@@ -197,8 +197,9 @@ define(['app/app'], function(app) {
 
         // 时间排序
         $scope.orderTime = function () {
-            $scope.params.timeSorting = $scope.params.timeSorting == 'DESC' ? 'ASC' : 'DESC'
-            $scope.params.sorting = {createTime: $scope.params.timeSorting};
+            /*$scope.params.timeSorting = $scope.params.timeSorting == 'DESC' ? 'ASC' : 'DESC'
+            $scope.params.sorting = {createTime: $scope.params.timeSorting};*/
+            $scope.params.timeSorting = $scope.params.timeSorting == '{\"createTime\":\"DESC\"}' ? '{\"createTime\":\"ASC\"}' : '{\"createTime\":\"DESC\"}';
             getData();
         };
 
@@ -220,11 +221,11 @@ define(['app/app'], function(app) {
             });
         };
 
-        $scope.unReadMessCount = $rootScope.unReadMessCount;
+        /*$scope.unReadMessCount = $rootScope.unReadMessCount;
         $scope.isReadMessCount = 0;
         var getData = function () {
-            /*InternalMessage.getUnread({isRead: 0}, function (data) {
-                $scope.unReadMessCount = data.toRead;*/
+            /!*InternalMessage.getUnread({isRead: 0}, function (data) {
+                $scope.unReadMessCount = data.toRead;*!/
             InternalMessage.getUnread({}, function (data) {
                 $scope.allReadMessCount = data.toRead;
             }, function (err) {
@@ -240,9 +241,9 @@ define(['app/app'], function(app) {
                     });
                     $scope.params.currentPage = data.number;
                     $scope.acculatePages(data.number, data.totalPages);
-                   /* if ($scope.tab == 'all') {
+                   /!* if ($scope.tab == 'all') {
                         $scope.isReadMessCount = data.totalElements;
-                    }*/
+                    }*!/
                     var params = {
                         page: 1,
                         count: 10,
@@ -278,7 +279,119 @@ define(['app/app'], function(app) {
             }, function(response) {
                 toaster.pop('error', '获取消息失败，请重新刷新界面，');
             });
+        };*/
+        $scope.unReadMessCount = $rootScope.unReadMessCount;
+        $scope.allReadMessCount = 0;
+        var getData = function () {
+            InternalMessage.getUrl({}, function(data) {
+
+                var url = data.url;
+                if (url == "http://218.17.158.219:24000/message") {
+                    url = 'http://192.168.253.6:24000/message';
+                }
+                var param = {
+                    'receiverUu': data.userUU,
+                    'receiverEnuu': data.enUU,
+                    'consumerApp': 'MALL',
+                    isRead: null
+                };
+                $http({
+                    method: 'get',
+                    dataType: 'json',
+                    url: url + '/messages/count',
+                    params: param
+                }).success(function (data) {
+                    $scope.allReadMessCount = data.count;
+                }).error(function (err) {
+                    toaster.pop('error', err || '获取未读消息数量失败');
+                });
+            })
+            InternalMessage.getUrl({}, function(info) {
+                if (info) {
+                    var url = info.url;
+                    if (url == "http://218.17.158.219:24000/message") {
+                        url = 'http://192.168.253.6:24000/message';
+                    }
+                    var param = {
+                        'receiverUu': info.userUU,
+                        'receiverEnuu': info.enUU,
+                        'consumerApp': 'MALL',
+                        isRead : $scope.params.isRead,
+                        page: $scope.params.page,
+                        count: 10,
+                        sorting: $scope.params.timeSorting ,
+                        classes: '',
+                        recRole: 'SELLER',
+                    }
+                    $http({
+                        method: 'get',
+                        dataType: 'json',
+                        url: url + '/messages',
+                        params: param
+                    }).success(function (data) {
+                        $scope.messageAllData = data;
+                        $scope.messageCurrent = data.content;
+
+                        var mess = new Array();
+                        var b = '';
+                        angular.forEach($scope.messageCurrent, function (message) {
+                            message.content = $sce.trustAsHtml(message.content);
+                            if(message.type =="MALL跳转卖家待报价页面"){
+                                message.url='/vendor#/seekPurchase';
+                            }else if (message.type =="MALL公共询价"){
+                                message.url='/user#/seekPurchase';
+                            }else if (message.type =="商城公共询价采纳结果"){
+                                message.url='/vendor#/vendorPurchaseOffer';
+                            }
+
+                            if(message.isRead != 1){
+                                b += message.id +",";
+                            }
+                        })
+                        mess = b.substring(0, b.length - 1);
+                        var param = {
+                            'receiverUu': info.userUU,
+                            'receiverEnuu': info.enUU,
+                            'messageId': mess,
+                            'consumerApp': 'MALL'
+
+                        };
+                        $http({
+                            method: 'post',
+                            dataType: 'json',
+                            url: url + '/messages/read',
+                            data:param
+                        });
+                        $scope.params.currentPage = data.number;
+                        $scope.acculatePages(data.number, data.totalPages);
+                    }).error(function (err) {
+                        toaster.pop('error', err || '获取未读消息数量失败');
+                    })
+                    if ($scope.tab == 'no') {
+                        // $rootScope.unReadMessCount = data.totalElements;
+                    } else {
+                        var param = {
+                            page: 1,
+                            count: 10,
+                            timeSorting: 'DESC',
+                            classes: '',
+                            recRole: 'SELLER',
+                            'isRead': 0
+                        };
+                        InternalMessage.getUrl({}, function(data) {
+                            /*InternalMessage.getUnread({isRead: 0}, function (data) {*/
+                            InternalMessage.getUrl({isRead: 0}, function (data) {
+                                $rootScope.unReadMessCount = data.count;
+                                $scope.unReadMessCount = data.count;
+                            })
+                        })
+                    }
+                }
+            }, function(response) {
+                toaster.pop('error', '获取消息失败，请重新刷新界面，');
+            });
         };
+
         // 批量删除
         $scope.deleteBatch = function () {
             var hasDelete = false;

src/main/webapp/resources/view/usercenter/forstore/messagePersonal.html

@@ -153,7 +153,7 @@
                 </select>
             </div>-->
             <div class="filter-list">
-                <a ng-click="orderTime()">时间<i class="fa fa-long-arrow-up" aria-hidden="true" ng-show="params.timeSorting == 'ASC'"></i><i class="fa fa-long-arrow-down" aria-hidden="true" ng-show="params.timeSorting == 'DESC'"></i></a>
+                <a ng-click="orderTime()">时间<i class="fa fa-long-arrow-up" aria-hidden="true" ng-show="params.timeSorting == '{&quot;createTime&quot;:&quot;DESC&quot;}'"></i><i class="fa fa-long-arrow-down" aria-hidden="true" ng-show="params.timeSorting == '{&quot;createTime&quot;:&quot;ASC&quot;}'"></i></a>
             <!--  <a ng-click="deleteBatch()">删除</a>-->
                <!-- <label class="check-active">
                     <input type="checkbox" id="isChooseAll" ng-click="chooseAll()" ng-model="isChoosedAll">

src/main/webapp/resources/view/vendor/forstore/messagePersonal.html

@@ -150,7 +150,7 @@
                 </select>
             </div>-->
             <div class="filter-list">
-                <a ng-click="orderTime()">时间<i class="fa fa-long-arrow-up" aria-hidden="true" ng-show="params.timeSorting == 'ASC'"></i><i class="fa fa-long-arrow-down" aria-hidden="true" ng-show="params.timeSorting == 'DESC'"></i></a>
+                <a ng-click="orderTime()">时间<i class="fa fa-long-arrow-up" aria-hidden="true" ng-show="params.timeSorting == '{&quot;createTime&quot;:&quot;DESC&quot;}'"></i><i class="fa fa-long-arrow-down" aria-hidden="true" ng-show="params.timeSorting == '{&quot;createTime&quot;:&quot;ASC&quot;}'"></i></a>
               <!--<a ng-click="deleteBatch()">删除</a>-->
                <!-- <label class="check-active">
                     <input type="checkbox" id="isChooseAll" ng-click="chooseAll()" ng-model="isChoosedAll">