bugfix

src/main/java/com/caimei365/order/mapper/OrderCommonMapper.java

@@ -165,4 +165,6 @@ public interface OrderCommonMapper {
     ShopOrderVo getShopOrderByOrderId(Integer shopOrderId);
 
     List<OrderProductVo> getOrderProductByShopOrderId(Integer shopOrderId);
+
+    Double findShopFee(Integer shopOrderId);
 }

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

@@ -687,6 +687,9 @@ public class PayOrderServiceImpl implements PayOrderService {
         }
         shop.setReceiptAmount(receiptAmount.get());
         shop.setObligation(MathUtil.sub(shop.getRealPay(), receiptAmount.get()).doubleValue());
+        if(998==shop.getShopId()){
+            shop.setObligation(orderCommonMapper.findShopFee(shopOrderId));
+        }
         // 总成本
         AtomicDouble totalCostPrice = new AtomicDouble(0d);
         // 商品数据

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

@@ -1150,7 +1150,8 @@ public class SubmitServiceImpl implements SubmitService {
             } else {
                 //无优惠金额
                 shopOrderList.forEach(so -> {
-                    double realPay = so.getRealNeedPay();
+                    //不包含优惠的真实支付金额=子订单应付？
+                    double realPay = so.getNeedPayAmount();
                     so.setRealPay(realPay);
                     so.setEachDiscount(0d);
                     double charge = MathUtil.mul(realPay, 0.0065, 2).doubleValue() > 10 ? MathUtil.mul(realPay, 0.0065, 2).doubleValue() : 10;
@@ -1731,7 +1732,6 @@ public class SubmitServiceImpl implements SubmitService {
             }
             orderShopPos.add(shopOrder);
         }
-        log.info("ordershops------------------->"+orderShopPos);
         return orderShopPos;
     }
 

src/main/resources/mapper/CartSellerMapper.xml

@@ -128,11 +128,9 @@
             if(csp.id is not null,1,0) as svipProductFlag,
             csp.priceType as svipPriceType,
             csp.discount as svipDiscount,
-            csp.discountPrice as svipDiscountPrice,
-            cop.productType as giftType
+            csp.discountPrice as svipDiscountPrice
         FROM bp_order_product_cart c
         LEFT JOIN product p ON c.productId = p.productID
-        left join cm_order_product cop on c.productId = cop.productID
         LEFT JOIN cm_svip_product csp ON p.productID = csp.productId
         WHERE c.serviceProviderId = #{serviceProviderId} AND c.clubId = #{clubId} AND c.shopID = #{shopId}
         AND p.productID in

src/main/resources/mapper/OrderCommonMapper.xml

@@ -706,4 +706,9 @@
           AND IF(co.userBeans = 0, 1 = 1, cop.shopid != 998)
         ORDER BY cop.discountPrice DESC
     </select>
+    <select id="findShopFee" resultType="java.lang.Double">
+        select totalAmount
+        from cm_shop_order
+        where shopOrderID = #{shopOrderId}
+    </select>
 </mapper>