diff --git a/plugins/cultural-space/src/PluginApplication.php b/plugins/cultural-space/src/PluginApplication.php index 349582af..f169b721 100644 --- a/plugins/cultural-space/src/PluginApplication.php +++ b/plugins/cultural-space/src/PluginApplication.php @@ -23,41 +23,6 @@ class PluginApplication extends \app\common\services\PluginApplication{ 'left_first_show' => 0, 'left_second_show' => 1, 'child' => [ - /* 'plugin_cultural_space_index' => [ - 'name' => '文创空间', - 'permit' => 1, - 'menu' => 1, - 'icon' => '', - 'url' => 'plugin.cultural-space.admin.index.index', - 'url_params' => '', - 'item' => 'plugin_cultural_space_index', - 'parents' => ['cultural-space'], - 'child' => [ - // 权限补充 - 'plugin_cultural_space_index_index' => [ - 'name' => '权重值明细', - 'url' => 'plugin.cultural-space.admin.index.index', - 'url_params' => '', - 'permit' => 1, - 'menu' => 0, - 'icon' => '', - 'item' => 'plugin_cultural_space_index_index', - 'parents' => ['cultural-space','plugin_cultural_space_index'] - ], - 'plugin_cultural_space_index_record' => [ - 'name' => '变更记录', - 'url' => 'plugin.cultural-space.admin.index.record', - 'url_params' => '', - 'permit' => 1, - 'menu' => 0, - 'icon' => '', - 'item' => 'plugin_cultural_space_index_record', - 'parents' => ['cultural-space','plugin_cultural_space_index'] - ], - ] - ],*/ - - 'plugin_cultural_space_contribution' => [ 'name' => '贡献值管理', 'permit' => 1, @@ -104,6 +69,31 @@ class PluginApplication extends \app\common\services\PluginApplication{ ], ] ], + 'plugin_cultural_space_legumes' => [ + 'name' => '易出申请', + 'permit' => 1, + 'menu' => 1, + 'icon' => '', + 'url' => 'plugin.cultural-space.admin.legumes.withdrawalApply', + 'url_params' => '', + 'item' => 'plugin_cultural_space_legumes', + 'parents' => ['cultural-space'], + 'child' => [ + // 权限补充 + 'plugin_cultural_space_legumes_withdrawal' => [ + 'name' => '易出申请', + 'url' => 'plugin.cultural-space.admin.legumes.withdrawalApply', + 'url_params' => '', + 'permit' => 1, + 'menu' => 0, + 'icon' => '', + 'item' => 'plugin_cultural_space_legumes_withdrawal', + 'parents' => ['cultural-space','plugin_cultural_space_legumes'] + ], + ] + ], + + 'plugin_cultural_space_set' => [ 'name' => '基本设置', 'permit' => 1, diff --git a/plugins/cultural-space/src/admin/IndexController.php b/plugins/cultural-space/src/admin/IndexController.php index ebf09f42..4d84e3fb 100644 --- a/plugins/cultural-space/src/admin/IndexController.php +++ b/plugins/cultural-space/src/admin/IndexController.php @@ -8,12 +8,6 @@ use Yunshop\NewPoster\models\Poster; class IndexController extends BaseController{ - // 列表 - public function index(){ - - - return view('Yunshop\CulturalSpace::index.index')->render(); - } /** * Common: 设置信息编辑 * Author: wu-hui diff --git a/plugins/cultural-space/src/admin/LegumesController.php b/plugins/cultural-space/src/admin/LegumesController.php new file mode 100644 index 00000000..3e5f9cb4 --- /dev/null +++ b/plugins/cultural-space/src/admin/LegumesController.php @@ -0,0 +1,119 @@ +isMethod('post')){ + // 参数获取 + $search = request()->input('search'); + // 获取记录 + $result = CulturalSpaceLegumesWithdrawal::getList($search); + + return $this->successJson('success',[ + 'current_page' => $result['current_page'], + 'data' => $result['data'], + 'last_page' => $result['last_page'], + ]); + } + + return view('Yunshop\CulturalSpace::legumes.withdrawal_apply')->render(); + } + /** + * Common: 易出审核 - 驳回 + * Author: wu-hui + * Time: 2023/11/29 16:37 + */ + public function rejectReason(){ + // 参数获取 + $id = request()->input('id'); + $rejectReason = request()->input('reject_reason'); + // 处理 + DB::beginTransaction(); + try{ + // 信息获取 + $info = CulturalSpaceLegumesWithdrawal::find($id); + // 修改状态 + $info->status = 2; + $info->reject_reason = $rejectReason; + $info->save(); + // 修改用户持有信息 + (new CulturalOrderFundLog())->transferHandle((int)$info->uid,(float)$info->withdrawal_total_num,0,"易出申请被驳回，返还易出数量",2); + + // 修改费率 + $culturalFund = CulturalFund::uniacid()->first(); + $culturalFund->fund_money = $culturalFund->fund_money + (float)$info->withdrawal_num;// 减少基金总数 易出部分数量 + $culturalFund->voucher_number = $culturalFund->voucher_number + (float)$info->withdrawal_total_num;// 减少文创豆总数 提现数量(包括手续费) + $culturalFund->last_fee = $culturalFund->current_fee;// 当前费率 成为 上一次费率 + $culturalFund->current_fee = $culturalFund->fund_money / $culturalFund->voucher_number;// 重新计算费率 + $culturalFund->save(); + + DB::commit(); + return $this->successJson('驳回成功'); + }catch(\Exception $e){ + DB::rollBack(); + return $this->errorJson($e->getMessage()); + } + } + /** + * Common: 易出审核 - 通过并且打款 + * Author: wu-hui + * Time: 2023/11/29 17:28 + * @return \Illuminate\Http\JsonResponse + */ + public function examinePass(){ + // 参数获取 + $id = request()->input('id'); + // 处理 + DB::beginTransaction(); + try{ + // 信息获取 + $info = CulturalSpaceLegumesWithdrawal::find($id); + $uid = $info->uid; + $buyGoodsNum = (float)$info->buy_goods_num; + $realityAmount = $info->reality_amount; + $month = $info->created_at->format('Ym'); + // 修改状态 + $info->status = 3; + $info->save(); + // 打款 第三方代发（汇优财） + $staff = UseStaff::getSingleInfo(['uid'=>$uid]); + $info = [ + 'uid' => $uid, + 'month' => $month, + 'member_id' => $staff['member_id'], + 'salary' => $realityAmount + ]; + $result = (new ExternalApi())->salaryModelOutOrder($info); + if((int)$result['respCode'] != 2) throw new ShopException($result['respDesc']); + // 商品兑换豆 到账 + (new CulturalSpaceGoodsLegumes())->changeHandle((int)$uid,$buyGoodsNum,1,"易出申请转换",0,['legumes_withdrawal_id' => $id]); + + DB::commit(); + return $this->successJson('打款成功'); + }catch(\Exception $e){ + DB::rollBack(); + return $this->errorJson($e->getMessage()); + } + } + + + + +} diff --git a/plugins/cultural-space/src/api/IndexController.php b/plugins/cultural-space/src/api/IndexController.php index 4cd2e5ce..304e9049 100644 --- a/plugins/cultural-space/src/api/IndexController.php +++ b/plugins/cultural-space/src/api/IndexController.php @@ -19,6 +19,7 @@ use Yunshop\CulturalSpace\models\ContributionLog; use Yunshop\CulturalSpace\models\CulturalFund; use Yunshop\CulturalSpace\models\CulturalOrderFundLog; use Yunshop\CulturalSpace\models\CulturalSpace; +use Yunshop\CulturalSpace\models\CulturalSpaceLegumesWithdrawal; use Yunshop\ShareholderDividend\models\ShareholderDividendModel; use Yunshop\TeamDividend\admin\models\MemberChild; use Yunshop\TeamDividend\models\TeamDividendAgencyModel; @@ -221,7 +222,6 @@ class IndexController extends ApiController{ } - /** * Common: 获取用户当前持有的文创豆 * Author: wu-hui @@ -231,12 +231,14 @@ class IndexController extends ApiController{ public function legumesHold(){ $uid = \YunShop::app()->getMemberId(); $voucher_number = sprintf("%.6f",CulturalSpace::uniacid()->where('uid',$uid)->value('voucher_number')); + $set = Setting::get('plugin.cultural_space_set'); $withdrawalCommissionRate = 20;//提现手续费比例 return $this->successJson('success',[ - 'voucher_number'=>$voucher_number, - 'commission_rate'=>$withdrawalCommissionRate + 'voucher_number' => $voucher_number, + 'commission_rate' => $withdrawalCommissionRate, + 'task_video_link' => $set['task_video_link'] ]); } /** @@ -312,12 +314,12 @@ class IndexController extends ApiController{ } } /** - * Common: 提现处理 + * Common: 提现处理 弃用 提现修改为易出，当前方法直接弃用2023-11-29 * Author: wu-hui * Time: 2023/11/23 10:04 * @return \Illuminate\Http\JsonResponse */ - public function withdrawal(){ + /*public function withdrawal(){ // 参数获取 $uid = \YunShop::app()->getMemberId(); $withdrawalNumber = abs((float)request()->input('withdrawal_number')); @@ -368,7 +370,7 @@ class IndexController extends ApiController{ DB::rollBack(); return $this->errorJson($e->getMessage()); } - } + }*/ /** * Common: 文创豆变更记录 * Author: wu-hui @@ -394,6 +396,30 @@ class IndexController extends ApiController{ 'last_page' => (int)$result['last_page'], ]); } + /** + * Common: 文创豆易出申请 + * Author: wu-hui + * Time: 2023/11/29 15:08 + * @return \Illuminate\Http\JsonResponse + */ + public function withdrawalNew(){ + DB::beginTransaction(); + try{ + // 参数获取 + $withdrawalNum = request()->input('withdrawal_num'); + $taskType = request()->input('task_type'); + // 处理提现 + (new CulturalSpaceLegumesWithdrawal())->applyWithdrawal($withdrawalNum,$taskType); + + + DB::commit(); + return $this->successJson("易出申请成功"); + }catch(\Exception $e){ + DB::rollBack(); + return $this->errorJson($e->getMessage()); + } + } + } \ No newline at end of file diff --git a/plugins/cultural-space/src/models/CulturalSpaceGoodsLegumes.php b/plugins/cultural-space/src/models/CulturalSpaceGoodsLegumes.php new file mode 100644 index 00000000..72939923 --- /dev/null +++ b/plugins/cultural-space/src/models/CulturalSpaceGoodsLegumes.php @@ -0,0 +1,85 @@ + 'datetime:Y-m-d H:i:s' + ]; + + protected $fillable = [ + 'uniacid', + 'uid', + 'goods_id', + 'order_id', + 'order_goods_id', + 'legumes_withdrawal_id', + 'change_type', + 'change_quantity', + 'change_front', + 'change_after', + 'remark', + 'created_at', + 'source' + ]; + + /** + * Common: 变更记录处理 + * Author: wu-hui + * Time: 2023/11/29 17:40 + * @param int $uid 用户id + * @param float $changeNum 变更数量 + * @param int $changeType 变更类型：0=减少，1=增加 + * @param string $remark 备注 + * @param int $changeSource 记录来源：0=文创豆易出，1=商品兑换 + * @param array $params 其他参数：goods_id、order_id、order_goods_id、legumes_withdrawal_id + * @return mixed + */ + public function changeHandle(int $uid,float $changeNum,int $changeType,string $remark,int $changeSource = 1,array $params = []){ + // 获取当前用户持有数量 + $changeFront = (float)CulturalSpace::uniacid()->where('uid',$uid)->value('goods_legumes'); + // 变更后的数量 + $changeAfter = $changeType == 1 ? $changeFront + $changeNum : $changeFront - $changeNum; + // 变更记录 + $data = [ + 'uniacid' => \YunShop::app()->uniacid, + 'uid' => $uid,// 用户id + 'goods_id' => $params['goods_id'] ?? 0,// 商品id + 'order_id' => $params['order_id'] ?? 0,// 订单id + 'order_goods_id' => $params['order_goods_id'] ?? 0,// 订单商品id + 'legumes_withdrawal_id' => $params['legumes_withdrawal_id'] ?? 0,// 文创豆易出申请id + 'change_type' => $changeType,// 变更类型：0=减少，1=增加 + 'change_quantity' => $changeNum,// 变更数量 + 'change_front' => $changeFront,// 变更前拥有的数量 + 'change_after' => $changeAfter,// 变更后拥有的数量 + 'remark' => $remark, + 'created_at' => time(),// 变更时间 + 'source' => $changeSource, + ]; + $id = $this->insertGetId($data); + // 修改用户持有 + CulturalSpace::uniacid()->where('uid',$uid)->update(['goods_legumes' => $changeAfter]); + + return $id; + } + + + + + + + + + + + + + + +} diff --git a/plugins/cultural-space/src/models/CulturalSpaceLegumesWithdrawal.php b/plugins/cultural-space/src/models/CulturalSpaceLegumesWithdrawal.php new file mode 100644 index 00000000..bab209ba --- /dev/null +++ b/plugins/cultural-space/src/models/CulturalSpaceLegumesWithdrawal.php @@ -0,0 +1,140 @@ + 'datetime:Y-m-d H:i:s', + 'updated_at' => 'datetime:Y-m-d H:i:s' + ]; + + protected $fillable = [ + 'uniacid', + 'uid', + 'withdrawal_total_num', + 'fund_ratio', + 'fund_num', + 'buy_goods_ratio', + 'buy_goods_num', + 'withdrawal_ratio', + 'withdrawal_num', + 'commission_ratio', + 'commission_num', + 'reality_num', + 'current_fee', + 'reality_amount', + 'status', + 'reject_reason', + 'task_type', + 'created_at', + 'updated_at' + ]; + /** + * Common: 获取易出申请列表 + * Author: wu-hui + * Time: 2023/11/29 15:52 + * @param $search + * @param int $limit + * @return array + */ + public function getList($search,$limit = 10){ + // 条件生成 + $where = []; + if($search['uid'] > 0) $where[] = ['uid','=',$search['uid']]; + // 列表获取 + $list = self::uniacid() + ->where($where) + ->with([ + 'member' => function($query){ + $query->select(['uid','nickname','realname','avatar']); + } + ]) + ->orderBy('created_at','DESC') + ->orderBy('id','DESC') + ->paginate($limit); + + return $list ? $list->toArray() : []; + } + /** + * Common: 易出申请 + * Author: wu-hui + * Time: 2023/11/29 15:16 + * @param $totalNum + * @param $taskType + * @return mixed + */ + public function applyWithdrawal($totalNum,$taskType){ + $uid = \YunShop::app()->getMemberId(); + // 获取设置信息 + $set = Setting::get('plugin.cultural_space_set'); + // 获取各个部分的比例 + $fundRatio = (float)$set['legumes_fund_ratio'];// 基金池部分比例 + $withdrawalRatio = (float)sprintf("%.2f",100 - $fundRatio);//易出部分比例 + $buyGoodsRatio = (float)$set['legumes_buy_goods_ratio'];// 购物部分比例 + $realityWithdrawalRatio = (float)sprintf("%.2f",100 - $buyGoodsRatio);// 实际易出部分比例 + $commissionRatio = (float)$set['legumes_withdrawal_commission'];// 实际易出部分的手续费比例 + // 计算各个部分的文创豆数量 + $fund_num = (float)sprintf("%.2f",$totalNum * $fundRatio / 100 );// 基金池部分数量 + $withdrawal_num = (float)sprintf("%.2f",$totalNum * $withdrawalRatio / 100 );// 易出部分数量 + $buy_goods_num = (float)sprintf("%.2f",$withdrawal_num * $buyGoodsRatio / 100 );// 购物部分数量 + $reality_num = (float)sprintf("%.2f",$withdrawal_num * $realityWithdrawalRatio / 100 );// 实际易出部分数量 + $commission_num = (float)sprintf("%.2f",$reality_num * $commissionRatio / 100);// 手续费数量 + $reality_num = (float)sprintf("%.2f",$reality_num - $commission_num);// 实际易出部分 - 手续费 = 实际可得 + // 计算实际到账金额 + $culturalFund = CulturalFund::uniacid()->first(); + $currentFee = $culturalFund->current_fee; + $reality_amount = (float)sprintf("%.2f",$reality_num * $currentFee);// 实际打款数量 + // 记录 + $data = [ + 'uniacid' => \YunShop::app()->uniacid, + 'uid' => $uid, + 'withdrawal_total_num' => $totalNum, // 文创豆提现总数 + 'fund_ratio' => $fundRatio, // 基金池比例 + 'fund_num' => $fund_num, // 基金池数量 + 'buy_goods_ratio' => $buyGoodsRatio, // 购物豆部分比例 + 'buy_goods_num' => $buy_goods_num, // 购物豆部分数量 + 'withdrawal_ratio' => $withdrawalRatio, // 易出部分比例 + 'withdrawal_num' => $withdrawal_num, // 易出数量 + 'commission_ratio' => $commissionRatio, // 手续费比例 + 'commission_num' => $commission_num, // 手续费数量 + 'reality_num' => $reality_num, // 实际易出文创豆 + 'current_fee' => $currentFee, // 费率 + 'reality_amount' => $reality_amount, // 实际提现打款数量(元) + 'status' => 0, // 审核状态：0=待审核，1=待打款，2=已驳回 + 'task_type' => $taskType == 'video' ? 1 : 2, // 任务类型：0=不明确，1=视频，2=分享 + 'created_at' => time(), // 申请时间 + 'updated_at' => time(), // 更新时间 + ]; + $id = self::insertGetId($data); + // 修改费率 + $culturalFund->fund_money = $culturalFund->fund_money - $withdrawal_num;// 减少基金总数 易出部分数量 + $culturalFund->voucher_number = $culturalFund->voucher_number - $totalNum;// 减少文创豆总数 提现数量(包括手续费) + $culturalFund->last_fee = $culturalFund->current_fee;// 当前费率 成为 上一次费率 + $culturalFund->current_fee = $culturalFund->fund_money / $culturalFund->voucher_number;// 重新计算费率 + $culturalFund->save(); + // 添加变更记录 + (new CulturalOrderFundLog())->transferHandle((int)$uid,(float)$totalNum,1,"易出申请",2); + + return $id; + } + + + + /** + * Common: 一对一关联 用户信息 + * Author: wu-hui + * Time: 2023/11/29 15:51 + * @return \Illuminate\Database\Eloquent\Relations\HasOne + */ + public function member(){ + return $this->hasOne(Member::class,'uid','uid'); + } + + +} diff --git a/plugins/cultural-space/src/models/GoodsCulturalSpace.php b/plugins/cultural-space/src/models/GoodsCulturalSpace.php index 10b00a8a..f9d7d2e7 100644 --- a/plugins/cultural-space/src/models/GoodsCulturalSpace.php +++ b/plugins/cultural-space/src/models/GoodsCulturalSpace.php @@ -57,6 +57,7 @@ class GoodsCulturalSpace extends BaseModel{ * @return array */ public static function getExchangeGoodsList(){ + $uid = \YunShop::app()->getMemberId(); $result = self::uniacid() ->select(['id','goods_id','legumes_exchange_price']) ->with(['belongsToGoods'=>function($query){ @@ -74,7 +75,7 @@ class GoodsCulturalSpace extends BaseModel{ ]; // 计算需要使用的文创豆 $currentFee = (float)CulturalFund::uniacid()->value('current_fee');// 当前费率 - $holdExchangeLegumes = 0;// 当前用户持有的用以兑换商品的文创豆 + $holdExchangeLegumes = (float)CulturalSpace::uniacid()->where('uid',$uid)->value('goods_legumes');// 当前用户持有的用以兑换商品的文创豆 $data['data'] = array_map(function($item) use ($currentFee,$holdExchangeLegumes){ // 使用的文创豆 $useLegumes = ceil($item['legumes_exchange_price'] * $currentFee); diff --git a/plugins/cultural-space/views/index/index.blade.php b/plugins/cultural-space/views/index/index.blade.php deleted file mode 100644 index d6d4d416..00000000 --- a/plugins/cultural-space/views/index/index.blade.php +++ /dev/null @@ -1,305 +0,0 @@ -@extends('layouts.base') - -@section('content') -
-
-
- - - {{--搜索--}} - - - - - - - - - - - - - - - - - - - 查询 - - - {{--表单--}} - - - - - - - - - - - - - - - - - - - - {{--搜索--}} - - - - - - - - - - - - 查询 - - - {{--表单--}} - - - - - - - - - - - - - - - - - - - {{--分页--}} - - -
-
-
- - -@endsection - diff --git a/plugins/cultural-space/views/legumes/withdrawal_apply.blade.php b/plugins/cultural-space/views/legumes/withdrawal_apply.blade.php new file mode 100644 index 00000000..ca766b23 --- /dev/null +++ b/plugins/cultural-space/views/legumes/withdrawal_apply.blade.php @@ -0,0 +1,272 @@ +@extends('layouts.base') + +@section('content') +
+
+
+ {{--搜索--}} + + + + + + 查询 + + + {{--表格--}} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + {{--分页--}} + + +
+
+
+ + +@endsection +