浏览代码

Merge remote-tracking branch 'origin/activity_2020_12' into activity_2020_12

Joburgess 4 年之前
父节点
当前提交
9188824fe9
共有 1 个文件被更改,包括 1 次插入1 次删除
  1. 1 1
      mec-biz/src/main/resources/config/mybatis/SellOrderMapper.xml

+ 1 - 1
mec-biz/src/main/resources/config/mybatis/SellOrderMapper.xml

@@ -593,7 +593,7 @@
                SUM(IF(g.type_ != 'INSTRUMENT', so.expect_amount_, 0)) teachingFee
         FROM student_payment_order spo
                  LEFT JOIN sell_order so ON spo.id_ = so.order_id_
-                 LEFT JOIN goods g ON g.id_ = so.goods_id_
+                 LEFT JOIN goods g ON IF(so.parent_goods_id_ IS NOT NULL,g.id_ = so.parent_goods_id_,g.id_ = so.goods_id_)
         WHERE spo.id_ = #{orderId}
     </select>
 </mapper>