Merge remote-tracking branch 'origin/developer' into developerF

src/main/java/com/caimei/modules/order/service/CmDiscernReceiptService.java

@@ -156,11 +156,6 @@ public class CmDiscernReceiptService extends CrudService<CmDiscernReceiptDao, Cm
                         BigDecimal refundsAmount = MathUtil.add(roi.getRefundsAmount(), shopRefundAmount);
                         roi.setRefundsAmount(refundsAmount.doubleValue());*/
                     }
-                    if (0 == roi.getOnlinePayFlag()) {
-                        // 可以线上支付，查询子订单信息
-                        List<NewShopOrder> shopOrderInfos = cmDiscernReceiptDao.getShopOrderInfos(relation.getOrderID(), null);
-                        roi.setShopOrderInfos(shopOrderInfos);
-                    }
                 }
             }
             if ("2".equals(relation.getRelationType())) { // relation.orderID 指的是主订单id

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

@@ -251,18 +251,18 @@
                         </div>
                     </c:if>
                     <div class="receipt-order-row2">
-                    <span class="font-blue"><label>订单编号：</label><a
+                        <span class="font-blue"><label>订单编号：</label><a
                             href="${ctx}/order/detail?id=${orderInfo.orderID}">${orderInfo.orderNo}（${orderInfo.orderID}）</a></span>
-                        <span><label>订单金额：</label>¥<fmt:formatNumber
-                                value="${orderInfo.orderAmount}"
-                                pattern="#0.00"/></span>
-                        <span>
-                        <span><label>应收金额：</label>¥<fmt:formatNumber value="${orderInfo.payableAmount}"
+                            <span><label>订单金额：</label>¥<fmt:formatNumber
+                                    value="${orderInfo.orderAmount}"
+                                    pattern="#0.00"/></span>
+                            <span>
+                            <span><label>应收金额：</label>¥<fmt:formatNumber value="${orderInfo.payableAmount}"
                                                                          pattern="#0.00"/></span>
-                        <span>
-                        <label>已收金额：</label>¥<fmt:formatNumber
-                                value="${empty orderInfo.receiptAmount ? 0 : orderInfo.receiptAmount}"
-                                pattern="#0.00"/>
+                            <span>
+                            <label>已收金额：</label>¥<fmt:formatNumber
+                                    value="${empty orderInfo.receiptAmount ? 0 : orderInfo.receiptAmount}"
+                                    pattern="#0.00"/>
                             <span>
                                     <c:forEach items="${orderInfo.receiptRecordVo}" var="receiptRecord"
                                                varStatus="index">
@@ -308,20 +308,21 @@
                                     </c:forEach>
                                 </span>
                             </span>
-                        <span><label>机构名称：</label>
-                                    <c:if test="${orderInfo.organizeID == 1}">
-                                        <span class="org-note">星范</span>
-                                    </c:if>
-                                        ${orderInfo.customerName}
-                        <c:if test="${orderInfo.organizeID == 3}">
+                            <span><label>机构名称：</label>
+                                        <c:if test="${orderInfo.organizeID == 1}">
+                                            <span class="org-note">星范</span>
+                                        </c:if>
+                                            ${orderInfo.customerName}
+                                <c:if test="${orderInfo.organizeID == 3}">
 
-                        </c:if>
-                                </span>
-                        <span><label>订单状态：</label>
-                                    <c:if test="${orderInfo.receiptStatus == 1}">待收款</c:if>
-                                    <c:if test="${orderInfo.receiptStatus == 2}">部分收款</c:if>
-                                    <c:if test="${orderInfo.receiptStatus == 3}">已收款</c:if>
-                                </span>
+                                </c:if>
+                            </span>
+                            <span><label>订单状态：</label>
+                                        <c:if test="${orderInfo.receiptStatus == 1}">待收款</c:if>
+                                        <c:if test="${orderInfo.receiptStatus == 2}">部分收款</c:if>
+                                        <c:if test="${orderInfo.receiptStatus == 3}">已收款</c:if>
+                            </span>
+                        </span>
                     </div>
                     <div class="receipt-order-row3">
                                 <span><label>订单类型：</label><c:if test="${orderInfo.orderType == 0}">协销订单</c:if>
@@ -332,9 +333,9 @@
                         <c:forEach items="${orderInfo.shopOrderInfos}" var="shopOrder" varStatus="index">
                             <span>子订单编号：${shopOrder.shopOrderNo}(${shopOrder.shopOrderID})</span>
                             <span>子订单应收金额：¥<fmt:formatNumber value="${shopOrder.realPay}"
-                                                           pattern="#0.00"/></span>
+                                                             pattern="#0.00"/></span>
                             <span>子订单已收金额：¥<fmt:formatNumber value="${shopOrder.receiptAmount}"
-                                                           pattern="#0.00"/></span>
+                                                             pattern="#0.00"/></span>
                             <span>子订单收款状态：${fns:getDictLabel(shopOrder.shopReceiptStatus,'receiptStatus' ,'' )}</span>
                         </c:forEach>
                     </div>