lvdongyang
/
jh-admin
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

修改会员价格前端不显示 

添加平级奖
This commit is contained in:
liqianjin 2025-03-27 18:03:21 +08:00
parent a900a6b19a
commit 3437066215
17 changed files with 80 additions and 63 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
addon/fenxiao/model/Config.php
View File

@ -46,6 +46,7 @@ class Config extends BaseModel
'founder_rate' => $data[ 'founder_rate' ],//创始人分红比例
'four_rate' => $data[ 'four_rate' ],//创始人分红比例
'weight_rate' => $data[ 'weight_rate' ],//创始人分红比例
'sideways_rate' => $data[ 'sideways_rate' ],//平级奖比例
];
$config->setConfig($basics_data, '分销基本配置', $is_use, [ [ 'site_id', '=', $site_id ], [ 'app_module', '=', 'shop' ], [ 'config_key', '=', 'FENXIAO_BASICS_CONFIG' ] ]);
//分销商设置
@ -96,7 +97,8 @@ class Config extends BaseModel
'founder_rate' => 0,//是否开启商品详情一级佣金
'four_rate' => 0,//是否开启商品详情一级佣金
'time' => 1,//加权分红时间段
'weight_rate' => 0//加权分红比例
'weight_rate' => 0,//加权分红比例
'sideways_rate' => 0//平级奖比例
];
}
$res[ 'data' ][ 'value' ][ 'is_commission_money' ] = $res[ 'data' ][ 'value' ][ 'is_commission_money' ] ?? 1;
@ -111,6 +113,7 @@ class Config extends BaseModel
$res[ 'data' ][ 'value' ][ 'return' ] = $res[ 'data' ][ 'value' ][ 'return' ] ?? 1;
$res[ 'data' ][ 'value' ][ 'time' ] = $res[ 'data' ][ 'value' ][ 'time' ] ?? 1;
$res[ 'data' ][ 'value' ][ 'weight_rate' ] = $res[ 'data' ][ 'value' ][ 'weight_rate' ] ?? 0;
$res[ 'data' ][ 'value' ][ 'sideways_rate' ] = $res[ 'data' ][ 'value' ][ 'sideways_rate' ] ?? 0;
return $res;
}

2
addon/fenxiao/model/FenxiaoOrder.php
View File

@ -88,13 +88,11 @@ class FenxiaoOrder extends BaseModel
$goods_info = model('goods')->getInfo([['goods_id','=',$v['goods_id']]],'is_fenxiao, fenxiao_type,goods_kind_id');
//报单商品才有直推和间推
if($goods_info['goods_kind_id']){
$order_fenxiao_data = $this->getPushFenXiaoCommission($fenxiao_info,$v,$order_fenxiao_data,$goods_info['fenxiao_type'],$fenxiao_basic_config);
}
$order_fenxiao_data = $this->getWholesaleFenXiaoCommission($fenxiao_info,$v,$order_fenxiao_data,$fenxiao_basic_config,$goods_info['goods_kind_id'],$goods_info['fenxiao_type']);
if(($order_fenxiao_data['commission'] && $order_fenxiao_data['commission_rate']) || $order_fenxiao_data['wholesale_rate'] || $order_fenxiao_data['founder_rate']){
$data = [
'order_id' => $order['order_id'],

1
addon/fenxiao/shop/controller/Config.php
View File

@ -56,6 +56,7 @@ class Config extends BaseShop
'indirect_rate' => input('indirect_rate', 0.00),
'founder_rate' => input('founder_rate', 0.00),
'weight_rate' => input('weight_rate', 0.00),
'sideways_rate' => input('sideways_rate', 0.00),//平级奖
'is_support_cashier' => input('is_support_cashier', 0)
];
$res = $model->setFenxiaoBasicsConfig($data, 1, $this->site_id);

12
addon/fenxiao/shop/view/config/basics.html
View File

@ -300,6 +300,18 @@
<p>根据设置时间按时给最高等级分销商分红</p>
</div>
</div>
<div class="fenxiao-rate">
<div class="layui-form-item">
<label class="layui-form-label"><span class="required">*</span>平级奖比例：</label>
<div class="layui-input-inline">
<input type="number" min="0" name="sideways_rate" value="{$basics_info.sideways_rate ?? 0}" lay-verify="sideways_rate" autocomplete="off" class="layui-input len-short">
</div>
<div class="layui-form-mid">%</div>
</div>
<div class="word-aux">
<p>会员购买后与会员同分销等级分销商的分红比例</p>
</div>
</div>
</div>
</div>

4
addon/fenxiao/shop/view/level/add.html
View File

@ -340,10 +340,12 @@
$(this).addClass("border-color");
$(".level-term>div").eq(_index).removeClass("layui-hide");
if ($(this).find("input").val() == 1) {
$(".level-term>div").eq(_index).find("input").attr("lay-verify", "required|num");
} else {
$(".level-term>div").eq(_index).find("input").attr("lay-verify", "required|money");
}
$('input[name="one_child_fenxiao_equal"]').removeAttr('lay-verify');
}
});
@ -396,7 +398,7 @@
num: function(value, item) {
var str = $(item).parents(".layui-form-item").find("label").text().split("*").join("");
str = str.substring(0, str.length - 1);
console.log(item,'item');
if (value <= 0) {
return str + '必须大于0';
}

1
addon/fenxiao/shop/view/level/edit.html
View File

@ -421,6 +421,7 @@
} else {
$(".level-term>div").eq(_index).find("input").attr("lay-verify", "required|money");
}
$('input[name="one_child_fenxiao_equal"]').removeAttr('lay-verify');
}
});

6
addon/store/model/StoreOrderCreate.php
View File

@ -344,8 +344,8 @@ class StoreOrderCreate extends OrderCreate
$v[ 'num' ] = $num;
$site_id = $v[ 'site_id' ];
$price_result = $goods_model->getGoodsPrice($v[ 'sku_id' ], $member_id);
$price_info = $price_result[ 'data' ];
// $price_result = $goods_model->getGoodsPrice($v[ 'sku_id' ], $member_id);
// $price_info = $price_result[ 'data' ];
$price = $price_info[ 'price' ];
$v[ 'price' ] = $price;
$v[ 'goods_money' ] = $price * $v[ 'num' ];
@ -556,4 +556,4 @@ class StoreOrderCreate extends OrderCreate
return $result;
}
}
}

2
addon/store/model/cashier/CashierOrderCreate.php
View File

@ -823,4 +823,4 @@ class CashierOrderCreate extends OrderCommonCreate
}
return $this->error();
}
}
}

2
addon/virtualcard/model/VirtualGoods.php
View File

@ -1086,4 +1086,4 @@ class VirtualGoods extends BaseModel
return $this->error('', $e->getMessage());
}
}
}
}

14
app/api/controller/Cart.php
View File

@ -121,7 +121,7 @@ class Cart extends BaseApi
$field = 'ngc.cart_id, ngc.site_id, ngc.member_id, ngc.sku_id, ngc.num, ngs.sku_name,ngs.goods_id,
ngs.sku_no, ngs.sku_spec_format,ngs.price,ngs.market_price, ngs.goods_spec_format,
ngs.discount_price, ngs.promotion_type, ngs.start_time, ngs.end_time, ngs.stock,
ngs.sku_image, ngs.sku_images, ngs.goods_state, ngs.goods_stock_alarm, ngs.is_virtual, ngs.goods_name, ngs.is_consume_discount, ngs.discount_config, ngs.member_price, ngs.discount_method,
ngs.sku_image, ngs.sku_images, ngs.goods_state, ngs.goods_stock_alarm, ngs.is_virtual, ngs.goods_name, ngs.is_consume_discount, ngs.discount_config, , ngs.discount_method,
ngs.virtual_indate, ngs.is_free_shipping, ngs.shipping_template, ngs.unit, ngs.introduction,ngs.sku_spec_format, ngs.keywords, ngs.max_buy, ngs.min_buy, ns.site_name, ngs.is_limit, ngs.limit_type';
$join = [
[ 'goods_cart ngc', 'ngc.sku_id = ngs.sku_id', 'inner' ],
@ -140,9 +140,9 @@ class Cart extends BaseApi
}
$list = $goods->getGoodsSkuList($condition, $field, 'ngc.cart_id desc', null, 'ngs', $join);
if (!empty($list[ 'data' ])) {
$list[ 'data' ] = $goods->getGoodsListMemberPrice($list[ 'data' ], $this->member_id);
}
// if (!empty($list[ 'data' ])) {
// $list[ 'data' ] = $goods->getGoodsListMemberPrice($list[ 'data' ], $this->member_id);
// }
return $this->response($list);
}
@ -207,8 +207,8 @@ class Cart extends BaseApi
$goods = new Goods();
foreach ($list[ 'data' ] as $k => $v) {
// 是否参与会员等级折扣
$goods_member_price = $goods->getGoodsPrice($v[ 'sku_id' ], $this->member_id, $this->store_id);
$goods_member_price = $goods_member_price[ 'data' ];
// $goods_member_price = $goods->getGoodsPrice($v[ 'sku_id' ], $this->member_id, $this->store_id);
// $goods_member_price = $goods_member_price[ 'data' ];
if (!empty($goods_member_price[ 'member_price' ]) && $goods_member_price[ 'member_price' ] < $v[ 'discount_price' ]) {
$list[ 'data' ][ $k ][ 'discount_price' ] = $goods_member_price[ 'price' ];
}
@ -271,4 +271,4 @@ class Cart extends BaseApi
$res = $cart->editCartSku($data);
return $this->response($res);
}
}
}

8
app/api/controller/Goodsbrowse.php
View File

@ -77,7 +77,7 @@ class Goodsbrowse extends BaseApi
];
$alias = 'ngb';
$field = 'ngb.id,ngb.member_id,ngb.browse_time,ngb.sku_id,ngs.sku_image,ngs.discount_price,ngs.sku_name,ng.goods_id,ng.goods_name,ng.goods_image,(ngs.sale_num + ngs.virtual_sale) as sale_num,ngs.is_free_shipping,ngs.promotion_type,ngs.member_price,ngs.price,ngs.market_price,ngs.is_virtual,ng.goods_image,ng.sale_show,ng.market_price_show,ngs.unit';
$field = 'ngb.id,ngb.member_id,ngb.browse_time,ngb.sku_id,ngs.sku_image,ngs.discount_price,ngs.sku_name,ng.goods_id,ng.goods_name,ng.goods_image,(ngs.sale_num + ngs.virtual_sale) as sale_num,ngs.is_free_shipping,ngs.promotion_type,,ngs.price,ngs.market_price,ngs.is_virtual,ng.goods_image,ng.sale_show,ng.market_price_show,ngs.unit';
$join = [
[
'goods ng',
@ -105,8 +105,8 @@ class Goodsbrowse extends BaseApi
$res[ 'data' ][ 'list' ][ $k ][ 'sale_num' ] = numberFormat($res[ 'data' ][ 'list' ][ $k ][ 'sale_num' ]);
if ($token[ 'code' ] >= 0) {
// 是否参与会员等级折扣
$goods_member_price = $goods->getGoodsPrice($v[ 'sku_id' ], $this->member_id);
$goods_member_price = $goods_member_price[ 'data' ];
// $goods_member_price = $goods->getGoodsPrice($v[ 'sku_id' ], $this->member_id);
// $goods_member_price = $goods_member_price[ 'data' ];
if (!empty($goods_member_price[ 'member_price' ])) {
$res[ 'data' ][ 'list' ][ $k ][ 'member_price' ] = $goods_member_price[ 'price' ];
} else {
@ -120,4 +120,4 @@ class Goodsbrowse extends BaseApi
return $this->response($res);
}
}
}

2
app/api/controller/Goodscollect.php
View File

@ -120,4 +120,4 @@ class Goodscollect extends BaseApi
return $this->response($res);
}
}
}

68
app/api/controller/Goodssku.php
View File

@ -63,10 +63,10 @@ class Goodssku extends BaseApi
$token = $this->checkToken();
if ($token['code'] >= 0) {
// 是否参与会员等级折扣
$goods_member_price = $goods->getGoodsPrice($sku_id, $this->member_id)['data'];
if (!empty($goods_member_price['member_price'])) {
$info['data']['member_price'] = $goods_member_price['member_price'];
}
// $goods_member_price = $goods->getGoodsPrice($sku_id, $this->member_id)['data'];
// if (!empty($goods_member_price['member_price'])) {
// $info['data']['member_price'] = $goods_member_price['member_price'];
// }
if ($info['data']['is_limit'] && $info['data']['limit_type'] == 2 && $info['data']['max_buy'] > 0) $res['goods_sku_detail']['purchased_num'] = $goods->getGoodsPurchasedNum($info['data']['goods_id'], $this->member_id);
}
@ -150,10 +150,10 @@ class Goodssku extends BaseApi
$token = $this->checkToken();
if ($token['code'] >= 0) {
// 是否参与会员等级折扣
$goods_member_price = $goods->getGoodsPrice($goods_sku_detail['sku_id'], $this->member_id, $this->store_id)['data'];
if (!empty($goods_member_price['member_price'])) {
$res['goods_sku_detail']['member_price'] = $goods_member_price['member_price'];
}
// $goods_member_price = $goods->getGoodsPrice($goods_sku_detail['sku_id'], $this->member_id, $this->store_id)['data'];
// if (!empty($goods_member_price['member_price'])) {
// $res['goods_sku_detail']['member_price'] = $goods_member_price['member_price'];
// }
if ($goods_sku_detail['is_limit'] && $goods_sku_detail['limit_type'] == 2 && $goods_sku_detail['max_buy'] > 0) {
$res['goods_sku_detail']['purchased_num'] = $goods->getGoodsPurchasedNum($goods_sku_detail['goods_id'], $this->member_id);
}
@ -243,10 +243,10 @@ class Goodssku extends BaseApi
foreach ($list['data'] as $k => $v) {
if ($token['code'] >= 0) {
// 是否参与会员等级折扣
$goods_member_price = $goods->getGoodsPrice($v['sku_id'], $this->member_id, $this->store_id)['data'];
if (!empty($goods_member_price['member_price'])) {
$list['data'][$k]['member_price'] = $goods_member_price['member_price'];
}
// $goods_member_price = $goods->getGoodsPrice($v['sku_id'], $this->member_id, $this->store_id)['data'];
// if (!empty($goods_member_price['member_price'])) {
// $list['data'][$k]['member_price'] = $goods_member_price['member_price'];
// }
if (addon_is_exit('supermember')) {
$member_model = new MemberModel();
$member_info = $member_model->getMemberInfo([['member_id', '=', $this->member_id, ['site_id', '=', $this->site_id]]], 'member_level_type')['data'];
@ -311,10 +311,10 @@ class Goodssku extends BaseApi
$token = $this->checkToken();
if ($token['code'] >= 0) {
// 是否参与会员等级折扣
$goods_member_price = $goods->getGoodsPrice($sku_id, $this->member_id, $this->store_id)['data'];
if (!empty($goods_member_price['member_price'])) {
$goods_sku_detail['data']['member_price'] = $goods_member_price['member_price'];
}
// $goods_member_price = $goods->getGoodsPrice($sku_id, $this->member_id, $this->store_id)['data'];
// if (!empty($goods_member_price['member_price'])) {
// $goods_sku_detail['data']['member_price'] = $goods_member_price['member_price'];
// }
if ($goods_sku_detail['data']['max_buy'] > 0) $goods_sku_detail['data']['purchased_num'] = $goods->getGoodsPurchasedNum($goods_sku_detail['data']['goods_id'], $this->member_id);
}
return $this->response($goods_sku_detail);
@ -357,10 +357,10 @@ class Goodssku extends BaseApi
foreach ($list['data'] as $k => $v) {
if ($token['code'] >= 0) {
// 是否参与会员等级折扣
$goods_member_price = $goods->getGoodsPrice($v['sku_id'], $this->member_id, $this->store_id)['data'];
if (!empty($goods_member_price['member_price'])) {
$list['data'][$k]['member_price'] = $goods_member_price['member_price'];
}
// $goods_member_price = $goods->getGoodsPrice($v['sku_id'], $this->member_id, $this->store_id)['data'];
// if (!empty($goods_member_price['member_price'])) {
// $list['data'][$k]['member_price'] = $goods_member_price['member_price'];
// }
}
}
@ -484,7 +484,7 @@ class Goodssku extends BaseApi
$condition[] = ['g.is_delete', '=', 0];
$alias = 'gs';
$field = 'gs.is_consume_discount,gs.discount_config,gs.discount_method,gs.member_price,gs.goods_id,gs.sort,gs.sku_id,gs.sku_name,gs.price,
$field = 'gs.is_consume_discount,gs.discount_config,gs.discount_method,gs.goods_id,gs.sort,gs.sku_id,gs.sku_name,gs.price,
gs.market_price,gs.discount_price,gs.stock,(g.sale_num + g.virtual_sale) as sale_num,(gs.sale_num + gs.virtual_sale) as sale_sort,
gs.sku_image,gs.goods_name,gs.site_id,gs.is_free_shipping,gs.introduction,gs.promotion_type,g.goods_image,g.promotion_addon,gs.is_virtual,
g.goods_spec_format,g.recommend_way,gs.max_buy,gs.min_buy,gs.unit,gs.is_limit,gs.limit_type,g.label_name,g.stock_show,g.sale_show,
@ -514,12 +514,12 @@ class Goodssku extends BaseApi
$goods_list_config = $config_model->getGoodsListConfig($this->site_id, $this->app_module)['data']['value'];
$list['data']['config'] = $goods_list_config;
}
$token = $this->checkToken();
if ($token['code'] >= 0) {
if (!empty($list['data']['list'])) {
$list['data']['list'] = $goods->getGoodsListMemberPrice($list['data']['list'], $this->member_id);
}
}
// $token = $this->checkToken();
// if ($token['code'] >= 0) {
// if (!empty($list['data']['list'])) {
// $list['data']['list'] = $goods->getGoodsListMemberPrice($list['data']['list'], $this->member_id);
// }
// }
return $this->response($list);
}
@ -597,9 +597,9 @@ class Goodssku extends BaseApi
}
$goods = new Goods();
$list = $goods->getGoodsSkuPageList($condition, $page, $page_size, $order_by, $field, $alias, $join);
if (!empty($list['data']['list']) && $token['code'] >= 0) {
$list['data']['list'] = $goods->getGoodsListMemberPrice($list['data']['list'], $this->member_id);
}
// if (!empty($list['data']['list']) && $token['code'] >= 0) {
// $list['data']['list'] = $goods->getGoodsListMemberPrice($list['data']['list'], $this->member_id);
// }
return $this->response($list);
}
@ -680,9 +680,9 @@ class Goodssku extends BaseApi
}
$goods = new Goods();
$list = $goods->getGoodsSkuList($condition, $field, $order_by, $num, $alias, $join);
if (!empty($list['data']) && $token['code'] >= 0) {
$list['data'] = $goods->getGoodsListMemberPrice($list['data'], $this->member_id);
}
// if (!empty($list['data']) && $token['code'] >= 0) {
// $list['data'] = $goods->getGoodsListMemberPrice($list['data'], $this->member_id);
// }
return $this->response($list);
}
@ -756,7 +756,7 @@ class Goodssku extends BaseApi
}
$list = $goods->getGoodsSkuPageList($condition, $page, $page_size, $order_by, $field, $alias, $join,'gs.sku_id');
if (!empty($list['data']['list'])) {
$list['data']['list'] = $goods->getGoodsListMemberPrice($list['data']['list'], $this->member_id);
// $list['data']['list'] = $goods->getGoodsListMemberPrice($list['data']['list'], $this->member_id);
$list['data']['config'] = $guess_you_like;
}
Cache::tag('goods_sku_recommend')->set($json_encode, $list, 600);

4
app/model/cart/CartCalculate.php
View File

@ -81,8 +81,8 @@ class CartCalculate extends BaseModel
foreach ($goods_list as $k => $v) {
$item_num = $sku_num_list[ $v[ 'sku_id' ] ];
$price_result = $goods_model->getGoodsPrice($v[ 'sku_id' ], $member_id);
$price_info = $price_result[ 'data' ];
// $price_result = $goods_model->getGoodsPrice($v[ 'sku_id' ], $member_id);
// $price_info = $price_result[ 'data' ];
$price = $price_info[ 'price' ];
$v[ 'price' ] = $price;

2
app/model/goods/GoodsCollect.php
View File

@ -124,4 +124,4 @@ class GoodsCollect extends BaseModel
}
return $this->success($res);
}
}
}

4
app/model/order/OrderCreate.php
View File

@ -929,8 +929,8 @@ class OrderCreate extends BaseModel
return $this->error([], '不存在的商品!');
}
$goods_model = new Goods();
$price_result = $goods_model->getGoodsPrice($data['sku_id'], $data['member_id']);
$price_info = $price_result['data'];
// $price_result = $goods_model->getGoodsPrice($data['sku_id'], $data['member_id']);
// $price_info = $price_result['data'];
$price = $price_info['price'];
// 是否存在推荐会员卡

6
app/pay/controller/Test.php
View File

@ -24,7 +24,7 @@ class Test{
//
public function test(){
$orderId = 92;
$orderId = 95;
$order_info = model('order')->getInfo(['order_id' => $orderId]);
// $fenxiao_order = new OrderPay();
// $res = $fenxiao_order->handle($order_info);
@ -33,8 +33,8 @@ class Test{
// $fenxiao_order_model = new FenxiaoOrder();
// $res = $fenxiao_order->handle($order_info);
$fenxiao_order_model = new FenxiaoOrder();
// $res = $fenxiao_order_model->calculateOrder($order_info['order_id']);
$res = $fenxiao_order_model->settlement($orderId);
$res = $fenxiao_order_model->calculate($order_info);
// $res = $fenxiao_order_model->settlement($orderId);
dump($res);die;
$fenxiao_id = 195;
$fenxiao = new Fenxiao();