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

src/main/java/com/uas/platform/b2c/common/account/model/User.java

@@ -24,7 +24,7 @@ import java.io.Serializable;
 @Entity
 @Table(name = "sec$users")
 @Cacheable
-@Cache(usage = CacheConcurrencyStrategy.READ_WRITE, region = "com.uas.platform.b2b.model.User")
+@Cache(usage = CacheConcurrencyStrategy.READ_WRITE, region = "com.uas.platform.b2c.model.User")
 public class User implements Serializable {
 
 	/**
@@ -124,7 +124,7 @@ public class User implements Serializable {
 	@ManyToMany(cascade = { CascadeType.REFRESH, CascadeType.REMOVE }, fetch = FetchType.EAGER)
 	@JoinTable(name = "sec$userenterprise", joinColumns = @JoinColumn(name = "user_uu", referencedColumnName = "user_uu"), inverseJoinColumns = @JoinColumn(name = "en_uu", referencedColumnName = "en_uu"))
 	@OrderBy("uu")
-	//@Cache(usage = CacheConcurrencyStrategy.READ_WRITE)
+	@Cache(usage = CacheConcurrencyStrategy.READ_WRITE)
 	private Set<Enterprise> enterprises;
 
 	/**

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

@@ -382,6 +382,8 @@ define(['app/app'], function(app) {
                                 message.url='/vendor#/seekPurchase?type=1';
                             }else if (message.type =="商城公共询价采纳结果"){
                                 message.url='/vendor#/vendorPurchaseOffer';
+                            }else if (message.type =="公共询价采纳结果"){
+                                message.url='/vendor#/vendorPurchaseOffer';
                             }
                             if(message.isRead !=1 ){
                                 b += message.id +",";
@@ -419,9 +421,9 @@ define(['app/app'], function(app) {
                         };
 
                             /*InternalMessage.getUnread({isRead: 0}, function (data) {*/
-                                InternalMessage.getUrl({isRead: 0}, function (data) {
-                                $rootScope.unReadMessCount = data.count;
-                                $scope.unReadMessCount = data.count;
+                                InternalMessage.getUnread({isRead: 0}, function (data) {
+                                $rootScope.unReadMessCount = data.toRead;
+                                $scope.unReadMessCount = data.toRead;
                             })
 
                     }

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

@@ -342,6 +342,8 @@ define(['app/app'], function(app) {
                                 message.url='/vendor#/seekPurchase?type=1';
                             }else if (message.type =="商城公共询价采纳结果"){
                                 message.url='/vendor#/vendorPurchaseOffer';
+                            }else if (message.type =="公共询价采纳结果"){
+                                message.url='/vendor#/vendorPurchaseOffer';
                             }
 
                             if(message.isRead != 1){
@@ -380,9 +382,9 @@ define(['app/app'], function(app) {
                         };
                         InternalMessage.getUrl({}, function(data) {
                             /*InternalMessage.getUnread({isRead: 0}, function (data) {*/
-                            InternalMessage.getUrl({isRead: 0}, function (data) {
-                                $rootScope.unReadMessCount = data.count;
-                                $scope.unReadMessCount = data.count;
+                            InternalMessage.getUnread({isRead: 0}, function (data) {
+                                $rootScope.unReadMessCount = data.toRead;
+                                $scope.unReadMessCount = data.toRead;
                             })
                         })
                     }