From 08ed99effc5d991360242c157cf88db7b7e3f769 Mon Sep 17 00:00:00 2001
From: liqianjin <949671634@qq.com>
Date: Thu, 23 Feb 2023 15:50:46 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90=E5=A2=9E=E5=8A=A0=E3=80=91=E8=B4=AD?=
=?UTF-8?q?=E4=B9=B0=E6=99=AE=E9=80=9A=E5=95=86=E5=93=81=E8=B5=A0=E9=80=81?=
=?UTF-8?q?=E9=92=BB=E7=9F=B3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
addon/fenxiao/model/FenxiaoOrder.php | 60 ++++------------------------
addon/futures/model/Futures.php | 13 ++++--
app/model/goods/Goods.php | 2 +
app/shop/controller/Goods.php | 2 +
app/shop/view/goods/add_goods.html | 9 +++++
app/shop/view/goods/edit_goods.html | 9 +++++
6 files changed, 40 insertions(+), 55 deletions(-)
diff --git a/addon/fenxiao/model/FenxiaoOrder.php b/addon/fenxiao/model/FenxiaoOrder.php
index 443bb1a8..b71be8e9 100644
--- a/addon/fenxiao/model/FenxiaoOrder.php
+++ b/addon/fenxiao/model/FenxiaoOrder.php
@@ -60,29 +60,6 @@ class FenxiaoOrder extends BaseModel
$money = $fenxia_area_order_info['real_goods_money'] * $fenxiao_agent_level['flower_multiple']/100;
$fenxiao_member_account->addMemberAccount($item[ 'site_id' ], $item['member_id'], 'balance_money', $money, 'area', '区域代理结算', '区域代理结算');
-
- // //添加茶果
- // $udata = [
- // 'flower_num' => Db::raw('flower_num -' . $money),
- // 'fruit_num' => Db::raw('fruit_num +' . $fruit_num),
- // ];
- // Db::name('fenxiao')->where([[ 'fenxiao_id', '=', $fenxiao_id ]])->update($udata);
- // $account_model->addAccountLog($fenxiao_id, $item['fenxiao_name'], 'fruit', $fruit_num, '', "代理奖励茶果-{$fruit_num}");
- // $account_model->addAccountLog($fenxiao_id, $item['fenxiao_name'], 'flower', '-' . $money, '', "茶花转茶果{$money}");
- //
- // if($fenxiao_basic_config['data']['value']['agent_level_parent_rate'] > 0){
- // $money = $money * $fenxiao_basic_config['data']['value']['agent_level_parent_rate'] / 100;
- // $fruit_num = $money * $fenxiao_basic_config['data']['value']['fruit_flower_rate'];
- // //添加茶果
- // $udata = [
- // 'flower_num' => Db::raw('flower_num -' . $money),
- // 'fruit_num' => Db::raw('fruit_num +'.$fruit_num)
- // ];
- // $fenxiaoParent = Db::name('fenxiao')->where('fenxiao_id','=',$item['parent'])->alias('fenxiao_name')->find();
- // Db::name('fenxiao')->where([['fenxiao_id','=',$item['parent']]])->update($udata);
- // $account_model->addAccountLog($item['parent'],$fenxiaoParent['fenxiao_name'],'fruit',$fruit_num,'',"推荐代理奖励茶果-{$fruit_num}");
- // $account_model->addAccountLog($item['parent'],$fenxiaoParent['fenxiao_name'], 'flower', '-' . $money, '', "茶花转茶果{$money}");
- // }
}
return $this->success();
}
@@ -126,8 +103,9 @@ class FenxiaoOrder extends BaseModel
//获取分销等级
foreach ($order_goods as $k => $v) {
//商品信息管理
- $goods_info = model("goods")->getInfo([ [ 'goods_id', '=', $v[ 'goods_id' ] ] ], 'is_fenxiao, fenxiao_type');
+ $goods_info = model("goods")->getInfo([ [ 'goods_id', '=', $v[ 'goods_id' ] ] ], 'is_fenxiao, fenxiao_type,give_diamond');
if ($goods_info[ 'is_fenxiao' ] != 1) {
+ $order['give_diamond'] += $goods_info['give_diamond'];
continue;
}
@@ -266,11 +244,12 @@ class FenxiaoOrder extends BaseModel
'three_fenxiao_name' => empty($grand_parent_fenxiao_info) ? '' : $grand_parent_fenxiao_info[ 'fenxiao_name' ],
'create_time' => time()
];
- if($order['promotion_type'] != 'pointexchange'){
- $this->orderGive($data);
- }
+
model("fenxiao_order")->add($data);
}
+ if($order['promotion_type'] != 'futures'){
+ $this->orderGive($order);
+ }
// 分销商检测升级
event('FenxiaoUpgrade', $member_info[ 'fenxiao_id' ]);
@@ -291,31 +270,8 @@ class FenxiaoOrder extends BaseModel
if (!$id) {
$i_fenxiao = model('fenxiao')->getInfo(['member_id' => $order['member_id'], 'site_id' => $order['site_id']], 'fenxiao_id,fenxiao_name,parent,grand_parent');
if ($i_fenxiao) {
- $config_model = new Config();
- $basic_config = $config_model->getFenxiaoBasicsConfig($order['site_id'])['data']['value'];
- $fenxiao_account = new FenxiaoAccount();
- $fenxiao_account->addAccount($i_fenxiao['fenxiao_id'], $i_fenxiao['fenxiao_name'], 'points', $order['real_goods_money'] * $basic_config['order_give_points_ratio'] /100, $order['order_id'],'points', '购物赠送积分');
- $fenxiao_account->addAccount($i_fenxiao['fenxiao_id'], $i_fenxiao['fenxiao_name'], 'contribution', $order['real_goods_money'] * $basic_config['order_give_contribution_ratio'] /100, $order['order_id'],'contribution', '购物赠送贡献值');
- $fenxiao_account->addAccount($i_fenxiao['fenxiao_id'], $i_fenxiao['fenxiao_name'], 'house_purchase', $order['real_goods_money'] * $basic_config['order_give_house_purchase_ratio'] /100, $order['order_id'],'house_purchase', '购物赠送购房券');
-
- $parent_fenxiao['parent'] = $i_fenxiao['parent'];
- for($i = 0;$i < 4;$i++){
- if($parent_fenxiao['parent'] <= 0){
- break;
- }
- $parent_fenxiao = model('fenxiao')->getInfo(['fenxiao_id' => $parent_fenxiao['parent']], 'fenxiao_id,fenxiao_name,parent,grand_parent');
- if(!$parent_fenxiao){
- break;
- }
- if($i == 0){
- $fenxiao_account->addAccount($parent_fenxiao['fenxiao_id'], $parent_fenxiao['fenxiao_name'], 'points', $order['real_goods_money'] * $basic_config['order_give_a_points_ratio'] /100, $order['order_id'],'points', '用户下单分享A位置获赠积分');
- $fenxiao_account->addAccount($parent_fenxiao['fenxiao_id'], $parent_fenxiao['fenxiao_name'], 'contribution', $order['real_goods_money'] * $basic_config['order_give_a_contribution_ratio'] /100, $order['order_id'],'contribution', '用户下单分享A位置获赠贡献值');
- }
- if($i == 3){
- $fenxiao_account->addAccount($parent_fenxiao['fenxiao_id'], $parent_fenxiao['fenxiao_name'], 'points', $order['real_goods_money'] * $basic_config['order_give_d_points_ratio'] /100, $order['order_id'],'points', '用户下单分享D位置获赠积分');
- $fenxiao_account->addAccount($parent_fenxiao['fenxiao_id'], $parent_fenxiao['fenxiao_name'], 'contribution', $order['real_goods_money'] * $basic_config['order_give_d_contribution_ratio'] /100, $order['order_id'],'contribution', '用户下单分享D位置获赠贡献值');
- }
- }
+ $fenxiao_account = new FenxiaoAccount;
+ $fenxiao_account->addAccount($i_fenxiao['fenxiao_id'], $i_fenxiao['fenxiao_name'], 'diamond', $order['give_diamond'], $order['order_id'],'diamond', '商品下单赠送');
}
}
return $this->success();
diff --git a/addon/futures/model/Futures.php b/addon/futures/model/Futures.php
index 0c1353c6..df0b2e3b 100644
--- a/addon/futures/model/Futures.php
+++ b/addon/futures/model/Futures.php
@@ -85,9 +85,18 @@ class Futures extends BaseModel{
* @return array
*/
public function orderComplete($id){
+ $date = model('futures')->getInfo([['id', '=', $id]]);
model('futures')->update([
'status' => 3,
], [['id', '=', $id]]);
+ model('')->add([
+ 'site_id' => $date['site_id'],
+ 'seller_uid' => $date['member_id'],
+ 'goods_id' => (int)$date['goods_id'],
+ 'total' => (int)$date['total'],
+ 'unit_price' => $date['price'],
+ 'status' => 1,
+ 'created_time' => time()]);
return $this->success();
}
@@ -97,9 +106,7 @@ class Futures extends BaseModel{
*/
public function orderClose($id){
model('futures')->update([
- 'status' => 7,
- 'member_id' => 0,
- 'order_id' => 0
+ 'status' => 1,
], [['id', '=', $id]]);
Cache::store('redis_concurrent')->set('addon_futures_'.$id,'1');
return $this->success();
diff --git a/app/model/goods/Goods.php b/app/model/goods/Goods.php
index 437ce4bf..27fb80ef 100644
--- a/app/model/goods/Goods.php
+++ b/app/model/goods/Goods.php
@@ -110,6 +110,7 @@ class Goods extends BaseModel
'barrage_show' => $data['barrage_show'] ?? 1,
'alipay_stages' => $data['alipay_stages'] ?? 0,
'is_unify_pirce' => $data['is_unify_pirce'] ?? 1,
+ 'give_diamond' => $data['give_diamond'] ?? 0,
];
$common_data = array (
'goods_name' => $data[ 'goods_name' ],
@@ -304,6 +305,7 @@ class Goods extends BaseModel
'alipay_stages' => $data['alipay_stages'] ?? 0,
'support_trade_type' => $data['support_trade_type'] ?? '',
'is_unify_pirce' => $data['is_unify_pirce'] ?? 1,
+ 'give_diamond' => $data['give_diamond'] ?? 0,
];
$common_data = array (
'goods_name' => $data[ 'goods_name' ],
diff --git a/app/shop/controller/Goods.php b/app/shop/controller/Goods.php
index f0a577f0..6d7e906d 100644
--- a/app/shop/controller/Goods.php
+++ b/app/shop/controller/Goods.php
@@ -308,6 +308,7 @@ class Goods extends BaseShop
'sale_channel' => input('sale_channel','all'),
'sale_store' => input('sale_store','all'),
'is_unify_pirce' => input('is_unify_pirce','1'),
+ 'give_diamond' => input('give_diamond','0'),
];
$goods_model = new GoodsModel();
$res = $goods_model->addGoods($data);
@@ -445,6 +446,7 @@ class Goods extends BaseShop
'sale_channel' => input('sale_channel','all'),
'sale_store' => input('sale_store','all'),
'is_unify_pirce' => input('is_unify_pirce','1'),
+ 'give_diamond' => input('give_diamond','0'),
];
$res = $goods_model->editGoods($data);
diff --git a/app/shop/view/goods/add_goods.html b/app/shop/view/goods/add_goods.html
index 8f3598a0..f9100ebd 100644
--- a/app/shop/view/goods/add_goods.html
+++ b/app/shop/view/goods/add_goods.html
@@ -354,6 +354,15 @@
商品没有优惠活动显示的划线价格，如果商品有折扣等优惠活动划线价显示销售价
+
+