Browse Source

完善功能

gorden 9 tháng trước cách đây
mục cha
commit
7f5de88b41

+ 7 - 0
app/admin/controller/member/BenefitController.php

@@ -7,6 +7,7 @@ use app\controller\Curd;
 use app\model\Appointment;
 use app\model\Member;
 use app\model\MemberBenefit;
+use app\model\Order;
 use app\model\SysUser;
 use support\Db;
 use support\exception\BusinessException;
@@ -191,6 +192,12 @@ class BenefitController extends Curd
             Db::beginTransaction();
             // 减额度
             $benefit->member_benefit_used_count = $benefit->member_benefit_used_count + $paramsData['nbr'];
+            if($benefit->member_benefit_used_count == $benefit->member_benefit_limit_count){
+                $benefit->member_benefit_status = 'DONE';
+                if(!empty($benefit->join_benefit_order_id)){
+                    Order::where('order_id',$benefit->join_benefit_order_id)->update(['order_is_complete'=>'Y','order_status_system'=>'DONE']);
+                }
+            }
             $benefit->save();
             // 记录核销
             $params = [

+ 5 - 2
app/admin/service/order/AppointmentService.php

@@ -353,7 +353,6 @@ class AppointmentService
             if ($goods->is_support_appointment == 'Y' && !empty($goods->goods_attribute_json)) {
                 $extendJson = json_decode($goods->goods_attribute_json, true);
                 foreach ($extendJson['times'] as $key => $time) {
-                    dump($time,$params['appointment_times']);
                     if ($time['duration'] == $params['appointment_times']) {
                         if (!empty($appointments)){
                             foreach ($appointments as $appointment) {
@@ -524,7 +523,11 @@ class AppointmentService
                     BenefitController::doWriteOff($paramsData);
                 }
                 // 回写权益ID
-                Appointment::where('appointment_id', $appointmentId)->update(['join_appointment_member_benefit_id' => $params['quota_id']]);
+                if(empty($appointment->join_appointment_member_benefit_id)){
+                    Appointment::where('appointment_id', $appointmentId)->update(['join_appointment_member_benefit_id' => $params['quota_id']]);
+                }
+
+                
             }
 
             Db::commit();