|
|
@@ -124,10 +124,9 @@ class StoreOrderCreateRepository extends StoreOrderRepository
|
|
|
|
|
|
foreach ($merchantCart['list'] as $k => $cart) {
|
|
|
// 判断是否同时存在普通商品，节能油商品和礼包商品
|
|
|
- @file_put_contents('quanju2.txt', json_encode($cart)."-购物车数据\r\n", 8);
|
|
|
- if ($merchantCart['list'][$k]['product']['is_oil']==1){
|
|
|
+ if ($cart['productAttr']['product']['is_oil']==1){
|
|
|
$jny=true;
|
|
|
- }elseif ($merchantCart['list'][$k]['product']['is_gift']==1){
|
|
|
+ }elseif ($cart['productAttr']['product']['is_gift']==1){
|
|
|
$lb=true;
|
|
|
}else{
|
|
|
$pt=true;
|
