bugfix

src/main/webapp/WEB-INF/views/modules/order/shopOrderDetail.jsp

@@ -312,7 +312,11 @@
     </div>
 
     <div>
-        <span>待收金额：<fmt:formatNumber value="${order.restAmount}" type="currency"/></span>
+        <span>待收金额：<fmt:formatNumber value="${order.restAmount}" type="currency"/>
+        <c:if test="${not empty order.couponAmount and order.couponAmount > 0}"> <span style="color:red;">(优惠券：${order.couponAmount})</span> </c:if>
+        <c:if test="${not empty order.promotionFullReduction and order.promotionFullReduction > 0}"> <span style="color:red;">(促销满减：${order.promotionFullReduction})</span> </c:if>
+        <c:if test="${not empty order.presentNum and order.presentNum > 0}"> <span style="color:red;">(赠品数：${order.presentNum})</span> </c:if>
+        </span>
     </div>
     <c:if test="${not empty order.note}">
         <div>