维沙标签

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

@@ -20,6 +20,7 @@ public class CmReturnedPurchase extends DataEntity<CmReturnedPurchase> {
     private Integer organizeID;    //组织id
     private String orderNo;         //主订单号
     private String userName;        //买家名
+    private Integer userOrganizeId;     //机构所属组织Id
     //	private Integer shopOrderID;		// 子订单Id
     private Integer userID;        // 用户ID（买家）
     private String status;        // 状态：1待审核、2审核通过、3审核不通过

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

@@ -39,7 +39,8 @@
 		a.confirmReturnTime AS "confirmReturnTime",
 		b.orderNo as "orderNo",
 		c.userName as "userName",
-		c.name as "name"
+		c.name as "name",
+		c.userOrganizeID as "userOrganizeId"
 	</sql>
 
 	<sql id="cmReturnedPurchaseJoins">

src/main/webapp/WEB-INF/views/modules/bulkpurchase/applyRefoundForm.jsp

@@ -26,6 +26,7 @@
         .upload-content .conList ol li{width:114px;min-height:80px;text-align:center;background:#fff;position:relative;top:120px}
         .hide-pic{display:none !important}
         .upload-tips{margin:10px 0}
+         .weishaIcon {background:darkorange;color:white;margin:0 0px;padding:0 3px;font-style:normal;font-size: 12px; display:inline-block;border-radius:2px}
     </style>
     <script type="text/javascript">
         $(document).ready(function () {
@@ -289,7 +290,7 @@
                         <input class="check-item-review refundOfflineFee" type="checkbox"   name="returnedWay" value='3' onclick="showBankInfo()"/>
                         线下转账
                         <from:input path="refundOfflineFee" onkeyup="num(this)"   placeholder="￥0.00" value="${empty cmReturnedPurchase.refundOfflineFee?'':(cmReturnedPurchase.refundOfflineFee)}"></from:input>
-                        <c:if test="${order.rechargeGoods == null}">
+                        <c:if test="${order.rechargeGoods == null and order.organizeID != 3}">
                             <input class="check-item-review refundBalanceFee" type="checkbox"  name="returnedWay" value='1'/>
                             账户余额
                             <from:input path="refundBalanceFee" onkeyup="num(this)" placeholder="￥0.00" value="${empty cmReturnedPurchase.refundBalanceFee?'':(cmReturnedPurchase.refundBalanceFee)}"></from:input>
@@ -412,7 +413,7 @@
         </tr>
         <tr>
             <td>
-            机构：${order.bpOrderUserinfo.name}
+            机构：${order.bpOrderUserinfo.name}<c:if test="${order.organizeID == 3}"><em class="weishaIcon">维沙</em></c:if>
             </td>
             <td>
             收货人：${order.bpOrderUserinfo.shouHuoRen}(${order.bpOrderUserinfo.mobile})

src/main/webapp/WEB-INF/views/modules/bulkpurchase/orderReturnRecord.jsp

@@ -83,6 +83,7 @@
             padding: 5px;
             margin-left: 10px;
         }
+        .weishaIcon {background:darkorange;color:white;margin:0 0px;padding:0 3px;font-style:normal;font-size: 12px; display:inline-block;border-radius:2px}
     </style>
     <script type="text/javascript">
         $(document).ready(function () {
@@ -438,7 +439,7 @@
             </tr>
             <tr>
                 <td>
-                    买家：${order.bpOrderUserinfo.name}
+                    买家：${order.bpOrderUserinfo.name}<c:if test="${order.organizeID == 3}"><em class="weishaIcon">维沙</em></c:if>
                 </td>
                 <td>
                     收货人：${order.bpOrderUserinfo.shouHuoRen}(${order.bpOrderUserinfo.mobile})

src/main/webapp/WEB-INF/views/modules/bulkpurchase/refundRecord.jsp

@@ -74,6 +74,7 @@
             padding: 5px;
             margin-left: 10px;
         }
+        .weishaIcon {background:darkorange;color:white;margin:0 0px;padding:0 3px;font-style:normal;font-size: 12px; display:inline-block;border-radius:2px}
     </style>
     <script type="text/javascript">
         $(document).ready(function () {
@@ -126,12 +127,12 @@
             订单号(ID)：${order.orderNo}(${order.orderID})
         </td>
         <td>
-            <c:if test="${order.organizeID == 0}">
+            <c:if test="${order.organizeID != 1}">
                 订单类型：${fns:getDictLabel(order.orderType,'order_type' ,'' )}
             </c:if>
         </td>
         <td>
-            <c:if test="${order.organizeID == 0}">
+            <c:if test="${order.organizeID != 1}">
                 订单来源：${fns:getDictLabel(order.orderSource,'bp_orderSource' ,'' )}
             </c:if>
         </td>
@@ -162,7 +163,7 @@
     </tr>
     <tr>
         <td>
-            机构：${order.bpOrderUserinfo.name}
+            机构：${order.bpOrderUserinfo.name}<c:if test="${order.organizeID == 3}"><em class="weishaIcon">维沙</em></c:if>
         </td>
         <td>
             收货人：${order.bpOrderUserinfo.shouHuoRen}

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

@@ -68,6 +68,8 @@
             padding: 5px;
             margin-left: 10px;
         }
+        .weishaIcon {background:darkorange;color:white;margin:0 0px;padding:0 3px;font-style:normal;font-size: 12px; display:inline-block;border-radius:2px}
+
     </style>
     <script type="text/javascript">
         $(document).ready(function () {
@@ -250,7 +252,7 @@
                         <c:if test="${s.organizeID == '1'}">
                             <span class="org-note">星范</span>
                         </c:if>
-                            ${s.clubName}
+                            ${s.clubName}<c:if test="${s.organizeID == 3}"><em class="weishaIcon">维沙</em></c:if>
                     </td>
                     <td><fmt:formatNumber value="${s.discountFee}" type="number" pattern="#,##0.00"/></td>
                     <td>

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

@@ -112,6 +112,7 @@
         .receipt-msg-wrapper {
             display: block;
         }
+        .weishaIcon {background:darkorange;color:white;margin:0 0px;padding:0 3px;font-style:normal;font-size: 12px; display:inline-block;border-radius:2px}
     </style>
     <script type="text/javascript">
         $(document).ready(function () {
@@ -271,7 +272,7 @@
 								<c:if test="${orderInfo.organizeID == 1}">
                                     <span class="org-note">星范</span>
                                 </c:if>
-									${orderInfo.customerName}
+									${orderInfo.customerName}<c:if test="${orderInfo.organizeID == 3}"><em class="weishaIcon">维沙</em></c:if>
 							</span>
                 <span><label>订单状态：</label>
 								<c:if test="${orderInfo.receiptStatus == 1}">待收款</c:if>

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

@@ -46,6 +46,7 @@
         .check-btn-wrapper input:last-child {
             margin-left: 10px;
         }
+        .weishaIcon {background:darkorange;color:white;margin:0 0px;padding:0 3px;font-style:normal;font-size: 12px; display:inline-block;border-radius:2px}
     </style>
     <script type="text/javascript">
         $(document).ready(function () {
@@ -212,10 +213,10 @@
                     <span class="org-note">星范</span>
                 </c:if>
                 <c:if test="${empty cmDiscernReceipt.userName}">
-                    ${cmDiscernReceipt.name}
+                    ${cmDiscernReceipt.name}<c:if test="${cmDiscernReceipt.organizeID == 3}"><em class="weishaIcon">维沙</em></c:if>
                 </c:if>
                 <c:if test="${not empty cmDiscernReceipt.userName}">
-                    ${cmDiscernReceipt.name}
+                    ${cmDiscernReceipt.name}<c:if test="${cmDiscernReceipt.organizeID == 3}"><em class="weishaIcon">维沙</em></c:if>
                 </c:if>
             </td>
             <td>${cmDiscernReceipt.orderType}</td>

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

@@ -16,6 +16,7 @@
 		@media screen and (max-width:1300px){#searchForm{width:1460px !important}
 		.nav-tabs,#contentTable{width:1490px !important}
 		}
+		.weishaIcon {background:darkorange;color:white;margin:0 0px;padding:0 3px;font-style:normal;font-size: 12px; display:inline-block;border-radius:2px}
 	</style>
 	<script type="text/javascript">
 		$(document).ready(function() {
@@ -127,7 +128,7 @@
 						<c:if test="${shopOrder.organizeID eq 1}">
 							<span class="org-note">星范</span>
 						</c:if>
-						${shopOrder.clubName}<br>
+						${shopOrder.clubName}<c:if test="${shopOrder.organizeID == 3}"><em class="weishaIcon">维沙</em></c:if><br>
 					</c:forEach>
 				</td>
 

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

@@ -50,6 +50,7 @@
 		.red{color:red;}
 		.payment-form-bottom .wipeImgs{height:auto;padding:8px 0;}
 		.wipeImgs img{width:120px;height:90px;background-color:#eee;margin-right:15px;}
+		.weishaIcon {background:darkorange;color:white;margin:0 0px;padding:0 3px;font-style:normal;font-size: 12px; display:inline-block;border-radius:2px}
 	</style>
 </head>
 <body>
@@ -142,7 +143,7 @@
 					</tr>
 					<tr>
 						<td>${s.shopName}</td>
-						<td colspan="3">${s.buyer}</td>
+						<td colspan="3">${s.buyer}<c:if test="${s.organizeID == 3}"><em class="weishaIcon">维沙</em></c:if></td>
 						<td>
                         <c:if test="${s.freight == 0}">
                             包邮

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

@@ -45,6 +45,7 @@
 		.red{color:red;}
 		.payment-form-bottom .wipeImgs{height:auto;padding:8px 0;}
 		.wipeImgs img{width:120px;height:90px;background-color:#eee;margin-right:15px;}
+		.weishaIcon {background:darkorange;color:white;margin:0 0px;padding:0 3px;font-style:normal;font-size: 12px; display:inline-block;border-radius:2px}
 	</style>
 	<style media="print">
 		.styleWidth{width:6%;word-break:break-all}
@@ -149,7 +150,7 @@
 				</tr>
 				<tr>
 					<td>${s.shopName}</td>
-					<td colspan="3">${s.clubName}</td>
+					<td colspan="3">${s.clubName}<c:if test="${s.organizeID == 3}"><em class="weishaIcon">维沙</em></c:if></td>
 					<td>
                         <c:if test="${s.freight == 0}">
                             包邮

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

@@ -47,6 +47,7 @@
 		.red{color:red;}
 		.payment-form-bottom .wipeImgs{height:auto;padding:8px 0;}
 		.wipeImgs img{width:120px;height:90px;background-color:#eee;margin-right:15px;}
+        .weishaIcon {background:darkorange;color:white;margin:0 0px;padding:0 3px;font-style:normal;font-size: 12px; display:inline-block;border-radius:2px}
     </style>
     <style media="print">
         .styleWidth{width:6%;word-break:break-all}
@@ -147,7 +148,7 @@
                     </tr>
                     <tr>
                         <td>${s.shopName}</td>
-                        <td colspan="3">${s.buyer}</td>
+                        <td colspan="3">${s.buyer}<c:if test="${s.organizeID == 3}"><em class="weishaIcon">维沙</em></c:if></td>
                         <td>
                         <c:if test="${s.freight == 0}">
                             包邮

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

@@ -68,6 +68,7 @@
 	.hide-pic{display:none !important}
 	.upload-tips{margin:10px 0}
 	.mask {z-index: 9999;}
+	.weishaIcon {background:darkorange;color:white;margin:0 0px;padding:0 3px;font-style:normal;font-size: 12px; display:inline-block;border-radius:2px}
 </style>
 </head>
 <body>
@@ -164,7 +165,7 @@
 				</tr>
 				<tr>
 					<td>${s.shopName}</td>
-					<td colspan="3">${s.buyer}</td>
+					<td colspan="3">${s.buyer}<c:if test="${s.organizeID == 3}"><em class="weishaIcon">维沙</em></c:if></td>
 					<td>
                         <c:if test="${s.freight == 0}">
                             包邮

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

@@ -281,6 +281,9 @@
         .pay-status label:first-child {
             margin-left: 10px
         }
+
+        .weishaIcon {background:darkorange;color:white;margin:0 0px;padding:0 3px;font-style:normal;font-size: 12px; display:inline-block;border-radius:2px}
+
     </style>
     <script type="text/javascript">
         function page(n, s) {
@@ -450,7 +453,7 @@
                     <td>${s.shopName}</td>
                     <td colspan="3">
                         <c:if test="${s.organizeID eq 1}"><span class="org-note">星范</span></c:if>
-                            ${s.clubName}
+                            ${s.clubName}<c:if test="${s.organizeID == 3}"><em class="weishaIcon">维沙</em></c:if>
                     </td>
                     <td>
                         <c:if test="${s.freight == 0}">

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

@@ -45,6 +45,7 @@
 		.red{color:red;}
 		.payment-form-bottom .wipeImgs{height:auto;padding:8px 0;}
 		.wipeImgs img{width:120px;height:90px;background-color:#eee;margin-right:15px;}
+		.weishaIcon {background:darkorange;color:white;margin:0 0px;padding:0 3px;font-style:normal;font-size: 12px; display:inline-block;border-radius:2px}
 	</style>
 	<style media="print">
 		.styleWidth{width:6%;word-break:break-all}
@@ -145,7 +146,7 @@
 				</tr>
 				<tr>
 					<td>${s.shopName}</td>
-					<td colspan="3">${s.buyer}</td>
+					<td colspan="3">${s.buyer}<c:if test="${s.organizeID == 3}"><em class="weishaIcon">维沙</em></c:if></td>
 					<td>
                         <c:if test="${s.freight == 0}">
                             包邮

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

@@ -66,6 +66,7 @@
 			padding: 5px;
 			margin-left: 10px;
 		}
+		.weishaIcon {background:darkorange;color:white;margin:0 0px;padding:0 3px;font-style:normal;font-size: 12px; display:inline-block;border-radius:2px}
 	</style>
 	<script type="text/javascript">
         function page(n,s){
@@ -228,7 +229,7 @@
 					<td>${s.shopName}</td>
 					<td colspan="3">
 						<c:if test="${s.organizeID eq 1}"><span class="org-note">星范</span></c:if>
-						${s.clubName}
+						${s.clubName}<c:if test="${s.organizeID == 3}"><em class="weishaIcon">维沙</em></c:if>
 					</td>
 					<td>
                         <c:if test="${s.freight == 0}">

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

@@ -46,6 +46,7 @@
 		.refund-methods{height:auto !important}
 		.refund-methods>div{display:inline-block}
 		.refund-methods label{vertical-align:top;line-height:50px}
+		.weishaIcon {background:darkorange;color:white;margin:0 0px;padding:0 3px;font-style:normal;font-size: 12px; display:inline-block;border-radius:2px}
 	</style>
 	<script type="text/javascript">
 		$(document).ready(function() {
@@ -140,7 +141,10 @@
 						</tr>
 						<tr>
 							<td>${s.shopName}</td>
-							<td colspan="3"><c:if test="${s.organizeID == 1}"><span class="org-note">星范</span></c:if>${s.buyer}</td>
+							<td colspan="3">
+								<c:if test="${s.organizeID == 1}"><span class="org-note">星范</span></c:if>
+									${s.buyer}<c:if test="${s.organizeID == 3}"><em class="weishaIcon">维沙</em></c:if>
+							</td>
 							<td>
 								<c:if test="${s.freight == 0}">
 									包邮

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

@@ -48,6 +48,8 @@
 		.refund-methods>div{display:inline-block}
 		.refund-methods label{vertical-align:top;line-height:50px}
 		.refund-amount{width:80px;vertical-align:bottom !important;margin-left:5px;position:relative;top:2px}
+		.weishaIcon {background:darkorange;color:white;margin:0 0px;padding:0 3px;font-style:normal;font-size: 12px; display:inline-block;border-radius:2px}
+
 	</style>
 	<script type="text/javascript">
 		$(document).ready(function() {
@@ -144,7 +146,7 @@
 					</tr>
 					<tr>
 						<td>${s.shopName}</td>
-						<td colspan="3">${s.buyer}</td>
+						<td colspan="3">${s.buyer}<c:if test="${s.organizeID == 3}"><em class="weishaIcon">维沙</em></c:if></td>
 						<td>
 							<c:if test="${s.freight == 0}">
 								包邮

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

@@ -45,6 +45,7 @@
 		.select-ele {
 			width: 177px;
 		}
+		.weishaIcon {background:darkorange;color:white;margin:0 0px;padding:0 3px;font-style:normal;font-size: 12px; display:inline-block;border-radius:2px}
 	</style>
 	<script type="text/javascript">
 		$(document).ready(function() {
@@ -162,7 +163,7 @@
 					<c:if test="${cmReturnedPurchase.organizeID == 1}">
 						<span class="org-note">星范</span>
 					</c:if>
-						${cmReturnedPurchase.name}
+						${cmReturnedPurchase.name}<c:if test="${order.organizeID == 3}"><em class="weishaIcon">维沙</em></c:if>
 				</td>
 				<td>${cmReturnedPurchase.orderNo}(${cmReturnedPurchase.orderID})</td>
 				<td><fmt:formatNumber type="number" pattern="#,##0.00"

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

@@ -245,6 +245,17 @@
         #auditBox .note-div {
             font-size: 16px;
         }
+
+        .weishaIcon {
+            background: darkorange;
+            color: white;
+            margin: 0 0px;
+            padding: 0 3px;
+            font-style: normal;
+            font-size: 12px;
+            display: inline-block;
+            border-radius: 2px
+        }
     </style>
     <script type="text/javascript" src="${ctxStatic}/QRCode/jquery.qrcode.min.js"></script>
     <script type="text/javascript" src="static/common/clipboard.min.js"></script>
@@ -641,7 +652,7 @@
                                     'orderID': orderId,
                                     'balanceAccountsRemark': content
                                 });
-                                window.location.href = "${ctx}/order/detail?id="+orderId;
+                                window.location.href = "${ctx}/order/detail?id=" + orderId;
                             }
                         }
                     });
@@ -852,7 +863,7 @@
         <li>退款状态</li>
         <li>待审核退款</li>
         <li>订单金额</li>
-<%--        <li>抹平金额</li>--%>
+        <%--        <li>抹平金额</li>--%>
         <li>下单时间</li>
         <li>确认时间</li>
         <li>操作</li>
@@ -897,14 +908,15 @@
                 </c:if>
 
                     ${order.buyer}
+                    <c:if test="${order.organizeID == 3}"><em class="weishaIcon">维沙</em></c:if>
             </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>
+                    交易中<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>
@@ -918,37 +930,43 @@
                     <font color="green">已收款</font>
                 </c:if>
                 <br>
-				    <%--抹平明细--%>
-                    <c:if test="${order.confirmType eq 1}">
-                        <c:if test="${order.receiptOrderFlag}">
-                            一款多单:少收抹平金额未知
-                        </c:if>
-                        <c:if test="${!order.receiptOrderFlag}">
-                            <font>少收抹平:<br>
-                                ￥<fmt:formatNumber value="${order.payableAmount - (empty order.orderReceivedAmount ? 0 : order.orderReceivedAmount)}" pattern="#0.00"/>
-                            </font>
-                        </c:if>
+                    <%--抹平明细--%>
+                <c:if test="${order.confirmType eq 1}">
+                    <c:if test="${order.receiptOrderFlag}">
+                        一款多单:少收抹平金额未知
                     </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 test="${!order.receiptOrderFlag}">
+                        <font>少收抹平:<br>
+                            ￥<fmt:formatNumber
+                                    value="${order.payableAmount - (empty order.orderReceivedAmount ? 0 : order.orderReceivedAmount)}"
+                                    pattern="#0.00"/>
+                        </font>
                     </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 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>
             </li>
             <li>
                 <c:if test="${order.payStatus == 1}">
@@ -994,7 +1012,7 @@
                 </c:if>
             </li>
             <li><fmt:formatNumber value="${order.payTotalFee}" type="currency"/></li>
-                            <%-- 订单金额 --%>
+                <%-- 订单金额 --%>
             <li>${order.orderTime}</li>
             <li>
                 <c:if test="${empty order.confirmTime}">
@@ -1021,6 +1039,7 @@
                         <%--<c:if test="${order.receiptStatus == 3 && order.confirmType != null && order.confirmType != ''}">
                             <a href="javascript:void(0);" onclick="moPingNote(${order.orderID})">抹平收款备注</a>
                         </c:if>--%>
+                        <%--采美订单确认/取消/修改订单--%>
                         <c:if test="${order.organizeID == 0}">
                             <c:if test="${order.status == 0}">
                                 <a href="${ctx}/order/confirmOrder?orderID=${order.orderID}"
@@ -1030,24 +1049,24 @@
                                 <a href="${ctx}/order/cancelOrder?orderID=${order.orderID}"
                                    onclick="return confirmx('是否取消订单?', this.href)">取消订单</a>
                             </c:if>
-                        <c:if test="${order.status eq 11 || order.status eq 12 || order.status eq 13 ||order.status eq 21 ||order.status eq 22 ||
+                            <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 0}">
-                            <c:if test="${!order.rechargeGoods || order.status eq 0}">
-                                <c:if test="${order.postageOrderFlag == 0 && order.secondHandOrderFlag != 1}">
-                                    <a href="${ctx}/order/form?id=${order.orderID}">修改订单</a>
-                                </c:if>
-                                <c:if test="${order.postageOrderFlag == 0 && order.secondHandOrderFlag == 1}">
-                                    <a href="${ctx}/order/secondeProductOrderForm?id=${order.orderID}">修改订单</a>
+                                <c:if test="${!order.rechargeGoods || order.status eq 0}">
+                                    <c:if test="${order.postageOrderFlag == 0 && order.secondHandOrderFlag != 1}">
+                                        <a href="${ctx}/order/form?id=${order.orderID}">修改订单</a>
+                                    </c:if>
+                                    <c:if test="${order.postageOrderFlag == 0 && order.secondHandOrderFlag == 1}">
+                                        <a href="${ctx}/order/secondeProductOrderForm?id=${order.orderID}">修改订单</a>
+                                    </c:if>
                                 </c:if>
                             </c:if>
-                        </c:if>
                             <c:if test="${order.status == 0}">
                                 <c:if test="${order.postageOrderFlag == 1}">
                                     <a href="${ctx}/order/postageOrderForm?id=${order.orderID}">修改邮费订单</a>
                                 </c:if>
                             </c:if>
                         </c:if>
-                        <c:if test="${order.organizeID == 0 && order.status == 11 && order.payStatus == 1}">
+                        <c:if test="${(order.organizeID == 0 or order.organizeID > 2)&& order.status == 11 && order.payStatus == 1}">
                             <a href="javascript:void(0);"
                                onclick="modelShow('${order.orderID}')">编辑经理折扣</a>
                         </c:if>

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

@@ -68,6 +68,7 @@
         .ladderPrice:hover .list{display:block}
         .ladderPrice .list span{margin:0 20px;width:60px;text-align:center;display:inline-block}
         .ladderPrice .list span.price{color:red}
+        .weishaIcon {background:darkorange;color:white;margin:0 0px;padding:0 3px;font-style:normal;font-size: 12px; display:inline-block;border-radius:2px}
     </style>
     <script type="text/javascript" src="${ctxStatic}/QRCode/jquery.qrcode.min.js"></script>
     <script type="text/javascript" src="static/common/clipboard.min.js"></script>
@@ -187,7 +188,7 @@
                 </c:if>
             </td>
         </c:if>
-        <td>机构：${order.bpOrderUserinfo.name}</td>
+        <td>机构：${order.bpOrderUserinfo.name}<c:if test="${order.organizeID == 3}"><em class="weishaIcon">维沙</em></c:if></td>
         <td>收货人: ${order.bpOrderUserinfo.shouHuoRen}</td>
     </tr>
     <tr>

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

@@ -25,7 +25,9 @@
             padding: 5px;
             margin-left: 10px;
         }
-	</style>
+        .weishaIcon {background:darkorange;color:white;margin:0 0px;padding:0 3px;font-style:normal;font-size: 12px; display:inline-block;border-radius:2px}
+
+    </style>
 	<script type="text/javascript">
 		function page(n,s){
 			$("#pageNo").val(n);
@@ -107,7 +109,10 @@
         </tr>
         <tr>
             <td>${s.shopName}</td>
-            <td colspan="3"><c:if test="${s.organizeID == 1}"><span class="org-note">星范</span></c:if>${s.buyer}</td>
+            <td colspan="3">
+                <c:if test="${s.organizeID == 1}"><span class="org-note">星范</span></c:if>
+                ${s.buyer}<c:if test="${s.organizeID == 3}"><em class="weishaIcon">维沙</em></c:if>
+            </td>
             <td>
                         <c:if test="${s.freight == 0}">
                             包邮

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

@@ -69,6 +69,8 @@
             padding: 5px;
             margin-left: 10px;
         }
+        .weishaIcon {background:darkorange;color:white;margin:0 0px;padding:0 3px;font-style:normal;font-size: 12px; display:inline-block;border-radius:2px}
+
     </style>
     <script type="text/javascript">
         $(document).ready(function () {
@@ -185,7 +187,7 @@
                     <c:if test="${order.organizeID == '1'}">
                         <span class="org-note">星范</span>
                     </c:if>
-                        ${order.buyer}
+                        ${order.buyer}<c:if test="${order.organizeID == 3}"><em class="weishaIcon">维沙</em></c:if>
                 </td>
                 <td><fmt:formatNumber value="${order.discountFee}" type="number" pattern="#,##0.00"/></td>
                 <td>