关联账户信息调整

src/main/java/com/uas/platform/b2c/fa/payment/dao/BankInfoDao.java

@@ -85,18 +85,14 @@ public interface BankInfoDao extends CrudRepository<BankInfo, Long>, JpaSpecific
 	@Query("select count(b) from BankInfo b where b.enuu=:enuu and b.opraterUserType=:operateUserType and b.status in :status")
 	int getCountByEnuuAndStatus(@Param("enuu") Long enuu, @Param("operateUserType") Integer operateUserType, @Param("status") List<Integer> status);
 
-
 	/**
-	 * 获取当前卖家的已通过企业银行账户
+	 * 返回已启用的账户信息
 	 *
-	 * @param useruu 个人uu
-	 * @param enuu 企业enuu
-	 * @param num 序号
-	 * @param type 账户类型
-	 * @param opraterUserType 操作人的类型
-	 * @param status 状态
-	 * @return list
+	 * @param enuu
+	 * @param opraterUserType
+	 * @param status
+	 * @return
 	 */
-	List<BankInfo> findByUseruuAndEnuuAndNumAndOpraterUserTypeAndStatus(Long useruu, Long enuu, Integer num, Integer opraterUserType, Integer status);
+	List<BankInfo> findByEnuuAndStatusAndOpraterUserTypeOrderByNumAsc(Long enuu, Integer opraterUserType, Integer status);
 
 }

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

@@ -191,22 +191,21 @@ public class BankInfoServiceImpl implements BankInfoService {
 
 	@Override
 	public List<BankInfo> getEnterpriseBankInfoContainsStatus(Integer operatorUserType, Integer status, Long... params) {
-//		Long enuu = null;
-//		if(params.length == 0) {
-//			enuu = SystemSession.getUser().getEnterprise() != null ? SystemSession.getUser().getEnterprise().getUu() : null;
-//		}else {
-//			enuu = params[0];
-//		}
-//		if(operatorUserType == Type.BUYER.value()) {
-//			if (enuu != null) {
-//				return bankInfoDao.findByUseruuAndEnuuAndTypeAndOpraterUserTypeAndStatusOrderByNumAsc(SystemSession.getUser().getUserUU(), enuu, (short)2, operatorUserType, status);
-//			} else {
-//				return bankInfoDao.findByUseruuAndDissociativeAndTypeAndOpraterUserTypeAndStatusOrderByNumAsc(SystemSession.getUser().getUserUU(), Type.PERSONAL.value(), (short)2, operatorUserType, status);
-//			}
-//		}else {
-//			return bankInfoDao.findByEnuuAndTypeAndStatusAndOpraterUserTypeOrderByNumAsc(enuu, (short)2, status, operatorUserType);
-//		}
-		return null;
+		Long enuu = null;
+		if(params.length == 0) {
+			enuu = SystemSession.getUser().getEnterprise() != null ? SystemSession.getUser().getEnterprise().getUu() : null;
+		}else {
+			enuu = params[0];
+		}
+		if(operatorUserType == Type.BUYER.value()) {
+			if (enuu != null) {
+				return bankInfoDao.findByUseruuAndEnuuAndOpraterUserTypeAndStatusOrderByNumAsc(SystemSession.getUser().getUserUU(), enuu, operatorUserType, status);
+			} else {
+				return bankInfoDao.findByUseruuAndDissociativeAndOpraterUserTypeAndStatusOrderByNumAsc(SystemSession.getUser().getUserUU(), Type.PERSONAL.value(), operatorUserType, status);
+			}
+		}else {
+			return bankInfoDao.findByEnuuAndStatusAndOpraterUserTypeOrderByNumAsc(enuu, status, operatorUserType);
+		}
 	}
 
 	@Override
@@ -366,7 +365,9 @@ public class BankInfoServiceImpl implements BankInfoService {
 		}
 		if(status == Status.ALLOW.value()) { //审核通过
 			if(bankInfo.getOpraterUserType() == Type.SUP.value()) {
-				//获取已通过且为已使用状态的账户信息
+				bankInfo.setStatus(Status.ALLOW.value());
+				bankInfo = bankInfoDao.save(bankInfo);
+				//获取所有的账户信息
 				List<BankInfo> infoList = bankInfoDao.findSupBankList(bankInfo.getEnuu(), bankInfo.getOpraterUserType(), statusList);
 				if (!CollectionUtils.isEmpty(infoList)){
 					BankInfo first = infoList.get(0); //获取第一个账户信息
@@ -378,8 +379,6 @@ public class BankInfoServiceImpl implements BankInfoService {
 						setDefaultAccountAssist(infoList, bankInfo.getId());
 					}
 				}
-				bankInfo.setStatus(Status.ALLOW.value());
-				bankInfo = bankInfoDao.save(bankInfo);
 			}
 		}else if(status == Status.NOTALLOW.value()){
 			if(str == null || str.length == 0) {

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

@@ -3,6 +3,7 @@ package com.uas.platform.b2c.fa.payment.service.impl;
 import com.uas.platform.b2c.core.config.SysConf;
 import com.uas.platform.b2c.core.support.SystemSession;
 import com.uas.platform.b2c.core.utils.FastjsonUtils;
+import com.uas.platform.b2c.core.utils.NumberUtil;
 import com.uas.platform.b2c.fa.payment.dao.BankInfoDao;
 import com.uas.platform.b2c.fa.payment.dao.BankTransAssociateDao;
 import com.uas.platform.b2c.fa.payment.dao.BankTransferDao;
@@ -472,7 +473,7 @@ public class BankTransferServiceImpl implements BankTransferService {
 		List<BankTransfer> content = pageBankTran.getContent();
 		Double totalPrice = 0.0d;
 		for (BankTransfer bankTransfer : content) {
-			totalPrice += bankTransfer.getTotal();
+			totalPrice = NumberUtil.add(totalPrice, bankTransfer.getTotal());
 			List<BankTransAssociate> list = transAssociateDao.findByBtaBanktranssn(bankTransfer.getBanktranssn());
 			if(!CollectionUtils.isEmpty(list)) {
 				bankTransfer.setBankTransAssociate(list.get(0));

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

@@ -483,6 +483,10 @@ public class SettlementServiceImpl implements SettlementService {
 			transfer.setCollectenuu(bankTransfer.getCollectenuu());
 			transfer.setCollectUseruu(bankTransfer.getCollectUseruu());
 			transfer.setImgUrl(bankTransfer.getImgUrl());
+			//买家姓名和企业名
+			transfer.setBuyername(purchase.getBuyername());
+			transfer.setBuyerentername(purchase.getBuyentername());
+			transfer.setOrderid(purchase.getOrderid());
 			//收方和付方的账户信息
 			transfer.setJsonPament(bankTransfer.getJsonPament());
 			transfer.setJsonReceive(bankTransfer.getJsonReceive());

src/main/webapp/resources/js/admin/controllers/checkMoney/SettlementCtrl.js

@@ -39,7 +39,9 @@ define(['app/app'], function(app) {
 					delete $scope.logoUrl;
 					delete $scope.imageUrl;
 					delete $scope.b2cAccount.filterAccount;
-					delete $scope.venderAccount.filterAccount;
+					if ($scope.venderAccount.filterAccount){
+						delete $scope.venderAccount.filterAccount;
+					}
 					$scope.batchCheckStatus = false;
 					$scope.oneCheckStatus = true;
 				}

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

@@ -686,7 +686,7 @@
                         <span>收款成功</span>
                     </dd>
                     <div class="total" ng-if="bankTransRecore && bankTransRecore.length > 0">
-                        <span>收入总计&nbsp;  <em ng-bind="totalPrice"></em></span>
+                        <span>收入总计&nbsp;  <em></em><em ng-bind="totalPrice"></em></span>
                         <b>|</b>
                         <span>支出总计&nbsp;  <em>0</em></span>
                         <b>|</b>