Просмотр исходного кода

新增采购单增加token验证

git-svn-id: svn+ssh://10.10.101.21/source/platform/platform-b2b@10758 f3bf4e98-0cf0-11e4-a00c-a99a8b9d557d
hejq 8 лет назад
Родитель
Сommit
835801e703

+ 10 - 2
src/main/java/com/uas/platform/b2b/controller/BaseInfoController.java

@@ -33,6 +33,7 @@ import com.uas.platform.b2b.service.BaseInfoService;
 import com.uas.platform.b2b.service.ProductService;
 import com.uas.platform.b2b.support.JxlsExcelView;
 import com.uas.platform.b2b.support.SystemSession;
+import com.uas.platform.b2b.support.TokenService;
 import com.uas.platform.b2b.support.UsageBufferedLogger;
 import com.uas.platform.b2b.temporary.model.BasePartnersInfo;
 import com.uas.platform.b2b.temporary.model.NewPurcOrder;
@@ -71,6 +72,9 @@ public class BaseInfoController {
 	@Autowired
 	private BaseInfoService baseInfoService;
 
+	@Autowired
+	private TokenService tokenService;
+
 	/**
 	 * 查看自己的物料资料
 	 */
@@ -377,10 +381,14 @@ public class BaseInfoController {
 	 * @return
 	 */
 	@RequestMapping(value = "/addtoCart", method = RequestMethod.POST)
-	public ResponseEntity<ModelMap> save(@RequestBody String json) {
+	public ResponseEntity<ModelMap> save(String token, @RequestBody String json) {
 		NewPurcOrder neworder = JSONObject.parseObject(json, NewPurcOrder.class);
 		ModelMap map = new ModelMap();
-		map = baseInfoService.addtoCart(neworder);
+		boolean flag = tokenService.enabled(token);
+		if (flag) {
+			map = baseInfoService.addtoCart(neworder);
+			tokenService.delete(token);
+		}
 		return new ResponseEntity<ModelMap>(map, HttpStatus.OK);
 	}
 	

+ 14 - 4
src/main/webapp/resources/js/index/app.js

@@ -12863,7 +12863,7 @@ define(['toaster', 'charts', 'ngTable', 'common/services', 'common/directives',
     /**
      * 新增采购单
      */
-    app.controller('PurcNewOrderCtrl', ['$scope', '$modal', 'toaster', '$filter', 'addtoCart', '$rootScope', 'VendorInfo', 'ngTableParams', 'BaseService', 'Product', 'newPurcOrder', 'cartOperation', 'ShipAddress', 'Vendor', '$http', '$window', function ($scope, $modal, toaster, $filter, addtoCart, $rootScope, VendorInfo, ngTableParams, BaseService, Product, newPurcOrder, cartOperation, ShipAddress, Vendor, $http, $window) {
+    app.controller('PurcNewOrderCtrl', ['$scope', '$modal', 'toaster', '$filter', 'addtoCart', '$rootScope', 'VendorInfo', 'ngTableParams', 'BaseService', 'Product', 'newPurcOrder', 'cartOperation', 'ShipAddress', 'Vendor', '$http', '$window', 'token', function ($scope, $modal, toaster, $filter, addtoCart, $rootScope, VendorInfo, ngTableParams, BaseService, Product, newPurcOrder, cartOperation, ShipAddress, Vendor, $http, $window, token) {
         BaseService.scrollBackToTop();
         // 每次进入时先清除掉rootScope下的venduu
         $rootScope.venduu = null;
@@ -12879,7 +12879,17 @@ define(['toaster', 'charts', 'ngTable', 'common/services', 'common/directives',
         }).then(function (response) {
             $scope.provinces = response.data;
         });
-
+        var getToken = function() {
+        	if($scope.token == null) {
+        		token.info({userType: 'salenotice'}, {}, function(data) {
+        			$scope.token = data.token;
+        		}, function(response) {
+        			toaster.pop('error', '提示', response.data);
+        		});
+        	}
+        }
+        getToken();
+        
         $scope.order = {
             date: new Date(),
             cust: {
@@ -13150,7 +13160,7 @@ define(['toaster', 'charts', 'ngTable', 'common/services', 'common/directives',
                     $scope.order.orderItems[i].rate = 0;
                 }
             }
-            addtoCart.save({}, $scope.order, function (data) {
+            addtoCart.save({token: $scope.token}, $scope.order, function (data) {
                 $scope.loading = false;
                 toaster.pop('success', '成功', '保存成功');
                 window.location.hash = '#/purc/cart/' + data.id;
@@ -13181,7 +13191,7 @@ define(['toaster', 'charts', 'ngTable', 'common/services', 'common/directives',
                     $scope.order.orderItems[i].rate = 0;
                 }
             }
-            addtoCart.save({}, $scope.order, function (data) {
+            addtoCart.save({token: $scope.token}, $scope.order, function (data) {
                 $scope.loading = false;
                 toaster.pop('success', '成功', '保存成功');
                 window.location.hash = '#/purc/order/' + data.id;