活动商品添加采购价--相关地方进行修改，订单商品也得添加采购价

app/Admin/Controllers/v3/GoodsActivityController.php

@@ -52,6 +52,7 @@ class GoodsActivityController extends AdminController
             $grid->column('cover_img')->image('',50);
             $grid->column('name')->editable();
             $grid->column('price')->editable();
+            $grid->column('purchase_price')->editable();
             $grid->column('original_price')->editable();
             $grid->column('goods_unit')->editable();
             $grid->column('type_text');
@@ -120,6 +121,7 @@ class GoodsActivityController extends AdminController
                 $show->width(6)->field('cover_img')->image();
                 $show->width(6)->field('goods_unit');
                 $show->width(6)->field('price');
+                $show->width(6)->field('purchase_price');
                 $show->width(6)->field('original_price');
                 $show->width(6)->field('vip_price');
                 $show->width(6)->field('start_num');
@@ -209,6 +211,7 @@ class GoodsActivityController extends AdminController
             });
             $form->column(6, function (Form $form) {
                 $form->currency('price')->required()->floatTwo()->symbol('￥');
+                $form->currency('purchase_price')->required()->floatTwo()->symbol('￥');
                 $form->currency('original_price')->required()->floatTwo()->symbol('￥');
                 $form->currency('vip_price')->required()->floatTwo()->symbol('￥');
                 $form->text('goods_unit')->help('如：50克，100克，250克，500克，1000克，1500克等');

app/Admin/Controllers/v3/GoodsActivityReportController.php

@@ -56,9 +56,9 @@ class GoodsActivityReportController extends AdminController
                 return $item->name ?? '';
             })->width('12%');
             $grid->column('price');
-            $grid->column('original_price');
+            $grid->column('purchase_price');
             $grid->column('total','销量');
-            $grid->column('subsidy_total','补贴')->help('（原价-售价）* 销量');
+            $grid->column('subsidy_total','补贴')->help('（采购价-售价）* 销量');
 
             $grid->filter(function (Filter $filter) use($marketList,$storeList) {
                 // 更改为 panel 布局

app/Admin/Forms/v3/GoodsActivityCopyForm.php

@@ -35,6 +35,7 @@ class GoodsActivityCopyForm extends Form implements LazyRenderable
         $canUseCoupon = $input['can_use_coupon'];
         $type = $input['type'];
         $inventory = $input['inventory'];
+        $typeLimit = $input['type_limit'];
 
         if($expireTime <= time()){
             $this->error('活动结束时间必须大于当前时间！');
@@ -53,6 +54,7 @@ class GoodsActivityCopyForm extends Form implements LazyRenderable
             $model->time_limit_num = $timeLimitNum;
             $model->can_use_coupon = $canUseCoupon;
             $model->type = $type;
+            $model->type_limit = $typeLimit;
             $model->inventory = $inventory;
 
             $model->goods_id = 0;
@@ -72,6 +74,7 @@ class GoodsActivityCopyForm extends Form implements LazyRenderable
             $model->details = $goods->details;
 
             $model->price = $goods->price;
+            $model->purchase_price = $goods->purchase_price;
             $model->original_price = $goods->original_price;
             $model->vip_price = $goods->vip_price;
 
@@ -117,10 +120,13 @@ class GoodsActivityCopyForm extends Form implements LazyRenderable
         $this->display('name')->value($name)->help('复制的活动商品默认下架状态，请核对信息后手动上架！');
         $stores = StoreModel::getStoreArray();
         $this->multipleSelect('store_ids','选择店铺')->required()->options($stores)->help('选择店铺，将当前商品复制到所选店铺。注意选择重复店铺问题！！！');
-        $this->number('inventory','库存')->required()->attribute('min', 1)->default(1);
         $this->datetime('expire_time','活动结束时间')->required()->format('YYYY-MM-DD HH:mm:ss')->rules('after:now',['after'=>'活动结束时间必须大于当前时间！']);
+
+        $this->number('inventory','库存')->required()->attribute('min', 1)->default(1);
+        
         $this->number('time_limit_days','限制的天数')->default(1)->help('A时间段内限购');
         $this->number('time_limit_num','限制购买数量')->default(1)->help('A时间段内限购的数量');
+        $this->number('type_limit','同类限购种数')->help('如填1，那么值为1的类型商品只能购买一种，2那么值为2的商品只能购买两种不同的商品')->default(0);
         $this->switch('can_use_coupon','可同时使用优惠券')->default(0);
         $this->select('type','活动类型')->options(GoodsModel::$_TYPE)->default('flash_sale');
         $this->disableResetButton();

app/Admin/Repositories/v3/GoodsActivityReport.php

@@ -39,9 +39,9 @@ class GoodsActivityReport extends EloquentRepository
             $where = ['market_id'=>$this->params['market_id']];
         }
        
-        $selects = 'SUM(number) as total,SUM((original_price-price)*number) as subsidy_total,price,original_price,'.Model::$tableName.'.goods_id,'.Model::$tableName.'.name,'.Model::$tableName.'.cover_img,'.OrderMainModel::$tableName.'.market_id,'.OrderModel::$tableName.'.store_id';
+        $selects = 'SUM(number) as total,SUM((purchase_price-price)*number) as subsidy_total,price,purchase_price,'.Model::$tableName.'.goods_id,'.Model::$tableName.'.name,'.Model::$tableName.'.cover_img,'.OrderMainModel::$tableName.'.market_id,'.OrderModel::$tableName.'.store_id';
         $orderGoodsActivity = $this->getDataModel($selects,$where);
-        $list = $orderGoodsActivity->orderBy('total','desc')->groupBy('goods_id',Model::$tableName.'.name','cover_img','market_id','store_id','price','original_price')->paginate($perPage);
+        $list = $orderGoodsActivity->orderBy('total','desc')->groupBy('goods_id',Model::$tableName.'.name','cover_img','market_id','store_id','price','purchase_price')->paginate($perPage);
         $list = $list->toArray(); 
 
         return $model->makePaginator(
@@ -101,7 +101,7 @@ class GoodsActivityReport extends EloquentRepository
      */
     public function getCountData($params = [])
     {
-        $selects = "SUM(".Model::$tableName.".number) as total,SUM((original_price-price)*number) as subsidy_total,FROM_UNIXTIME(".Model::$tableName.".created_at,'%Y-%m-%d') as dtime"; 
+        $selects = "SUM(".Model::$tableName.".number) as total,SUM((purchase_price-price)*number) as subsidy_total,FROM_UNIXTIME(".Model::$tableName.".created_at,'%Y-%m-%d') as dtime"; 
         $orderGoodsActivity = $this->getDataModel($selects,$params);
         $total = $orderGoodsActivity->orderBy('dtime','desc')->groupBy('dtime')->get()->toArray();
 
@@ -113,7 +113,7 @@ class GoodsActivityReport extends EloquentRepository
      */
     public function getMarketData($params = [])
     {
-        $selects = "SUM(".Model::$tableName.".number) as total,SUM((original_price-price)*number) as subsidy_total,market_id"; 
+        $selects = "SUM(".Model::$tableName.".number) as total,SUM((purchase_price-price)*number) as subsidy_total,market_id"; 
         $orderGoodsActivity = $this->getDataModel($selects,$params);
         $total = $orderGoodsActivity->groupBy('market_id')->get()->toArray();
 

resources/lang/zh-CN/goods-activity-report.php

@@ -13,6 +13,7 @@ return [
         'price' => '售价',
         'original_price' => '原价',
         'total' => '统计数量',
+        'purchase_price' => '采购价'
     ],
     'options' => [
     ],

resources/lang/zh-CN/goods-activity.php

@@ -41,7 +41,8 @@ return [
         'video_banners' => '轮播视频',
         'spec_key' =>'规格名称',
         'spec_value' => '规格参数',
-        'sales' => '销量'
+        'sales' => '销量',
+        'purchase_price' => '采购价'
     ],
     'options' => [
     ],