1

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

@@ -123,13 +123,14 @@ public class CommonController {
 	@ApiImplicitParams({
 		@ApiImplicitParam(paramType = "query", name = "appId", dataType = "String"),
 		@ApiImplicitParam(paramType = "query", name = "orgNo", dataType = "String"),
+		@ApiImplicitParam(paramType = "query", name = "agentID", dataType = "String"),
 		@ApiImplicitParam(paramType = "query", name = "terminal", dataType = "String", required = false, value = "终端标识", defaultValue = "wechat"),
 		@ApiImplicitParam(paramType = "query", name = "langID", dataType = "String", required = false, value = "语言", defaultValue = "936"),
 		@ApiImplicitParam(paramType = "query", name = "sign", dataType = "String", required = true, value = "签名", defaultValue = ""),
 		@ApiImplicitParam(paramType = "query", name = "timestamp", dataType = "String", required = true, value = "时间戳", defaultValue = "")
 	})
 	@RequestMapping(value = "/getConfig",method=RequestMethod.GET)
-	public Object getConfig(String appId,String orgNo) {
+	public Object getConfig(String appId,String orgNo,String agentID) {
 		Map<String, Object> map = null;
 		try {
 			String sql = "select sOrgNO, sOrgDesc, sOrgPicUrl from tOrg where sAppID = ?   and nTag&1 = 0 ";
@@ -158,7 +159,7 @@ public class CommonController {
 		Map<String, Object> emap = jdbcTemplate.queryForMap("select sDesc,sValue1,sValue2,sValue3,sValue4,sValue5,sMemo from tSystemCtrl where sCode = 'AliyunOssStyle'");
 		Map<String, Object> fmap = jdbcTemplate.queryForMap("select sDesc,sValue1,sValue2,sValue3,sValue4,sValue5,sMemo from tSystemCtrl where sCode = 'IsAppShowStockQty'");
 		Map<String, Object> gmap = jdbcTemplate.queryForMap("select sDesc,sValue1,sValue2,sValue3,sValue4,sValue5,sMemo from tSystemCtrl where sCode = 'IsShowSwitch'");
-		Map<String, Object> hmap = jdbcTemplate.queryForMap("select sDesc,sValue1,sValue2,sValue3,sValue4,sValue5,sMemo from tSystemCtrl where sCode = 'MinOrderAmountType'");
+		Map<String, Object> hmap = jdbcTemplate.queryForMap("select sDesc, sSysTypeID, sSysType, sValue1, sValue2, sValue3, sMemo, sValue4, sValue5 from tAgentSystemCtrl where sCode ='MinOrderAmountType' and nAgentID = "+agentID+" and nTag&1 = 0  ");
 		List<Map<String, Object>> payTypes = jdbcTemplate.queryForList("select sSalesOrderPayTypeID, sSalesOrderPayType from tOrgPayType where sOrgNO = ? and nTag&1=0 order by nSort desc", sOrgNO);
 		List<Map<String, Object>> goodsTags = jdbcTemplate.queryForList("select sGoodsTagID, sGoodsTag from tOrgGoodsTag where sOrgNO = ? and nTag&1 = 0", sOrgNO);
 		Map<String, Object> shareInfo = new HashMap<String, Object>();