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

src/main/java/com/uas/platform/b2c/trade/vendor/service/impl/VendorIntroductionServiceImpl.java

@@ -86,7 +86,7 @@ public class VendorIntroductionServiceImpl implements VendorIntroductionService
 						productCondition = "pr_pbranden = '" + keyword + "'";
 						break;
                     default :
-                        enterpriseCondition = "(en_name like '%" + keyword + "%' or en_address like '%" + keyword + "%' or en_industry like '% "
+                        enterpriseCondition = "(en_name like '%" + keyword + "%' or en_address like '%" + keyword + "%' or en_industry like '%"
                                 + keyword + "%')";
                         break;
 				}
@@ -240,8 +240,11 @@ public class VendorIntroductionServiceImpl implements VendorIntroductionService
 		enCountSql.append("select count(1) from (select distinct(en_uu) from (select en_uu from sec$enterprises where en_name not like '%测试%' " +
 				" and en_name not like '%test%' and (length(en_businesscode) > 12 or en_name like '%香港%' or en_name like '%HONG KONG%' " +
 				" or en_area like '%香港%')and (en_name not REGEXP '^[0-9]*$' and (en_name like '%ltd%' or en_name like '%limited%' or " +
-				" en_name like '%tcl%' or en_name not regexp '[\\u4e00-\\u9fa5_a-zA-Z0-9]') ) and en_uu <> ")
-				.append(enUU).append(") e ");
+				" en_name like '%tcl%' or en_name not regexp '[\\u4e00-\\u9fa5_a-zA-Z0-9]') ) and ");
+		if (StringUtils.isEmpty(productCondition)) {
+			enCountSql.append(enterpriseCondition).append(" and ");
+		}
+		enCountSql.append(" en_uu <> ").append(enUU).append(") e ");
 		if (!StringUtils.isEmpty(productCondition)) {
 			enCountSql.append("right join ( select pr_enuu from products where ").append(productCondition).append(") p on pr_enuu = en_uu");
 			enCountSql.append(" union select en_uu from sec$enterprises where en_name not like '%测试%'  and en_name not like '%test%' and (length(en_businesscode) > 12 or en_name like '%香港%' or en_name like '%HONG KONG%'  or en_area like '%香港%')and (en_name not REGEXP '^[0-9]*$' and (en_name like '%ltd%' or en_name like '%limited%' or  en_name like '%tcl%' or en_name not regexp '[\\u4e00-\\u9fa5_a-zA-Z0-9]') and ")

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

@@ -51,6 +51,13 @@ define(['ngResource'], function(ngResource) {
 				params : {
 					type : 'sup'
 				}
+			},
+			getTotalTransferMoney: {
+				url: '/trade/transfer/vendor/bankTransfer/ledger',
+				method: 'GET',
+				params: {
+					type: 'sup'
+				}
 			}
 		});
 	}]);

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

@@ -645,7 +645,7 @@ define([ 'app/app' ], function(app) {
 							return;
 						}
 						imageArray.push($scope.imagesList[i].imageUrl);
-					} else if ($scope.type == "PAIDTOVENDOR" && $scope.imagesList[i].imageUrl == '') {
+					} else if ($scope.type == "PAIDTOVENDOR" && !$scope.imagesList[i].imageUrl) {
 						if ($scope.diliverPrice[i] != '') {
 							toaster.pop('info','提示','请输入付款金额对应的付款截图');
 							return;

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

@@ -22,6 +22,19 @@ define(['app/app'], function(app) {
         $scope.paytype = 'ALL';
         $scope.$$transfer = {};
 
+        var getTransferMoney = function () {
+            bankTransferService.getTotalTransferMoney({}, function (data) {
+                if (data.code == 1) {
+                    $scope.totalPrice = data.data;
+                } else {
+                    toaster.pop('error', data.message || '获取收入总额失败');
+                }
+            }, function (error) {
+                toaster.pop('error', error.data || '获取收入总额失败');
+            })
+        }
+        getTransferMoney();
+
         var getTradeRecordInfo = function () {
             $scope.tradeRecordTableParams = new ngTableParams({
                 page : 1,
@@ -49,7 +62,7 @@ define(['app/app'], function(app) {
                                 $scope.currencySymbol = $scope.bankTransRecore[0].currencyName;
                             }
                             var pageObject = page.data.data;
-                            $scope.totalPrice = page.data.total;
+                            // $scope.totalPrice = page.data.total;
                             angular.forEach($scope.bankTransRecode, function (bankT) {
                                 bankT.jsonReceive = angular.fromJson(bankT.jsonReceive);
                             });