调整财务对账的接口

src/main/java/com/uas/platform/b2c/fa/payment/controller/BankTransferController.java

@@ -2,13 +2,12 @@ package com.uas.platform.b2c.fa.payment.controller;
 
 
 import com.uas.platform.b2c.core.config.SysConf;
+import com.uas.platform.b2c.core.support.SystemSession;
+import com.uas.platform.b2c.core.support.log.UsageBufferedLogger;
 import com.uas.platform.b2c.core.support.view.JxlsExcelView;
 import com.uas.platform.b2c.fa.payment.model.BankInfo;
 import com.uas.platform.b2c.fa.payment.model.BankTransfer;
 import com.uas.platform.b2c.fa.payment.service.BankTransferService;
-import com.uas.platform.b2c.core.support.SystemSession;
-import com.uas.platform.b2c.core.support.log.UsageBufferedLogger;
-import com.uas.platform.b2c.trade.order.model.OrderSimpleInfo;
 import com.uas.platform.b2c.trade.support.ResultMap;
 import com.uas.platform.core.logging.BufferedLoggerManager;
 import com.uas.platform.core.model.PageInfo;
@@ -242,8 +241,8 @@ public class BankTransferController {
 	@RequestMapping(value = "/vendor/bankTransfer/page", method = RequestMethod.GET, params = "type=sup")
 	@ApiOperation(value = "获取供应商的的收款转账单", httpMethod = "GET")
 	public ResultMap getVendorBankTransferByMall(@ApiParam(required = true, value = "分页参数") PageParams params,
-												String keyword, Long fromDate, Long toDate) {
-		return bankTransferService.getVendorBankTransferByMall(params, Type.SUP.value(), keyword, fromDate, toDate);
+												String keyword, Long fromDate, Long toDate, String remitteeType) {
+		return bankTransferService.getVendorBankTransferByMall(params, Type.SUP.value(), keyword, fromDate, toDate, remitteeType);
 	}
 
 	/**
@@ -257,7 +256,7 @@ public class BankTransferController {
 	 */
 	@RequestMapping(value = "/export/bankTransfer", method = RequestMethod.POST)
 	public ModelAndView exportPayRecordToExcel(@RequestParam(required = false, value = "isAjax", defaultValue = "false")Boolean isAjax, HttpServletRequest request,
-											   String keyword, Long fromDate, Long toDate){
+											   String keyword, Long fromDate, Long toDate, String remitteeType){
 		HttpSession session = request.getSession();
 		ModelAndView modelAndView = new ModelAndView();
 		Object loading = session.getAttribute("loading");
@@ -271,7 +270,7 @@ public class BankTransferController {
 			return modelAndView;
 		}
 		session.setAttribute("loading", true);
-		List<BankTransfer> data = bankTransferService.getExportData(Type.SUP.value(), keyword, fromDate, toDate);
+		List<BankTransfer> data = bankTransferService.getExportData(Type.SUP.value(), keyword, fromDate, toDate, remitteeType);
 		modelAndView.addObject("data", data);
 		modelAndView.addObject("operator", "+");
 		modelAndView.setView(new JxlsExcelView("classpath:jxls-tpl/trade/bankTransfer", "优软商城-卖家交易记录"));

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

@@ -8,7 +8,6 @@ import com.uas.platform.core.model.PageParams;
 import org.springframework.data.domain.Page;
 
 import java.util.List;
-import java.util.Random;
 
 /**
  * The interface BankTransfer service.
@@ -150,7 +149,7 @@ public interface BankTransferService {
 	 * @param type   the type 指定类型
 	 * @return ResultMap
 	 */
-	ResultMap getVendorBankTransferByMall(PageParams params, Integer type, String keyword, Long fromDate, Long toDate);
+	ResultMap getVendorBankTransferByMall(PageParams params, Integer type, String keyword, Long fromDate, Long toDate, String remitteeType);
 
 	/**
 	 * 导出excel数据
@@ -160,5 +159,5 @@ public interface BankTransferService {
 	 * @param toDate
 	 * @return
 	 */
-	List<BankTransfer> getExportData(Integer type, String keyword, Long fromDate, Long toDate);
+	List<BankTransfer> getExportData(Integer type, String keyword, Long fromDate, Long toDate, String remitteeType);
 }

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

@@ -322,6 +322,7 @@ public class BankTransferServiceImpl implements BankTransferService {
 			orderN.setBuyaccount(bankTransfer.getJsonPament());
 			orderN.setSelleraccount(bankTransfer.getJsonReceive());
 			orderN.setPaytime(new Date());
+			orderN.setRemitteeType(bankTransfer.getType());
 			orderN.setPaytype(Type.Payment_CompanyTransfer_Code.value());
 
 			//修改采购单的状态
@@ -384,6 +385,7 @@ public class BankTransferServiceImpl implements BankTransferService {
 					}
 
 				}
+				orderN.setRemitteeType(bankTransfer.getType());
 				orderN.setBuyaccount(bankTransfer.getJsonPament());
 				orderN.setSelleraccount(bankTransfer.getJsonReceive());
 				orderN.setPaytime(new Date());
@@ -541,7 +543,7 @@ public class BankTransferServiceImpl implements BankTransferService {
 	 * @return Page<BankTransfer>
 	 */
 	@Override
-	public ResultMap getVendorBankTransferByMall(PageParams params, Integer type, String keyword, Long fromDate, Long toDate) {
+	public ResultMap getVendorBankTransferByMall(PageParams params, Integer type, String keyword, Long fromDate, Long toDate, String remitteeType) {
 		if(type == null || (type != Type.SUP.value() && type != Type.MALL.value()) || params == null) {
 			return new ResultMap(CodeType.NO_INFO, "参数信息丢失");
 		}
@@ -551,7 +553,7 @@ public class BankTransferServiceImpl implements BankTransferService {
 			info.filter("collectenuu", SystemSession.getUser().getEnterprise().getUu());
 		}
 		info.expression(PredicateUtils.isNotNull("transferTime"));
-		filterPageInfo(info, keyword, fromDate, toDate);
+		filterPageInfo(info, keyword, fromDate, toDate, remitteeType);
 
 		Page<BankTransfer> pageBankTran = bankTransferDao.findAll(new Specification<BankTransfer>() {
 			@Override
@@ -576,7 +578,7 @@ public class BankTransferServiceImpl implements BankTransferService {
 	}
 
 	@Override
-	public List<BankTransfer> getExportData(Integer type, String keyword, Long fromDate, Long toDate) {
+	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())) {
 			throw new IllegalOperatorException("参数丢失，刷新后重试");
 		}
@@ -587,7 +589,7 @@ public class BankTransferServiceImpl implements BankTransferService {
 		}
 		info.expression(PredicateUtils.isNotNull("transferTime"));
 		info.sorting(Sort.Direction.DESC, "transferTime");
-		filterPageInfo(info, keyword, fromDate, toDate);
+		filterPageInfo(info, keyword, fromDate, toDate, remitteeType);
 		List<BankTransfer> list = bankTransferDao.findAll(new Specification<BankTransfer>() {
 			@Override
 			public Predicate toPredicate(Root<BankTransfer> root, CriteriaQuery<?> criteriaQuery, CriteriaBuilder criteriaBuilder) {
@@ -598,7 +600,7 @@ public class BankTransferServiceImpl implements BankTransferService {
 		return list;
 	}
 
-	private void filterPageInfo(PageInfo info, String keyword, Long fromDate, Long toDate){
+	private void filterPageInfo(PageInfo info, String keyword, Long fromDate, Long toDate, String remitteeType){
 		if (StringUtils.hasText(keyword)){
 			SimpleExpression[] simpArrs = new SimpleExpression[2];
 			simpArrs[0] = new SimpleExpression("orderid", keyword, CriterionExpression.Operator.LIKE, true);
@@ -612,5 +614,8 @@ public class BankTransferServiceImpl implements BankTransferService {
 		if (toDate != null) {
 			info.expression(PredicateUtils.lte("transferTime", new Date(toDate), false));
 		}
+		if (!StringUtils.isEmpty(remitteeType)) {
+			info.expression(PredicateUtils.eq("type", remitteeType, true));
+		}
 	}
 }

src/main/java/com/uas/platform/b2c/trade/order/controller/OrderController.java

@@ -916,8 +916,8 @@ public class OrderController {
 	 */
 	@RequestMapping(value = "buyer/payRecord")
 	public Page<OrderSimpleInfo> findBuyerPayRecord(PageParams params, String keyword, Long fromDate,
-													Long toDate, String currencyName, Integer method){
-		return orderService.getBuyerPayRecord(params, keyword, fromDate, toDate, currencyName, method);
+													Long toDate, String currencyName, Integer method, String remitteeType){
+		return orderService.getBuyerPayRecord(params, keyword, fromDate, toDate, currencyName, method, remitteeType);
 	}
 
 	/**
@@ -933,7 +933,7 @@ public class OrderController {
 	 */
 	@RequestMapping(value = "/export/payRecord", method = RequestMethod.POST)
 	public ModelAndView exportPayRecordToExcel(@RequestParam(required = false, value = "isAjax", defaultValue = "false")Boolean isAjax, HttpServletRequest request,
-											   String keyword, Long fromDate, Long toDate, String currencyName, Integer method){
+											   String keyword, Long fromDate, Long toDate, String currencyName, Integer method, String remitteeType){
 		HttpSession session = request.getSession();
 		ModelAndView modelAndView = new ModelAndView();
 		Object loading = session.getAttribute("loading");
@@ -947,7 +947,7 @@ public class OrderController {
 			return modelAndView;
 		}
 		session.setAttribute("loading", true);
-		List<OrderSimpleInfo> data = orderService.getExportData(keyword, fromDate, toDate, currencyName, method);
+		List<OrderSimpleInfo> data = orderService.getExportData(keyword, fromDate, toDate, currencyName, method, remitteeType);
 		modelAndView.addObject("data", data);
 		modelAndView.addObject("operator", "-");
 		modelAndView.setView(new JxlsExcelView("classpath:jxls-tpl/trade/payRecord", "优软商城-买家交易记录"));

src/main/java/com/uas/platform/b2c/trade/order/model/Order.java

@@ -114,6 +114,12 @@ public class Order extends Document implements Serializable {
 	@Column(name = "or_paytype")
 	private Integer paytype;
 
+	/**
+	 * 收款方
+	 */
+	@Column(name = "or_remittee_type")
+	private String remitteeType;
+
 	/**
 	 * 配送方式
 	 */
@@ -2557,6 +2563,15 @@ public class Order extends Document implements Serializable {
 		return this;
 	}
 
+	public String getRemitteeType() {
+		return remitteeType;
+	}
+
+	public Order setRemitteeType(String remitteeType) {
+		this.remitteeType = remitteeType;
+		return this;
+	}
+
 	@Override
 	public String toString() {
 		return "Order{" +

src/main/java/com/uas/platform/b2c/trade/order/service/OrderService.java

@@ -623,7 +623,7 @@ public interface OrderService {
 	 * @return
 	 */
 	Page<OrderSimpleInfo> getBuyerPayRecord(PageParams params, String keyword, Long fromDate, Long toDate,
-											String currencyName, Integer method);
+											String currencyName, Integer method, String remitteeType);
 
 	/**
 	 * 获取导出的支付记录数据
@@ -635,7 +635,7 @@ public interface OrderService {
 	 * @return
 	 */
 	List<OrderSimpleInfo> getExportData(String keyword, Long fromDate, Long toDate,
-										String currencyName, Integer method);
+										String currencyName, Integer method, String remitteeType);
 
 	/**
 	 * 根据订单单号修改订单使用状态

src/main/java/com/uas/platform/b2c/trade/order/service/impl/OrderServiceImpl.java

@@ -61,8 +61,8 @@ import com.uas.platform.b2c.trade.deprecated.model.OrderRelationInfo;
 import com.uas.platform.b2c.trade.deprecated.model.UserInfoForOrder;
 import com.uas.platform.b2c.trade.inquiry.dao.TradeChargeDao;
 import com.uas.platform.b2c.trade.inquiry.model.TradeCharge;
-import com.uas.platform.b2c.trade.order.StringConstant.*;
 import com.uas.platform.b2c.trade.order.StringConstant.Currency;
+import com.uas.platform.b2c.trade.order.StringConstant.StringFormat;
 import com.uas.platform.b2c.trade.order.dao.OrderDao;
 import com.uas.platform.b2c.trade.order.dao.OrderDetailDao;
 import com.uas.platform.b2c.trade.order.dao.OrderIndexDetailDao;
@@ -1424,6 +1424,9 @@ public class OrderServiceImpl implements OrderService {
 
         if (type != null) {
             order.setPaytype(type);
+            if (type.equals(Type.Payment_Online_Code.value())) {
+                order.setRemitteeType(com.uas.platform.b2c.core.constant.Type.PAIDTOPLATFORM.name());
+            }
         }
         Set<OrderDetail> orderDetails = order.getOrderDetails();
         for (OrderDetail orderDetail : orderDetails) {
@@ -3311,9 +3314,9 @@ public class OrderServiceImpl implements OrderService {
 
     @Override
     public Page<OrderSimpleInfo> getBuyerPayRecord(com.uas.platform.core.model.PageParams params, String keyword, Long fromDate, Long toDate,
-                                                   String currencyName, Integer method) {
+                                                   String currencyName, Integer method, String remitteeType) {
         final PageInfo info = new PageInfo(params);
-        filterPageInfo(info, keyword, fromDate, toDate, currencyName, method);
+        filterPageInfo(info, keyword, fromDate, toDate, currencyName, method, remitteeType);
 
         Page<Order> orderPage = orderDao.findAll(new Specification<Order>() {
             @Override
@@ -3332,9 +3335,9 @@ public class OrderServiceImpl implements OrderService {
     }
 
     @Override
-    public List<OrderSimpleInfo> getExportData(String keyword, Long fromDate, Long toDate, String currencyName, Integer method) {
+    public List<OrderSimpleInfo> getExportData(String keyword, Long fromDate, Long toDate, String currencyName, Integer method, String remitteeType) {
         final PageInfo info = new PageInfo();
-        filterPageInfo(info, keyword, fromDate, toDate, currencyName, method);
+        filterPageInfo(info, keyword, fromDate, toDate, currencyName, method, remitteeType);
         List<Order> orderList = orderDao.findAll(new Specification<Order>() {
             @Override
             public Predicate toPredicate(Root<Order> root, CriteriaQuery<?> criteriaQuery, CriteriaBuilder criteriaBuilder) {
@@ -3357,7 +3360,7 @@ public class OrderServiceImpl implements OrderService {
      * 设置分页过滤条件
      */
     private void filterPageInfo(PageInfo info, String keyword, Long fromDate, Long toDate,
-                               String currencyName, Integer method){
+                               String currencyName, Integer method, String remitteeType){
 
         info.filter("buyeruu", SystemSession.getUser().getUserUU());
         if (SystemSession.getUser().getEnterprise() != null) {
@@ -3385,6 +3388,9 @@ public class OrderServiceImpl implements OrderService {
         if (method != null){
             info.expression(PredicateUtils.eq("paytype", method, false));
         }
+        if (!StringUtils.isEmpty(remitteeType)) {
+            info.expression(PredicateUtils.eq("remitteeType", remitteeType, true));
+        }
     }
 
     /**