Skip to content

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

1212

parent 6de145df
Show whitespace changes
Inline Side-by-side
Showing with 2 additions and 1 deletion
src/main/java/com/egolm/shop/api/service/impl/CartQueryServiceImpl.java
View file @ d2973f66
...@@ -900,6 +900,7 @@ public class CartQueryServiceImpl implements CartQueryService { ...@@ -900,6 +900,7 @@ public class CartQueryServiceImpl implements CartQueryService {
MinOrderAmt = Util.objTo(goodsFirst.get("nMinDCAmount"), Double.class); MinOrderAmt = Util.objTo(goodsFirst.get("nMinDCAmount"), Double.class);
} catch (Exception e) { } catch (Exception e) {
MinOrderAmt = Double.valueOf(0); MinOrderAmt = Double.valueOf(0);
logger.info("MinOrderAmt 为null -----换值为: "+MinOrderAmt);
} }
String WMSInfo = goodsFirst.get("sWarehouseName")+""; // 物流名称 String WMSInfo = goodsFirst.get("sWarehouseName")+""; // 物流名称
String sWarehouseNO = goodsFirst.get("sWarehouseNO")+""; // 物流名称 String sWarehouseNO = goodsFirst.get("sWarehouseNO")+""; // 物流名称
......
src/main/resources/templates/redmine.html
View file @ d2973f66
...@@ -24,7 +24,7 @@ ...@@ -24,7 +24,7 @@
</head> </head>
<body> <body>
<div id="app"> <div id="app">
<el-divider content-position="left">V1.1.7.6 2024-5-27</el-divider> <el-divider content-position="left">V1.1.7.6 2024-7-18</el-divider>
<p class="title">1.支付回调失败状态为99的，刚写文件，需求 #16796</p> <p class="title">1.支付回调失败状态为99的，刚写文件，需求 #16796</p>
<p class="title">2.改取IP方法,需求 #16869</p> <p class="title">2.改取IP方法,需求 #16869</p>
<p class="title">3.日志增加trace_id</p> <p class="title">3.日志增加trace_id</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