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

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;
@@ -86,7 +85,7 @@ public class BankInfoServiceImpl implements BankInfoService {
 				bankInfo.setNum(count + 1);
 			}
 		}
-		if (AccountType.RECEIVE_TYPE.equals(bankInfo.getAccountType())) {
+		if (AccountType.RECEIVE_TYPE.equals(bankInfo.getAccountType()) && (!sysConf.getEnUU().equals(bankInfo.getEnuu()))) {
 			bankInfo.setStatus(Status.SUBMITTED.value());
 		}
 
@@ -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

@@ -2,6 +2,7 @@ package com.uas.platform.b2c.fa.payment.service.impl;
 
 import com.uas.platform.b2c.common.account.dao.EnterpriseDao;
 import com.uas.platform.b2c.common.account.model.Enterprise;
+import com.uas.platform.b2c.common.account.model.User;
 import com.uas.platform.b2c.core.config.SysConf;
 import com.uas.platform.b2c.core.support.SystemSession;
 import com.uas.platform.b2c.core.utils.FastjsonUtils;
@@ -38,6 +39,7 @@ import com.uas.platform.core.persistence.criteria.CriterionExpression;
 import com.uas.platform.core.persistence.criteria.LogicalExpression;
 import com.uas.platform.core.persistence.criteria.PredicateUtils;
 import com.uas.platform.core.persistence.criteria.SimpleExpression;
+import com.uas.platform.core.util.serializer.FlexJsonUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Sort;
@@ -275,7 +277,19 @@ public class BankTransferServiceImpl implements BankTransferService {
 		// 将转账信息的ID保存到订单类型中
 		String[] orderIds = order.split("-");
 		BankTransfer saveBankTransfer = new BankTransfer();
-
+        User user = SystemSession.getUser();
+        bankTransfer.setPayUseruu(user.getUserUU());
+        bankTransfer.setPayenuu(user.getEnterprise() != null ? user.getEnterprise().getUu() : null);
+        if (bankTransfer.getPayenuu() == null) {
+            bankTransfer.setDissociative(Type.PERSONAL.value());
+        } else {
+            bankTransfer.setDissociative(Type.ENTERPRISING.value());
+        }
+        bankTransfer.setTransferTime(new Date());
+        bankTransfer.setTranferCreateTime(new Date());
+        bankTransfer.setBuyername(user.getUserName());
+        bankTransfer.setBuyerentername(user.getEnterprise().getEnName());
+        bankTransfer.setOrderid(order);
 		if (com.uas.platform.b2c.core.constant.Type.PAIDTOVENDOR.name().equals(bankTransfer.getType())) {// 付款类型为分期付款
 			if (orderIds.length > 1)
 				throw new IllegalOperatorException("多张订单合并付款只能向平台支付，如需直接支付给卖家，请前往 订单中心 进行单张支付");
@@ -287,15 +301,13 @@ public class BankTransferServiceImpl implements BankTransferService {
 				throw new IllegalOperatorException("您操作的订单不在待付款状态：" + orderIds[0]);
 			}
 
-			bankTransfer.setPayUseruu(SystemSession.getUser().getUserUU());
-			bankTransfer.setPayenuu(SystemSession.getUser().getEnterprise() != null ? SystemSession.getUser().getEnterprise().getUu() : null);
-			if (bankTransfer.getPayenuu() == null) {
-				bankTransfer.setDissociative(Type.PERSONAL.value());
-			} else {
-				bankTransfer.setDissociative(Type.ENTERPRISING.value());
-			}
-
-			List<BankInfo> bankInfos = bankInfoService.getEnterpriseBankInfoContainsStatus(Type.SUP.value(), Status.ALLOW.value(), orderN.getSellerenuu());
+            List<Purchase> purchaseList = purchaseDao.findByOrderid(orderN.getOrderid());
+            String puid = "";
+            for (Purchase purchase : purchaseList) {
+                puid += ("," + purchase.getPurchaseid());
+            }
+            puid = puid.substring(1);
+            List<BankInfo> bankInfos = bankInfoService.getEnterpriseBankInfoContainsStatus(Type.SUP.value(), Status.ALLOW.value(), orderN.getSellerenuu());
 			if (CollectionUtils.isEmpty(bankInfos))
 				throw new IllegalOperatorException("卖家收款账户不存在，请联系卖家");
 			Enterprise enterprise = enterpriseDao.findByUu(orderN.getSellerenuu());
@@ -304,11 +316,11 @@ public class BankTransferServiceImpl implements BankTransferService {
 
 			bankTransfer.setCollectUseruu(enterprise.getEnAdminuu());
 			bankTransfer.setCollectenuu(orderN.getSellerenuu());
+            bankTransfer.setJsonReceive(FlexJsonUtils.toJson(bankInfos.get(0)));
 
 			bankTransfer.setBanktranssn(EncodingRulesConstant.BANKTRANSFER.replace("_TIMESTAP_NUMBER", createNumberService.getTimeNumber("trade$bank_transfer", 8)));
-			bankTransfer.setTranferCreateTime(new Date());
 			bankTransfer.setOperateType(Type.SUP.value());
-
+            bankTransfer.setPuid(puid);
 			saveBankTransfer = bankTransferDao.save(bankTransfer);
 
 			BankTransAssociate bankTransAssociate = new BankTransAssociate();
@@ -317,7 +329,7 @@ public class BankTransferServiceImpl implements BankTransferService {
 			btaDao.save(bankTransAssociate);
 
 			orderN.setBanktfid(saveBankTransfer.getId());
-			Long userUU = SystemSession.getUser().getUserUU();
+			Long userUU = user.getUserUU();
 			orderN.setStatusPaid(userUU);
 			Set<OrderDetail> orderDetails = orderN.getOrderDetails();
 			for (OrderDetail orderDetail : orderDetails) {
@@ -333,8 +345,7 @@ public class BankTransferServiceImpl implements BankTransferService {
 			orderN.setPaytype(Type.Payment_CompanyTransfer_Code.value());
 
 			//修改采购单的状态
-			List<Purchase> purchases = purchaseDao.findByOrderid(orderN.getOrderid());
-			for (Purchase purchase : purchases) {
+			for (Purchase purchase : purchaseList) {
 				if(purchase.getStatus().intValue() == Status.TOBECONFIRMED.value()) {
 					Set<PurchaseDetail> purchaseDetails = purchase.getPurchaseDetails();
 					for (PurchaseDetail purchaseDetail : purchaseDetails) {
@@ -345,24 +356,15 @@ public class BankTransferServiceImpl implements BankTransferService {
 					purchase.setStatusPaid(userUU);
 				}
 			}
-			purchaseDao.save(purchases);
+			purchaseDao.save(purchaseList);
 			orderDao.save(orderN);
 			// 单期分期付款
 			installmentService.paidInstallment(bankTransfer, orderN.getId());
 		} else {
-			bankTransfer.setPayUseruu(SystemSession.getUser().getUserUU());
-			bankTransfer.setPayenuu(SystemSession.getUser().getEnterprise() != null ? SystemSession.getUser().getEnterprise().getUu() : null);
-			if (bankTransfer.getPayenuu() == null) {
-				bankTransfer.setDissociative(Type.PERSONAL.value());
-			} else {
-				bankTransfer.setDissociative(Type.ENTERPRISING.value());
-			}
-
 			bankTransfer.setCollectUseruu(sysConf.getAdminUU()); // 收款方 设置为应鹏账号
 			bankTransfer.setCollectenuu(sysConf.getEnUU()); // 收款方设置为B2C的uu
 
 			bankTransfer.setBanktranssn(EncodingRulesConstant.BANKTRANSFER.replace("_TIMESTAP_NUMBER", createNumberService.getTimeNumber("trade$bank_transfer", 8)));
-			bankTransfer.setTranferCreateTime(new Date());
 			bankTransfer.setOperateType(Type.MALL.value());
 
 			saveBankTransfer = bankTransferDao.save(bankTransfer);
@@ -383,14 +385,13 @@ public class BankTransferServiceImpl implements BankTransferService {
 				btaDao.save(bankTransAssociate);
 
 				orderN.setBanktfid(saveBankTransfer.getId());
-				Long userUU = SystemSession.getUser().getUserUU();
+				Long userUU = user.getUserUU();
 				orderN.setStatusPaid(userUU);
 				Set<OrderDetail> orderDetails = orderN.getOrderDetails();
 				for (OrderDetail orderDetail : orderDetails) {
 					if(orderDetail.getStatus().intValue() == Status.TOBEPAID.value()) {
 						orderDetail.setStatusPaid(userUU);
 					}
-
 				}
 				orderN.setRemitteeType(bankTransfer.getType());
 				orderN.setBuyaccount(bankTransfer.getJsonPament());
@@ -559,7 +560,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 +639,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/java/com/uas/platform/b2c/fa/settlement/service/impl/BillSubmitServiceImpl.java

@@ -74,9 +74,11 @@ public class BillSubmitServiceImpl implements BillSubmitService {
         Long buyerEnuu = null;
         if (SystemSession.getUser().getEnterprise() != null)
             buyerEnuu = SystemSession.getUser().getEnterprise().getUu();
-
-        if ((!bill.getUseruu().equals(buyeruu)) || (buyerEnuu != null && !bill.getEnuu().equals(buyerEnuu)))
+        if ((buyerEnuu != null && !bill.getEnuu().equals(buyerEnuu))) {
+            throw new IllegalOperatorException("发票信息不属于您，请重新确认发票信息");
+        } else if((buyerEnuu == null) && !buyeruu.equals(bill.getUseruu())){
             throw new IllegalOperatorException("发票信息不属于您，请重新确认发票信息");
+        }
 
         // 获取验证订单信息
         List<String> orderidList = Arrays.asList(orderids);

src/main/java/com/uas/platform/b2c/logistics/dao/AddressDao.java

@@ -81,6 +81,6 @@ public interface AddressDao extends JpaSpecificationExecutor<Address>, JpaReposi
 	 * @param usetype      使用类型
 	 * @return Integer 返回地址总数
 	 */
-	@Query(value="select count(1) from Address a where a.useruu=:useruu and a.dissociative=:dissociative and a.type=:type and a.usetype =:usetype")
+	@Query(value="select count(1) from Address a where a.useruu=:useruu and a.type=:type and a.usetype =:usetype")
 	Integer getCountByUseruuAndTypeAndUsetype(@Param("useruu") Long useruu, @Param("type") int type, @Param("usetype") Short usetype);
 }

src/main/webapp/resources/js/sso/controllers/ssoAddressCtrl.js

@@ -186,6 +186,7 @@ define(['app/app'], function (app) {
                     }, address, function () {
                         toaster.pop('success', '成功 ', '保存收货地址成功');
                         $scope.loadAddresses();
+                        $scope.newAddr = {};
                     }, function (res) {
                         toaster.pop('error', '保存收货地址失败 ', res.data);
                     });

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

@@ -44,7 +44,7 @@ define(['app/app'], function(app) {
 
 		$scope.param = {};
 
-		$scope.currency = 'ALL';
+		$scope.currency = 'RMB';
 
 		$scope.paytype = 'ALL';
 
@@ -166,7 +166,7 @@ define(['app/app'], function(app) {
 			// }
 			$event.preventDefault();
 			$event.stopPropagation();
-			openParam == 0 ? $scope.condition[1].open = false : $scope.condition[0].open = falsremitteeTypee;
+			openParam == 0 ? $scope.condition[1].open = false : $scope.condition[0].open = false;
 			item[openParam].open = !item[openParam].open;
 		};
 
@@ -270,13 +270,13 @@ define(['app/app'], function(app) {
 					$scope.startDate = null;
 					$scope.endDate = null;
 				} else if (val == 'oneMonth') {
-					$scope.startDate = new Date(currentTime - 30 * 24 * 60 * 60 * 1000);
+					$scope.startDate = new Date(currentTime - 30 * 24 * 60 * 60 * 1000 - 24 * 60 * 60 * 1000);
 					$scope.endDate = endDate;
 				} else if (val == 'threeMonth') {
-					$scope.startDate = new Date(currentTime - 3 * 30 * 24 * 60 * 60 * 1000);
+					$scope.startDate = new Date(currentTime - 3 * 30 * 24 * 60 * 60 * 1000 - 24 * 60 * 60 * 1000);
 					$scope.endDate = endDate;
 				} else if (val == 'sixMonth') {
-					$scope.startDate = new Date(currentTime - 6 * 30 * 24 * 60 * 60 * 1000);
+					$scope.startDate = new Date(currentTime - 6 * 30 * 24 * 60 * 60 * 1000 - 24 * 60 * 60 * 1000);
 					$scope.endDate = endDate;
 				} else {
 					$scope.startDate = null;

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

@@ -30,19 +30,81 @@ define(['app/app', 'clipboard', 'QRCode'], function (app, clipboard, QRCode) {
             } else {
                 $scope.tab = 'waitOffer';
             }
+            var _formatDate = function (date, fmt) {
+                if (!date) {
+                    return null;
+                }
+                if (typeof date === 'string') {
+                    date = new Date(Date.parse(date.replace(/-/g, '/')));
+                }
+                var o = {
+                    'M+': date.getMonth() + 1, // 月份
+                    'd+': date.getDate(), // 日
+                    'h+': date.getHours(), // 小时
+                    'm+': date.getMinutes(), // 分
+                    's+': date.getSeconds(), // 秒
+                    'q+': Math.floor((date.getMonth() + 3) / 3), // 季度
+                    'S': date.getMilliseconds() // 毫秒
+                }
+                if (/(y+)/.test(fmt)) {
+                    fmt = fmt.replace(RegExp.$1, (date.getFullYear() + '').substr(4 - RegExp.$1.length));
+                }
+                for (var k in o) {
+                    if (new RegExp('(' + k + ')').test(fmt)) {
+                        fmt = fmt.replace(RegExp.$1, (RegExp.$1.length === 1) ? (o[k]) : (('00' + o[k]).substr(('' + o[k]).length)));
+                    }
+                }
+                return fmt;
+            }
 
-          // 发布时间
-          $scope.dateArea = 'sevenDay';
+            var _getClearDay = function (date) {
+                return new Date(_formatDate(date, 'yyyy-MM-dd')).getTime() - 8 * 60 * 60 * 1000
+            }
+            var init = function () {
+                // 发布时间
+                $scope.dateArea = 'sevenDay';
+                var currentTime = _getClearDay(new Date());
+                $scope.startDate = new Date(currentTime - 6 * 24 * 60 * 60 * 1000);
+                $scope.endDate = new Date(currentTime + 23 * 60 * 60 * 1000 + 59 * 60 * 1000 + 59 * 1000);
+            }
+            init()
 
           // 更换待报价状态
           $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';
@@ -543,6 +605,7 @@ define(['app/app', 'clipboard', 'QRCode'], function (app, clipboard, QRCode) {
           }
           // 采纳报价
           $scope.adopt = function (of) {
+            $scope.showCurrentRefuseOffer = false;
             $http({
                 headers:{
                     'content-Type':'application/x-www-form-urlencoded'
@@ -1162,63 +1225,5 @@ define(['app/app', 'clipboard', 'QRCode'], function (app, clipboard, QRCode) {
             })
           }
           });
-            // 筛选
-            var _formatDate = function (date, fmt) {
-                if (!date) {
-                    return null;
-                }
-                if (typeof date === 'string') {
-                    date = new Date(Date.parse(date.replace(/-/g, '/')));
-                }
-                var o = {
-                    'M+': date.getMonth() + 1, // 月份
-                    'd+': date.getDate(), // 日
-                    'h+': date.getHours(), // 小时
-                    'm+': date.getMinutes(), // 分
-                    's+': date.getSeconds(), // 秒
-                    'q+': Math.floor((date.getMonth() + 3) / 3), // 季度
-                    'S': date.getMilliseconds() // 毫秒
-                }
-                if (/(y+)/.test(fmt)) {
-                    fmt = fmt.replace(RegExp.$1, (date.getFullYear() + '').substr(4 - RegExp.$1.length));
-                }
-                for (var k in o) {
-                    if (new RegExp('(' + k + ')').test(fmt)) {
-                        fmt = fmt.replace(RegExp.$1, (RegExp.$1.length === 1) ? (o[k]) : (('00' + o[k]).substr(('' + o[k]).length)));
-                    }
-                }
-                return fmt;
-            }
-
-            var _getClearDay = function (date) {
-                return new Date(_formatDate(date, 'yyyy-MM-dd')).getTime() - 8 * 60 * 60 * 1000
-            }
-
-            $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 - 24 * 60 * 60 * 1000);
-                        $scope.endDate = endDate;
-                    } else if (val == 'threeDay') {
-                        $scope.startDate = new Date(currentTime - 3 * 24 * 60 * 60 * 1000);
-                        $scope.endDate = endDate;
-                    } else if (val == 'sevenDay') {
-                        $scope.startDate = new Date(currentTime - 7 * 24 * 60 * 60 * 1000);
-                        $scope.endDate = endDate;
-                    } else {
-                        $scope.startDate = null;
-                        $scope.endDate = null;
-                    }
-                }
-                $scope.seekPurchaseTableParams.page(1);
-                $scope.seekPurchaseTableParams.reload();
-            }
         }]);
 });

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

@@ -16,6 +16,7 @@ define(['app/app'], function(app) {
         $scope.param = {};
 
         $scope.tab = $stateParams.tab == 'accountTab' ? $stateParams.tab : hiStatus == null ? 'paymentRecord' : hiStatus;
+        console.log($stateParams, '$stateParams')
 
         document.title = $stateParams.tab == 'accountTab' ? '收款账户' : '应收对账' + '-优软商城';
 
@@ -204,13 +205,13 @@ define(['app/app'], function(app) {
                     $scope.startDate = null;
                     $scope.endDate = null;
                 } else if (val == 'oneMonth') {
-                    $scope.startDate = new Date(currentTime - 30 * 24 * 60 * 60 * 1000);
+                    $scope.startDate = new Date(currentTime - 30 * 24 * 60 * 60 * 1000 - 24 * 60 * 60 * 1000);
                     $scope.endDate = endDate;
                 } else if (val == 'threeMonth') {
-                    $scope.startDate = new Date(currentTime - 3 * 30 * 24 * 60 * 60 * 1000);
+                    $scope.startDate = new Date(currentTime - 3 * 30 * 24 * 60 * 60 * 1000 - 24 * 60 * 60 * 1000);
                     $scope.endDate = endDate;
                 } else if (val == 'sixMonth') {
-                    $scope.startDate = new Date(currentTime - 6 * 30 * 24 * 60 * 60 * 1000);
+                    $scope.startDate = new Date(currentTime - 6 * 30 * 24 * 60 * 60 * 1000 - 24 * 60 * 60 * 1000);
                     $scope.endDate = endDate;
                 } else {
                     $scope.startDate = null;

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

@@ -44,7 +44,7 @@ define(['app/app'], function (app) {
                 // 发布时间
                 $scope.dateArea = 'sevenDay';
                 var currentTime = _getClearDay(new Date());
-                $scope.startDate = new Date(currentTime - 7 * 24 * 60 * 60 * 1000);
+                $scope.startDate = new Date(currentTime - 6 * 24 * 60 * 60 * 1000);
                 $scope.endDate = new Date(currentTime + 23 * 60 * 60 * 1000 + 59 * 60 * 1000 + 59 * 1000);
             }
 
@@ -325,13 +325,13 @@ define(['app/app'], function (app) {
                           $scope.startDate = null;
                           $scope.endDate = null;
                       } else if (val == 'oneDay') {
-                          $scope.startDate = new Date(currentTime - 24 * 60 * 60 * 1000);
+                          $scope.startDate = new Date(currentTime);
                           $scope.endDate = endDate;
                       } else if (val == 'threeDay') {
-                          $scope.startDate = new Date(currentTime - 3 * 24 * 60 * 60 * 1000);
+                          $scope.startDate = new Date(currentTime - 2 * 24 * 60 * 60 * 1000);
                           $scope.endDate = endDate;
                       } else if (val == 'sevenDay') {
-                          $scope.startDate = new Date(currentTime - 7 * 24 * 60 * 60 * 1000);
+                          $scope.startDate = new Date(currentTime - 6 * 24 * 60 * 60 * 1000);
                           $scope.endDate = endDate;
                       } else {
                           $scope.startDate = null;

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

@@ -479,12 +479,12 @@
 <div class="user_right fr" id="pay_center">
 	<!--支付中心-->
 	<div class="pay_record oder">
-		<!--<div class="oder01" style="margin-bottom: 16px;">
+		<div class="oder01" style="margin-bottom: 16px;">
 			<ul>
-				<li ng-class="{'active' : status=='pay-history'}" ng-click="toggleStatus('pay-history')"><a href="javascript:void(0)">交易记录</a></li>
-				<li ng-class="{'active' : status=='pay-info'}" ng-click="toggleStatus('pay-info')"><a href="javascript:void(0)">付款账户</a></li>
+				<li ng-if="status != 'pay-info'" ng-class="{'active' : status=='pay-history'}"><a href="javascript:void(0)">交易记录</a></li>
+				<li ng-if="status == 'pay-info'" ng-class="{'active' : status=='pay-info'}"><a href="javascript:void(0)">应付对账</a></li>
 			</ul>
-		</div>-->
+		</div>
 		<!--支付中心列表-->
 		<div class="ticket_record_list">
 			<!-- 支付信息-->
@@ -615,11 +615,11 @@
 					</div>
 					<div class="radio-block" style="display:block;">
 					交易币种：
-					<label class="com-check-radio">
-						<input type="radio" id="currencyAll" name="currency" ng-click="setFilters('currency', 'ALL')" ng-checked="currency == 'ALL'">
-						<label for="currencyAll"></label>
-						全部
-					</label>
+					<!--<label class="com-check-radio">-->
+						<!--<input type="radio" id="currencyAll" name="currency" ng-click="setFilters('currency', 'ALL')" ng-checked="currency == 'ALL'">-->
+						<!--<label for="currencyAll"></label>-->
+						<!--全部-->
+					<!--</label>-->
 					<label class="com-check-radio">
 						<input type="radio" id="RMB" name="currency" ng-click="setFilters('currency', 'RMB')" ng-checked="currency == 'RMB'">
 						<label for="RMB"></label>

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

@@ -364,13 +364,13 @@
     }
     .seek-purchase .seek-purchase-content >table >tbody tr.expand-row table tbody tr td.operate > span {
         display: inline-block;
-        width: 39px;
         height: 24px;
         line-height: 24px;
         text-align: center;
         background: #4290f7;
         color: #fff;
-        margin-left: 13px;
+        padding: 0 5px;
+        margin: 0 5px;
         cursor: pointer;
         font-size: 12px;
         border-radius: 2px;

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

@@ -677,12 +677,12 @@
 <div class="user_right fr" id="pay_center">
     <!--支付中心-->
     <div class="pay_record oder">
-      <!--  <div class="oder01">
+        <div class="oder01">
             <ul>
-                <li ng-click="setTab('paymentRecord')" ng-class="{'active' : tab == 'paymentRecord'}"><a href="javascript:void(0)">交易记录</a></li>
-                <li ng-click="setTab('accountTab')" ng-class="{'active' : tab == 'accountTab'}"><a href="javascript:void(0)">收款帐户</a></li>
+                <li ng-if="tab != 'accountTab'" ng-class="{'active' : tab == 'paymentRecord'}"><a href="javascript:void(0)">交易记录</a></li>
+                <li ng-if="tab == 'accountTab'" ng-class="{'active' : tab == 'accountTab'}"><a href="javascript:void(0)">应收对账</a></li>
             </ul>
-        </div>-->
+        </div>
         <!--支付中心列表-->
         <div class="ticket_record_list">
             <!-- 交易记录-->

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

@@ -975,7 +975,7 @@
                                 <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.date | date:'yyyy-MM-dd HH:mm'"></div>
+                            <div class="date-bottom-item" ng-bind="seek.reDate | date:'yyyy-MM-dd HH:mm'"></div>
                         </div>
                     </td>
                     <td>