bugfix-优惠券有效期

src/main/java/com/caimei/modules/coupon/entity/CmCoupon.java

@@ -352,6 +352,7 @@ public class CmCoupon extends DataEntity<CmCoupon> {
         this.usePeriod = usePeriod;
     }
 
+    @JsonFormat(pattern = "yyyy-MM-dd")
     public Date getReceiveDate() {
         return receiveDate;
     }
@@ -360,6 +361,7 @@ public class CmCoupon extends DataEntity<CmCoupon> {
         this.receiveDate = receiveDate;
     }
 
+    @JsonFormat(pattern = "yyyy-MM-dd")
     public Date getUseEndDate() {
         return useEndDate;
     }

src/main/webapp/WEB-INF/views/modules/hehe/heheNewOrderDetail.jsp

@@ -385,46 +385,6 @@
         <span><label>下单时间：</label>${order.orderTime}</span>
         <span><label>子订单号(ID)：</label>${shopOrder.shopOrderNo}(${shopOrder.shopOrderID})</span>
         <span><label>子订单金额：</label><fmt:formatNumber value="${shopOrder.realPay}" type="currency"/></span>
-        <br/>
-        <span><label>商品总额：</label><fmt:formatNumber value="${shopOrder.needPayAmount}" type="currency"/></span>
-        <span><label>优惠：</label><fmt:formatNumber value="${shopOrder.eachDiscount}" type="currency"/></span>
-        <span><label>应付金额：</label><fmt:formatNumber value="${shopOrder.realPay}" type="currency"/></span>
-        <span><label>已付金额：</label><fmt:formatNumber value="${shopOrder.receiptAmount}" type="currency"/></span>
-        <span><label>待付金额：</label><fmt:formatNumber value="${shopOrder.restAmount}" type="currency"/></span>
-        <br/>
-        <span><label>收款状态：</label>
-                <c:if test="${shopOrder.shopReceiptStatus == 1}">
-                    <font color="red">待收款</font>
-                </c:if>
-                <c:if test="${shopOrder.shopReceiptStatus == 2}">
-                    <font color="#ff8c00">部分收款</font>
-                </c:if>
-                <c:if test="${shopOrder.shopReceiptStatus == 3}">
-                    <font color="green">已收款</font>
-                </c:if>
-        </span>
-        <span><label>付款状态：</label>
-                <c:if test="${shopOrder.payStatus == 1}">
-                    <font color="red">待付款</font>
-                </c:if>
-                <c:if test="${shopOrder.payStatus == 2}">
-                    <font color="#ff8c00">部分付款</font>
-                </c:if>
-                <c:if test="${shopOrder.payStatus == 3}">
-                    <font color="green">已付款</font>
-                </c:if>
-        </span>
-        <span><label>发货状态：</label>
-                <c:if test="${shopOrder.sendOutStatus == 1}">
-                    <font color="red">待发货</font>
-                </c:if>
-                <c:if test="${shopOrder.sendOutStatus == 2}">
-                    <font color="#ff8c00">部分发货</font>
-                </c:if>
-                <c:if test="${shopOrder.sendOutStatus == 3}">
-                    <font color="green">已发货</font>
-                </c:if>
-        </span>
         <c:if test="${shopOrder.postFeeCos eq '0'}">
             <div class="print-wrapper">
                 <a href="${ctx}/order/printOrder?shopOrderID=${shopOrder.shopOrderID}">打印</a>
@@ -432,37 +392,89 @@
                 <c:if test="${order.status ne '0'}">
                     <a onclick="copyText('${shopOrder.shopOrderID}')" style="cursor:pointer;">供应商订单二维码</a>
                 </c:if>
+                <c:if test="${shopOrder.orderArchiveId ne null}">
+                    <a href="${ctx}/archive/cmOrderArchive/form?id=${shopOrder.orderArchiveId}">查看订单资料</a>
+                </c:if>
             </div>
-            <c:if test="${order.status ne 0 && order.status ne 11}">
-                <div class="delivery-wrapper">
-                        <span>发货状态：
-                            <c:if test="${shopOrder.sendOutStatus == 1}">
-                                <font color="red">待发货</font>
-                            </c:if>
-                            <c:if test="${shopOrder.sendOutStatus == 2}">
-                                <font color="#ff8c00">部分发货</font>
-                            </c:if>
-                            <c:if test="${shopOrder.sendOutStatus == 3}">
-                                <font color="green">已发货</font>
-                            </c:if>
-                        </span>
-                    <span>付款状态：<c:if test="${shopOrder.payStatus == 1}">
+        </c:if>
+        <c:if test="${order.onlinePayFlag eq 0}">
+            <br/>
+            <span><label>商品总额：</label><fmt:formatNumber value="${shopOrder.needPayAmount}" type="currency"/></span>
+            <span><label>优惠：</label><fmt:formatNumber value="${shopOrder.eachDiscount}" type="currency"/></span>
+            <span><label>应付金额：</label><fmt:formatNumber value="${shopOrder.realPay}" type="currency"/></span>
+            <span><label>已付金额：</label><fmt:formatNumber value="${shopOrder.receiptAmount}" type="currency"/></span>
+            <span><label>待付金额：</label><fmt:formatNumber value="${shopOrder.restAmount}" type="currency"/></span>
+            <br/>
+            <span><label>收款状态：</label>
+                    <c:if test="${shopOrder.shopReceiptStatus == 1}">
+                        <font color="red">待收款</font>
+                    </c:if>
+                    <c:if test="${shopOrder.shopReceiptStatus == 2}">
+                        <font color="#ff8c00">部分收款</font>
+                    </c:if>
+                    <c:if test="${shopOrder.shopReceiptStatus == 3}">
+                        <font color="green">已收款</font>
+                    </c:if>
+            </span>
+            <span><label>付款状态：</label>
+                    <c:if test="${shopOrder.payStatus == 1}">
                         <font color="red">待付款</font>
                     </c:if>
-                                        <c:if test="${shopOrder.payStatus == 2}">
-                                            <font color="#ff8c00">部分付款</font>
-                                        </c:if>
-                                        <c:if test="${shopOrder.payStatus == 3}">
-                                            <font color="green">已付款</font>
-                                        </c:if></span>
-                    <c:if test="${shopOrder.payStatus == 3 or shopOrder.payStatus == 2}">
-                                <span>已付金额: <fmt:formatNumber value="${shopOrder.payed}" type="currency"/>
-                                </span>
+                    <c:if test="${shopOrder.payStatus == 2}">
+                        <font color="#ff8c00">部分付款</font>
                     </c:if>
-                </div>
-            </c:if>
+                    <c:if test="${shopOrder.payStatus == 3}">
+                        <font color="green">已付款</font>
+                    </c:if>
+            </span>
+            <span><label>发货状态：</label>
+                    <c:if test="${shopOrder.sendOutStatus == 1}">
+                        <font color="red">待发货</font>
+                    </c:if>
+                    <c:if test="${shopOrder.sendOutStatus == 2}">
+                        <font color="#ff8c00">部分发货</font>
+                    </c:if>
+                    <c:if test="${shopOrder.sendOutStatus == 3}">
+                        <font color="green">已发货</font>
+                    </c:if>
+            </span>
             <c:if test="${not empty shopOrder.note}">
-                <div><label>留言：</label>${shopOrder.note}</div>
+                <span>留言：${shopOrder.note}</span>
+            </c:if>
+        </c:if>
+        <c:if test="${order.onlinePayFlag eq 1}">
+            <c:if test="${shopOrder.postFeeCos eq '0'}">
+                <c:if test="${order.status ne 0 && order.status ne 11}">
+                    <div class="delivery-wrapper">
+                            <span>发货状态：
+                                <c:if test="${shopOrder.sendOutStatus == 1}">
+                                    <font color="red">待发货</font>
+                                </c:if>
+                                <c:if test="${shopOrder.sendOutStatus == 2}">
+                                    <font color="#ff8c00">部分发货</font>
+                                </c:if>
+                                <c:if test="${shopOrder.sendOutStatus == 3}">
+                                    <font color="green">已发货</font>
+                                </c:if>
+                            </span>
+                        <span>付款状态：<c:if test="${shopOrder.payStatus == 1}">
+                            <font color="red">待付款</font>
+                        </c:if>
+                                            <c:if test="${shopOrder.payStatus == 2}">
+                                                <font color="#ff8c00">部分付款</font>
+                                            </c:if>
+                                            <c:if test="${shopOrder.payStatus == 3}">
+                                                <font color="green">已付款</font>
+                                            </c:if></span>
+                        <c:if test="${shopOrder.payStatus == 3 or shopOrder.payStatus == 2}">
+                                    <span>已付金额: <fmt:formatNumber value="${shopOrder.payed}" type="currency"/>
+                                    </span>
+                        </c:if>
+                    </div>
+                </c:if>
+                <c:if test="${not empty shopOrder.note}">
+                    <div><label>留言：</label>${shopOrder.note}</div>
+                </c:if>
             </c:if>
         </c:if>
     </div>