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

# Conflicts:
#	src/main/webapp/resources/js/usercenter/controllers/forstore/seek_purchase_ctrl.js

src/main/java/com/uas/platform/b2c/fa/payment/service/impl/BankInfoServiceImpl.java

@@ -1,6 +1,5 @@
 package com.uas.platform.b2c.fa.payment.service.impl;
 
-import com.uas.platform.b2c.common.account.model.Enterprise;
 import com.uas.platform.b2c.common.account.model.User;
 import com.uas.platform.b2c.common.base.model.FileUpload;
 import com.uas.platform.b2c.common.base.service.FileService;
@@ -332,14 +331,14 @@ public class BankInfoServiceImpl implements BankInfoService {
 			return new ResultMap(CodeType.NOT_PERMIT, "该账户信息不是已提交状态，不能审核");
 		}
 		if(status == Status.ALLOW.value()) { //审核通过
+			bankInfo.setStatus(Status.ALLOW.value());
+			bankInfo = bankInfoDao.save(bankInfo);
 			List<BankInfo> infoList = null;
 			if (bankInfo.getDissociative() == Type.PERSONAL.value()){
 				infoList = bankInfoDao.findByUseruuAndAccountTypeAndDissociativeAndStatusOrderByNumAsc(bankInfo.getUseruu(), bankInfo.getAccountType(), bankInfo.getDissociative(), Status.ALLOW.value());
 			} else {
 				infoList = bankInfoDao.findSupBankList(bankInfo.getEnuu(), bankInfo.getDissociative(), bankInfo.getAccountType(), statusList);
 			}
-			bankInfo.setStatus(Status.ALLOW.value());
-			bankInfo = bankInfoDao.save(bankInfo);
 			if (!CollectionUtils.isEmpty(infoList) && infoList.size() > 1){
 				BankInfo first = infoList.get(0); //获取第一个账户信息
 				if (first.getStatus() == Status.ALLOW.value()){

src/main/java/com/uas/platform/b2c/fa/payment/service/impl/BankTransferServiceImpl.java

@@ -559,7 +559,6 @@ public class BankTransferServiceImpl implements BankTransferService {
 			info.filter("operateType", type);
 			info.filter("collectenuu", SystemSession.getUser().getEnterprise().getUu());
 		}
-		info.expression(PredicateUtils.isNotNull("transferTime"));
 		filterPageInfo(info, keyword, fromDate, toDate, remitteeType);
 
 		Page<BankTransfer> pageBankTran = bankTransferDao.findAll(new Specification<BankTransfer>() {
@@ -639,7 +638,9 @@ public class BankTransferServiceImpl implements BankTransferService {
 			info.expression(PredicateUtils.lte("transferTime", new Date(toDate), false));
 		}
 		if (!StringUtils.isEmpty(remitteeType)) {
-			info.expression(PredicateUtils.eq("type", remitteeType, false));
+			if (!"ALL".equals(remitteeType)) {
+				info.expression(PredicateUtils.eq("type", remitteeType, false));
+			}
 		}
 	}
 }

src/main/java/com/uas/platform/b2c/fa/settlement/service/impl/BillServiceImpl.java

@@ -63,11 +63,11 @@ public class BillServiceImpl implements BillService {
 			List<Bill> billList = new ArrayList<Bill>();
 			User user = SystemSession.getUser();
 			Long userUu = useruu, enUU = enuu;
-			if ((enUU == null) && (user.getEnterprise() != null)) {
-				userUu = user.getEnterprise().getUu();
+			if ((enUU == null) && (user.getEnterprise() == null)) {
+				userUu = user.getUserUU();
 			}
 			if (enUU == null && userUu == null) {
-				userUu = user.getUserUU();
+                enUU = user.getEnterprise().getUu();
 			}
 			bill.setCreateTime(new Date());
 			if (enUU == null) {

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

@@ -61,7 +61,6 @@ define(['app/app', 'clipboard', 'QRCode'], function (app, clipboard, QRCode) {
                 return new Date(_formatDate(date, 'yyyy-MM-dd')).getTime() - 8 * 60 * 60 * 1000
             }
             var init = function () {
-
                 // 发布时间
                 $scope.dateArea = 'sevenDay';
                 var currentTime = _getClearDay(new Date());
@@ -74,11 +73,38 @@ define(['app/app', 'clipboard', 'QRCode'], function (app, clipboard, QRCode) {
           $scope.vendorType = 'self'
           $scope.onVendorTypeChange = function () {
             $scope.keyword = '';
-            $scope.startDate = null;
-            $scope.endDate = null;
             $scope.seekPurchaseTableParams.page(1);
             $scope.seekPurchaseTableParams.reload();
           }
+            $scope.setFilters = function (type, val, flag) {
+                $scope[type] = val;
+                if (type == 'dateArea') {
+                    // 时间筛选
+                    var currentTime = _getClearDay(new Date());
+                    var endDate = new Date(currentTime + 23 * 60 * 60 * 1000 + 59 * 60 * 1000 + 59 * 1000);
+                    if (val == 'ALL' || val == 'autoDay') {
+                        $scope.startDate = null;
+                        $scope.endDate = null;
+                    } else if (val == 'oneDay') {
+                        $scope.startDate = new Date(currentTime);
+                        $scope.endDate = endDate;
+                    } else if (val == 'threeDay') {
+                        $scope.startDate = new Date(currentTime - 2 * 24 * 60 * 60 * 1000);
+                        $scope.endDate = endDate;
+                    } else if (val == 'sevenDay') {
+                        $scope.startDate = new Date(currentTime - 6 * 24 * 60 * 60 * 1000);
+                        $scope.endDate = endDate;
+                    } else {
+                        $scope.startDate = null;
+                        $scope.endDate = null;
+                    }
+                }
+                if (flag) return
+                $scope.seekPurchaseTableParams.page(1);
+                $scope.seekPurchaseTableParams.reload();
+            }
+            $scope.setFilters('dateArea', 'sevenDay', '1')
+
           seekPurchase.getSeekUrl({}, function(data) {
             var seekUrl = data.url;
             //   var seekUrl = 'http://10.1.51.82:24002';
@@ -1199,33 +1225,5 @@ define(['app/app', 'clipboard', 'QRCode'], function (app, clipboard, QRCode) {
             })
           }
           });
-            // 筛选
-
-            $scope.setFilters = function (type, val) {
-                $scope[type] = val;
-                if (type == 'dateArea') {
-                    // 时间筛选
-                    var currentTime = _getClearDay(new Date());
-                    var endDate = new Date(currentTime + 23 * 60 * 60 * 1000 + 59 * 60 * 1000 + 59 * 1000);
-                    if (val == 'ALL' || val == 'autoDay') {
-                        $scope.startDate = null;
-                        $scope.endDate = null;
-                    } else if (val == 'oneDay') {
-                        $scope.startDate = new Date(currentTime);
-                        $scope.endDate = endDate;
-                    } else if (val == 'threeDay') {
-                        $scope.startDate = new Date(currentTime - 2 * 24 * 60 * 60 * 1000);
-                        $scope.endDate = endDate;
-                    } else if (val == 'sevenDay') {
-                        $scope.startDate = new Date(currentTime - 6 * 24 * 60 * 60 * 1000);
-                        $scope.endDate = endDate;
-                    } else {
-                        $scope.startDate = null;
-                        $scope.endDate = null;
-                    }
-                }
-                $scope.seekPurchaseTableParams.page(1);
-                $scope.seekPurchaseTableParams.reload();
-            }
         }]);
 });