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

src/main/java/com/uas/platform/b2c/prod/commodity/service/impl/ProductServiceImpl.java

@@ -2353,14 +2353,22 @@ public class ProductServiceImpl implements ProductService {
     public ResultMap countProduct(Long fromDate, Long toDate) {
         if (fromDate == null || toDate == null) {
             //统计所有的未审核的品牌信息
-            Integer count = jdbcTemplate.queryForInt("select count(1) from products p left join product$private pp on p.pr_id = pp.pr_id  where pp.pr_b2cenabled = 1;");
-            return ResultMap.success(count);
+            Map<String, Integer> map = new HashedMap();
+            Integer productAmout = jdbcTemplate.queryForInt("select count(1) from products p left join product$private pp on p.pr_id = pp.pr_id  where pp.pr_b2cenabled = 1;");
+            map.put("productAmout", productAmout);
+            Integer productUserAmout = jdbcTemplate.queryForInt("select count(DISTINCT pr_enuu) from products p left join product$private pp on p.pr_id = pp.pr_id  where pp.pr_b2cenabled = 1;");
+            map.put("productUserAmout", productUserAmout);
+            return ResultMap.success(map);
         } else {
             Date fromT = new Date(fromDate);
             Date toT = new Date(toDate);
             SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
-            Integer count = jdbcTemplate.queryForInt("select count(1) from products p left join product$private pp on p.pr_id = pp.pr_id  where pr_create_time < '" + dateFormat.format(toT) + "' and pr_create_time > '" + dateFormat.format(fromT) + "' and pp.pr_b2cenabled = 1;");
-            return ResultMap.success(count);
+            Map<String, Integer> map = new HashedMap();
+            Integer productAmout = jdbcTemplate.queryForInt("select count(1) from products p left join product$private pp on p.pr_id = pp.pr_id  where pr_create_time < '" + dateFormat.format(toT) + "' and pr_create_time > '" + dateFormat.format(fromT) + "' and pp.pr_b2cenabled = 1;");
+            map.put("productAmout", productAmout);
+            Integer productUserAmout = jdbcTemplate.queryForInt("select count(DISTINCT pr_enuu) from products p left join product$private pp on p.pr_id = pp.pr_id  where pr_create_time < '" + dateFormat.format(toT) + "' and pr_create_time > '" + dateFormat.format(fromT) + "' and pp.pr_b2cenabled = 1;");
+            map.put("productUserAmout", productUserAmout);
+            return ResultMap.success(map);
         }
     }
 }

src/main/java/com/uas/platform/b2c/prod/product/common/CommonTask.java

@@ -38,7 +38,9 @@ public class CommonTask {
                 try {
                     String responseText = HttpUtil.sendGetRequest(commonCount.getSql(), null).getResponseText();
                     if (!StringUtils.isEmpty(responseText)) {
-                        if (responseText.contains("{")) {
+                        if (commonCount.getSql().contains("113.105.74.140:8092")) {
+                            commonCount.setCount(JSON.parseObject(responseText).getDouble("totalCount"));
+                        } else if (responseText.contains("{")) {
                             commonCount.setCount(JSON.parseObject(responseText).getDouble("count"));
                         } else {
                             commonCount.setCount(Double.parseDouble(responseText));

src/main/java/com/uas/platform/b2c/prod/product/common/api/CommonCountController.java

@@ -114,4 +114,13 @@ public class CommonCountController {
         return commonCounts;
     }
 
+    /**
+     * 获取全部统计数据
+     * @return
+     */
+    @RequestMapping(value = "/all", method = RequestMethod.GET)
+    public List<CommonCount> findAll() {
+        return commonCountService.findAllForCust();
+    }
+
 }

src/main/java/com/uas/platform/b2c/prod/product/common/dao/CommonCountDao.java

@@ -3,6 +3,7 @@ package com.uas.platform.b2c.prod.product.common.dao;
 import com.uas.platform.b2c.prod.product.common.model.CommonCount;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
+import org.springframework.data.jpa.repository.Query;
 import org.springframework.stereotype.Repository;
 
 import java.util.List;
@@ -18,12 +19,19 @@ public interface CommonCountDao extends JpaSpecificationExecutor<CommonCount>,Jp
      * @param status 状态
      * @return 计数器
      */
-    public List<CommonCount> findByStatusAndUsedForOrderByDetno(Short status, String usedFor);
+    List<CommonCount> findByStatusAndUsedForOrderByDetno(Short status, String usedFor);
 
     /**
      * 通过状态获取计数器
      * @param status
      * @return
      */
-    public List<CommonCount> findByStatus(Short status);
+    List<CommonCount> findByStatus(Short status);
+
+    /**
+     * 获取全部技术器（对外）
+     * @return
+     */
+    @Query(value = "select c from CommonCount c where c.status=1 order by c.id")
+    List<CommonCount> findAllForCust();
 }

src/main/java/com/uas/platform/b2c/prod/product/common/service/CommonCountService.java

@@ -22,4 +22,10 @@ public interface CommonCountService {
      * @return
      */
     CommonCount findById(Long id);
+
+    /**
+     * 获取全部计数器（对外）
+     * @return
+     */
+    List<CommonCount> findAllForCust();
 }

src/main/java/com/uas/platform/b2c/prod/product/common/service/impl/CommonCountServiceImpl.java

@@ -27,4 +27,9 @@ public class CommonCountServiceImpl implements CommonCountService{
     public CommonCount findById(Long id) {
         return commonCountDao.findOne(id);
     }
+
+    @Override
+    public List<CommonCount> findAllForCust() {
+        return commonCountDao.findAllForCust();
+    }
 }

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

@@ -1,8 +1,7 @@
 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) {
-
-        $scope.dateArea = 'autoMonth';
+        $scope.dateArea = 'oneMonth';
         var _formatDate = function (date, fmt) {
             if (!date) {
                 return null;
@@ -32,29 +31,43 @@ define([ 'app/app' ], function(app) {
         var _getClearDay = function (date) {
             return new Date(_formatDate(date, 'yyyy-MM-dd')).getTime() - 8 * 60 * 60 * 1000
         };
+
+        var currentTime = _getClearDay(new Date());
+        $scope.startDate = new Date(currentTime - 30 * 24 * 60 * 60 * 1000);
+        $scope.endDate = new Date(currentTime + 23 * 60 * 60 * 1000 + 59 * 60 * 1000 + 59 * 1000);
+        $scope.startFormatDate = _formatDate($scope.startDate, 'yyyy-MM-dd');
+        $scope.endFormatDate = _formatDate($scope.endDate, 'yyyy-MM-dd');
+
         $scope.setFilters = function (type, val) {
             $scope[type] = val;
             if (type == 'dateArea') {
                 // 时间筛选
                 var currentTime = _getClearDay(new Date());
+                console.log(currentTime, 'currentTime')
                 var endDate = new Date(currentTime + 23 * 60 * 60 * 1000 + 59 * 60 * 1000 + 59 * 1000);
-                if (val == 'ALL' || val == 'autoMonth') {
-                    $scope.startDate = null;
-                    $scope.endDate = null;
-                } else if (val == 'oneMonth') {
+                if (val == 'oneMonth') {
                     $scope.startDate = new Date(currentTime - 30 * 24 * 60 * 60 * 1000 - 24 * 60 * 60 * 1000);
                     $scope.endDate = endDate;
+                    $scope.startFormatDate = _formatDate($scope.startDate, 'yyyy-MM-dd');
+                    $scope.endFormatDate = _formatDate($scope.endDate, 'yyyy-MM-dd');
                 } else if (val == 'threeMonth') {
                     $scope.startDate = new Date(currentTime - 3 * 30 * 24 * 60 * 60 * 1000 - 24 * 60 * 60 * 1000);
                     $scope.endDate = endDate;
+                    $scope.startFormatDate = _formatDate($scope.startDate, 'yyyy-MM-dd');
+                    $scope.endFormatDate =  _formatDate($scope.endDate, 'yyyy-MM-dd');
                 } else if (val == 'sixMonth') {
                     $scope.startDate = new Date(currentTime - 6 * 30 * 24 * 60 * 60 * 1000 - 24 * 60 * 60 * 1000);
                     $scope.endDate = endDate;
-                } else {
-                    $scope.startDate = null;
-                    $scope.endDate = null;
+                    $scope.startFormatDate = _formatDate($scope.startDate, 'yyyy-MM-dd');
+                    $scope.endFormatDate =  _formatDate($scope.endDate, 'yyyy-MM-dd');
                 }
             }
+            if (val != 'autoMonth') {
+                initData();
+            } else {
+                $scope.startDate = null;
+                $scope.endDate = null;
+            }
         };
 
         $scope.condition = [];
@@ -90,87 +103,179 @@ define([ 'app/app' ], function(app) {
                 $scope.endDate = new Date($scope.endDate.getFullYear(), $scope.endDate.getMonth(), $scope.endDate.getDate())
                 $scope.endDate = new Date($scope.endDate.getTime() + 23 * 60 * 60 * 1000 + 59 * 60 * 1000 + 59 * 1000);
             }
+            initData();
+        };
 
+        // 获取帐户中心数据和询价接口数据
+        var getDevOrProdData = function () {
+            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.startFormatDate, end: $scope.endFormatDate, 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.startFormatDate, end: $scope.endFormatDate, 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/notlogin',
+                    params: {month: 6}
+                }).success(function (data) {
+                    $scope.sixMonthLogoData = data.count
+                }).error(function () {
+                    toaster.pop('error', '获取未处理审批数据失败');
+                });
+            }, function (response) {
+                toaster.pop('error', '获取运行环境失败');
+            });
         };
 
-        User.isDevOrProd(null, function (data) {
-            $scope.urlPrex = 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: '2018-07-01', endDate: '2018-08-29'}
-            }).success(function (data) {
-                $scope.inquiryData = data
-            }).error(function () {
-                toaster.pop('error', '获取未处理审批数据失败');
+        // 获取不同时间阶段的相关数据
+        var initData = function () {
+            getDevOrProdData();
+            // 上传产品个数
+            Goods.getProductsCmp({fromDate: $scope.startDate.getTime(), toDate: $scope.endDate.getTime()}, function (data) {
+                $scope.productsCount = data
+            }, function (res) {
+                toaster.pop('error', '数据获取失败，请重试')
             });
-        }, function (response) {
-            toaster.pop('error', '获取运行环境失败');
-        });
+        };
+        initData();
 
-        Goods.getStatistics({}, {}, function(data) {
-            $scope.statistics = data;
+        Goods.getAllCmp({}, function (data) {
+            angular.forEach(data, function(value) {
+                switch(value.item)
+                {
+                    case '规格书':
+                        $scope.start1 = value.count;
+                        break;
+                    case '品牌':
+                        $scope.start2 = value.count;
+                        break;
+                    case '现货':
+                        $scope.start3 = value.count;
+                        break;
+                    case '当前器件总数':
+                        $scope.start4 = value.count;
+                        break;
+                    case '本月新增器件数':
+                        $scope.start5 = value.count;
+                        break;
+                    case '上月新增器件数':
+                        $scope.start6 = value.count;
+                        break;
+                    case '本月新增品牌数':
+                        $scope.start7 = value.count;
+                        break;
+                    case '当前类目总数':
+                        $scope.start8 = value.count;
+                        break;
+                    case '本月更新器件数':
+                        $scope.start9 = value.count;
+                        break;
+                    case '库存合计':
+                        $scope.start10 = value.count;
+                        break;
+                    case '在售商品品牌数量':
+                        $scope.start11 = value.count;
+                        break;
+                    case '在售商品类目数量':
+                        $scope.start12 = value.count;
+                        break;
+                    case '在售商品型号数量':
+                        $scope.start13 = value.count;
+                        break;
+                    case '含税金额合计(RMB)':
+                        $scope.start14 = value.count;
+                        break;
+                    case '未税金额合计(RMB)':
+                        $scope.start15 = value.count;
+                        break;
+                    case '上年交易金额':
+                        $scope.start16 = value.count;
+                        break;
+                    case '本年交易金额':
+                        $scope.start17 = value.count;
+                        break;
+                    case '上月器件总数':
+                        $scope.start18 = value.count;
+                        break;
+                    case '上月品牌总数':
+                        $scope.start19 = value.count;
+                        break;
+                    case '上月开通店铺数量':
+                        $scope.start20 = value.count;
+                        break;
+                    case '上个月用户注册量':
+                        $scope.start21 = value.count;
+                        break;
+                    case '上个月企业注册量':
+                        $scope.start22 = value.count;
+                        break;
+                    case '供应商总数':
+                        $scope.start23 = value.count;
+                        break;
+                    case '店铺总数':
+                        $scope.start24 = value.count;
+                        break;
+                    case '本月新增店铺数':
+                        $scope.start25 = value.count;
+                        break;
+                    case '上月新增店铺数':
+                        $scope.start26 = value.count;
+                        break;
+                    case '优软云个人用户数':
+                        $scope.start27 = value.count;
+                        break;
+                    case '注册总数量':
+                        $scope.start28 = value.count;
+                        break;
+                    case '当月注册数量':
+                        $scope.start29 = value.count;
+                        break;
+                    case '上月注册汇总':
+                        $scope.start30 = value.count;
+                        break;
+                    case '手机UU用户数':
+                        $scope.start31 = value.count;
+                        break;
+                    default:
+                        $scope.default = 0
+                }
+            })
         }, function(res) {
-            toaster.pop('error', '提示', '获取数据失败，请刷新页面');
-        });
-
-        // 器件申请用户数
-        Goods.getComponentSubmitCmp({fromDate: $scope.startDate, toDate: $scope.endDate}, function (data) {
-            $scope.componentSubmit = data
-        }, function (res) {
-            toaster.pop('error', '数据获取失败，请重试')
-        });
-
-        // 上传产品用户数
-        Goods.getProductsCmp({fromDate: $scope.startDate, toDate: $scope.endDate}, function (data) {
-            $scope.productsCount = data
-        }, function (res) {
-            toaster.pop('error', '数据获取失败，请重试')
-        });
-
-        // 品牌申请用户数
-        Goods.getBrandSubmitCmp({fromDate: $scope.startDate, toDate: $scope.endDate}, function (data) {
-            $scope.brandSubmit = data
-        }, function (res) {
-            toaster.pop('error', '数据获取失败，请重试')
-        });
-
-        // 各月新增器件数量
-        ComponentActive.getIncreaseCount({}, function(data) {
-            $scope.increaseCmpCount = data;
-        }, function (response) {
-            toaster.pop('error', '数据获取失败，请重试');
-        });
-
-        //各月新增品牌数量
-        BrandActive.getIncreaseCount({}, function(data) {
-            $scope.increaseBrandCount = data;
-        }, function (response) {
-            toaster.pop('error', '数据获取失败，请重试');
-        });
-
-        //各月新增批次数量
-        Goods.getIncreaseBatch({}, function(data) {
-            $scope.increaseBatchCount = data;
-        }, function (response) {
-            toaster.pop('error', '数据获取失败，请重试');
-        });
-
-        //各月新增在售器件数量
-        Goods.getIncreaseCmp({}, function(data) {
-            $scope.increaseInSaleCmpCount = data;
-        }, function (response) {
-            toaster.pop('error', '数据获取失败，请重试');
-        });
-
-        // 首页轮播数据统计
-        CommonCountAPI.getActived({}, function (data) {
-            $scope.count = data;
-        }, function (response) {
-            toaster.pop('error', '数据获取失败，请重试');
-        });
+            toaster.pop('error', '提示', '获取数据失败，请刷新页面')
+        })
     }]);
 });

src/main/webapp/resources/js/admin/controllers/trade/goodsStatisticsCtrl.js

@@ -8,33 +8,33 @@ define([ 'app/app' ], function(app) {
 			toaster.pop('error', '提示', '获取数据失败，请刷新页面');
 		});
 
-		// 各月新增器件数量
-		ComponentActive.getIncreaseCount({}, function(data) {
-			$scope.increaseCmpCount = data;
-		}, function (response) {
-			toaster.pop('error', '数据获取失败，请重试');
-		});
-
-		//各月新增品牌数量
-		BrandActive.getIncreaseCount({}, function(data) {
-			$scope.increaseBrandCount = data;
-		}, function (response) {
-			toaster.pop('error', '数据获取失败，请重试');
-		});
-
-		//各月新增批次数量
-		Goods.getIncreaseBatch({}, function(data) {
-			$scope.increaseBatchCount = data;
-		}, function (response) {
-			toaster.pop('error', '数据获取失败，请重试');
-		});
-
-		//各月新增在售器件数量
-		Goods.getIncreaseCmp({}, function(data) {
-			$scope.increaseInSaleCmpCount = data;
-		}, function (response) {
-			toaster.pop('error', '数据获取失败，请重试');
-		});
+		// // 各月新增器件数量
+		// ComponentActive.getIncreaseCount({}, function(data) {
+		// 	$scope.increaseCmpCount = data;
+		// }, function (response) {
+		// 	toaster.pop('error', '数据获取失败，请重试');
+		// });
+		//
+		// //各月新增品牌数量
+		// BrandActive.getIncreaseCount({}, function(data) {
+		// 	$scope.increaseBrandCount = data;
+		// }, function (response) {
+		// 	toaster.pop('error', '数据获取失败，请重试');
+		// });
+		//
+		// //各月新增批次数量
+		// Goods.getIncreaseBatch({}, function(data) {
+		// 	$scope.increaseBatchCount = data;
+		// }, function (response) {
+		// 	toaster.pop('error', '数据获取失败，请重试');
+		// });
+		//
+		// //各月新增在售器件数量
+		// Goods.getIncreaseCmp({}, function(data) {
+		// 	$scope.increaseInSaleCmpCount = data;
+		// }, function (response) {
+		// 	toaster.pop('error', '数据获取失败，请重试');
+		// });
 
 		// 首页轮播数据统计
 		CommonCountAPI.getActived({}, function (data) {

src/main/webapp/resources/js/common/query/goods.js

@@ -203,21 +203,16 @@ define([ 'ngResource' ], function() {
 				method : 'GET',
 				isArray : true
 			},
-            // 上传产品用户数
+            // 上传产品个数
             getProductsCmp: {
                 url : rootPath + '/trade/products/apply/count',
                 method : 'GET'
             },
-            // 器件申请用户数
-            getComponentSubmitCmp: {
-                url : rootPath + '/produce/componentSubmit/submit/count',
+			// 所有统计信息数据
+            getAllCmp: {
+                url : rootPath + '/api/product/commoncount/all',
                 method : 'GET',
-                isArray : true
-            },
-            // 品牌申请用户数
-            getBrandSubmitCmp: {
-                url : rootPath + '/produce/brandSubmit/submit/count',
-                method : 'GET'
+				isArray: true
             },
 			getDownLoadStatus: {
 				url : 'release/product/release/failure/status',

src/main/webapp/resources/view/admin/stats_data.html

@@ -18,10 +18,10 @@
     #rootStats .form-group{
         margin-bottom:10px;
     }
-    #rootStats .col-sm-6{
+    #rootStats .col-sm-6,#rootStats .col-sm-8{
         padding-right:0;
     }
-    #rootStats .col-sm-6{
+    #rootStats .col-sm-6,#rootStats .col-sm-4{
         padding-left:0;
     }
 
@@ -92,80 +92,62 @@
                     </div>
                     <div class="form-group row">
                         <span class="col-sm-6 text-right">注册总数量：</span>
-                        <span class="col-sm-6" ng-bind="statistics.codes | number"></span>
+                        <span class="col-sm-6" ng-bind="start28 | number"></span>
                     </div>
                     <div class="form-group row">
                         <span class="col-sm-6 text-right">当月注册总量：</span>
-                        <span class="col-sm-6" ng-bind="statistics.kinds | number"></span>
+                        <span class="col-sm-6" ng-bind="start29 | number"></span>
                     </div>
                     <div class="form-group row">
                         <span class="col-sm-6 text-right">上月注册总量：</span>
-                        <span class="col-sm-6" ng-bind="statistics.brands | number"></span>
+                        <span class="col-sm-6" ng-bind="start30 | number"></span>
                     </div>
                     <div class="form-group row">
                         <span class="col-sm-6 text-right">商城开店总数：</span>
-                        <span class="col-sm-6" ng-bind="statistics.reserves | number"></span>
+                        <span class="col-sm-6" ng-bind="start24 | number"></span>
                     </div>
                     <div class="form-group row">
                         <span class="col-sm-6 text-right">商城本月开店数：</span>
                         <span class="col-sm-6">
-							<span ng-bind="statistics.sumPriceRMB | number"></span>
+							<span ng-bind="start25 | number"></span>
 						</span>
                     </div>
                     <div class="form-group row">
                         <span class="col-sm-6 text-right">商城上月开店总数：</span>
                         <span class="col-sm-6">
-							<span ng-bind="statistics.sumPriceRMBNT | number"></span>
-						</span>
-                    </div>
-                    <div class="form-group row">
-                        <span class="col-sm-6 text-right">当前器件总数：</span>
-                        <span class="col-sm-6">
-							<span ng-bind="statistics.sumPriceRMBNT | number"></span>
-						</span>
-                    </div>
-                    <div class="form-group row">
-                        <span class="col-sm-6 text-right">本月新增器件总数：</span>
-                        <span class="col-sm-6">
-							<span ng-bind="statistics.sumPriceRMBNT | number"></span>
+							<span ng-bind="start26 | number"></span>
 						</span>
                     </div>
                     <div class="form-group row">
-                        <span class="col-sm-6 text-right">上月新增器件总数：</span>
-                        <span class="col-sm-6">
-							<span ng-bind="statistics.sumPriceRMBNT | number"></span>
+                        <span class="col-sm-6 text-right">本年度交易总额折合(RMB)：</span>
+                        <span class="col-sm-6">￥
+							<span ng-bind="start17 | number"></span>
 						</span>
                     </div>
                     <div class="form-group row">
-                        <span class="col-sm-6 text-right">B2B年度交易总额折合RMB：</span>
-                        <span class="col-sm-6">
-							<span ng-bind="statistics.sumPriceRMBNT | number"></span>
+                        <span class="col-sm-6 text-right">上年度交易总额折合(RMB)：</span>
+                        <span class="col-sm-6">￥
+							<span ng-bind="start16 | number"></span>
 						</span>
                     </div>
-                    <div class="form-group row">
+                    <!--<div class="form-group row">
                         <span class="col-sm-6 text-right">企业信息库总数：</span>
                         <span class="col-sm-6">
 							<span ng-bind="statistics.sumPriceRMBNT | number"></span>
 						</span>
-                    </div>
+                    </div>-->
                     <div class="form-group row">
                         <span class="col-sm-6 text-right">优软云个人用户数：</span>
                         <span class="col-sm-6">
-							<span ng-bind="statistics.sumPriceRMBNT | number"></span>
+							<span ng-bind="start27 | number"></span>
 						</span>
                     </div>
                     <div class="form-group row">
                         <span class="col-sm-6 text-right">手机UU用户数：</span>
                         <span class="col-sm-6">
-							<span ng-bind="statistics.sumPriceRMBNT | number"></span>
+							<span ng-bind="start31 | number"></span>
 						</span>
                     </div>
-                    <!--<div class="form-group row">-->
-                    <!--<span class="col-sm-6 text-right">商城本月开店数：</span>-->
-                    <!--<span class="col-sm-5 text-num">-->
-                    <!--<span ng-bind="statistics.sumPriceRMB | number"></span>-->
-                    <!--</span>-->
-                    <!--</div>-->
                 </div>
                 <div class="col-sm-4 f14">
                     <div class="form-group row title">
@@ -173,30 +155,34 @@
                     </div>
                     <div class="form-group row">
                         <span class="col-sm-6 text-right">当前器件总数：</span>
-                        <span class="col-sm-6" ng-bind="statistics.codes | number"></span>
+                        <span class="col-sm-6" ng-bind="start4 | number"></span>
                     </div>
                     <div class="form-group row">
                         <span class="col-sm-6 text-right">本月新增器件数：</span>
-                        <span class="col-sm-6" ng-bind="statistics.kinds | number"></span>
+                        <span class="col-sm-6" ng-bind="start5 | number"></span>
+                    </div>
+                    <div class="form-group row">
+                        <span class="col-sm-6 text-right">上月新增器件数：</span>
+                        <span class="col-sm-6" ng-bind="start6 | number"></span>
                     </div>
                     <div class="form-group row">
                         <span class="col-sm-6 text-right">当前品牌数：</span>
-                        <span class="col-sm-6" ng-bind="statistics.brands | number"></span>
+                        <span class="col-sm-6" ng-bind="start2 | number"></span>
                     </div>
                     <div class="form-group row">
                         <span class="col-sm-6 text-right">本月新增品牌数：</span>
-                        <span class="col-sm-6" ng-bind="statistics.reserves | number"></span>
+                        <span class="col-sm-6" ng-bind="start7 | number"></span>
                     </div>
                     <div class="form-group row">
                         <span class="col-sm-6 text-right">当前类目总数：</span>
                         <span class="col-sm-6">
-							<span ng-bind="statistics.sumPriceRMB | number"></span>
+							<span ng-bind="start8 | number"></span>
 						</span>
                     </div>
                     <div class="form-group row">
                         <span class="col-sm-6 text-right">本月更新器件数：</span>
                         <span class="col-sm-6">
-							<span ng-bind="statistics.sumPriceRMBNT | number"></span>
+							<span ng-bind="start9 | number"></span>
 						</span>
                     </div>
                     <!--<div class="form-group row">-->
@@ -212,29 +198,31 @@
                     </div>
                     <div class="form-group row">
                         <span class="col-sm-6 text-right">在售商品型号总数：</span>
-                        <span class="col-sm-6" ng-bind="statistics.codes | number"></span>
+                        <span class="col-sm-6" ng-bind="start13 | number"></span>
                     </div>
                     <div class="form-group row">
                         <span class="col-sm-6 text-right">在售商品类目：</span>
-                        <span class="col-sm-6" ng-bind="statistics.kinds | number"></span>
+                        <span class="col-sm-6" ng-bind="start12 | number"></span>
                     </div>
                     <div class="form-group row">
                         <span class="col-sm-6 text-right">在售商品品牌总数：</span>
-                        <span class="col-sm-6" ng-bind="statistics.brands | number"></span>
+                        <span class="col-sm-6" ng-bind="start11 | number"></span>
                     </div>
                     <div class="form-group row">
                         <span class="col-sm-6 text-right">库存合计：</span>
-                        <span class="col-sm-6" ng-bind="statistics.reserves | number"></span>
+                        <span class="col-sm-6" ng-bind="start10 | number"></span>
                     </div>
                     <div class="form-group row">
                         <span class="col-sm-6 text-right">含税金额合计(RMB)：</span>
                         <span class="col-sm-6 text-num">￥
-							<span ng-bind="statistics.sumPriceRMB | number"></span>
+							<span ng-bind="start14 | number"></span>
 						</span>
                     </div>
                     <div class="form-group row">
-                        <span class="col-sm-6 text-right">未税金额合计RMB：</span>
-                        <span class="col-sm-6" ng-bind="statistics.reserves | number"></span>
+                        <span class="col-sm-6 text-right">未税金额合计(RMB)：</span>
+                        <span class="col-sm-6 text-num">￥
+							<span ng-bind="start15 | number"></span>
+						</span>
                     </div>
 
                     <!--<div class="form-group row">-->
@@ -247,18 +235,13 @@
             </div>
         </div>
     </div>
-    <div class="box">
+    <div class="box" style="height:350px">
         <div class="box-header well" data-original-title style="position:relative;">
             <i class="icon-user"></i> 更多数据统计
             <!--搜索时间筛选-->
             <div class="screen">
                 <div class="radio-block fl">
                     日期区间：
-                    <label class="com-check-radio">
-                        <input type="radio" id="All" name="date" ng-click="setFilters('dateArea', 'All')" ng-checked="dateArea == 'All'">
-                        <label for="All"></label>
-                        全部
-                    </label>
                     <label class="com-check-radio">
                         <input type="radio" id="oneMonth" name="date" ng-click="setFilters('dateArea', 'oneMonth')" ng-checked="dateArea == 'oneMonth'">
                         <label for="oneMonth"></label>
@@ -313,67 +296,49 @@
             <div class="fullscreen">
                 <div class="col-sm-2 f14">
                     <div class="form-group row title">
-                        <span class="col-sm-6 text-right">新增用户数：</span>
-                        <span class="col-sm-6" ng-bind="statistics.codes | number"></span>
+                        <span class="col-sm-8 text-right">新增用户数：</span>
+                        <span class="col-sm-4" ng-bind="(newAddUserSpaceData.b2b + newAddUserSpaceData.mall + newAddUserData.mall) | number"></span>
                     </div>
                     <div class="form-group row">
-                        <span class="col-sm-6 text-right">B2B新增用户数：</span>
-                        <span class="col-sm-6" ng-bind="statistics.codes | number"></span>
+                        <span class="col-sm-8 text-right">B2B新增用户数：</span>
+                        <span class="col-sm-4" ng-bind="newAddUserSpaceData.b2b | number"></span>
                     </div>
                     <div class="form-group row">
-                        <span class="col-sm-6 text-right">商城新增企业用户数：</span>
-                        <span class="col-sm-6" ng-bind="statistics.kinds | number"></span>
+                        <span class="col-sm-8 text-right">商城新增企业用户数：</span>
+                        <span class="col-sm-4" ng-bind="newAddUserSpaceData.mall | number"></span>
                     </div>
                     <div class="form-group row">
-                        <span class="col-sm-6 text-right">商城新增个人用户数：</span>
-                        <span class="col-sm-6" ng-bind="statistics.brands | number"></span>
+                        <span class="col-sm-8 text-right">商城新增个人用户数：</span>
+                        <span class="col-sm-4" ng-bind="newAddUserData.mall | number"></span>
                     </div>
+                </div>
+                <!--<div class="col-sm-2 f14">-->
+                    <!--<div class="form-group row title">-->
+                        <!--<span class="col-sm-6 text-right">在线用户数：</span>-->
+                        <!--<span class="col-sm-6" ng-bind="statistics.codes | number"></span>-->
+                    <!--</div>-->
                     <!--<div class="form-group row">-->
-                        <!--<span class="col-sm-6 text-right">商城本月开店数：</span>-->
-                        <!--<span class="col-sm-5 text-num">-->
-							<!--<span ng-bind="statistics.sumPriceRMB | number"></span>-->
-						<!--</span>-->
+                        <!--<span class="col-sm-6 text-right">已开店企业用户数：</span>-->
+                        <!--<span class="col-sm-6" ng-bind="statistics.codes | number"></span>-->
                     <!--</div>-->
-                </div>
-                <div class="col-sm-2 f14">
-                    <div class="form-group row title">
-                        <span class="col-sm-6 text-right">在线用户数：</span>
-                        <span class="col-sm-6" ng-bind="statistics.codes | number"></span>
-                    </div>
-                    <div class="form-group row">
-                        <span class="col-sm-6 text-right">已开店企业用户数：</span>
-                        <span class="col-sm-6" ng-bind="statistics.codes | number"></span>
-                    </div>
-                    <div class="form-group row">
-                        <span class="col-sm-6 text-right">未开店企业用户数：</span>
-                        <span class="col-sm-6" ng-bind="statistics.kinds | number"></span>
-                    </div>
-                    <div class="form-group row">
-                        <span class="col-sm-6 text-right">个人用户数：</span>
-                        <span class="col-sm-6" ng-bind="statistics.brands | number"></span>
-                    </div>
                     <!--<div class="form-group row">-->
-                    <!--<span class="col-sm-6 text-right">商城本月开店数：</span>-->
-                    <!--<span class="col-sm-5 text-num">-->
-                    <!--<span ng-bind="statistics.sumPriceRMB | number"></span>-->
-                    <!--</span>-->
+                        <!--<span class="col-sm-6 text-right">未开店企业用户数：</span>-->
+                        <!--<span class="col-sm-6" ng-bind="statistics.kinds | number"></span>-->
                     <!--</div>-->
-                </div>
+                    <!--<div class="form-group row">-->
+                        <!--<span class="col-sm-6 text-right">个人用户数：</span>-->
+                        <!--<span class="col-sm-6" ng-bind="statistics.brands | number"></span>-->
+                    <!--</div>-->
+                <!--</div>-->
                 <div class="col-sm-2 f14">
                     <div class="form-group row title">
                         <span class="col-sm-6 text-right">上传产品用户数：</span>
-                        <span class="col-sm-6" ng-bind="statistics.codes | number"></span>
+                        <span class="col-sm-6" ng-bind="productsCount.data | number"></span>
                     </div>
                     <div class="form-group row">
                         <span class="col-sm-6 text-right">上传产品个数：</span>
-                        <span class="col-sm-6" ng-bind="statistics.codes | number"></span>
+                        <span class="col-sm-6" ng-bind="productsCount.data | number"></span>
                     </div>
-                    <!--<div class="form-group row">-->
-                    <!--<span class="col-sm-6 text-right">商城本月开店数：</span>-->
-                    <!--<span class="col-sm-5 text-num">-->
-                    <!--<span ng-bind="statistics.sumPriceRMB | number"></span>-->
-                    <!--</span>-->
-                    <!--</div>-->
                 </div>
                 <div class="col-sm-2 f14">
                     <div class="form-group row title">
@@ -384,12 +349,6 @@
                         <span class="col-sm-6 text-right">询价产品个数：</span>
                         <span class="col-sm-6" ng-bind="inquiryData.inquiryAmount | number"></span>
                     </div>
-                    <!--<div class="form-group row">-->
-                    <!--<span class="col-sm-6 text-right">商城本月开店数：</span>-->
-                    <!--<span class="col-sm-5 text-num">-->
-                    <!--<span ng-bind="statistics.sumPriceRMB | number"></span>-->
-                    <!--</span>-->
-                    <!--</div>-->
                 </div>
                 <div class="col-sm-2 f14">
                     <div class="form-group row title">
@@ -400,12 +359,6 @@
                         <span class="col-sm-6 text-right">报价产品个数：</span>
                         <span class="col-sm-6" ng-bind="inquiryData.offerEnAmount | number"></span>
                     </div>
-                    <!--<div class="form-group row">-->
-                    <!--<span class="col-sm-6 text-right">商城本月开店数：</span>-->
-                    <!--<span class="col-sm-5 text-num">-->
-                    <!--<span ng-bind="statistics.sumPriceRMB | number"></span>-->
-                    <!--</span>-->
-                    <!--</div>-->
                 </div>
                 <div class="col-sm-2 f14">
                     <div class="form-group row title">
@@ -424,12 +377,6 @@
                         <span class="col-sm-6 text-right">两年未登录：</span>
                         <span class="col-sm-6" ng-bind="statistics.brands | number"></span>
                     </div>
-                    <!--<div class="form-group row">-->
-                    <!--<span class="col-sm-6 text-right">商城本月开店数：</span>-->
-                    <!--<span class="col-sm-5 text-num">-->
-                    <!--<span ng-bind="statistics.sumPriceRMB | number"></span>-->
-                    <!--</span>-->
-                    <!--</div>-->
                 </div>
             </div>
         </div>

src/main/webapp/resources/view/admin/trade/trade_goods_statistics.html

@@ -77,49 +77,49 @@
 			</div>
 		</div>
 	</div>
-	<div class="box">
-		<div class="box-header well" data-original-title>
-			<i class="icon-user"></i> 各月新增信息统计
-		</div>
-		<div class="box-content">
-			<ul class="fullscreen row f14" style="padding: 10px;">
-				<li class="newItem row">
-					<div class="text-center form-group newTitle">各月新增器件数量</div>
-					<div class="col-xs-6 form-group text-center">月份</div>
-					<div class="col-xs-6 form-group text-center">数量</div>
-					<div ng-repeat="increaseCmp in increaseCmpCount | orderBy : 'MONTH'" class="form-group">
-						<div class="col-xs-6 form-group text-center month" ng-bind="::increaseCmp.MONTH"></div>
-						<div class="col-xs-6 form-group text-right count" ng-bind="::increaseCmp.COUNT | number"></div>
-					</div>
-				</li>
-				<li class="newItem row">
-					<div class="text-center form-group newTitle">各月新增品牌数量</div>
-					<div class="col-xs-6 form-group text-center">月份</div>
-					<div class="col-xs-6 form-group text-center">数量</div>
-					<div ng-repeat="increase in increaseBrandCount | orderBy : 'MONTH'" class="form-group">
-						<div class="col-xs-6 form-group text-center month" ng-bind="::increase.MONTH"></div>
-						<div class="col-xs-6 form-group text-right count" ng-bind="::increase.COUNT | number"></div>
-					</div>
-				</li>
-				<li class="newItem row">
-					<div class="text-center form-group newTitle">各月新增批次数量</div>
-					<div class="col-xs-6 form-group text-center">月份</div>
-					<div class="col-xs-6 form-group text-center">数量</div>
-					<div ng-repeat="increase in increaseBatchCount | orderBy : 'MONTH'" class="form-group">
-						<div class="col-xs-6 form-group text-center month" ng-bind="::increase.MONTH"></div>
-						<div class="col-xs-6 form-group text-right count" ng-bind="::increase.COUNT | number"></div>
-					</div>
-				</li>
-				<li class="newItem row">
-					<div class="text-center form-group newTitle">各月新增在售器件数量</div>
-					<div class="col-xs-6 form-group text-center">月份</div>
-					<div class="col-xs-6 form-group text-center">数量</div>
-					<div ng-repeat="increase in increaseInSaleCmpCount | orderBy : 'MONTH'" class="form-group">
-						<div class="col-xs-6 form-group text-center month" ng-bind="::increase.MONTH"></div>
-						<div class="col-xs-6 form-group text-right count" ng-bind="::increase.COUNT | number"></div>
-					</div>
-				</li>
-			</ul>
-		</div>
-	</div>
+	<!--<div class="box">-->
+		<!--<div class="box-header well" data-original-title>-->
+			<!--<i class="icon-user"></i> 各月新增信息统计-->
+		<!--</div>-->
+		<!--<div class="box-content">-->
+			<!--<ul class="fullscreen row f14" style="padding: 10px;">-->
+				<!--<li class="newItem row">-->
+					<!--<div class="text-center form-group newTitle">各月新增器件数量</div>-->
+					<!--<div class="col-xs-6 form-group text-center">月份</div>-->
+					<!--<div class="col-xs-6 form-group text-center">数量</div>-->
+					<!--<div ng-repeat="increaseCmp in increaseCmpCount | orderBy : 'MONTH'" class="form-group">-->
+						<!--<div class="col-xs-6 form-group text-center month" ng-bind="::increaseCmp.MONTH"></div>-->
+						<!--<div class="col-xs-6 form-group text-right count" ng-bind="::increaseCmp.COUNT | number"></div>-->
+					<!--</div>-->
+				<!--</li>-->
+				<!--<li class="newItem row">-->
+					<!--<div class="text-center form-group newTitle">各月新增品牌数量</div>-->
+					<!--<div class="col-xs-6 form-group text-center">月份</div>-->
+					<!--<div class="col-xs-6 form-group text-center">数量</div>-->
+					<!--<div ng-repeat="increase in increaseBrandCount | orderBy : 'MONTH'" class="form-group">-->
+						<!--<div class="col-xs-6 form-group text-center month" ng-bind="::increase.MONTH"></div>-->
+						<!--<div class="col-xs-6 form-group text-right count" ng-bind="::increase.COUNT | number"></div>-->
+					<!--</div>-->
+				<!--</li>-->
+				<!--<li class="newItem row">-->
+					<!--<div class="text-center form-group newTitle">各月新增批次数量</div>-->
+					<!--<div class="col-xs-6 form-group text-center">月份</div>-->
+					<!--<div class="col-xs-6 form-group text-center">数量</div>-->
+					<!--<div ng-repeat="increase in increaseBatchCount | orderBy : 'MONTH'" class="form-group">-->
+						<!--<div class="col-xs-6 form-group text-center month" ng-bind="::increase.MONTH"></div>-->
+						<!--<div class="col-xs-6 form-group text-right count" ng-bind="::increase.COUNT | number"></div>-->
+					<!--</div>-->
+				<!--</li>-->
+				<!--<li class="newItem row">-->
+					<!--<div class="text-center form-group newTitle">各月新增在售器件数量</div>-->
+					<!--<div class="col-xs-6 form-group text-center">月份</div>-->
+					<!--<div class="col-xs-6 form-group text-center">数量</div>-->
+					<!--<div ng-repeat="increase in increaseInSaleCmpCount | orderBy : 'MONTH'" class="form-group">-->
+						<!--<div class="col-xs-6 form-group text-center month" ng-bind="::increase.MONTH"></div>-->
+						<!--<div class="col-xs-6 form-group text-right count" ng-bind="::increase.COUNT | number"></div>-->
+					<!--</div>-->
+				<!--</li>-->
+			<!--</ul>-->
+		<!--</div>-->
+	<!--</div>-->
 </div>

src/main/webapp/resources/view/common/bankInfoModal.html

@@ -76,6 +76,26 @@
 </div>
 <form class="form-horizontal add-bank-account" style="margin-left: 17px;" name="myForm" novalidate>
     <div class="modal-body">
+        <div class="form-group">
+            <label class="margin15"><b class="text-inverse">*&nbsp;</b>开户名称</label>
+            <div class="divinline">
+                <input name="accountname" type="text" class="form-control" ng-model="account.accountname"
+                       placeholder="请填写开户人姓名或企业名称" ng-required="true" ng-change="checkAccount(4)" autocomplete="off">
+            </div>
+            <span class="warn-message" ng-if="account.accountname && nameError">请勿超过50个字</span>
+            <span class="warn-message" ng-if="myForm.accountname.$touched && myForm.accountname.$invalid">开户名称不能为空</span>
+        </div>
+        <div class="form-group">
+            <label class="margin15"><b class="text-inverse">*&nbsp;</b>银行账号</label>
+            <div class="divinline">
+                <input name="number" ng-model="account.number" type="text" class="form-control"
+                       placeholder="请填写银行账号" ng-required="true" ng-change="checkAccount(3)" autocomplete="off">
+            </div>
+            <span class="warn-message" ng-if="account.number && numberPattError">请填写正确的银行账号</span>
+            <span class="warn-message" ng-if="account.number && !numberPattError && numberError">请勿超过30个字符</span>
+            <span class="warn-message" ng-if="account.number && !numberPattError && !numberError && repeatError">该银行账号已存在</span>
+            <span class="warn-message" ng-if="myForm.number.$touched && myForm.number.$invalid">银行账号不能为空</span>
+        </div>
         <div class="form-group">
             <label class="margin15"><b class="text-inverse">*&nbsp;</b>开户银行</label>
             <div class="divinline" style="position:relative;margin-right:25px;">
@@ -103,26 +123,6 @@
             <span class="warn-message" ng-if="account.branchname && !branchPattError && branchError">请勿超过20个字</span>
             <span class="warn-message" ng-if="myForm.branchname.$touched && myForm.branchname.$invalid">开户支行不能为空</span>
         </div>
-        <div class="form-group">
-            <label class="margin15"><b class="text-inverse">*&nbsp;</b>银行账号</label>
-            <div class="divinline">
-                <input name="number" ng-model="account.number" type="text" class="form-control"
-                       placeholder="请填写银行账号" ng-required="true" ng-change="checkAccount(3)" autocomplete="off">
-            </div>
-            <span class="warn-message" ng-if="account.number && numberPattError">请填写正确的银行账号</span>
-            <span class="warn-message" ng-if="account.number && !numberPattError && numberError">请勿超过30个字符</span>
-            <span class="warn-message" ng-if="account.number && !numberPattError && !numberError && repeatError">该银行账号已存在</span>
-            <span class="warn-message" ng-if="myForm.number.$touched && myForm.number.$invalid">银行账号不能为空</span>
-        </div>
-        <div class="form-group">
-            <label class="margin15"><b class="text-inverse">*&nbsp;</b>开户名称</label>
-            <div class="divinline">
-                <input name="accountname" type="text" class="form-control" ng-model="account.accountname"
-                       placeholder="请填写开户人姓名或企业名称" ng-required="true" ng-change="checkAccount(4)" autocomplete="off">
-            </div>
-            <span class="warn-message" ng-if="account.accountname && nameError">请勿超过50个字</span>
-            <span class="warn-message" ng-if="myForm.accountname.$touched && myForm.accountname.$invalid">开户名称不能为空</span>
-        </div>
         <label class="remind-message"><b class="text-inverse">*&nbsp;</b>为保障您的资金安全，账户信息加密显示且不可修改，只能删除后重新提交。</label>
     </div>
 </form>

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

@@ -498,6 +498,30 @@
 				</div>
 				<div class="new-accounts" ng-if="accounts && accounts.length <= 0">
 					<form name="myForm" novalidate>
+						<div class="row">
+							<div class="col-sm-3"><em class="colorRed">*</em>开户名称</div>
+							<div class="col-sm-5">
+								<input name="accountname" type="text" class="form-control" ng-model="account.accountname"
+									   placeholder="请填写开户人姓名或企业名称" ng-required="true" ng-change="checkAccount(4)" autocomplete="off">
+							</div>
+							<div class="col-sm-4">
+								<p ng-if="account.accountname && nameError">请勿超过50个字</p>
+								<p ng-if="myForm.accountname.$touched && myForm.accountname.$invalid">开户名称不能为空</p>
+							</div>
+						</div>
+						<div class="row">
+							<div class="col-sm-3"><em class="colorRed">*</em>银行账号</div>
+							<div class="col-sm-5">
+								<input name="number" ng-model="account.number" type="text" class="form-control"
+									   placeholder="请填写银行账号" ng-required="true" ng-change="checkAccount(3)" autocomplete="off">
+							</div>
+							<div class="col-sm-4">
+								<p ng-if="account.number && numberPattError">请填写正确的银行账号</p>
+								<p ng-if="account.number && !numberPattError && numberError">请勿超过30个字符</p>
+								<p ng-if="account.number && !numberPattError && !numberError && repeatError">该银行账号已存在</p>
+								<p ng-if="myForm.number.$touched && myForm.number.$invalid">银行账号不能为空</p>
+							</div>
+						</div>
 						<div class="row">
 							<div class="col-sm-3"><em class="colorRed">*</em>开户银行</div>
 							<div class="col-sm-5" style="position:relative;">
@@ -524,30 +548,6 @@
 								<p ng-if="myForm.branchname.$touched && myForm.branchname.$invalid">开户支行不能为空</p>
 							</div>
 						</div>
-						<div class="row">
-							<div class="col-sm-3"><em class="colorRed">*</em>银行账号</div>
-							<div class="col-sm-5">
-								<input name="number" ng-model="account.number" type="text" class="form-control"
-									   placeholder="请填写银行账号" ng-required="true" ng-change="checkAccount(3)" autocomplete="off">
-							</div>
-							<div class="col-sm-4">
-								<p ng-if="account.number && numberPattError">请填写正确的银行账号</p>
-								<p ng-if="account.number && !numberPattError && numberError">请勿超过30个字符</p>
-								<p ng-if="account.number && !numberPattError && !numberError && repeatError">该银行账号已存在</p>
-								<p ng-if="myForm.number.$touched && myForm.number.$invalid">银行账号不能为空</p>
-							</div>
-						</div>
-						<div class="row">
-							<div class="col-sm-3"><em class="colorRed">*</em>开户名称</div>
-							<div class="col-sm-5">
-								<input name="accountname" type="text" class="form-control" ng-model="account.accountname"
-									   placeholder="请填写开户人姓名或企业名称" ng-required="true" ng-change="checkAccount(4)" autocomplete="off">
-							</div>
-							<div class="col-sm-4">
-								<p ng-if="account.accountname && nameError">请勿超过50个字</p>
-								<p ng-if="myForm.accountname.$touched && myForm.accountname.$invalid">开户名称不能为空</p>
-							</div>
-						</div>
 						<div class="row">
 							<div class="col-sm-9 col-sm-offset-2" style="position: relative;left: -10px;font-size: 12px;"><em class="colorRed">*声明：</em>为保障您的资金安全，账户信息加密显示且不可修改，只能删除后重新提交。</div>
 						</div>
@@ -772,6 +772,30 @@
 			<h2>新增账户信息</h2>
 			<span style="color:#cbcaca;width:10px;height:10px;position:absolute;top:15px;right:15px;"><i class="fa fa-close" ng-click="cancel()"></i></span>
 			<form name="myForm" novalidate>
+				<div class="row">
+					<div class="col-sm-3"><em class="colorRed">*</em>开户名称</div>
+					<div class="col-sm-5">
+						<input name="accountname" type="text" class="form-control" ng-model="account.accountname"
+							   placeholder="请填写开户人姓名或企业名称" ng-required="true" ng-change="checkAccount(4)" autocomplete="off">
+					</div>
+					<div class="col-sm-4">
+						<p ng-if="account.accountname && nameError">请勿超过50个字</p>
+						<p ng-if="myForm.accountname.$touched && myForm.accountname.$invalid">开户名称不能为空</p>
+					</div>
+				</div>
+				<div class="row">
+					<div class="col-sm-3"><em class="colorRed">*</em>银行账号</div>
+					<div class="col-sm-5">
+						<input name="number" ng-model="account.number" type="text" class="form-control"
+							   placeholder="请填写银行账号" ng-required="true" ng-change="checkAccount(3)" autocomplete="off">
+					</div>
+					<div class="col-sm-4">
+						<p ng-if="account.number && numberPattError">请填写正确的银行账号</p>
+						<p ng-if="account.number && !numberPattError && numberError">请勿超过30个字符</p>
+						<p ng-if="account.number && !numberPattError && !numberError && repeatError">该银行账号已存在</p>
+						<p ng-if="myForm.number.$touched && myForm.number.$invalid">银行账号不能为空</p>
+					</div>
+				</div>
 				<div class="row">
 					<div class="col-sm-3"><em class="colorRed">*</em>开户银行</div>
 					<div class="col-sm-5" style="position:relative;">
@@ -798,30 +822,6 @@
 						<p ng-if="myForm.branchname.$touched && myForm.branchname.$invalid">开户支行不能为空</p>
 					</div>
 				</div>
-				<div class="row">
-					<div class="col-sm-3"><em class="colorRed">*</em>银行账号</div>
-					<div class="col-sm-5">
-						<input name="number" ng-model="account.number" type="text" class="form-control"
-							   placeholder="请填写银行账号" ng-required="true" ng-change="checkAccount(3)" autocomplete="off">
-					</div>
-					<div class="col-sm-4">
-						<p ng-if="account.number && numberPattError">请填写正确的银行账号</p>
-						<p ng-if="account.number && !numberPattError && numberError">请勿超过30个字符</p>
-						<p ng-if="account.number && !numberPattError && !numberError && repeatError">该银行账号已存在</p>
-						<p ng-if="myForm.number.$touched && myForm.number.$invalid">银行账号不能为空</p>
-					</div>
-				</div>
-				<div class="row">
-					<div class="col-sm-3"><em class="colorRed">*</em>开户名称</div>
-					<div class="col-sm-5">
-						<input name="accountname" type="text" class="form-control" ng-model="account.accountname"
-							   placeholder="请填写开户人姓名或企业名称" ng-required="true" ng-change="checkAccount(4)" autocomplete="off">
-					</div>
-					<div class="col-sm-4">
-						<p ng-if="account.accountname && nameError">请勿超过50个字</p>
-						<p ng-if="myForm.accountname.$touched && myForm.accountname.$invalid">开户名称不能为空</p>
-					</div>
-				</div>
 				<div class="row">
 					<div class="col-sm-10 col-sm-offset-2" style="position: relative;left: -43px;font-size: 12px;"><em class="colorRed">*声明：</em>为保障您的资金安全，账户信息加密显示且不可修改，只能删除后重新提交。</div>
 				</div>

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

@@ -879,6 +879,28 @@
                 </table>
                 <div class="add-count" ng-if="accounts && accounts.length <= 0">
                     <form name="myForm">
+                        <div class="row">
+                            <div class="col-sm-3"><em class="colorRed">*</em>开户名称</div>
+                            <div class="col-sm-5">
+                                <input name="accountname" ng-model="account.accountname" ng-change="checkAccount(4)" class="form-control" autocomplete="off" type="text" placeholder="请填写开户人姓名或企业名称">
+                            </div>
+                            <div class="col-sm-4">
+                                <p ng-if="account.accountname && nameError">请勿超过50个字</p>
+                                <p ng-if="myForm.accountname.$touched && !account.accountname">开户名称不能为空</p>
+                            </div>
+                        </div>
+                        <div class="row">
+                            <div class="col-sm-3"><em class="colorRed">*</em>银行账号</div>
+                            <div class="col-sm-5">
+                                <input name="number" ng-model="account.number" ng-change="checkAccount(3)" class="form-control" autocomplete="off" type="text" placeholder="请填写银行账号">
+                            </div>
+                            <div class="col-sm-4">
+                                <p ng-if="account.number && numberPattError">请填写正确的银行账号</p>
+                                <p ng-if="account.number && !numberPattError && numberError">请勿超过30个字符</p>
+                                <p ng-if="account.number && !numberPattError && !numberError && repeatError">该银行账号已存在</p>
+                                <p ng-if="myForm.number.$touched && !account.number">银行账号不能为空</p>
+                            </div>
+                        </div>
                         <div class="row">
                             <div class="col-sm-3"><em class="colorRed">*</em>开户银行</div>
                             <div class="col-sm-5" style="position:relative;">
@@ -904,28 +926,6 @@
                                 <p ng-if="myForm.branchname.$touched && !account.branchname">开户支行不能为空</p>
                             </div>
                         </div>
-                        <div class="row">
-                            <div class="col-sm-3"><em class="colorRed">*</em>银行账号</div>
-                            <div class="col-sm-5">
-                                <input name="number" ng-model="account.number" ng-change="checkAccount(3)" class="form-control" autocomplete="off" type="text" placeholder="请填写银行账号">
-                            </div>
-                            <div class="col-sm-4">
-                                <p ng-if="account.number && numberPattError">请填写正确的银行账号</p>
-                                <p ng-if="account.number && !numberPattError && numberError">请勿超过30个字符</p>
-                                <p ng-if="account.number && !numberPattError && !numberError && repeatError">该银行账号已存在</p>
-                                <p ng-if="myForm.number.$touched && !account.number">银行账号不能为空</p>
-                            </div>
-                        </div>
-                        <div class="row">
-                            <div class="col-sm-3"><em class="colorRed">*</em>开户名称</div>
-                            <div class="col-sm-5">
-                                <input name="accountname" ng-model="account.accountname" ng-change="checkAccount(4)" class="form-control" autocomplete="off" type="text" placeholder="请填写开户人姓名或企业名称">
-                            </div>
-                            <div class="col-sm-4">
-                                <p ng-if="account.accountname && nameError">请勿超过50个字</p>
-                                <p ng-if="myForm.accountname.$touched && !account.accountname">开户名称不能为空</p>
-                            </div>
-                        </div>
                         <!--<div class="row">
                             <div class="col-sm-3"><em class="colorRed">*</em>上传开户许可证</div>
                             <div class="col-sm-5 upload">
@@ -981,6 +981,28 @@
             <h2>新增账户信息</h2>
             <span style="color:#cbcaca;width:10px;height:10px;position:absolute;top:15px;right:15px;"><i class="fa fa-close" ng-click="cancelAdd()"></i></span>
             <form name="myForm">
+                <div class="row">
+                    <div class="col-sm-3"><em class="colorRed">*</em>开户名称</div>
+                    <div class="col-sm-5">
+                        <input name="accountname" ng-model="account.accountname" ng-change="checkAccount(4)" class="form-control" autocomplete="off" type="text" placeholder="请填写开户人姓名或企业名称">
+                    </div>
+                    <div class="col-sm-4">
+                        <p ng-if="account.accountname && nameError">请勿超过50个字</p>
+                        <p ng-if="myForm.accountname.$touched && !account.accountname">开户名称不能为空</p>
+                    </div>
+                </div>
+                <div class="row">
+                    <div class="col-sm-3"><em class="colorRed">*</em>银行账号</div>
+                    <div class="col-sm-5">
+                        <input name="number" ng-model="account.number" ng-change="checkAccount(3)" class="form-control" autocomplete="off" type="text" placeholder="请填写银行账号">
+                    </div>
+                    <div class="col-sm-4">
+                        <p ng-if="account.number && numberPattError">请填写正确的银行账号</p>
+                        <p ng-if="account.number && !numberPattError && numberError">请勿超过30个字符</p>
+                        <p ng-if="account.number && !numberPattError && !numberError && repeatError">该银行账号已存在</p>
+                        <p ng-if="myForm.number.$touched && !account.number">银行账号不能为空</p>
+                    </div>
+                </div>
                 <div class="row">
                     <div class="col-sm-3"><em class="colorRed">*</em>开户银行</div>
                     <div class="col-sm-5" style="position:relative;">
@@ -1006,28 +1028,6 @@
                         <p ng-if="myForm.branchname.$touched && !account.branchname">开户支行不能为空</p>
                     </div>
                 </div>
-                <div class="row">
-                    <div class="col-sm-3"><em class="colorRed">*</em>银行账号</div>
-                    <div class="col-sm-5">
-                        <input name="number" ng-model="account.number" ng-change="checkAccount(3)" class="form-control" autocomplete="off" type="text" placeholder="请填写银行账号">
-                    </div>
-                    <div class="col-sm-4">
-                        <p ng-if="account.number && numberPattError">请填写正确的银行账号</p>
-                        <p ng-if="account.number && !numberPattError && numberError">请勿超过30个字符</p>
-                        <p ng-if="account.number && !numberPattError && !numberError && repeatError">该银行账号已存在</p>
-                        <p ng-if="myForm.number.$touched && !account.number">银行账号不能为空</p>
-                    </div>
-                </div>
-                <div class="row">
-                    <div class="col-sm-3"><em class="colorRed">*</em>开户名称</div>
-                    <div class="col-sm-5">
-                        <input name="accountname" ng-model="account.accountname" ng-change="checkAccount(4)" class="form-control" autocomplete="off" type="text" placeholder="请填写开户人姓名或企业名称">
-                    </div>
-                    <div class="col-sm-4">
-                        <p ng-if="account.accountname && nameError">请勿超过50个字</p>
-                        <p ng-if="myForm.accountname.$touched && !account.accountname">开户名称不能为空</p>
-                    </div>
-                </div>
                <!-- <div class="row">
                     <div class="col-sm-3"><em class="colorRed">*</em>上传开户许可证</div>
                     <div class="col-sm-5 upload">

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

@@ -963,7 +963,7 @@
                     <th width="245">品牌/物料名称</th>
                     <th width="245">型号/规格</th>
                     <th width="110">采购数量(PCS)</th>
-                    <th width="130">剩余时间</th>
+                    <th width="130">截至日期</th>
                     <th width="90">操作</th>
                 </tr>
             </thead>
@@ -975,7 +975,8 @@
                                 <span ng-if="seek.inquiry.enterprise.enName" title="{{seek.inquiry.enterprise.enName}}" ng-bind="seek.inquiry.enterprise.enName"></span>
                                 <span ng-if="!seek.inquiry.enterprise.enName" title="{{seek.userName}}" ng-bind="seek.userName"></span>
                             </div>
-                            <div class="date-bottom-item" ng-bind="seek.reDate | date:'yyyy-MM-dd HH:mm'"></div>
+                            <div ng-if="vendorType == 'noOppor'" class="date-bottom-item" ng-bind="seek.date | date:'yyyy-MM-dd HH:mm'"></div>
+                            <div ng-if="vendorType != 'noOppor'" class="date-bottom-item" ng-bind="seek.reDate | date:'yyyy-MM-dd HH:mm'"></div>
                         </div>
                     </td>
                     <td>
@@ -1004,7 +1005,8 @@
                             </div>
                         </div>
                     </td>
-                    <td class="left-time" ng-if="seek.remainingTime > 0">剩余&nbsp;<span ng-bind="getDay(seek.remainingTime)" ng-if="getDay(seek.remainingTime) > 0" class="red-text"></span><i ng-if="getDay(seek.remainingTime) > 0">&nbsp;天&nbsp;</i><span ng-if="getDay(seek.remainingTime) <= 0" ng-bind="getHours(seek.remainingTime)" class="red-text">5</span><i ng-if="getDay(seek.remainingTime) <= 0">&nbsp;小时</i></td>
+                    <!--<td class="left-time" ng-if="seek.remainingTime > 0">剩余&nbsp;<span ng-bind="getDay(seek.remainingTime)" ng-if="getDay(seek.remainingTime) > 0" class="red-text"></span><i ng-if="getDay(seek.remainingTime) > 0">&nbsp;天&nbsp;</i><span ng-if="getDay(seek.remainingTime) <= 0" ng-bind="getHours(seek.remainingTime)" class="red-text">5</span><i ng-if="getDay(seek.remainingTime) <= 0">&nbsp;小时</i></td>-->
+                    <td class="left-time" ng-if="seek.remainingTime > 0" ng-bind="seek.endDate | date:'yyyy-MM-dd'"></td>
                     <td class="left-time" ng-if="seek.remainingTime <= 0"><span>已截止</span></td>
                     <td class="left-time" ng-if="seek.remainingTime == null"><span>-</span></td>
                     <td class="operate">