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

src/main/resources/mapper/ShipMapper.xml

@@ -475,7 +475,7 @@
         SELECT ifnull((SELECT IFNULL(realPay, needPayAmount) - receiptAmount  FROM cm_shop_order WHERE shopOrderId = #{shopOrderId}) - ifnull(SUM(receiptAmount),0),0)
         FROM cm_discern_receipt cdr
                  LEFT JOIN cm_receipt_order_relation cror ON cdr.id = cror.receiptID
-        WHERE cror.shopOrderId = #{shopOrderId} AND cdr.payway != 3
+        WHERE cror.shopOrderId = #{shopOrderId} AND cdr.payway != 3 AND cdr.delFlag = 0 AND cror.delFlag = 0
     </select>
     <insert id="insertOrderReceipt" keyColumn="id" keyProperty="id"
             parameterType="com.caimei365.order.model.vo.ReceiptVo" useGeneratedKeys="true">