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

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

@@ -117,10 +117,10 @@ public class CmDiscernReceiptService extends CrudService<CmDiscernReceiptDao, Cm
                         }
                         if ("".equals(no)) {
                             // no += "<a href='/a/order/detail?id=" + map.get("orderID") + "'>" + map.get("shopOrderNo") + "</a>";
-                            no += "<a href='/a/order/detail?id=" + map.get("orderID") + "&shopOrderID=" + map.get("shopOrderId") + "'>" + "子订单" + map.get("shopOrderNo") + "(" + map.get("shopOrderId") + ")" + "</a>";
+                            no += "<a href='/a/shopOrder/detail?shopOrderID=" + map.get("shopOrderId") + "'>" + "子订单" + map.get("shopOrderNo") + "(" + map.get("shopOrderId") + ")" + "</a>";
                         } else {
                             // no += ("<br><a href='/a/order/detail?id=" + map.get("orderID") + "'>" + map.get("shopOrderNo")) + "</a>";
-                            no += ("<br><a href='/a/order/detail?id=" + map.get("orderID") + "&shopOrderID=" + map.get("shopOrderId") + "'>" + "子订单" + map.get("shopOrderNo") + "(" + map.get("shopOrderId") + ")") + "</a>";
+                            no += ("<br><a href='/a/shopOrder/detail?shopOrderID=" + map.get("shopOrderId") + "'>" + "子订单" + map.get("shopOrderNo") + "(" + map.get("shopOrderId") + ")") + "</a>";
                         }
                     }
                 }

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

@@ -427,12 +427,11 @@
                             </c:if>
                         </td>--%>
                     <td colspan="2">
-                        <a href="${ctx}/bulkpurchase/cmRefundsProduct/toRefundRecord.rpc?orderID=${s.orderID}&shopOrderID=${shopOrderID}&from=1"
-                           style="text-decoration: underline">
+<%--                        <a href="${ctx}/bulkpurchase/cmRefundsProduct/toRefundRecord.rpc?orderID=${s.orderID}&shopOrderID=${shopOrderID}&from=1" style="text-decoration: underline">--%>
                             <c:if test="${s.shopReceiptStatus == 1}"><font color="red">待收款</font></c:if>
                             <c:if test="${s.shopReceiptStatus == 2}"><font color="#ff8c00">部分收款</font></c:if>
                             <c:if test="${s.shopReceiptStatus == 3}"><font color="green">已收款</font></c:if>
-                        </a>
+<%--                        </a>--%>
                     </td>
                     <td colspan="3">
                             <%--<a href="${ctx}/bulkpurchase/cmRefundsProduct/toRefundRecord.rpc?orderID=${s.orderID}&from=1"
@@ -527,13 +526,12 @@
                                                           pattern="#,##0.00"/></td>
 
                     <td>
-                        <a href="${ctx}/bulkpurchase/cmRefundsProduct/toRefundRecord.rpc?orderID=${s.orderID}&shopOrderID=${shopOrderID}&from=1"
-                           style="text-decoration: underline">
+<%--                        <a href="${ctx}/bulkpurchase/cmRefundsProduct/toRefundRecord.rpc?orderID=${s.orderID}&shopOrderID=${shopOrderID}&from=1" style="text-decoration: underline">--%>
                             <c:if test="${s.payStatus == 1 || empty s.payStatus || s.payStatus == 0}"><font
                                     color="red">待付款</font></c:if>
                             <c:if test="${s.payStatus == 2}"><font color="#ff8c00">部分付款</font></c:if>
                             <c:if test="${s.payStatus == 3}"><font color="green">已付款</font></c:if>
-                        </a>
+<%--                        </a>--%>
                     </td>
 
                     <td colspan="3" class="supplier-fee">