+
+
+
+
+
+
+
+
+
+
+
+ 基本信息 {{$value['title']}}
+
+
+
+
+
@include('Yunshop\AreaDividend::area.order.storeBasicDetail')
+ @foreach(\app\backend\modules\income\Income::current()->getItem('order') as $key=>$value)
+
{!! widget($value['class'], ['goods_id'=> $goods->id])!!}
+ @endforeach
+
+
+
+
+
+
+
+@endsection('content')
+
diff --git a/plugins/area-dividend/views/area/order/store-list.blade.php b/plugins/area-dividend/views/area/order/store-list.blade.php
new file mode 100644
index 00000000..b3c6ed8f
--- /dev/null
+++ b/plugins/area-dividend/views/area/order/store-list.blade.php
@@ -0,0 +1,438 @@
+@extends('layouts.base')
+@section('title','订单列表')
+
+@section('content')
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 订单数: {{$list['total']}}
+ 订单金额: {{$total_price}} 元
+ @section('supplier_apply')
+
+ @show
+
+
+
+
+ @section('is_plugin')
+ @foreach ($list['data'] as $order_index => $order)
+
+
+
+
+ 订单编号: {{$order['order_sn']}}
+ @if($order['status']>\app\common\models\Order::WAIT_PAY && isset($order['has_one_order_pay']))
+ 支付单号: {{$order['has_one_order_pay']['pay_sn']}}
+ @endif
+ 下单时间: {{$order['create_time']}}
+ @if( $order['has_one_refund_apply'] == \app\common\models\refund\RefundApply::WAIT_RECEIVE_RETURN_GOODS)
+ 客户已经寄出快递 @endif
+
+ {{$order['shop_name']}}
+
+ @if(!empty($order['has_one_refund_apply']))
+ {{$order['has_one_refund_apply']['refund_type_name']}}
+ :{{$order['has_one_refund_apply']['status_name']}}
+ @endif
+
+
+
+ {{--@if(empty($order['status']))
+ 关闭订单
+ @endif--}}
+
+
+
+
+
+
+
+ @foreach( $order['has_many_order_goods'] as $order_goods_index => $order_goods)
+
+
+
+
+ {{--{{$order_goods['title']}} --}}
+ {{$order_goods['title']}}
+ @if( !empty($order_goods['goods_option_title'])){{$order_goods['goods_option_title']}}
+
+ @endif
+ {{$order_goods['goods_sn']}}
+
+
+
+ 原价: {{ number_format($order_goods['goods_price']/$order_goods['total'],2)}}
+
+
+
+ @if( $order_goods_index == 0)
+
+ {{-- {{$order['belongs_to_member']['nickname']}} --}}
+ {{$order['belongs_to_member']['nickname']}}
+
+
+
+ {{$order['pay_type_name']}}
+
+
+
+
+ 商品小计：
+ ￥{!! number_format(
+ $order['goods_price'] ,2) !!}
+
+
+
+
+ 运费：
+ ￥{!! number_format(
+ $order['dispatch_price'],2) !!}
+
+
+ @if($order['change_price'] != 0)
+
+ 卖家改价：
+ ￥{!! number_format(
+ $order['change_price'] ,2) !!}
+
+
+ @endif
+ @if($order['change_dispatch_price'] != 0)
+
+ 卖家改运费：
+ ￥{{ number_format(
+ $order['change_dispatch_price'] ,2) }}
+
+
+ @endif
+
+ 应收款：
+ ￥{!! number_format(
+ $order['price'] ,2) !!}
+
+
+ {{--@if($order['status'] == 0)
+
+
+ 修改价格
+
+
+ @endif--}}
+
+
+ {{$order['status_name']}}
+ 查看详情
+
+
+ {{--@include($include_ops)--}}
+
+ @endif
+
+ @endforeach
+
+
+ @endforeach
+ @show
+ @include('Yunshop\AreaDividend::area.order.modals')
+
+
+
+
+
+
+
+@section('plugin_js')
+@show
+@endsection('content')
\ No newline at end of file
diff --git a/plugins/area-dividend/views/area/order/storeBasicDetail.blade.php b/plugins/area-dividend/views/area/order/storeBasicDetail.blade.php
new file mode 100644
index 00000000..bce84c3a
--- /dev/null
+++ b/plugins/area-dividend/views/area/order/storeBasicDetail.blade.php
@@ -0,0 +1,326 @@
+
+
+
+
+
+
+
+{{--
+
--}}
+
+
+
+
+{{--
--}}
+
+
+@if ($order['status'] >= 1)
+
+@endif
+@if ($order['status'] >= 2)
+
+@endif
+@if ($order['status'] == 3)
+
+@endif
+@if (!empty($order['address']))
+ @include('dispatch.detail')
+@endif
+@if (!empty($order['has_one_refund_apply']))
+ @include('Yunshop\AreaDividend::area.refund.index')
+@endif
+@if(!empty($order['call']))
+ @include('invoice.display')
+@endif
+@if (count($order['discounts']))
+
+
+ 优惠信息
+
+
+
+
+
+ 优惠名称
+ 优惠金额
+
+
+ @foreach ($order['discounts'] as $discount)
+
+ {{$discount['name']}}
+ ¥{{$discount['amount']}}
+
+
+ @endforeach
+
+
+
+@endif
+@if (count($order['deductions']))
+
+
+ 抵扣信息
+
+
+
+
+
+ 名称
+ 抵扣值
+ 抵扣金额
+
+
+ @foreach ($order['deductions'] as $deduction)
+
+ {{$deduction['name']}}
+ {{$deduction['coin']}}
+ ¥{{$deduction['amount']}}
+
+
+ @endforeach
+
+
+
+@endif
+@if (count($order['coupons']))
+
+
+ 优惠券信息
+
+
+
+
+
+ 名称
+ 优惠金额
+
+
+ @foreach ($order['coupons'] as $coupon)
+
+ {{$coupon['name']}}
+ ¥{{$coupon['amount']}}
+
+
+ @endforeach
+
+
+
+@endif
+@if($div_from['status'])
+
+@endif
+
+
+
+
+ 商品信息
+
+
+
+
+
+ ID
+ 商品标题
+ 商品规格
+ 现价/原价/成本价
+ 购买数量
+ {{--折扣前 --}}
+ 操作
+
+
+ @foreach ($order['has_many_order_goods'] as $order_goods)
+
+
+ {{$order_goods['goods_id']}}
+
+ {{--{{$order_goods['title']}} --}}
+ {{$order_goods['title']}}
+
+ {{$order_goods['goods_option_title']}}
+ {{$order_goods['goods_price']}}
+ /{{$order_goods['goods_market_price']}}
+ /{{$order_goods['goods_cost_price']}}元
+
+ {{$order_goods['total']}}
+ {{--{{sprintf('%.2f', $order_goods['goods_price']/$order_goods['total'])}}--}}
+ {{-- --}}
+
+ {{--
+
+ @endforeach
+ {{--@include('Yunshop\AreaDividend::area.refund.modal')--}}
+ {{----}}
+ {{----}}
+ {{--@include('order.modals')--}}
+ {{--@include($ops)--}}
+ {{-- --}}
+ {{----}}
+ {{-- --}}
+ {{-- --}}
+
+
+
+
\ No newline at end of file
diff --git a/plugins/area-dividend/views/area/refund/index.blade.php b/plugins/area-dividend/views/area/refund/index.blade.php
new file mode 100644
index 00000000..3c45688c
--- /dev/null
+++ b/plugins/area-dividend/views/area/refund/index.blade.php
@@ -0,0 +1,206 @@
+
+
+
+ 退款申请
+
+
+
+
+
+
+ @if ($order['has_one_refund_apply']['refund_way_type'] != 2)
+
+ @endif
+
+
+
+ @if (!empty($order['has_one_refund_apply']['images']))
+
+ @endif
+ @if ($order['has_one_refund_apply']['is_refunding'])
+
+ @endif
+ @if ($order['has_one_refund_apply']['status'] == \app\common\models\refund\RefundApply::WAIT_REFUND)
+
+
+
+ @endif
+ @if (isset($order['has_one_refund_apply']['return_express']))
+
+
+
+ @if (!empty($order['has_one_refund_apply']['return_express']['express_company_name']))
+
+
+
+
+
+
+ @endif
+
+
+ @endif
+
+ @if (!empty($order['has_one_refund_apply']['resend_express']))
+
+
+
+
+
+
+
+
+ @endif
+
+
+
\ No newline at end of file
diff --git a/plugins/area-dividend/views/area/refund/modal.blade.php b/plugins/area-dividend/views/area/refund/modal.blade.php
new file mode 100644
index 00000000..0b9bad13
--- /dev/null
+++ b/plugins/area-dividend/views/area/refund/modal.blade.php
@@ -0,0 +1,7 @@
+@if($order['has_one_refund_apply']['refund_type'] == \app\common\models\refund\RefundApply::REFUND_TYPE_REFUND_MONEY)
+ @include('Yunshop\AreaDividend::area.refund.modal_refund_money')
+@elseif($order['has_one_refund_apply']['refund_type'] == \app\common\models\refund\RefundApply::REFUND_TYPE_RETURN_GOODS)
+ @include('Yunshop\AreaDividend::area.refund.modal_return_goods')
+@elseif($order['has_one_refund_apply']['refund_type'] == \app\common\models\refund\RefundApply::REFUND_TYPE_EXCHANGE_GOODS)
+ @include('Yunshop\AreaDividend::area.refund.modal_exchange_goods')
+@endif
\ No newline at end of file
diff --git a/plugins/area-dividend/views/area/refund/modal_base.blade.php b/plugins/area-dividend/views/area/refund/modal_base.blade.php
new file mode 100644
index 00000000..e49da91a
--- /dev/null
+++ b/plugins/area-dividend/views/area/refund/modal_base.blade.php
@@ -0,0 +1,157 @@
+
+
\ No newline at end of file
diff --git a/plugins/area-dividend/views/area/refund/modal_exchange_goods.blade.php b/plugins/area-dividend/views/area/refund/modal_exchange_goods.blade.php
new file mode 100644
index 00000000..c9e3fda5
--- /dev/null
+++ b/plugins/area-dividend/views/area/refund/modal_exchange_goods.blade.php
@@ -0,0 +1,27 @@
+@extends('Yunshop\AreaDividend::area.refund.modal_base')
+@section('operation_pass')
+ @if($order['has_one_refund_apply']['status'] == \app\common\models\refund\RefundApply::WAIT_CHECK)
+
+
+ @endif
+@endsection
+@section('operation_resend')
+ @if($order['has_one_refund_apply']['status'] < \app\common\models\refund\RefundApply::WAIT_RESEND_GOODS)
+
+
+
+ @endif
+ {{--@if($order['has_one_refund_apply']['is_refunding'])
+
+
+ @endif--}}
+@endsection
diff --git a/plugins/area-dividend/views/area/refund/modal_refund_money.blade.php b/plugins/area-dividend/views/area/refund/modal_refund_money.blade.php
new file mode 100644
index 00000000..2d3adc3b
--- /dev/null
+++ b/plugins/area-dividend/views/area/refund/modal_refund_money.blade.php
@@ -0,0 +1,24 @@
+@extends('Yunshop\AreaDividend::area.refund.modal_base')
+@section('operation_consensus')
+
+
+
+
+
+
+
+ 微信支付方式： 会返回到相应的的支付渠道(如零钱或银行卡）
+ 支付宝支付方式： 会返回到相应的的支付渠道
+ 其他支付方式： 会返回到微信钱包(需商户平台余额充足)
+ 如有余额抵扣： 会返回金额到商城用户余额
+ {{--{if $plugin_commission && $cset['deduction']}--}}
+ {{--如有佣金抵扣： 会返回佣金到商城用户佣金 --}}
+ {{--{/if}--}}
+ 手动退款： 订单会完成退款处理，您用其他方式进行退款
+
+@endsection
\ No newline at end of file
diff --git a/plugins/area-dividend/views/area/refund/modal_return_goods.blade.php b/plugins/area-dividend/views/area/refund/modal_return_goods.blade.php
new file mode 100644
index 00000000..3147e3bb
--- /dev/null
+++ b/plugins/area-dividend/views/area/refund/modal_return_goods.blade.php
@@ -0,0 +1,40 @@
+@extends('Yunshop\AreaDividend::area.refund.modal_base')
+
+@section('operation_pass')
+ @if($order['has_one_refund_apply']['status'] == \app\common\models\refund\RefundApply::WAIT_CHECK)
+
+
+ @endif
+@endsection
+@section('operation_consensus')
+
+
+
+
+
+
+
+ 微信支付方式： 会返回到相应的的支付渠道(如零钱或银行卡）
+ 支付宝支付方式： 会返回到相应的的支付渠道
+ 其他支付方式： 会返回到微信钱包(需商户平台余额充足)
+ 如有余额抵扣： 会返回金额到商城用户余额
+ {{--{if $plugin_commission && $cset['deduction']}--}}
+ {{--如有佣金抵扣： 会返回佣金到商城用户佣金 --}}
+ {{--{/if}--}}
+ 手动退款： 订单会完成退款处理，您用其他方式进行退款
+
+@endsection
\ No newline at end of file
diff --git a/plugins/area-dividend/views/area/return/info.blade.php b/plugins/area-dividend/views/area/return/info.blade.php
new file mode 100644
index 00000000..ac3efb9b
--- /dev/null
+++ b/plugins/area-dividend/views/area/return/info.blade.php
@@ -0,0 +1,147 @@
+@extends('layouts.base')
+@section('content')
+@section('title', trans('退货地址模板详情'))
+
+
+
+
+
+
+@endsection
\ No newline at end of file
diff --git a/plugins/area-dividend/views/area/return/list.blade.php b/plugins/area-dividend/views/area/return/list.blade.php
new file mode 100644
index 00000000..119c9cba
--- /dev/null
+++ b/plugins/area-dividend/views/area/return/list.blade.php
@@ -0,0 +1,66 @@
+@extends('layouts.base')
+
+@section('content')
+@section('title', trans('退货地址列表'))
+
+
+
+
+
+
+
+
+
+
+
+ ID
+ 退货地址名称
+ 联系人
+ 联系方式
+ 地址
+ 默认退货地址
+ 操作
+
+
+
+ @foreach ( $list as $address )
+
+ {{ $address['id'] }}
+ {{ $address['address_name'] }}
+ {{ $address['contact'] }}
+ {{ $address['mobile'] }}
+ {{ $address['province_name'] }}{{ $address['city_name'] }}{{ $address['district_name'] }}{{ $address['street_name'] }}{{ $address['address'] }}
+ @if ( $address['is_default'] == 1 ) 是 @else 否 @endif
+
+
+ @endforeach
+
+
+ {!! $pager !!}
+
+
+
+
+
+
+
+
+@endsection
+
diff --git a/plugins/area-dividend/views/widget/profit/areaDividend.js b/plugins/area-dividend/views/widget/profit/areaDividend.js
new file mode 100644
index 00000000..6ebe4d2d
--- /dev/null
+++ b/plugins/area-dividend/views/widget/profit/areaDividend.js
@@ -0,0 +1,147 @@
+define({
+ name: "areaDividend",
+ template: `
+
+
+
+
+
+
+
+
+ 关闭
+ 开启
+ 如果不开启区域分红，则不产生分红佣金
+
+
+ 启用独立佣金比例
+ 启用独立分红金额设置，此商品拥有独自的分红金额,不受默认设置限制
+
+
+
+
+
+
+ % 固定
+
+
+
+
+
+
+
+ 元
+
+
+
+
+
+
+ 如果比例为空或等于0，则使用固定规则，如果都为空或等于0则使用默认规则
+
+
+ 启用独立佣金比例
+ 启用独立设置，如果比例为空为0则无分红佣金（开启了第一个独立规则，独立设置就无法开启）
+
+
+
+
+ 省
+ %
+
+
+
+
+ 市
+ %
+
+
+
+
+ 区/县
+ %
+
+
+
+
+ 街道/乡镇
+ %
+
+
+
+
+
+
+
+
+
+ `,
+ style: `
+ .help-block{
+ font-size:12px;
+ }
+ .location{
+ display:flex;
+ justify-content:flex-end;
+ }
+ `,
+ props: {
+ form: {
+ type: Object,
+ default() {
+ return {}
+ }
+ },
+ },
+ data(){
+ return {
+ jsonData: {
+ is_dividend: 0,
+ has_dividend: 0,
+ has_dividend_rate: '',
+ has_dividend_price: '',
+ alone_rule: 0,
+ province_rate:'',
+ city_rate:'',
+ area_rate: '',
+ street_rate: '',
+ },
+ }
+ },
+ mounted() {
+ if (this.form.item && !Array.isArray(this.form.item)) {
+ this.jsonData = {...this.form.item};
+ }
+ },
+ methods: {
+ validate(){
+
+ let result = {
+ is_dividend: this.jsonData.is_dividend,
+ has_dividend: this.jsonData.has_dividend,
+ alone_rule:this.jsonData.alone_rule,
+ };
+
+ if (this.jsonData.has_dividend) {
+ result.has_dividend_rate = this.jsonData.has_dividend_rate?this.jsonData.has_dividend_rate:0;
+ result.has_dividend_price = this.jsonData.has_dividend_price?this.jsonData.has_dividend_price:0;
+ }
+
+ if (this.jsonData.alone_rule) {
+ result.province_rate = this.jsonData.province_rate?this.jsonData.province_rate:0;
+ result.city_rate = this.jsonData.city_rate?this.jsonData.city_rate:0;
+ result.area_rate = this.jsonData.area_rate?this.jsonData.area_rate:0;
+ result.street_rate = this.jsonData.street_rate?this.jsonData.street_rate:0;
+ }
+
+
+ return result;
+ },
+ },
+ });
\ No newline at end of file
diff --git a/plugins/commission/src/services/TimedTaskService.php b/plugins/commission/src/services/TimedTaskService.php
index bc92959b..da7a20f8 100644
--- a/plugins/commission/src/services/TimedTaskService.php
+++ b/plugins/commission/src/services/TimedTaskService.php
@@ -94,7 +94,7 @@ class TimedTaskService
])->first();
if (!empty($is_repeat)) {
\Log::info("--分销--有重复信息");
- throw new ShopException('分销有重复');
+ // throw new ShopException('分销有重复');
continue;
}
@@ -123,7 +123,7 @@ class TimedTaskService
DB::commit();
} catch (\Exception $e) {
- \Log::info("--分销--插入失败",$e);
+ \Log::info("--分销--插入失败",$e->getMessage());
DB::rollBack();
}
}
diff --git a/plugins/team-dividend/src/models/Uplog.php b/plugins/team-dividend/src/models/Uplog.php
index 4d7e0cf8..0db06c6d 100644
--- a/plugins/team-dividend/src/models/Uplog.php
+++ b/plugins/team-dividend/src/models/Uplog.php
@@ -7,7 +7,9 @@ namespace Yunshop\TeamDividend\models;
use app\common\models\BaseModel;
use app\common\models\Member;
use Illuminate\Database\Eloquent\Builder;
+use Yunshop\CollectionRoom\models\CollectionRoomModel;
use Yunshop\TeamDividend\services\upgrate\UplogService;
+use Yunshop\WeightValue\models\WeightValue;
class Uplog extends BaseModel
{
@@ -95,6 +97,14 @@ class Uplog extends BaseModel
$uplogService->setAfterLevelId($afterLevelSetting['id']);
$uplogService->setUpCode($upCode);
$uplogService->store();
+
+
+ \Log::debug('经销商等级变更 - 权重值操作：',['uid' => $agency->uid,'old_lv'=>$beforeLevelSetting['id'],'lv'=>$afterLevelSetting['id']]);
+ // 经销商升级赠送权重值处理
+ (new WeightValue())->upgradeGiveInit((int)$agency->uid,(int)$afterLevelSetting['id']);
+ // 会员升级经销商 赠送画
+ CollectionRoomModel::addInfo((int)$agency->uid,(int)$afterLevelSetting['id']);
+
}
public static function boot()
diff --git a/plugins/team-dividend/src/observers/DealerObserver.php b/plugins/team-dividend/src/observers/DealerObserver.php
index 0303d4ab..5e32cc9d 100644
--- a/plugins/team-dividend/src/observers/DealerObserver.php
+++ b/plugins/team-dividend/src/observers/DealerObserver.php
@@ -44,21 +44,5 @@ class DealerObserver extends BaseObserver{
}
- // 保存后 添加|编辑
- public function saved(Model $model){
- \Log::debug('经销商信息保存 - 保存成功后：',['old_lv'=>$model->getOriginal('level'),'lv'=>$model->level]);
- // 经销商等级变更
- if((int)$model->uid > 0 && (int)$model->getOriginal('level') != (int)$model->level){
- // 经销商升级赠送权重值处理
- (new WeightValue())->upgradeGiveInit((int)$model->uid,(int)$model->level);
- // 会员升级经销商 赠送画
- CollectionRoomModel::addInfo((int)$model->uid,(int)$model->level);
- }
- }
-
-
-
-
-
}
diff --git a/plugins/weight-value/src/admin/IndexController.php b/plugins/weight-value/src/admin/IndexController.php
index 585fba52..165e000c 100644
--- a/plugins/weight-value/src/admin/IndexController.php
+++ b/plugins/weight-value/src/admin/IndexController.php
@@ -131,9 +131,9 @@ class IndexController extends BaseController{
public function test(){
- // (new WeightValue())->upgradeGiveInit(1,1);
- // (new WeightValue())->giveInit(Order::find(134));
-
+ // (new WeightValue())->upgradeGiveInit(4,9);
+ // (new WeightValue())->giveInit(Order::find(143));
+ // (new \Yunshop\Commission\services\TimedTaskService)->handle();
// $hasNum = Uplog::uniacid()
// ->select(['uid'])
// ->where('after_level_id',6)
diff --git a/plugins/weight-value/src/models/WeightValue.php b/plugins/weight-value/src/models/WeightValue.php
index fca0987d..d22260fc 100644
--- a/plugins/weight-value/src/models/WeightValue.php
+++ b/plugins/weight-value/src/models/WeightValue.php
@@ -44,10 +44,13 @@ class WeightValue extends BaseModel{
// 循环处理每个商品
$changeRecord = [];// 变更记录
foreach($goodsList as $goodsInfo){
+ $agentsUseParents = array_values($agents['parents']);
+ // 判断：根据赠送方式 是否删除最后一个上级
+ if((int)$goodsInfo['lv_type'] == 0) unset($agentsUseParents[1]);
$useAgentList = [];
- $mergeAgentList = array_merge($agents['parents'],$agents['agents']);// 默认上级信息
+ $mergeAgentList = array_merge($agentsUseParents,$agents['agents']);// 默认上级信息
// 判断：是否开启自购
- if((int)$goodsInfo['is_self_purchase'] == 1) $mergeAgentList = $agentAllList;
+ if((int)$goodsInfo['is_self_purchase'] == 1) $mergeAgentList = array_merge($agents['current_user'],$agentsUseParents,$agents['agents']);
foreach($mergeAgentList as $useAgentItem){
$useAgentList[$useAgentItem['uid']] = $useAgentItem;
}
@@ -199,17 +202,13 @@ class WeightValue extends BaseModel{
}
// 处理上级列表 取前二
$parentList = $agents;
- // unset($parentList[$uid]);
- $sort = array_column($parentList,'level');
- array_multisort($parentList,SORT_ASC,$sort);
- array_column($parentList,null,'uid');
+ unset($parentList[$uid]);
$parentList = array_splice($parentList,0,2);
// 获取代理商信息 这里只取第一个代理商
$agentInfo = collect($agents)
->where('identity_type',2)
->where('uid','!=',$uid)
->first();
-
return [
// 当前用户
'current_user' => [$uid => $agents[$uid]],
@@ -274,7 +273,6 @@ class WeightValue extends BaseModel{
}
-
/**
* Common: 经销商升级赠送权重值 - 开始处理
* Author: wu-hui
@@ -378,11 +376,6 @@ class WeightValue extends BaseModel{
}
-
-
-
-
-
/**
* Common: 修改信息
* 必须是包含member_id、team_dividend_agency_level_id、quantity的二维数组
diff --git a/plugins/weight-value/views/widget/marketing/weight_value.js b/plugins/weight-value/views/widget/marketing/weight_value.js
index d42f6016..3f2ef37a 100644
--- a/plugins/weight-value/views/widget/marketing/weight_value.js
+++ b/plugins/weight-value/views/widget/marketing/weight_value.js
@@ -12,11 +12,13 @@ define({