bugfix

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

@@ -958,6 +958,7 @@
         SELECT CONCAT(shopOrderNo, '（', shopOrderID, '）') AS result
         FROM cm_shop_order
         WHERE orderID = #{orderID}
+        and shopId != 998
     </select>
     <select id="findIncome" resultType="java.lang.Double">
         SELECT ROUND(IFNULL((

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

@@ -319,7 +319,7 @@
                     <th colspan="3">客户</th>
                     <th colspan="2">下单时间</th>
                     <th>订单金额</th>
-                    <th colspan="3">主订单下所有子订单</th>
+                    <th colspan="3">所有子订单</th>
                     <th>订单总佣金</th>
                     <th>机构运费</th>
                     <th>收款状态</th>

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

@@ -98,7 +98,7 @@
 						<th colspan="3">客户</th>
 						<th colspan="2">下单时间</th>
 						<th>订单金额</th>
-						<th colspan="3">主订单下所有子订单</th>
+						<th colspan="3">所有子订单</th>
 						<th>订单总佣金</th>
 						<th>机构运费</th>
 						<th>收款状态</th>

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

@@ -87,7 +87,7 @@
                         <th colspan="3">客户</th>
                         <th colspan="2">下单时间</th>
                         <th>订单金额</th>
-                        <th colspan="3">主订单下所有子订单</th>
+                        <th colspan="3">所有子订单</th>
                         <th>订单总佣金</th>
                         <th>机构运费</th>
                         <th>收款状态</th>

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

@@ -419,7 +419,7 @@
                         <th colspan="3">客户</th>
                         <th colspan="2">下单时间</th>
                         <th>订单金额</th>
-                        <th colspan="3">主订单下所有子订单</th>
+                        <th colspan="3">所有子订单</th>
                         <th>订单总佣金</th>
                         <th>机构运费</th>
                         <th>收款状态</th>

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

@@ -342,7 +342,7 @@
                     <th colspan="3">客户</th>
                     <th colspan="2">下单时间</th>
                     <th>订单金额</th>
-                    <th colspan="3">主订单下所有子订单</th>
+                    <th colspan="3">所有子订单</th>
                     <th>订单总佣金</th>
                     <th>机构运费</th>
                     <th>收款状态</th>

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

@@ -100,7 +100,7 @@
 						<th colspan="3">客户</th>
 						<th colspan="2">下单时间</th>
 						<th>订单金额</th>
-						<th colspan="3">主订单下所有子订单</th>
+						<th colspan="3">所有子订单</th>
 						<th>订单总佣金</th>
 						<th>机构运费</th>
 						<th>收款状态</th>

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

@@ -292,7 +292,7 @@
                     <th colspan="3">客户</th>
                     <th colspan="2">下单时间</th>
                     <th>订单金额</th>
-                    <th colspan="3">主订单下所有子订单</th>
+                    <th colspan="3">所有子订单</th>
                     <th>订单总佣金</th>
                     <th>机构运费</th>
                     <th>收款状态</th>

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

@@ -94,7 +94,7 @@
 						<th colspan="3">客户</th>
 						<th colspan="2">下单时间</th>
 						<th>订单金额</th>
-						<th colspan="3">主订单下所有子订单</th>
+						<th colspan="3">所有子订单</th>
 						<th>订单总佣金</th>
 						<th>机构运费</th>
 						<th>收款状态</th>