zhijiezhao 1 ano atrás
pai
commit
adecd3df9a

+ 3 - 4
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>