Skip to content

G
goods
Commit 12d5d538 authored by luhongguang's avatar luhongguang
Browse files
Options

Merge branch 'develop' of https://git.yidian-inc.com:8021/bp/goods into develop

parents f77d9eef 8649cf90
Hide whitespace changes
Inline Side-by-side
Showing with 58 additions and 47 deletions
application/services/marketing/MarketingGoodsService.php
View file @ 12d5d538
...@@ -99,55 +99,61 @@ class MarketingGoodsService ...@@ -99,55 +99,61 @@ class MarketingGoodsService
$list = []; $list = [];
$i = 0; $i = 0;
foreach ($data as $key => $value) { foreach ($data as $key => $value) {
$list[$i] = $value;
$list[$i]['life_account_id'] = !empty($goodsSkuList[$value['goods_sku_id']]['life_account_id']) ? $goodsSkuList[$value['goods_sku_id']]['life_account_id'] : ''; $inventoryRest = !empty($goodsSkuList[$value['goods_sku_id']]['inventory_rest']) ? $goodsSkuList[$value['goods_sku_id']]['inventory_rest'] : '';
if (!empty($inventoryRest)) {
$publishUserId = !empty($goodsSkuList[$value['goods_sku_id']]['publish_user_id']) ? $goodsSkuList[$value['goods_sku_id']]['publish_user_id'] : ''; $list[$i]['inventory_rest'] = !empty($goodsSkuList[$value['goods_sku_id']]['inventory_rest']) ? $goodsSkuList[$value['goods_sku_id']]['inventory_rest'] : '';
$list[$i] = $value;
if (!empty($userId) && $userId == $publishUserId) { $list[$i]['life_account_id'] = !empty($goodsSkuList[$value['goods_sku_id']]['life_account_id']) ? $goodsSkuList[$value['goods_sku_id']]['life_account_id'] : '';
$list[$i]['is_self_publish'] = 0;
}else{ $publishUserId = !empty($goodsSkuList[$value['goods_sku_id']]['publish_user_id']) ? $goodsSkuList[$value['goods_sku_id']]['publish_user_id'] : '';
if (!empty($userId) && $userId == $publishUserId) {
$list[$i]['is_self_publish'] = 0;
}else{
$list[$i]['is_self_publish'] = 1;
}
//允许自己买自己的
$list[$i]['is_self_publish'] = 1; $list[$i]['is_self_publish'] = 1;
}
//允许自己买自己的 $life_account_id = !empty($list[$i]['life_account_id']) ? $list[$i]['life_account_id'] : '';
$list[$i]['is_self_publish'] = 1;
$list[$i]['life_account_name'] = !empty($lifeAccountList[$life_account_id]['life_account_name']) ? $lifeAccountList[$life_account_id]['life_account_name'] : '';
$life_account_id = !empty($list[$i]['life_account_id']) ? $list[$i]['life_account_id'] : '';
$list[$i]['life_account_icon'] = !empty($lifeAccountList[$life_account_id]['life_account_icon']) ? $lifeAccountList[$life_account_id]['life_account_icon'] : '';
$list[$i]['life_account_name'] = !empty($lifeAccountList[$life_account_id]['life_account_name']) ? $lifeAccountList[$life_account_id]['life_account_name'] : '';
$list[$i]['shop_id'] = !empty($goodsSkuList[$value['goods_sku_id']]['shop_id']) ? $goodsSkuList[$value['goods_sku_id']]['shop_id'] : '';
$list[$i]['life_account_icon'] = !empty($lifeAccountList[$life_account_id]['life_account_icon']) ? $lifeAccountList[$life_account_id]['life_account_icon'] : ''; $list[$i]['goods_name'] = !empty($goodsSkuList[$value['goods_sku_id']]['goods_name']) ? $goodsSkuList[$value['goods_sku_id']]['goods_name'] : '';
$list[$i]['shop_id'] = !empty($goodsSkuList[$value['goods_sku_id']]['shop_id']) ? $goodsSkuList[$value['goods_sku_id']]['shop_id'] : ''; $list[$i]['goods_desc'] = !empty($goodsSkuList[$value['goods_sku_id']]['desc']) ? $goodsSkuList[$value['goods_sku_id']]['desc'] : '';
$list[$i]['goods_name'] = !empty($goodsSkuList[$value['goods_sku_id']]['goods_name']) ? $goodsSkuList[$value['goods_sku_id']]['goods_name'] : ''; $list[$i]['goods_spu_id'] = !empty($goodsSkuList[$value['goods_sku_id']]['goods_spu_id']) ? $goodsSkuList[$value['goods_sku_id']]['goods_spu_id'] : '';
$list[$i]['goods_desc'] = !empty($goodsSkuList[$value['goods_sku_id']]['desc']) ? $goodsSkuList[$value['goods_sku_id']]['desc'] : ''; $list[$i]['original_price'] = !empty($goodsSkuList[$value['goods_sku_id']]['original_price']) ? $goodsSkuList[$value['goods_sku_id']]['original_price']/100 : '';
$list[$i]['goods_spu_id'] = !empty($goodsSkuList[$value['goods_sku_id']]['goods_spu_id']) ? $goodsSkuList[$value['goods_sku_id']]['goods_spu_id'] : ''; $list[$i]['price'] = !empty($goodsSkuList[$value['goods_sku_id']]['price']) ? $goodsSkuList[$value['goods_sku_id']]['price']/100 : '';
$list[$i]['original_price'] = !empty($goodsSkuList[$value['goods_sku_id']]['original_price']) ? $goodsSkuList[$value['goods_sku_id']]['original_price']/100 : ''; $list[$i]['total_amount_order'] = !empty($goodsSkuList[$value['goods_sku_id']]['total_amount_order']) ? $goodsSkuList[$value['goods_sku_id']]['total_amount_order'] : '';
$list[$i]['price'] = !empty($goodsSkuList[$value['goods_sku_id']]['price']) ? $goodsSkuList[$value['goods_sku_id']]['price']/100 : ''; $list[$i]['desc_pic_url'] = !empty($goodsSkuList[$value['goods_sku_id']]['desc_pic_url']) ? GoodsService::getUrlList($goodsSkuList[$value['goods_sku_id']]['desc_pic_url']) : '';
$list[$i]['total_amount_order'] = !empty($goodsSkuList[$value['goods_sku_id']]['total_amount_order']) ? $goodsSkuList[$value['goods_sku_id']]['total_amount_order'] : '';
$list[$i]['desc_pic_url'] = !empty($goodsSkuList[$value['goods_sku_id']]['desc_pic_url']) ? GoodsService::getUrlList($goodsSkuList[$value['goods_sku_id']]['desc_pic_url']) : ''; $shopId = !empty($list[$i]['shop_id']) ? $list[$i]['shop_id'] : '';
$list[$i]['shop_name'] = !empty($subShopList[$shopId]['shop_name']) ? $subShopList[$shopId]['shop_name'] : '';
$shopId = !empty($list[$i]['shop_id']) ? $list[$i]['shop_id'] : ''; $commissionMode = !empty($marketingList[$value['marketing_id']]['commission_mode']) ? $marketingList[$value['marketing_id']]['commission_mode'] : '';
$list[$i]['shop_name'] = !empty($subShopList[$shopId]['shop_name']) ? $subShopList[$shopId]['shop_name'] : '';
$commissionMode = !empty($marketingList[$value['marketing_id']]['commission_mode']) ? $marketingList[$value['marketing_id']]['commission_mode'] : ''; $secondCommission = !empty($marketingList[$value['marketing_id']]['second_commission_value']) ? $marketingList[$value['marketing_id']]['second_commission_value']/100 : 0;
//
$secondCommission = !empty($marketingList[$value['marketing_id']]['second_commission_value']) ? $marketingList[$value['marketing_id']]['second_commission_value']/100 : 0; $list[$i]['share_price'] = 0;
// //比例
$list[$i]['share_price'] = 0; if (!empty($secondCommission) && $commissionMode == 1) {
//比例 $price = !empty($list[$i]['price']) ? $list[$i]['price'] : 0;
if (!empty($secondCommission) && $commissionMode == 1) { $list[$i]['share_price'] = substr(sprintf("%.4f",$secondCommission*$price/100),0,-2);
$price = !empty($list[$i]['price']) ? $list[$i]['price'] : 0; }
$list[$i]['share_price'] = substr(sprintf("%.4f",$secondCommission*$price/100),0,-2);
} //固定
if (!empty($commissionMode) && $commissionMode == 2) {
//固定 $list[$i]['share_price'] = substr(sprintf("%.4f",$secondCommission/100),0,-2);
if (!empty($commissionMode) && $commissionMode == 2) { }
$list[$i]['share_price'] = substr(sprintf("%.4f",$secondCommission/100),0,-2);
}
$content = $userId .'_' .$value['marketing_id']; $content = $userId .'_' .$value['marketing_id'];
$goodsShareId = Aes::encrypt($content); $goodsShareId = Aes::encrypt($content);
$list[$i]['goods_share_code'] = $goodsShareId; $list[$i]['goods_share_code'] = $goodsShareId;
}
$i++; $i++;
} }
......
application/services/shop/ShopService.php
View file @ 12d5d538
...@@ -99,6 +99,11 @@ class ShopService ...@@ -99,6 +99,11 @@ class ShopService
$address = !empty($params['address']) ? $params['address'] : ''; $address = !empty($params['address']) ? $params['address'] : '';
$subShopId = !empty($params['sub_shop_id']) ? $params['sub_shop_id'] : ''; $subShopId = !empty($params['sub_shop_id']) ? $params['sub_shop_id'] : '';
if (empty($lifeAccountId)) {
throw new ShopException(['cus' => 0]);
}
if (!empty($subShopId)) { if (!empty($subShopId)) {
$where['sub_shop_id'] = $subShopId; $where['sub_shop_id'] = $subShopId;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment