feat: 添加库存类型参数和库存处理逻辑
This commit is contained in:
parent
d48ee7b613
commit
975a296b46
@ -98,15 +98,16 @@ class StoreProductController extends BaseAdminController
|
||||
{
|
||||
$product_arr = $this->request->post('product_arr');
|
||||
$store_arr = $this->request->post('store_arr');
|
||||
$stock_type = $this->request->post('stock_type',1);
|
||||
if (count($store_arr) == 1) {
|
||||
$store_id = $store_arr[0];
|
||||
foreach ($product_arr as $key => $arr) {
|
||||
Redis::send('store-storage', ['product_arr' => $arr, 'store_id' => $store_id, 'admin_id' => $this->adminId]);
|
||||
Redis::send('store-storage', ['product_arr' => $arr, 'store_id' => $store_id,'stock_type'=>$stock_type, 'admin_id' => $this->adminId]);
|
||||
}
|
||||
} else {
|
||||
foreach ($product_arr as $key => $arr) {
|
||||
foreach ($store_arr as $k => $store_id) {
|
||||
Redis::send('store-storage', ['product_arr' => $arr, 'store_id' => $store_id, 'admin_id' => $this->adminId]);
|
||||
Redis::send('store-storage', ['product_arr' => $arr, 'store_id' => $store_id,'stock_type'=>$stock_type, 'admin_id' => $this->adminId]);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@ -56,9 +56,14 @@ class StoreOrderLogic extends BaseLogic
|
||||
$cart_select[$k]['price'] = $find['price'];
|
||||
$cart_select[$k]['total_price'] = bcmul($v['cart_num'], $find['price'], 2); //订单总价
|
||||
$cart_select[$k]['deduction_price'] =self::$activity_price;//抵扣金额
|
||||
|
||||
|
||||
if ($user && $user['user_ship'] == 4) {
|
||||
$deduction_price_count=bcmul(bcsub($find['price'], $find['cost'], 2),$v['cart_num'],2);
|
||||
$cart_select[$k]['deduction_price'] =$deduction_price_count;
|
||||
self::$activity_price = bcadd(self::$activity_price, $deduction_price_count, 2);
|
||||
}
|
||||
//利润
|
||||
$cart_select[$k]['profit'] = bcmul($cart_select[$k]['total_price'],0.05,2); //利润
|
||||
// $cart_select[$k]['profit'] = bcmul($cart_select[$k]['total_price'],0.05,2); //利润
|
||||
$cart_select[$k]['cost'] = bcmul($v['cart_num'], $find['cost'], 2) ?? 0; //成本
|
||||
$cart_select[$k]['pay_price'] = bcmul($v['cart_num'], $find['price'], 2); //订单支付金额
|
||||
$cart_select[$k]['product_id'] = $find['product_id'];
|
||||
@ -84,10 +89,10 @@ class StoreOrderLogic extends BaseLogic
|
||||
self::$total_price = bcadd(self::$total_price, $cart_select[$k]['total_price'], 2);
|
||||
self::$pay_price = bcadd(self::$pay_price, $cart_select[$k]['pay_price'], 2);
|
||||
self::$cost = bcadd(self::$cost, $cart_select[$k]['cost'], 2);
|
||||
self::$profit = bcadd(self::$profit, $cart_select[$k]['profit'], 2);
|
||||
// self::$profit = bcadd(self::$profit, $cart_select[$k]['profit'], 2);
|
||||
}
|
||||
//TODO 收单打9.9折 会员按照比例打折 等级按照充值去升级
|
||||
$pay_price = self::$pay_price;
|
||||
$pay_price = bcsub(self::$pay_price, self::$activity_price, 2); //减去活动优惠金额
|
||||
$vipPrice = 0;
|
||||
//成本价 收益
|
||||
$order = [
|
||||
@ -95,7 +100,7 @@ class StoreOrderLogic extends BaseLogic
|
||||
'order_id' =>$params['order_id'] ?? getNewOrderId('PF'),
|
||||
'total_price' => self::$total_price, //总价
|
||||
'cost' => self::$cost,//成本价
|
||||
'profit' => self::$profit,//利润
|
||||
'profit' => 0,//利润
|
||||
'pay_price' => $pay_price,//后期可能有降价抵扣
|
||||
'vip_price' => $vipPrice,
|
||||
'total_num' => count($cart_select),//总数
|
||||
|
||||
@ -0,0 +1,24 @@
|
||||
<?php
|
||||
|
||||
namespace app\common\model\store_branch_product_exchange;
|
||||
|
||||
|
||||
use app\common\model\BaseModel;
|
||||
use app\common\model\store_category\StoreCategory;
|
||||
use app\common\model\store_product\StoreProduct;
|
||||
use app\common\model\store_product_unit\StoreProductUnit;
|
||||
use think\model\concern\SoftDelete;
|
||||
|
||||
|
||||
/**
|
||||
* 门店兑换商品属性值辅助表模型
|
||||
* Class StoreBranchProductExchange
|
||||
* @package app\common\model\store_branch_product_exchange
|
||||
*/
|
||||
class StoreBranchProductExchange extends BaseModel
|
||||
{
|
||||
use SoftDelete;
|
||||
protected $name = 'store_branch_product_exchange';
|
||||
protected $deleteTime = 'delete_time';
|
||||
|
||||
}
|
||||
@ -5,6 +5,7 @@ namespace app\queue\redis;
|
||||
use app\admin\logic\store_product\StoreProductLogic;
|
||||
use app\common\model\store_branch_product\StoreBranchProduct;
|
||||
use app\common\model\store_branch_product_attr_value\StoreBranchProductAttrValue;
|
||||
use app\common\model\store_branch_product_exchange\StoreBranchProductExchange;
|
||||
use app\common\model\store_product\StoreProduct;
|
||||
use app\common\model\store_product_attr_value\StoreProductAttrValue;
|
||||
use app\common\model\system_store_storage\SystemStoreStorage;
|
||||
@ -28,9 +29,18 @@ class StoreStorageSend implements Consumer
|
||||
{
|
||||
$product_arr = $data['product_arr'];
|
||||
$store_id = $data['store_id'];
|
||||
$stock_type = $data['stock_type'];
|
||||
$admin_id = $data['admin_id'];
|
||||
Log::error('StoreStorageSend: ' . json_encode($data));
|
||||
$find = StoreProduct::where('id', $product_arr['id'])->findOrEmpty()->toArray();
|
||||
if($stock_type == 1){
|
||||
$this->ordinary($product_arr,$store_id,$admin_id,$find);
|
||||
}elseif($stock_type == 2){
|
||||
$this->exchange($product_arr,$store_id,$admin_id,$find);
|
||||
}
|
||||
}
|
||||
|
||||
/**普通 */
|
||||
public function ordinary($product_arr,$store_id,$admin_id,$find){
|
||||
$store_find = StoreBranchProduct::where(['product_id' => $product_arr['id'], 'store_id' => $store_id])->findOrEmpty()->toArray();
|
||||
if ($find && !$store_find) {
|
||||
$attr_value = StoreProductAttrValue::where('product_id', $product_arr['id'])->findOrEmpty();
|
||||
@ -89,13 +99,63 @@ class StoreStorageSend implements Consumer
|
||||
}
|
||||
}
|
||||
|
||||
public function storage($find, $store_id, $admin_id, $product_arr)
|
||||
/**兑换 */
|
||||
public function exchange($product_arr,$store_id,$admin_id,$find){
|
||||
$store_find = StoreBranchProductExchange::where(['product_id' => $product_arr['id'], 'store_id' => $store_id])->findOrEmpty()->toArray();
|
||||
if ($find && !$store_find) {
|
||||
Db::startTrans();
|
||||
try {
|
||||
$product = [
|
||||
'product_id' => $find['id'],
|
||||
'image' => $find['image'],
|
||||
'store_name' => $find['store_name'],
|
||||
'store_info' => $find['store_info'],
|
||||
'keyword' => $find['keyword'],
|
||||
'bar_code' => $find['bar_code'],
|
||||
'cate_id' => $find['cate_id'],
|
||||
'price' => $find['price'],
|
||||
'cost' => $find['cost'],
|
||||
'vip_price' => $find['vip_price'],
|
||||
'unit' => $find['unit'],
|
||||
'store_id' => $store_id,
|
||||
'sales' => 0,
|
||||
'stock' => 0,
|
||||
];
|
||||
StoreBranchProduct::create($product);
|
||||
if ($product_arr['stock'] > 0) {
|
||||
$this->storage($find, $store_id, $admin_id, $product_arr);
|
||||
}
|
||||
// StoreProductLogic::updateGoodsclass($find['cate_id'],$store_id);
|
||||
Db::commit();
|
||||
return true;
|
||||
} catch (\Exception $e) {
|
||||
Db::rollback();
|
||||
Log::error('store-storage队列消费失败: ' . $e->getMessage() . ',line:' . $e->getLine() . ',file:' . $e->getFile());
|
||||
return false;
|
||||
}
|
||||
} else {
|
||||
Db::startTrans();
|
||||
try {
|
||||
if ($product_arr['stock'] > 0) {
|
||||
$this->storage($find, $store_id, $admin_id, $product_arr);
|
||||
}
|
||||
Db::commit();
|
||||
return true;
|
||||
} catch (\Exception $e) {
|
||||
Db::rollback();
|
||||
Log::error('store-storage队列消费失败: ' . $e->getMessage() . ',line:' . $e->getLine() . ',file:' . $e->getFile());
|
||||
return false;
|
||||
}
|
||||
}
|
||||
}
|
||||
public function storage($find, $store_id, $admin_id, $product_arr,$stock_type=1)
|
||||
{
|
||||
$storage = [
|
||||
'product_id' => $product_arr['id'],
|
||||
'store_id' => $store_id,
|
||||
'nums' => $product_arr['stock'],
|
||||
'admin_id' => $admin_id,
|
||||
'type' => $stock_type,
|
||||
];
|
||||
if ($find['stock'] < $product_arr['stock']) {
|
||||
$storage['status'] = -1;
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user