呵呵订单详情

src/main/java/com/caimei/modules/order/entity/NewShopOrder.java

@@ -45,6 +45,11 @@ public class NewShopOrder extends DataEntity<NewShopOrder> {
     private Integer refundStatus;//    int(11),
     private BigInteger deliveryTimeMills;//   bigint(20) comment '发货时间（时间戳）',
     private Double needPayAmount;//   decimal(20,2) comment '实付金额',
+    private Double realPay;     // 实际支付金额
+    private Double eachDiscount;        // 分摊优惠金额
+    private Double receiptAmount;       // 已付金额
+    private Double restAmount;      // 待付金额
+    private Integer shopReceiptStatus;      // 子订单收款状态:1待收款，2部分收款，3已收款
     private Double canRefundAmount;//   float comment '退款金额',
     private Double refundAmount;//   float,
     private Integer clubID;//  int(11),
@@ -1147,4 +1152,44 @@ public class NewShopOrder extends DataEntity<NewShopOrder> {
     public void setSvipShopReduction(Double svipShopReduction) {
         this.svipShopReduction = svipShopReduction;
     }
+
+    public Double getRealPay() {
+        return realPay;
+    }
+
+    public void setRealPay(Double realPay) {
+        this.realPay = realPay;
+    }
+
+    public Double getEachDiscount() {
+        return eachDiscount;
+    }
+
+    public void setEachDiscount(Double eachDiscount) {
+        this.eachDiscount = eachDiscount;
+    }
+
+    public Double getReceiptAmount() {
+        return receiptAmount;
+    }
+
+    public void setReceiptAmount(Double receiptAmount) {
+        this.receiptAmount = receiptAmount;
+    }
+
+    public Double getRestAmount() {
+        return restAmount;
+    }
+
+    public void setRestAmount(Double restAmount) {
+        this.restAmount = restAmount;
+    }
+
+    public Integer getShopReceiptStatus() {
+        return shopReceiptStatus;
+    }
+
+    public void setShopReceiptStatus(Integer shopReceiptStatus) {
+        this.shopReceiptStatus = shopReceiptStatus;
+    }
 }

src/main/resources/mappings/modules/order/ShopOrderMapper.xml

@@ -23,6 +23,11 @@
 			a.finishTime AS finishTime,
 			a.refundStatus AS  refundStatus,
 			a.needPayAmount AS  needPayAmount,
+            a.realPay AS realPay,
+            a.eachDiscount AS eachDiscount,
+            a.receiptAmount AS receiptAmount,
+            (ifnull(a.realPay,0) - ifnull(a.receiptAmount,0)) as restAmount,
+            a.receiptStatus as shopReceiptStatus,
 			a.canRefundAmount AS  canRefundAmount,
 			a.refundAmount AS  refundAmount,
 			a.clubID  AS clubID,

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

@@ -384,7 +384,47 @@
     <div class="order-rows">
         <span><label>下单时间：</label>${order.orderTime}</span>
         <span><label>子订单号(ID)：</label>${shopOrder.shopOrderNo}(${shopOrder.shopOrderID})</span>
-        <span><label>子订单金额：</label><fmt:formatNumber value="${shopOrder.needPayAmount}" type="currency"/></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>