Merge remote-tracking branch 'origin/release-201827-wangcz' into release-201827-wangcz

src/main/java/com/uas/platform/b2c/common/message/service/InternalMessageService.java

@@ -25,7 +25,7 @@ public interface InternalMessageService {
      * @param status 状态
      * @return 消息数量
      */
-    Integer getCount(Long recuu, Long recEnuu, String recType, String status);
+    Integer  getCount(Long recuu, Long recEnuu, String recType, String status);
 
     /**
      * 分页获取消息 (用户)

src/main/resources/dev/sys.properties

@@ -57,4 +57,4 @@ b2b=http://218.17.158.219/b2b_test
 b2bDomain=218.17.158.219:9000/b2b_test
 
 #lottery
-lottery=http://10.1.51.79:20000
+lottery=http://192.168.253.3:26789/

src/main/resources/prod/sys.properties

@@ -60,4 +60,4 @@ b2bDomain=uas.ubtob.com
 b2bInner=http://10.10.100.103:8080
 
 #lottery
-lottery=http://10.1.51.79:20000
+lottery=http://192.168.253.3:26789

src/main/resources/test/sys.properties

@@ -58,4 +58,4 @@ b2b=http://218.17.158.219/b2b_test
 b2bDomain=218.17.158.219:9000/b2b_test
 
 #lottery
-lottery=http://10.1.51.79:20000
+lottery=http://192.168.253.3:26789/

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

@@ -842,26 +842,6 @@
             title: '数据统计数据'
 		}));
 		
-		$httpProvider.interceptors.push(['Loading', '$q', function(Loading, $q) {
-			return {
-				request: function(cfg){
-					Loading.show();
-					return cfg;
-				},
-				requestError: function(rejection) {
-					Loading.hide();
-					return $q.reject(rejection);
-				},
-				response: function(res) {
-					Loading.hide();
-					return res;
-				},
-				responseError: function(rejection) {
-					Loading.hide();
-					return $q.reject(rejection);
-				}
-			}
-		}]);
 	}]);
 
 	app.run(['$rootScope', 'BaseService', '$location',  function($rootScope, BaseService, $location) {

src/main/webapp/resources/js/admin/controllers/statsDataCtrl.js

@@ -1,6 +1,6 @@
 define([ 'app/app' ], function(app) {
     //在售商品信息统计
-    app.register.controller('statsDataCtrl', ['$scope', 'Goods', 'toaster', 'ComponentActive', 'BrandActive', 'CommonCountAPI', 'User', '$http', function($scope, Goods, toaster, ComponentActive, BrandActive, CommonCountAPI, User, $http) {
+    app.register.controller('statsDataCtrl', ['$scope', 'Goods', 'toaster', 'ComponentActive', 'BrandActive', 'CommonCountAPI', 'User', '$http', '$q', 'Loading', function($scope, Goods, toaster, ComponentActive, BrandActive, CommonCountAPI, User, $http, $q, Loading) {
         $scope.dateArea = 'oneMonth';
         var _formatDate = function (date, fmt) {
             if (!date) {
@@ -102,76 +102,124 @@ define([ 'app/app' ], function(app) {
             }
             initData();
         };
+        var getSeekInfo = function (commonUrl) {
+            // 询价信息
+            var defer = $q.defer();
+            $http({
+                method: 'get',
+                dataType: 'json',
+                url: commonUrl + '/inquiry/public/getInquiryCountData',
+                params: {startDate: $scope.startFormatDate, endDate: $scope.endFormatDate}
+            }).success(function (data) {
+                defer.resolve(data);
+            }).error(function (err) {
+                defer.reject(err);
+            });
+            return defer.promise;
+        }
+        var getAddEnUserCount = function (ssoUrl) {
+            // 新增企业用户数
+            var defer = $q.defer();
+            $http({
+                method: 'get',
+                dataType: 'json',
+                url: ssoUrl + '/api/userspace/inputTime/count/apps',
+                params: {start: $scope.addStartFormatDate, end: $scope.addEndFormatDate, fromApps:'mall,b2b'}
+            }).success(function (data) {
+                defer.resolve(data);
+            }).error(function (err) {
+                defer.reject(err);
+            });
+            return defer.promise;
+        }
+        var getAddUserCount = function (ssoUrl) {
+            // 新增个人用户
+            var defer = $q.defer();
+            $http({
+                method: 'get',
+                dataType: 'json',
+                url: ssoUrl + '/api/user/inputTime/count/apps',
+                params: {start: $scope.addStartFormatDate, end: $scope.addEndFormatDate, fromApps:'mall,b2b'}
+            }).success(function (data) {
+                defer.resolve(data);
+            }).error(function (err) {
+                defer.reject(err);
+            });
+            return defer.promise;
+        }
+
+        var getNoLoginInfo = function (ssoUrl) {
+            // 半年未登录用户数
+            var defer = $q.defer();
+            $http({
+                method: 'get',
+                dataType: 'json',
+                url: ssoUrl + '/api/user/count/notlgoin/month',
+                params: {start: $scope.addStartFormatDate, end: $scope.addEndFormatDate, months: '6,12,24'}
+            }).success(function (data) {
+                defer.resolve(data);
+            }).error(function (err) {
+                defer.reject(err);
+            });
+            return defer.promise;
+        }
+
+        var getProductData = function () {
+            // 上传产品个数
+            var defer = $q.defer();
+            Goods.getProductsCmp({fromDate: $scope.startDate.getTime(), toDate: $scope.endDate.getTime()}, function (data) {
+                defer.resolve(data.data);
+            }, function (err) {
+                defer.reject(err);
+                toaster.pop('error', '数据获取失败，请重试')
+            });
+            return defer.promise;
+        }
 
         // 获取帐户中心数据和询价接口数据
-        var getDevOrProdData = function () {
+        var getAllData = function (addStartFormatDate, addEndFormatDate, startFormatDate, endFormatDate) {
+            var defer = $q.defer();
             User.isDevOrProd(null, function (data) {
-                $scope.ssoUrl = data.data == 'success' ? 'https://sso.ubtob.com' : 'http://192.168.253.6:32323';
-                $scope.uasUrl = data.data == 'success' ? 'http://uas.ubtob.com' : 'http://192.168.253.12:9000/b2b-test';
-                $scope.commonUrl = data.data == 'success' ? 'https://api-inquiry.usoftmall.com' : 'http://218.17.158.219:24000';
-                // 询价信息
-                $http({
-                    method: 'get',
-                    dataType: 'json',
-                    url: $scope.commonUrl + '/inquiry/public/getInquiryCountData',
-                    params: {startDate: $scope.startFormatDate, endDate: $scope.endFormatDate}
-                }).success(function (data) {
-                    $scope.inquiryData = data
-                }).error(function () {
-                    toaster.pop('error', '获取未处理审批数据失败');
-                });
-                // 新增企业用户数
-                $http({
-                    method: 'get',
-                    dataType: 'json',
-                    url: $scope.ssoUrl + '/api/userspace/inputTime/count/apps',
-                    params: {start: $scope.addStartFormatDate, end: $scope.addEndFormatDate, fromApps:'mall,b2b'}
-                }).success(function (data) {
-                    $scope.newAddUserSpaceData = data.content
-                }).error(function () {
-                    toaster.pop('error', '获取未处理审批数据失败');
-                });
-                // 新增个人用户
-                $http({
-                    method: 'get',
-                    dataType: 'json',
-                    url: $scope.ssoUrl + '/api/user/inputTime/count/apps',
-                    params: {start: $scope.addStartFormatDate, end: $scope.addEndFormatDate, fromApps:'mall,b2b'}
-                }).success(function (data) {
-                    $scope.newAddUserData = data.content
-                }).error(function () {
-                    toaster.pop('error', '获取未处理审批数据失败');
-                });
-                // 半年未登录用户数
-                $http({
-                    method: 'get',
-                    dataType: 'json',
-                    url: $scope.ssoUrl + '/api/user/count/notlgoin/month',
-                    params: {start: $scope.addStartFormatDate, end: $scope.addEndFormatDate, months: '6,12,24'}
-                }).success(function (data) {
-                    $scope.monthLogoData = data
-                }).error(function () {
-                    toaster.pop('error', '获取未处理审批数据失败');
-                });
+                var ssoUrl = data.data == 'success' ? 'https://sso.ubtob.com' : 'http://192.168.253.6:32323',
+                // uasUrl = data.data == 'success' ? 'http://uas.ubtob.com' : 'http://192.168.253.12:9000/b2b-test',
+                commonUrl = data.data == 'success' ? 'https://api-inquiry.usoftmall.com' : 'http://218.17.158.219:24000';
+                defer.resolve([
+                    getSeekInfo(commonUrl),
+                    getAddEnUserCount(ssoUrl),
+                    getAddUserCount(ssoUrl),
+                    getNoLoginInfo(ssoUrl),
+                    getProductData()
+                ]);
             }, function (response) {
                 toaster.pop('error', '获取运行环境失败');
+                defer.reject(response);
             });
+            return defer.promise;
         };
         // 获取不同时间阶段的相关数据
         var initData = function () {
-            var addStartDate = new Date($scope.startDate.getTime() + 24 * 60 * 60 * 1000)
-            var addEndDate = new Date($scope.endDate.getTime() + 24 * 60 * 60 * 1000)
+            var addStartDate = new Date($scope.startDate.getTime() + 24 * 60 * 60 * 1000),
+            addEndDate = new Date($scope.endDate.getTime() + 24 * 60 * 60 * 1000);
             $scope.addStartFormatDate = _formatDate(addStartDate, 'yyyy-MM-dd');
             $scope.addEndFormatDate = _formatDate(addEndDate, 'yyyy-MM-dd');
             $scope.startFormatDate = _formatDate($scope.startDate, 'yyyy-MM-dd');
             $scope.endFormatDate =  _formatDate($scope.endDate, 'yyyy-MM-dd');
-            getDevOrProdData();
-            // 上传产品个数
-            Goods.getProductsCmp({fromDate: $scope.startDate.getTime(), toDate: $scope.endDate.getTime()}, function (data) {
-                $scope.productsCount = data.data
-            }, function (res) {
-                toaster.pop('error', '数据获取失败，请重试')
-            });
+            $q.all([getAllData()]).then(function (resolve) {
+                Loading.show();
+                $q.all(resolve[0]).then(function (dataListResolve) {
+                    $scope.inquiryData = dataListResolve[0];
+                    $scope.newAddUserSpaceData = dataListResolve[1].content;
+                    $scope.newAddUserData = dataListResolve[2].content;
+                    $scope.monthLogoData = dataListResolve[3];
+                    $scope.productsCount = dataListResolve[4];
+                    Loading.hide();
+                }, function (dataListReject) {
+                    console.log(dataListReject);
+                    Loading.hide();
+                })
+            }, function (reject) {
+                console.log(reject);
+            })
         };
         initData();
 

src/main/webapp/resources/js/admin/main.js

@@ -75,6 +75,6 @@ require.config({
 		'big' : ['jquery']
 	}
 });
-require([ 'app/app' ], function(app) {
+require([ 'app/app', 'common/controllers/commonCtrls' ], function(app) {
 	app.init();
 });

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

@@ -3677,6 +3677,10 @@ define(['app/app', 'jquery-uploadify'], function(app) {
     }
 
     $scope.editRegulPicture = function(Regulpic, commodity) {
+      if (commodity.erpReserve === '' ||  commodity.erpReserve === 0 || !commodity.erpReserve) {
+        toaster.pop('warning','提示','当前物料库存为0，请先入库')
+        return;
+      }
       if (commodity.editRegulShow ) return
       $scope.clearCheckBox()
       commodity.editRegulShow = true
@@ -3821,9 +3825,11 @@ define(['app/app', 'jquery-uploadify'], function(app) {
         return
       }
       if (!$scope.productUpOff.goods.breakUp && $scope.productUpOff.goods.minBuyQty !== $scope.productUpOff.minPackQty) {
-        $scope.productUpOff.goods.minBuyQty = $scope.productUpOff.minPackQty
-        toaster.pop('warning', '提示', '不可拆卖时，起订量必须是包装数量的倍数');
-        $scope.ProductupdateStartNumber($scope.productUpOff.goods.minBuyQty)
+        if ($scope.productUpOff.goods.minBuyQty % $scope.productUpOff.minPackQty !== 0) {
+          $scope.productUpOff.goods.minBuyQty = $scope.productUpOff.minPackQty
+          toaster.pop('warning', '提示', '不可拆卖时，起订量必须是包装数量的倍数');
+          $scope.ProductupdateStartNumber($scope.productUpOff.goods.minBuyQty)
+        }
       }
     }
     // 可拆卖 上下架开关