DEP订单增加特殊展示

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

@@ -18,6 +18,10 @@ import java.util.List;
 @Data
 public class NewShopOrder extends DataEntity<NewShopOrder> {
 
+    /**
+     * 友站Id 1唯美概念DEP
+     */
+    private Integer partnerId;
     /**
      * 线下账户类型 0公账 1私账
      */

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

@@ -2558,7 +2558,8 @@
         cso.closeTime,
         (SELECT COUNT(*) FROM cm_returned_purchase
         WHERE shopOrderId = cso.shopOrderId AND status =1 AND delFLag = 0) AS returnedPurchaseStatus,
-        co.closeReason AS closeReason
+        co.closeReason AS closeReason,
+        IF(EXISTS(SELECT 1 FROM cm_order_product WHERE productId = 4730 AND shopOrderId= cso.shopOrderId) , 1, 0) AS partnerId
         from cm_shop_order cso
         left join cm_order co on cso.orderId = co.orderId
         left join bp_order_userinfo bou on bou.orderId = cso.orderId

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

@@ -6,27 +6,118 @@
     <title>订单管理</title>
     <meta name="decorator" content="default"/>
     <style type="text/css">
-        .table th{text-align:center}
-        .table td{text-align:center}
-        .data-title{width:100%;display:table}
-        .data-title ul li{word-break:break-all;display:table-cell;width:100px;border:1px solid #000;text-align:center;height:35px;vertical-align:middle;border-right:0;border-bottom:0}
-        .data-title ul{margin-bottom:0 !important;display:table-row}
-        .data-title ul li:last-of-type{width:120px;border-right:1px solid #000000}
-        .data-title ul:last-of-type li{border-bottom:1px solid #000000}
-        .data-title ul li:nth-child(6){width:80px}
-        .spileOrder li:nth-of-type(1){position:relative}
-        .san{width:10px;height:10px;border-top:2px solid #000;border-right:2px solid #000;transform:rotate(45deg);position:absolute;right:-2px;top:50%;margin-top:-5px;cursor:pointer}
-        .red-waring{margin:0 !important;background-color:#f3f3f3 !important}
-        .red-waring li{border-color:red !important}
-        #biao1{position:absolute;left:-9999px;top:-9999px;z-index:-99;width:1px;height:1px}
-        #searchForm{line-height:40px}
-        #searchForm .ul-form{overflow:visible}
-        #searchForm{white-space:nowrap}
-        #searchForm label{margin-top:15px}
-        .ul-form{white-space:nowrap;margin-left:-10px !important}
-        .ul-form label{width:90px;text-align:right}
-        #btnSubmit{width:128px;margin-left:152px}
-        .select-ele{width:177px}
+        .table th {
+            text-align: center
+        }
+
+        .table td {
+            text-align: center
+        }
+
+        .data-title {
+            width: 100%;
+            display: table
+        }
+
+        .data-title ul li {
+            word-break: break-all;
+            display: table-cell;
+            width: 100px;
+            border: 1px solid #000;
+            text-align: center;
+            height: 35px;
+            vertical-align: middle;
+            border-right: 0;
+            border-bottom: 0
+        }
+
+        .data-title ul {
+            margin-bottom: 0 !important;
+            display: table-row
+        }
+
+        .data-title ul li:last-of-type {
+            width: 120px;
+            border-right: 1px solid #000000
+        }
+
+        .data-title ul:last-of-type li {
+            border-bottom: 1px solid #000000
+        }
+
+        .data-title ul li:nth-child(6) {
+            width: 80px
+        }
+
+        .spileOrder li:nth-of-type(1) {
+            position: relative
+        }
+
+        .san {
+            width: 10px;
+            height: 10px;
+            border-top: 2px solid #000;
+            border-right: 2px solid #000;
+            transform: rotate(45deg);
+            position: absolute;
+            right: -2px;
+            top: 50%;
+            margin-top: -5px;
+            cursor: pointer
+        }
+
+        .red-waring {
+            margin: 0 !important;
+            background-color: #f3f3f3 !important
+        }
+
+        .red-waring li {
+            border-color: red !important
+        }
+
+        #biao1 {
+            position: absolute;
+            left: -9999px;
+            top: -9999px;
+            z-index: -99;
+            width: 1px;
+            height: 1px
+        }
+
+        #searchForm {
+            line-height: 40px
+        }
+
+        #searchForm .ul-form {
+            overflow: visible
+        }
+
+        #searchForm {
+            white-space: nowrap
+        }
+
+        #searchForm label {
+            margin-top: 15px
+        }
+
+        .ul-form {
+            white-space: nowrap;
+            margin-left: -10px !important
+        }
+
+        .ul-form label {
+            width: 90px;
+            text-align: right
+        }
+
+        #btnSubmit {
+            width: 128px;
+            margin-left: 152px
+        }
+
+        .select-ele {
+            width: 177px
+        }
     </style>
     <script type="text/javascript">
         function page(n, s) {
@@ -35,13 +126,14 @@
             $("#searchForm").submit();
             return false;
         }
+
         function checkfun() {
             var orderID = $('#orderID').val();
             var reg = /^[0-9]*$/;
             if (!reg.test(orderID) && orderID.trim() != "") {
-                    alertx("请输入正确的订单ID!");
-                    return false;
-                }
+                alertx("请输入正确的订单ID!");
+                return false;
+            }
             return true;
         }
     </script>
@@ -52,18 +144,18 @@
     <shiro:hasPermission name="order:order:view">
         <li class="active"><a href="${ctx}/order/orderList">订单列表</a></li>
     </shiro:hasPermission>
-<%--    <shiro:hasPermission name="order:order:form">--%>
-<%--        <li><a href="${ctx}/order/form">添加订单</a></li>--%>
-<%--    </shiro:hasPermission>--%>
-<%--    <shiro:hasPermission name="order:order:postageOrderForm">--%>
-<%--        <li><a href="${ctx}/order/postageOrderForm">添加运费订单</a></li>--%>
-<%--    </shiro:hasPermission>--%>
+    <%--    <shiro:hasPermission name="order:order:form">--%>
+    <%--        <li><a href="${ctx}/order/form">添加订单</a></li>--%>
+    <%--    </shiro:hasPermission>--%>
+    <%--    <shiro:hasPermission name="order:order:postageOrderForm">--%>
+    <%--        <li><a href="${ctx}/order/postageOrderForm">添加运费订单</a></li>--%>
+    <%--    </shiro:hasPermission>--%>
     <shiro:hasPermission name="order:order:secondhandOrder">
         <li><a href="${ctx}/order/secondhandOrderList">二手订单列表</a></li>
     </shiro:hasPermission>
-<%--    <shiro:hasPermission name="order:order:secondeProductOrderForm">--%>
-<%--        <li><a href="${ctx}/order/secondeProductOrderForm">添加二手订单</a></li>--%>
-<%--    </shiro:hasPermission>--%>
+    <%--    <shiro:hasPermission name="order:order:secondeProductOrderForm">--%>
+    <%--        <li><a href="${ctx}/order/secondeProductOrderForm">添加二手订单</a></li>--%>
+    <%--    </shiro:hasPermission>--%>
 </ul>
 <sys:message content="${message}"/>
 <form:form id="searchForm" modelAttribute="newShopOrder" onsubmit="return checkfun()" action="${ctx}/order/orderList"
@@ -74,7 +166,8 @@
         <div class="flex-wrap">
             <div class="item">
                 <label>子订单ID：</label>
-                <form:input path="shopOrderID" id="shipOrderID" htmlEscape="false" maxlength="30" class="input-medium" type="number"/>
+                <form:input path="shopOrderID" id="shipOrderID" htmlEscape="false" maxlength="30" class="input-medium"
+                            type="number"/>
             </div>
             <div class="item">
                 <label>子订单号：</label>
@@ -181,14 +274,14 @@
                     <form:option value="0" label="否"/>
                 </form:select>
             </div>
-<%--            <div class="item">--%>
-<%--                <label>二手订单：</label>--%>
-<%--                <form:select path="secondHandOrderFlag" class="select-ele input-medium required">--%>
-<%--                    <form:option value="" label="请选择"/>--%>
-<%--                    <form:option value="0" label="否"/>--%>
-<%--                    <form:option value="1" label="是"/>--%>
-<%--                </form:select>--%>
-<%--            </div>--%>
+                <%--            <div class="item">--%>
+                <%--                <label>二手订单：</label>--%>
+                <%--                <form:select path="secondHandOrderFlag" class="select-ele input-medium required">--%>
+                <%--                    <form:option value="" label="请选择"/>--%>
+                <%--                    <form:option value="0" label="否"/>--%>
+                <%--                    <form:option value="1" label="是"/>--%>
+                <%--                </form:select>--%>
+                <%--            </div>--%>
             <div class="item">
                 <label>组织：</label>
                 <form:select path="organizeID" class="select-ele input-medium required">
@@ -232,11 +325,11 @@
         <li style="width: 190px; ">订单ID(订单编号)</li>
         <li>订单类型</li>
         <li>返佣订单</li>
-<%--        <li>二手订单</li>--%>
+        <%--        <li>二手订单</li>--%>
         <li>机构</li>
         <li>收货人</li>
         <li>订单来源</li>
-<%--        <li>订单状态</li>--%>
+        <%--        <li>订单状态</li>--%>
         <li>子订单状态</li>
         <li>收款状态</li>
         <li>付款状态</li>
@@ -244,28 +337,39 @@
         <li>退款状态</li>
         <li>待审核退款</li>
         <li>子订单金额</li>
-<%--        <li>返佣服务费</li>--%>
+        <%--        <li>返佣服务费</li>--%>
         <li>下单时间</li>
-<%--        <li>确认时间</li>--%>
+        <%--        <li>确认时间</li>--%>
         <li>操作</li>
     </ul>
     <c:forEach items="${page.list}" var="order">
         <%--颜色区分分期不分期订单以及终止订单--%>
         <ul class="spileOrder" data-id="${order.orderNo}">
-            <li style="position: relative"><b style="font-size: 15px;">${order.shopOrderID}</b>(${order.shopOrderNo})</li>
+            <li style="position: relative"><b style="font-size: 15px;">${order.shopOrderID}</b>(${order.shopOrderNo})
+            </li>
             <li><b style="font-size: 15px;">${order.orderID}</b>(${order.orderNo})</li>
             <li>
+        <%-- 由DEP引流注册的用户并且购买了DEP二代该产品的才标注为DEP订单 --%>
                 <c:if test="${order.orderType == 1}">
                     自主订单
+                    <c:if test="${order.partnerId = 1}">
+                        <span style="width: 120px;color: red;display: inline-block">（DEP订单）</span>
+                    </c:if>
                 </c:if>
                 <c:if test="${order.orderType == 0}">
                     协销订单
                     <c:if test="${not empty order.spName and order.organizeID != 4}">
                         <br>${fns:appendLast1('(',order.spName,')')}
                     </c:if>
+                    <c:if test="${order.partnerId = 1}">
+                        <span style="width: 120px;color: red;display: inline-block">（DEP订单）</span>
+                    </c:if>
                 </c:if>
                 <c:if test="${order.orderType > 1}">
                     ---
+                    <c:if test="${order.partnerId = 1}">
+                        <span style="width: 120px;color: red;display: inline-block">（DEP订单）</span>
+                    </c:if>
                 </c:if>
             </li>
             <li>
@@ -277,13 +381,13 @@
                 </c:if>
             </li>
                 <%--            <li>--%>
-<%--                <c:if test="${order.secondHandOrderFlag == '1'}">--%>
-<%--                    是--%>
-<%--                </c:if>--%>
-<%--                <c:if test="${order.secondHandOrderFlag ne '1'}">--%>
-<%--                    否--%>
-<%--                </c:if>--%>
-<%--            </li>--%>
+                <%--                <c:if test="${order.secondHandOrderFlag == '1'}">--%>
+                <%--                    是--%>
+                <%--                </c:if>--%>
+                <%--                <c:if test="${order.secondHandOrderFlag ne '1'}">--%>
+                <%--                    否--%>
+                <%--                </c:if>--%>
+                <%--            </li>--%>
             <li>
                 <a href="${ctx}/new/user/agency/clubPortrait?clubID=${order.clubID}&dateType=0&type=4">
                     <c:if test="${order.organizeID == 1}">
@@ -297,13 +401,13 @@
             </li>
             <li>${order.receiver}</li>
             <li>${fns:getDictLabel(order.orderSource,"bp_orderSource","" )}</li>
-<%--            <li class="sd-li">--%>
-<%--                <c:if test="${order.status eq 11 || order.status eq 12 || order.status eq 13 ||order.status eq 21 ||order.status eq 22 ||--%>
-<%--				order.status eq 23 || order.status eq 31 ||order.status eq 32 ||order.status eq 33}">--%>
-<%--                    交易中<br>(${fns:getDictLabel(order.status,"order_detail_status","" )})--%>
-<%--                </c:if>--%>
-<%--                <c:if test="${order.status eq 0 || order.status eq 4 || order.status eq 5 || order.status eq 6 || order.status eq 7}">${fns:getDictLabel(order.status,"order_detail_status","" )}</c:if>--%>
-<%--            </li>--%>
+                <%--            <li class="sd-li">--%>
+                <%--                <c:if test="${order.status eq 11 || order.status eq 12 || order.status eq 13 ||order.status eq 21 ||order.status eq 22 ||--%>
+                <%--				order.status eq 23 || order.status eq 31 ||order.status eq 32 ||order.status eq 33}">--%>
+                <%--                    交易中<br>(${fns:getDictLabel(order.status,"order_detail_status","" )})--%>
+                <%--                </c:if>--%>
+                <%--                <c:if test="${order.status eq 0 || order.status eq 4 || order.status eq 5 || order.status eq 6 || order.status eq 7}">${fns:getDictLabel(order.status,"order_detail_status","" )}</c:if>--%>
+                <%--            </li>--%>
             <li>
                 <c:if test="${order.shopStatus == 0}">
                     <font color="red">待确认</font>
@@ -336,49 +440,49 @@
                 </c:if>
                 <br>
                     <%--抹平明细 主订单不在展示抹平 由子订单展示--%>
-                <%--<c:if test="${order.confirmType eq 1}">
-                    <c:if test="${order.receiptOrderFlag}">
-                        一款多单:少收抹平金额未知
+                    <%--<c:if test="${order.confirmType eq 1}">
+                        <c:if test="${order.receiptOrderFlag}">
+                            一款多单:少收抹平金额未知
+                        </c:if>
+                        <c:if test="${!order.receiptOrderFlag}">tui
+                            <font>少收抹平:<br>
+                                ￥<fmt:formatNumber
+                                        value="${order.payableAmount - (empty order.orderReceivedAmount ? 0 : order.orderReceivedAmount)}"
+                                        pattern="#0.00"/>
+                            </font>
+                        </c:if>
                     </c:if>
-                    <c:if test="${!order.receiptOrderFlag}">tui
-                        <font>少收抹平:<br>
-                            ￥<fmt:formatNumber
-                                    value="${order.payableAmount - (empty order.orderReceivedAmount ? 0 : order.orderReceivedAmount)}"
-                                    pattern="#0.00"/>
-                        </font>
+                    <c:if test="${order.confirmType eq 2}">
+                        <c:if test="${order.receiptOrderFlag}">
+                            一款多单:多收抹平金额未知
+                        </c:if>
+                        <c:if test="${!order.receiptOrderFlag}">
+                            <font>多收抹平:<br>
+                                ￥<fmt:formatNumber
+                                        value="${(empty order.orderReceivedAmount ? 0 : order.orderReceivedAmount) - order.payableAmount}"
+                                        pattern="#0.00"/>
+                            </font>
+                        </c:if>
                     </c:if>
-                </c:if>
-                <c:if test="${order.confirmType eq 2}">
-                    <c:if test="${order.receiptOrderFlag}">
-                        一款多单:多收抹平金额未知
-                    </c:if>
-                    <c:if test="${!order.receiptOrderFlag}">
-                        <font>多收抹平:<br>
-                            ￥<fmt:formatNumber
-                                    value="${(empty order.orderReceivedAmount ? 0 : order.orderReceivedAmount) - order.payableAmount}"
-                                    pattern="#0.00"/>
-                        </font>
-                    </c:if>
-                </c:if>
-                <c:if test="${order.confirmType eq 3}">
-                    <c:if test="${order.receiptOrderFlag}">
-                        一款多单:多收退余额
-                    </c:if>
-                    <c:if test="${!order.receiptOrderFlag}">
-                        <font>多收退余额&nbsp;&nbsp;${order.associationType eq 2 ? "(自动)" : ""}:<br>
-                            ￥<fmt:formatNumber
-                                    value="${(empty order.returnBalanceAmount ? 0 : order.returnBalanceAmount)}"
-                                    pattern="#0.00"/>
-                        </font>
-                    </c:if>
-                </c:if>--%>
+                    <c:if test="${order.confirmType eq 3}">
+                        <c:if test="${order.receiptOrderFlag}">
+                            一款多单:多收退余额
+                        </c:if>
+                        <c:if test="${!order.receiptOrderFlag}">
+                            <font>多收退余额&nbsp;&nbsp;${order.associationType eq 2 ? "(自动)" : ""}:<br>
+                                ￥<fmt:formatNumber
+                                        value="${(empty order.returnBalanceAmount ? 0 : order.returnBalanceAmount)}"
+                                        pattern="#0.00"/>
+                            </font>
+                        </c:if>
+                    </c:if>--%>
             </li>
             <li>
                 <c:if test="${order.payStatus == 1}">
-                     <font color="red">待付款</font>
+                    <font color="red">待付款</font>
                 </c:if>
                 <c:if test="${order.payStatus == 2}">
-                     <font color="#ff8c00">部分付款</font>
+                    <font color="#ff8c00">部分付款</font>
                 </c:if>
                 <c:if test="${order.payStatus == 3}">
                     <font color="green">已付款</font>
@@ -386,21 +490,21 @@
             </li>
             <li>
                 <c:if test="${order.sendOutStatus == 1}">
-                      <font color="red">待发货</font>
+                    <font color="red">待发货</font>
                 </c:if>
                 <c:if test="${order.sendOutStatus == 2}">
-                       <font color="#ff8c00">部分发货</font>
+                    <font color="#ff8c00">部分发货</font>
                 </c:if>
                 <c:if test="${order.sendOutStatus == 3}">
-                     <font color="green">已发货</font>
+                    <font color="green">已发货</font>
                 </c:if>
             </li>
             <li>
                 <c:if test="${order.refundStatus == 1}">
-                      <font>无退款</font>
+                    <font>无退款</font>
                 </c:if>
                 <c:if test="${order.refundStatus == 3}">
-                      <font>有退款</font>
+                    <font>有退款</font>
                 </c:if>
             </li>
             <li>
@@ -416,23 +520,23 @@
             <li>                    <%-- 订单金额 --%>
                 <fmt:formatNumber value="${order.needPayAmount}" type="currency"/>
             </li>
-<%--            <li>                    &lt;%&ndash; 返佣服务费 &ndash;%&gt;--%>
-<%--                <c:if test="${not empty order.rebateFee}">--%>
-<%--                <fmt:formatNumber value="${order.rebateFee}" type="currency"/>--%>
-<%--                </c:if>--%>
-<%--                <c:if test="${empty order.rebateFee}">--%>
-<%--                    -----%>
-<%--                </c:if>--%>
-<%--            </li>--%>
+                <%--            <li>                    &lt;%&ndash; 返佣服务费 &ndash;%&gt;--%>
+                <%--                <c:if test="${not empty order.rebateFee}">--%>
+                <%--                <fmt:formatNumber value="${order.rebateFee}" type="currency"/>--%>
+                <%--                </c:if>--%>
+                <%--                <c:if test="${empty order.rebateFee}">--%>
+                <%--                    -----%>
+                <%--                </c:if>--%>
+                <%--            </li>--%>
             <li>${order.orderTime}</li>
-<%--            <li>--%>
-<%--                <c:if test="${empty order.confirmTime}">--%>
-<%--                    -----%>
-<%--                </c:if>--%>
-<%--                <c:if test="${not empty order.confirmTime}">--%>
-<%--                    ${order.confirmTime}--%>
-<%--                </c:if>--%>
-<%--            </li>--%>
+                <%--            <li>--%>
+                <%--                <c:if test="${empty order.confirmTime}">--%>
+                <%--                    -----%>
+                <%--                </c:if>--%>
+                <%--                <c:if test="${not empty order.confirmTime}">--%>
+                <%--                    ${order.confirmTime}--%>
+                <%--                </c:if>--%>
+                <%--            </li>--%>
             <li class="operation-wrap">
                 <a href="${ctx}/shopOrder/detail?id=${order.shopOrderID}">查看详情</a>
             </li>