需求 #17488

src/main/java/com/egolm/shop/api/OrderController.java

@@ -246,6 +246,7 @@ public class OrderController {
 	@ApiImplicitParams({
 		@ApiImplicitParam(paramType = "query", name="orgNo", dataType = "String", required = true),
 		@ApiImplicitParam(paramType = "query", name="shopNo", dataType = "String", required = true, value = "店铺编号"),
+		@ApiImplicitParam(paramType = "query", name = "agentID", dataType = "String", required = true), 
 		@ApiImplicitParam(paramType = "query", name="refundStatus", dataType = "int", required = true, value = "退单状态，1=申请售后、2=平台确认、3=退货/退款、4=售后完成"), 
  		@ApiImplicitParam(paramType = "query", name = "terminal", dataType = "String", required = true, value = "终端标识", defaultValue = "wechat"),  
 		@ApiImplicitParam(paramType = "query", name = "langID", dataType = "String", required = true, value = "语言", defaultValue = "936"), 
@@ -254,13 +255,13 @@ public class OrderController {
  	})
 	@RequestMapping(value = "/getRefundOrderList",method=RequestMethod.GET)
 	@IDCLogResource(name="B2B售后退单列表")
-	public RespObject getRefundOrderList(String orgNo, String shopNo, Integer refundStatus,  String langID, Integer index, Integer limit) {
+	public RespObject getRefundOrderList(String orgNo,String agentID, String shopNo, Integer refundStatus,  String langID, Integer index, Integer limit) {
 		 
 		Page page = new Page();
 		page.setIndex(Long.valueOf(index));
 		page.setLimit(Long.valueOf(limit));
 		page.setLimitKey("OrderDate desc");
-		return orderService.queryRefundOrderList(orgNo, shopNo, refundStatus, langID, page);
+		return orderService.queryRefundOrderList(orgNo, shopNo,agentID, refundStatus, langID, page);
 	} 
 	
 	

src/main/java/com/egolm/shop/api/service/OrderService.java

@@ -45,7 +45,7 @@ public interface OrderService {
 	public List<Map<String, Object>> getDeliverSubDetail(String aocOrderID);
 	
 	
-	public RespObject queryRefundOrderList(String orgNo, String shopNo, Integer refundStatus,  String langID, Page page);
+	public RespObject queryRefundOrderList(String orgNo, String shopNo,String agentID, Integer refundStatus,  String langID, Page page);
 
 	public List<Map<String, Object>> createSalesOrderDebtPay(String shopNO, String salesOrderID,String subOrderID,String payTypeID,String payType,String payAmount,String payCardNO) ;
 	

src/main/java/com/egolm/shop/api/service/impl/OrderServiceImpl.java

@@ -1155,7 +1155,7 @@ public class OrderServiceImpl implements OrderService {
 	}
 
 	@Override
-	public RespObject queryRefundOrderList(String orgNo, String shopNo, Integer refundStatus, String langID,
+	public RespObject queryRefundOrderList(String orgNo, String shopNo,String agentID, Integer refundStatus, String langID,
 			Page page) {
 		List<Map<String, Object>> sortList = new ArrayList<Map<String, Object>>();
 
@@ -1176,7 +1176,7 @@ public class OrderServiceImpl implements OrderService {
 				+ "   ExpressFee = a.nExpressFee," + "   OrderStatus = a.nOrderStatus,"
 				+ "   OrderStatusName = a.nOrderStatusName," + "   OrderMemo = a.sOrderMemo" + " "
 				+ " from tSalesOrderSub a  join tSalesOrderSubDtl b on a.sSubOrderID = b.sSubOrderID "
-				+ " where a.sShopNO = '" + shopNo + "' ";
+				+ " where a.sShopNO = '" + shopNo + "' and a.nAgentID = "+agentID+" ";
 
 		if (refundStatus == 1) { /* 查询指定状态订单：1=申请售后 */
 			sql += " and a.sSalesOrderTypeID = '0' " + " and a.sB2BOrderTypeID = '1' " + " and a.nOrderStatus&1 = 0 "
@@ -1250,7 +1250,7 @@ public class OrderServiceImpl implements OrderService {
 					+ " from tSalesOrderSubDtl a join tSalesOrderSub b on a.sSubOrderID = b.sSubOrderID   left join tAgentContractGoods ag on a.nAgentID = ag.nAgentID   "
 					+ "     and a.sAgentContractNO = ag.sAgentContractNO  and a.nGoodsID = ag.nGoodsID  "
 					+ "                    left join V_GetminAgentGoodsPic gp on a.nAgentID = gp.nAgentID and a.nGoodsID = gp.nGoodsID "
-					+ " where a.sSubOrderID in (" + StringUtil.join("', '", "'", "'", orderIdList) + ") "
+					+ " where a.sSubOrderID in (" + StringUtil.join("', '", "'", "'", orderIdList) + ") and a.nAgentID= "+agentID+" "
 					+ " order by a.nIdx";
 
 			List<Map<String, Object>> goodsList = readJdbcTemplate.queryForList(detailSql);