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

soss-system/src/main/resources/mapper/system/GoodsSkuMapper.xml

@@ -20,7 +20,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </sql>
 
     <select id="selectSkuListForOrder" resultMap="GoodsSkuResult">
-        select id, goods_id, price, discount, is_deleted from goods_sku where id in
+        select gs.id, gs.goods_id, gs.price,
+        case when sgs.discount>=0 then sgs.discount else gs.discount end as discount,
+        gs.is_deleted from goods_sku gs
+        left join shop_goods_sku sgs on gs.goods_id = sgs.goods_id
+        where id in
         <foreach collection="ids" item="id" separator="," open="(" close=")">#{id}</foreach>
     </select>