需求 #16595

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

@@ -87,6 +87,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="status", dataType = "int", required = true, value = "订单状态 0.全部 1. 待付款 2.待审核 3.待发货 4.已发货 5.已完成 6.已取消"), 
 		@ApiImplicitParam(paramType = "query", name="orderType", dataType = "int", required = true, value = "订单类型 1正常 2门店装饰 3众筹", allowMultiple=true), 
 		@ApiImplicitParam(paramType = "query", name = "terminal", dataType = "String", required = true, value = "终端标识", defaultValue = "wechat"),  
@@ -96,7 +97,7 @@ public class OrderController {
  	})
 	@RequestMapping(value = "/getOrderList",method=RequestMethod.GET)
 	@IDCLogResource(name="获取主订单列表")
-	public String getOrderList(String orgNo, String shopNo, Integer status, Integer[] orderType, String langID, Integer index, Integer limit) {
+	public String getOrderList(String orgNo, String shopNo,String agentID, Integer status, Integer[] orderType, String langID, Integer index, Integer limit) {
 		List<String> types = new ArrayList<String>();
 		if(orderType != null) {
 			for(Integer id : orderType) {
@@ -109,7 +110,7 @@ public class OrderController {
 		page.setIndex(Long.valueOf(index));
 		page.setLimit(Long.valueOf(limit));
 		page.setLimitKey("dOrderTime desc");
-		return orderService.queryOrderList(orgNo, shopNo, status, types.toArray(new String[types.size()]), langID, page);
+		return orderService.queryOrderList(orgNo, shopNo,agentID, status, types.toArray(new String[types.size()]), langID, page);
 	} 
 	
 	@ApiOperation("B2B售后退单列表")
@@ -138,41 +139,44 @@ public class OrderController {
 	@ApiOperation("获取主订单详情")
 	@ApiImplicitParams({
 		@ApiImplicitParam(paramType = "query", name="salesOrderId", dataType = "String", required = true),
+		@ApiImplicitParam(paramType = "query", name = "agentID", dataType = "String", required = true), 
 		@ApiImplicitParam(paramType = "query", name = "terminal", dataType = "String", required = true, value = "终端标识", defaultValue = "wechat"),  
 		@ApiImplicitParam(paramType = "query", name = "langID", dataType = "String", required = true, value = "语言", defaultValue = "936"), 
  	})
 	@RequestMapping(value = "/getOrderDetail",method=RequestMethod.GET)
 	@IDCLogResource(name="获取主订单详情")
-	public String getOrderDetail(String salesOrderId, String langID, Integer index, Integer limit) {
+	public String getOrderDetail(String salesOrderId,String agentID, String langID, Integer index, Integer limit) {
 
 		XException.assertNotBlank(salesOrderId, "单号不能为空");
-		return orderService.getOrderDetail(salesOrderId);
+		return orderService.getOrderDetail(salesOrderId,agentID);
 	} 
 	
 	@ApiOperation("获取子订单列表及详情")
 	@ApiImplicitParams({
 		@ApiImplicitParam(paramType = "query", name="salesOrderId", dataType = "String", required = true),
+		@ApiImplicitParam(paramType = "query", name = "agentID", dataType = "String", required = true), 
 		@ApiImplicitParam(paramType = "query", name = "terminal", dataType = "String", required = true, value = "终端标识", defaultValue = "wechat"),  
 		@ApiImplicitParam(paramType = "query", name = "langID", dataType = "String", required = true, value = "语言", defaultValue = "936"), 
  	})
 	@RequestMapping(value = "/getSubOrderList",method=RequestMethod.GET)
 	@IDCLogResource(name="获取子订单列表及详情")
-	public String getSubOrderList(String salesOrderId) {
+	public String getSubOrderList(String salesOrderId,String agentID) {
 		XException.assertNotBlank(salesOrderId, "单号不能为空");
-		return orderService.queryOrderDetailList(salesOrderId);
+		return orderService.queryOrderDetailList(salesOrderId,agentID);
 	} 
 	
 	@ApiOperation("获取子订单详情")
 	@ApiImplicitParams({
 		@ApiImplicitParam(paramType = "query", name="subOrderID", dataType = "String", required = true),
+		@ApiImplicitParam(paramType = "query", name = "agentID", dataType = "String", required = true), 
 		@ApiImplicitParam(paramType = "query", name = "terminal", dataType = "String", required = true, value = "终端标识", defaultValue = "wechat"),  
 		@ApiImplicitParam(paramType = "query", name = "langID", dataType = "String", required = true, value = "语言", defaultValue = "936"), 
  	})
 	@RequestMapping(value = "/getSubOrderDetail",method=RequestMethod.GET)
 	@IDCLogResource(name="获取子订单详情")
-	public String getSubOrderDetail(String subOrderID) {
+	public String getSubOrderDetail(String subOrderID,String agentID) {
 		XException.assertNotBlank(subOrderID, "单号不能为空");
-		return orderService.getSubOrderDetail(subOrderID);
+		return orderService.getSubOrderDetail(subOrderID,agentID);
 	} 
 	
 	@ApiOperation("获取送货单详情")

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

@@ -16,15 +16,15 @@ public interface OrderService {
 	
 	public String submit(JSONObject submitObj);
 	
-	public String queryOrderList(String orgNo, String shopNo, Integer status, String[] orderType, String langID, Page page);
+	public String queryOrderList(String orgNo, String shopNo,String agentID, Integer status, String[] orderType, String langID, Page page);
 
-	public String queryOrderDetailList(String salesOrderId);
+	public String queryOrderDetailList(String salesOrderId,String agentID);
 
-	public String getOrderDetail(String salesOrderId);
+	public String getOrderDetail(String salesOrderId,String agentID);
 
 	public List<Map<String, Object>> paySuccess(String sOutTradeNO, BigDecimal nPayAmount, String sOpenID, String sTransTraceNO, Date dPayDateTime,String PayTypeID);
 
-	public String getSubOrderDetail(String subOrderID);
+	public String getSubOrderDetail(String subOrderID,String agentID);
 
 	public void cancelOrder(String sSalesOrderID);
 

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

@@ -175,7 +175,7 @@ public class OrderServiceImpl implements OrderService {
 	}
 
 	@Override
-	public String queryOrderList(String orgNo, String shopNo, Integer status, String[] orderType, String langID,
+	public String queryOrderList(String orgNo, String shopNo,String agentID, Integer status, String[] orderType, String langID,
 			Page page) {
 		if (status == null) {
 			status = 0;
@@ -283,11 +283,14 @@ public class OrderServiceImpl implements OrderService {
 				orderMap.put("subList", subListItem == null ? new Object[0] : subListItem);
 			}
 		}
-		return Rjx.jsonOk().set("list", orderList).toJson();
+		
+		Map<String,Object> appOrderPayCountdownMap = this.getAgentSystemCtrlMap("AppOrderPayCountdown", agentID);
+		
+		return Rjx.jsonOk().set("list", orderList).set("AppOrderPayCountdown", appOrderPayCountdownMap).toJson();
 	}
 
 	@Override
-	public String getOrderDetail(String salesOrderId) {
+	public String getOrderDetail(String salesOrderId,String agentID) {
 		Map<String, Object> orderMap = null;
 		try {
 			orderMap = readJdbcTemplate.queryForMap("select * from tSalesOrder where sSalesOrderID = ?", salesOrderId);
@@ -348,12 +351,13 @@ public class OrderServiceImpl implements OrderService {
 		} catch (Exception e) { 
 		} 
 		 
+		Map<String,Object> appOrderPayCountdownMap = this.getAgentSystemCtrlMap("AppOrderPayCountdown", agentID);
 		
-		return Rjx.jsonOk().set("payData", payMap).set("list", orderMap).set("detail", orderDtlList).toJson();
+		return Rjx.jsonOk().set("payData", payMap).set("list", orderMap).set("detail", orderDtlList).set("AppOrderPayCountdown", appOrderPayCountdownMap).toJson();
 	}
 
 	@Override
-	public String queryOrderDetailList(String salesOrderId) {
+	public String queryOrderDetailList(String salesOrderId,String agentID) {
 		String sql = "select " + "       sSubOrderID, " + "       sSalesOrderID, " + "       sAgentContractNO, "
 				+ "       sWarehouseNO, " + "       nAgentID, " + "       sOrgNO, " + "       sCustNO, "
 				+ "       sShopNO, " + "       sSalesOrderTypeID, " + "       sSalesOrderType, "
@@ -401,7 +405,9 @@ public class OrderServiceImpl implements OrderService {
 				subMap.put("list", dtlList);
 			}
 		}
-		return Rjx.jsonOk().set("list", subList).toJson();
+		Map<String,Object> appOrderPayCountdownMap = this.getAgentSystemCtrlMap("AppOrderPayCountdown", agentID);
+		
+		return Rjx.jsonOk().set("list", subList).set("AppOrderPayCountdown", appOrderPayCountdownMap).toJson();
 	}
 
 	@Transactional
@@ -448,7 +454,7 @@ public class OrderServiceImpl implements OrderService {
 	
 
 	@Override
-	public String getSubOrderDetail(String subOrderID) {
+	public String getSubOrderDetail(String subOrderID,String agentID) {
 		new ArrayList<Map<String, Object>>();
 		int ReturnDay = 0;
 		try {
@@ -537,9 +543,10 @@ public class OrderServiceImpl implements OrderService {
 		} catch (Exception e) { 
 		} 
 		
+		Map<String,Object> appOrderPayCountdownMap = this.getAgentSystemCtrlMap("AppOrderPayCountdown", agentID);
 		
 		return Rjx.jsonOk().set("deliver", deliver).set("deliverList", deliverSubList).set("order", orderMap).set("payData", payMap)
-				.set("subOrder", subOrderMap).set("list", dtlList).toJson();
+				.set("subOrder", subOrderMap).set("list", dtlList).set("AppOrderPayCountdown", appOrderPayCountdownMap).toJson();
 	}
 
 	@Override
@@ -1417,6 +1424,18 @@ public class OrderServiceImpl implements OrderService {
 		return returnMap;
 	}
 	
+	//查经销商配置 
+	private Map<String,Object> getAgentSystemCtrlMap(String code,String agentID){
+		Map<String,Object> map  = new HashMap<String,Object>();
+		try {
+			String sql = "SELECT nAgentID,sValue1,sValue2,sValue3,sValue4,sValue5,sMemo FROM tAgentSystemCtrl WHERE sCode = ? AND nAgentID = ? AND nTag&1 = 0";
+			map = readJdbcTemplate.queryForMap(sql,code,agentID);
+		} catch (Exception e) {
+		
+		}
+		return map;
+	}
+
 	public static void main(String[] args) {
 		String aa = "20230421121212";
 		String a1 = DateUtil.format(DateUtil.parse(aa, DateUtil.FMT_YYYYMMddHHMMSS), DateUtil.FMT_DATE_SECOND);

src/main/resources/templates/redmine.html

@@ -24,9 +24,9 @@
 </head>
 <body>
 	<div id="app">
-	     <el-divider content-position="left">V1.1.7.5 2024-3-25</el-divider>
+	     <el-divider content-position="left">V1.1.7.5 2024-3-26</el-divider>
 		 <p class="title">1.增加接口签名验证及开关</p> 
-		 <p class="title">2.需求 #16555、需求 #16563   需求 #16542</p> 
+		 <p class="title">2.需求 #16555、需求 #16563   需求 #16542,需求 #16595</p> 
 		 <el-divider content-position="left">V1.1.7.4 2024-3-1</el-divider>
 		 <p class="title">1.将日志写入SqlServer LGODB的idcSystemLog,一月一表: idcSystemLog_yyyyMM</p> 
 		 <p class="title">2.读写分离拆分 需求 #16467</p>