分账10块运费算15

bugfix

src/main/java/com/caimei365/order/service/impl/PayOrderServiceImpl.java

@@ -1177,7 +1177,6 @@ public class PayOrderServiceImpl implements PayOrderService {
         splitAmount = MathUtil.sub(splitAmount, procedureFee).doubleValue();
         // 商品数据
         List<OrderProductVo> orderProductList = orderCommonMapper.getOrderProductByOrderId(order.getOrderId());
-        orderProductList.removeIf(o -> 998 == o.getShopId() && orderCommonMapper.finduserBean(o.getOrderId()) > 0);
         for (OrderProductVo orderProduct : orderProductList) {
             double costPrice = MathUtil.mul(orderProduct.getCostPrice(), orderProduct.getNum()).doubleValue();
             // 不含税能开发票

src/main/resources/mapper/OrderCommonMapper.xml

@@ -214,7 +214,7 @@
         cop.productImage AS image,
         cop.price,
         cop.shopName,
-        cop.costPrice,
+        IF(cop.shopid=998 AND co.freight> 0,co.freight,cop.price)AS costPrice,
         cop.normalPrice,
         cop.ladderPriceFlag,
         cop.discountPrice,
@@ -249,7 +249,9 @@
         p.splitCode
         FROM cm_order_product cop
         LEFT JOIN product p ON cop.productID = p.productID
+        LEFT JOIN cm_order co ON cop.orderId=co.orderId
         WHERE orderID = #{orderId}
+        AND IF(co.userBeans=0,1=1,cop.shopid!=998)
         ORDER BY cop.discountPrice DESC
     </select>
     <select id="countReturnedNum" resultType="java.lang.Integer">