Browse Source

处理财务对账的bug

yujia 7 years ago
parent
commit
83dbdaf08c

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

@@ -914,7 +914,7 @@ public class OrderController {
 	 * @param toDate
 	 * @return
 	 */
-	@RequestMapping(value = "buyer/payRecord")
+	@RequestMapping(value = "/buyer/payRecord")
 	public Page<OrderSimpleInfo> findBuyerPayRecord(PageParams params, String keyword, Long fromDate,
 													Long toDate, String currencyName, Integer method, String remitteeType){
 		return orderService.getBuyerPayRecord(params, keyword, fromDate, toDate, currencyName, method, remitteeType);

+ 6 - 0
src/main/java/com/uas/platform/b2c/trade/order/model/OrderSimpleInfo.java

@@ -97,6 +97,11 @@ public class OrderSimpleInfo extends Document implements Serializable {
 	 */
 	private Integer type;
 
+	/**
+	 * 收款方
+	 */
+	private String remitteeType;
+
 	/**
 	 * Gets id.
 	 *
@@ -363,6 +368,7 @@ public class OrderSimpleInfo extends Document implements Serializable {
 		this.ensurePrice = order.getEnsurePrice();
 		this.paytype = order.getPaytype();
 		this.sellername = order.getSellername();
+		this.remitteeType = order.getRemitteeType();
 	}
 
 	@Override