用户支付-测试

app/common/logic/EffectiveLogic.php

@@ -15,16 +15,19 @@ class EffectiveLogic extends BaseLogic
     {
         $orderGoods = OrderGoods::whereIn('sn',RechargeOrder::where('work_id',$work->id)->column('sn'))->findOrEmpty();
         $effective =  EffectiveCategory::with('effectiveRule')->where('goods_category_id',$orderGoods->goods_category_id)->findOrEmpty();
-        OrderEffectiveLog::create([
-            'effective_id' => $effective->effectiveRule->id,
-            'sn' => $orderGoods['sn'],
-            'user_id' => $work['user_id'],
-            'work_id' => $work->work_id,
-            'goods_id' => $orderGoods->goods_id,
-            'effective_unit' => $effective->effectiveRule->effective_unit,
-            'effective_num' => $effective->effectiveRule->effective_num,
-            'remark' => $effective->effectiveRule->remark,
-            'end_effective_time' =>  date("Y-m-d H:i:s",EffectiveRules::formatEndEffectiveTime(time() ,$effective->effectiveRule->effective_num,$effective->effectiveRule->effective_unit)),
-        ]);
+        if(!$effective->isEmpty()){
+            OrderEffectiveLog::create([
+                'effective_id' => $effective->effectiveRule->id,
+                'sn' => $orderGoods['sn'],
+                'user_id' => $work['user_id'],
+                'work_id' => $work->work_id,
+                'goods_id' => $orderGoods->goods_id,
+                'effective_unit' => $effective->effectiveRule->effective_unit,
+                'effective_num' => $effective->effectiveRule->effective_num,
+                'remark' => $effective->effectiveRule->remark,
+                'end_effective_time' =>  date("Y-m-d H:i:s",EffectiveRules::formatEndEffectiveTime(time() ,$effective->effectiveRule->effective_num,$effective->effectiveRule->effective_unit)),
+            ]);
+        }
+
     }
 }

app/common/logic/PaymentLogic.php

@@ -17,6 +17,7 @@ namespace app\common\logic;
 
 use app\common\enum\PayEnum;
 use app\common\enum\YesNoEnum;
+use app\common\model\effective\EffectiveCategory;
 use app\common\model\pay\PayWay;
 use app\common\model\recharge\RechargeOrder;
 use app\common\model\user\User;