Skip to content

S
shop
Commit 34189da0 authored by 张永's avatar 张永
Browse files
Options

V1.1.7.8.3

parent 5b6c7c0f
Hide whitespace changes
Inline Side-by-side
Showing with 5 additions and 3 deletions
src/main/java/com/egolm/shop/api/CommonController.java
View file @ 34189da0
...@@ -175,6 +175,8 @@ public class CommonController { ...@@ -175,6 +175,8 @@ public class CommonController {
Map<String, Object> gmap = readJdbcTemplate.queryForMap("select sDesc,sValue1,sValue2,sValue3,sValue4,sValue5,sMemo from tSystemCtrl where sCode = 'IsShowSwitch'"); Map<String, Object> gmap = readJdbcTemplate.queryForMap("select sDesc,sValue1,sValue2,sValue3,sValue4,sValue5,sMemo from tSystemCtrl where sCode = 'IsShowSwitch'");
Map<String, Object> hmap = readJdbcTemplate.queryForMap("select sDesc, sSysTypeID, sSysType, sValue1, sValue2, sValue3, sMemo, sValue4, sValue5 from tAgentSystemCtrl where sCode ='MinOrderAmountType' and nAgentID = "+agentID+" and nTag&1 = 0 "); Map<String, Object> hmap = readJdbcTemplate.queryForMap("select sDesc, sSysTypeID, sSysType, sValue1, sValue2, sValue3, sMemo, sValue4, sValue5 from tAgentSystemCtrl where sCode ='MinOrderAmountType' and nAgentID = "+agentID+" and nTag&1 = 0 ");
Map<String, Object> lmap = readJdbcTemplate.queryForMap("select sDesc, sSysTypeID, sSysType, sValue1, sValue2, sValue3, sMemo, sValue4, sValue5 from tAgentSystemCtrl where sCode ='AppSolrSortRule' and nAgentID = "+agentID+" and nTag&1 = 0 "); //排序字段 Map<String, Object> lmap = readJdbcTemplate.queryForMap("select sDesc, sSysTypeID, sSysType, sValue1, sValue2, sValue3, sMemo, sValue4, sValue5 from tAgentSystemCtrl where sCode ='AppSolrSortRule' and nAgentID = "+agentID+" and nTag&1 = 0 "); //排序字段
Map<String, Object> mmap = readJdbcTemplate.queryForMap("select sDesc, sSysTypeID, sSysType, sValue1, sValue2, sValue3, sMemo, sValue4, sValue5 from tAgentSystemCtrl where sCode ='IsShowSysFee' and nAgentID = "+agentID+" and nTag&1 = 0 "); //排序字段
List<Map<String, Object>> payTypes = readJdbcTemplate.queryForList("select sSalesOrderPayTypeID, sSalesOrderPayType from tOrgPayType where sOrgNO = ? and nTag&1=0 order by nSort desc", sOrgNO); List<Map<String, Object>> payTypes = readJdbcTemplate.queryForList("select sSalesOrderPayTypeID, sSalesOrderPayType from tOrgPayType where sOrgNO = ? and nTag&1=0 order by nSort desc", sOrgNO);
List<Map<String, Object>> goodsTags = readJdbcTemplate.queryForList("select sGoodsTagID, sGoodsTag from tOrgGoodsTag where sOrgNO = ? and nTag&1 = 0", sOrgNO); List<Map<String, Object>> goodsTags = readJdbcTemplate.queryForList("select sGoodsTagID, sGoodsTag from tOrgGoodsTag where sOrgNO = ? and nTag&1 = 0", sOrgNO);
Map<String, Object> shareInfo = new HashMap<String, Object>(); Map<String, Object> shareInfo = new HashMap<String, Object>();
...@@ -205,7 +207,7 @@ public class CommonController { ...@@ -205,7 +207,7 @@ public class CommonController {
AppSystemInfo = readJdbcTemplate.queryForMap(sql, sOrgNO, appId); AppSystemInfo = readJdbcTemplate.queryForMap(sql, sOrgNO, appId);
} catch (EmptyResultDataAccessException e) {} } catch (EmptyResultDataAccessException e) {}
return Rjx.jsonOk().set("OrgInfo", map).set("PicInfo", omap).set("ExemptCheck", cmap).set("BusinessModel", bmap).set("BrandFilter", dmap).set("AliyunOssStyle", emap).set("ShowStockQty", fmap).set("IsShowSwitch", gmap).set("MinOrderAmountType", hmap) return Rjx.jsonOk().set("OrgInfo", map).set("PicInfo", omap).set("ExemptCheck", cmap).set("BusinessModel", bmap).set("BrandFilter", dmap).set("AliyunOssStyle", emap).set("ShowStockQty", fmap).set("IsShowSwitch", gmap).set("MinOrderAmountType", hmap)
.set("payTypes", payTypes).set("goodsTags", goodsTags).set("AppSystemInfo", AppSystemInfo).set("shareInfo", shareInfo).set("AppSolrSortRule", lmap).toJson(); .set("payTypes", payTypes).set("goodsTags", goodsTags).set("AppSystemInfo", AppSystemInfo).set("shareInfo", shareInfo).set("AppSolrSortRule", lmap).set("IsShowSysFee", mmap).toJson();
} }
} }
src/main/resources/templates/redmine.html
View file @ 34189da0
...@@ -24,9 +24,9 @@ ...@@ -24,9 +24,9 @@
</head> </head>
<body> <body>
<div id="app"> <div id="app">
<el-divider content-position="left">V1.1.7.8.3 2024-8-15</el-divider> <el-divider content-position="left">V1.1.7.8.3 2024-8-22</el-divider>
<p class="title">1.需求 #17240</p> <p class="title">1.需求 #17240</p>
<p class="title">2. 订单提交增加参数，需求 #17203</p> <p class="title">2. 订单提交增加参数，需求 #17203,需求 #17271</p>
<el-divider content-position="left">V1.1.7.8.2 2024-8-14</el-divider> <el-divider content-position="left">V1.1.7.8.2 2024-8-14</el-divider>
<p class="title">1.回调增加个日志，便于查。</p> <p class="title">1.回调增加个日志，便于查。</p>
<p class="title">2.confirmReceipt 长度扩36</p> <p class="title">2.confirmReceipt 长度扩36</p>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment