From c16b9ffceac828840ef7ebc4827612d17906704a Mon Sep 17 00:00:00 2001
From: jyy <935090232@qq.com>
Date: Fri, 19 Mar 2021 19:56:29 +0800
Subject: [PATCH] 积分商城9

---
 zq-erp/src/main/java/com/matrix/system/shopXcx/api/service/impl/WXShopOrderServiceImpl.java |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/zq-erp/src/main/java/com/matrix/system/shopXcx/api/service/impl/WXShopOrderServiceImpl.java b/zq-erp/src/main/java/com/matrix/system/shopXcx/api/service/impl/WXShopOrderServiceImpl.java
index dce9db6..51bfc9b 100644
--- a/zq-erp/src/main/java/com/matrix/system/shopXcx/api/service/impl/WXShopOrderServiceImpl.java
+++ b/zq-erp/src/main/java/com/matrix/system/shopXcx/api/service/impl/WXShopOrderServiceImpl.java
@@ -134,7 +134,7 @@
         }
 
 
-        List<ShopCartVo> cartList = shoppingCartService.findUserCartList(addShopOrderPOJO.getShopId());
+        List<ShopCartVo> cartList = shoppingCartService.findUserCartList(addShopOrderPOJO.getShopId(),ShopShoppingCart.CAR_TYPE_MICRO);
         //购物车不能为空
         if (CollectionUtils.isEmpty(cartList)) {
             return new AjaxResult(AjaxResult.STATUS_FAIL, "请选择您需要购买的产品");
@@ -175,6 +175,7 @@
             shopOrderDetails.setpId(shopShoppingCart.getCartProductId());
             shopOrderDetails.setsId(shopShoppingCart.getCartSkuId());
             shopOrderDetails.setPrice(shopShoppingCart.getPrice());
+            shopOrderDetails.setPayType(shopShoppingCart.getCartType());
             shopOrderDetails.setCount(shopShoppingCart.getCartNumber());
             shopOrderDetails.setsTitle(shopShoppingCart.getTitle() + shopShoppingCart.getName());
             shopOrderDetails.setDiscountAmount(BigDecimal.ZERO);

--
Gitblit v1.9.1