cqp 4 月之前
父節點
當前提交
dca19c59b8
共有 2 個文件被更改,包括 4 次插入2 次删除
  1. 2 0
      app/Model/Product.php
  2. 2 2
      app/Service/CheckService.php

+ 2 - 0
app/Model/Product.php

@@ -25,6 +25,7 @@ class Product extends UseScopeBaseModel
     const Product_attribute_three = 3;
     const Product_attribute_four = 4;
     const Product_attribute_five = 5;
+    const Product_attribute_six = 6;
     public static $product_attribute = [
         self::Product_attribute_zero => '无',
         self::Product_attribute_one => '其他',
@@ -32,6 +33,7 @@ class Product extends UseScopeBaseModel
         self::Product_attribute_three => '严选',
         self::Product_attribute_four => '热门畅销',
         self::Product_attribute_five => 'NEW',
+        self::Product_attribute_six => '含税产品',
     ];
     public static $product_attribute_color = [
         self::Product_attribute_zero => [

+ 2 - 2
app/Service/CheckService.php

@@ -198,7 +198,7 @@ class CheckService extends Service
         self::seven => OrderOperation::thi,//采购单确认
         self::three => OrderOperation::fourteen,//采购单入库
         self::ten => OrderOperation::twenty_one,//收付款单
-        self::twl => OrderOperation::twenty_one,//收付款单
+        self::twl => OrderOperation::twenty_seven,//活动包确认
         self::thi => OrderOperation::twenty_nine,//虚拟采购单
         self::sixteen => OrderOperation::thirty_three,//出库单
     ];
@@ -416,7 +416,7 @@ class CheckService extends Service
         if(! in_array($model->state, [SportsBag::State_minus_one,SportsBag::STATE_ZERO])) return [false, '请确认活动包状态,操作失败'];
 
         SportsBag::where('del_time',0)->where('id',$data['id'])
-            ->update(['state' => PaymentReceipt::STATE_ONE]);
+            ->update(['state' => SportsBag::STATE_ONE]);
 
         return [true, $model->toArray()];
     }