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

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

@@ -972,15 +972,14 @@
         where cror.delFlag = '0' and cdr.delFlag = '0'
           <if test="identifying == 2">
             <if test="relationType == 1">
-                and cror.orderID in (select shopOrderID from cm_shop_order where orderID = #{orderID}) and cror.relationType
-                = '1'
+                and cror.orderID in (select shopOrderID from cm_shop_order where orderID = #{orderID}) and (cror.relationType = '1' or cror.relationType = '7')
             </if>
             <if test="relationType == 2">
-                and cror.orderID = #{orderID} and cror.relationType = '2'
+                and cror.orderID = #{orderID} and (cror.relationType = '2' or cror.relationType = '7')
             </if>
           </if>
           <if test="identifying == 1">
-              and cror.shopOrderId = #{shopOrderID} and cror.relationType = 2
+              and cror.shopOrderId = #{shopOrderID} and (cror.relationType = 2 or cror.relationType = 7)
           </if>
     </select>
 

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

@@ -330,6 +330,12 @@
     <div>
         <span>待收金额：<fmt:formatNumber value="${order.restAmount}" type="currency"/></span>
     </div>
+    <c:if test="${not empty order.note}">
+        <div>
+            <span>留言：${order.note}</span>
+
+        </div>
+    </c:if>
 </div>
 <div class="order-rows">
     <span><label>供应商：</label>${order.shopName}</span>