Browse Source

处理批量上架的bug.

yujia 7 years ago
parent
commit
f3812d4c00

+ 9 - 0
src/main/java/com/uas/platform/b2c/fa/payment/controller/BankTransferController.java

@@ -245,6 +245,15 @@ public class BankTransferController {
 		return bankTransferService.getVendorBankTransferByMall(params, Type.SUP.value(), keyword, fromDate, toDate, remitteeType);
 	}
 
+	/**
+	 * 获取供应商的的收款转账
+	 * @return ResultMap
+	 */
+	@RequestMapping(value = "/vendor/bankTransfer/ledger", method = RequestMethod.GET, params = "type=sup")
+	public ResultMap getVendorBankTransferLedger() {
+		return bankTransferService.getVendorBankTransferLedger();
+	}
+
 	/**
 	 * 导出收款记录到excel表中
 	 * @param isAjax

+ 13 - 6
src/main/java/com/uas/platform/b2c/fa/payment/dao/BankTransferDao.java

@@ -1,15 +1,13 @@
 package com.uas.platform.b2c.fa.payment.dao;
 
-import java.util.List;
-
+import com.uas.platform.b2c.fa.payment.model.BankTransfer;
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
 import org.springframework.data.jpa.repository.Query;
 import org.springframework.data.repository.query.Param;
 import org.springframework.stereotype.Repository;
 
-import com.uas.platform.b2c.fa.payment.model.BankTransfer;
-
-import org.springframework.data.jpa.repository.JpaRepository;
-import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
+import java.util.List;
 
 /** 
   * @author yujia 
@@ -28,6 +26,15 @@ public interface BankTransferDao extends JpaSpecificationExecutor<BankTransfer>,
 	 */
 	public List<BankTransfer> findByCollectenuu(Long collectenuu);
 
+	/**
+	 * 统计卖家的应收对账总金额
+	 * @param operateType
+	 * @param collectenuu
+	 * @return
+	 */
+	@Query(value = "select sum(b.total) from BankTransfer b where b.operateType = :operateType and b.collectenuu = :collectenuu")
+	Double getLedgerByTypeAndEnuu(@Param("operateType") Integer operateType, @Param("collectenuu") Long collectenuu);
+
 	/**
 	 * 根据转账流水单id查找转账信息(客户)
 	 *

+ 6 - 0
src/main/java/com/uas/platform/b2c/fa/payment/service/BankTransferService.java

@@ -151,6 +151,12 @@ public interface BankTransferService {
 	 */
 	ResultMap getVendorBankTransferByMall(PageParams params, Integer type, String keyword, Long fromDate, Long toDate, String remitteeType);
 
+	/**
+	 * 获取卖家的总账
+	 * @return
+	 */
+	ResultMap getVendorBankTransferLedger();
+
 	/**
 	 * 导出excel数据
 	 * @param type

+ 11 - 0
src/main/java/com/uas/platform/b2c/fa/payment/service/impl/BankTransferServiceImpl.java

@@ -577,6 +577,17 @@ public class BankTransferServiceImpl implements BankTransferService {
 		return ResultMap.success(resultMap);
 	}
 
+	/**
+	 * 获取卖家的总账
+	 *
+	 * @return
+	 */
+	@Override
+	public ResultMap getVendorBankTransferLedger() {
+		Double total = bankTransferDao.getLedgerByTypeAndEnuu(Type.SUP.value(), SystemSession.getUser().getEnterprise().getUu());
+		return ResultMap.success(total);
+	}
+
 	@Override
 	public List<BankTransfer> getExportData(Integer type, String keyword, Long fromDate, Long toDate, String remitteeType) {
 		if(type == null || (type != Type.SUP.value() && type != Type.MALL.value())) {

+ 1 - 0
src/main/java/com/uas/platform/b2c/prod/commodity/service/impl/ReleaseProductByBatchServiceImpl.java

@@ -337,6 +337,7 @@ public class ReleaseProductByBatchServiceImpl implements ReleaseProductByBatchSe
 		modelMap.put("success", success);
 		modelMap.put("failure", failure);
 		modelMap.put("filter", filter);
+		modelMap.put("batch", batch);
 		return modelMap;
 	}