fix : place order coupon

app/Service/Admin/Catering/Option/PrintService.php

@@ -92,7 +92,7 @@ class PrintService extends CateringBaseService
      */
     public function cancel(): array
     {
-        $service = $this->printOrderFactory->handle($this->request->input('type'));
+        $service = $this->printOrderFactory->handle((int)$this->request->input('type'));
         $service->printId = (int)$this->request->input('print_id');
         $service->handle();
         $service->printCancel();

app/Service/Admin/Catering/Print/YlyPrintService.php

@@ -115,8 +115,8 @@ class YlyPrintService implements PrintOrderInterface
             empty($this->data['order_sno']) ||
             empty($this->data['username']) ||
             empty($this->data['mobile']) ||
-            empty($this->data['date']) ||
-            empty($this->data['heapsort'])
+            empty($this->data['date'])
+//            empty($this->data['heapsort'])
         ) {
             $this->log->error('打印数据'.json_encode($this->data));
             throw new ErrException('打印数据丢失');

app/Service/Api/Order/BaseOrderService.php

@@ -16,6 +16,7 @@ use App\Model\CouponTemplate;
 use App\Model\UserCoupon;
 use App\Service\Api\BaseService;
 use App\Service\ServiceTrait\Admin\Catering\PrintTrait;
+use App\Service\ServiceTrait\Api\CouponTrait;
 use App\Service\ServiceTrait\Api\OrderTrait;
 use App\Service\ServiceTrait\Common\CycleTrait;
 use Hyperf\Di\Annotation\Inject;
@@ -24,7 +25,7 @@ use Psr\Container\NotFoundExceptionInterface;
 
 abstract class BaseOrderService extends BaseService
 {
-    use CycleTrait,OrderTrait,PrintTrait;
+    use CycleTrait,OrderTrait,PrintTrait,CouponTrait;
 
     /**
      * @var int 周期id
@@ -100,7 +101,7 @@ abstract class BaseOrderService extends BaseService
      * 优惠券id
      * @var int
      */
-    protected int $couponId;
+    protected int $couponId = 0;
 
     /**
      * 地点id

app/Service/Api/Order/PlaceOrderService.php

@@ -121,6 +121,7 @@ class PlaceOrderService extends BaseOrderService
      * @return void
      * @throws ContainerExceptionInterface
      * @throws NotFoundExceptionInterface
+     * @throws ErrException
      */
     private function placeOrder(): void
     {
@@ -133,12 +134,16 @@ class PlaceOrderService extends BaseOrderService
 
             $this->insertOrderGoods();
 
+            $this->couponLock();
+
             Db::commit();
         } catch (Exception $e){
             echo $e->getMessage();
             //回滚数据库 和 缓存
             Db::rollBack();
             $this->rollbackStock();
+
+//            $this->rollbackCouponLock();
             //意外抛出
             throw new ErrException($e->getMessage());
         }
@@ -207,7 +212,7 @@ class PlaceOrderService extends BaseOrderService
         $orderInsertModel->is_refund_all = OrderCode::REFUND_NULL;
         $orderInsertModel->order_json = json_encode($this->orderRes);
 
-        if (!$orderInsertModel->save()) throw new Exception('下单失败');
+        if (!$orderInsertModel->save()) throw new Exception('下单失败-01');
 
         $this->orderId = $orderInsertModel->id;
     }

app/Service/ServiceTrait/Api/CouponTrait.php

@@ -4,6 +4,7 @@ namespace App\Service\ServiceTrait\Api;
 
 use App\Constants\Common\CouponCode;
 use App\Constants\Common\OrderCode;
+use App\Exception\ErrException;
 use App\Extend\DateUtil;
 use App\Model\UserCoupon;
 use Exception;
@@ -40,6 +41,46 @@ trait CouponTrait
         if (!$couponInfo->save()) throw new Exception('CancelOrderConsumer:error:couponStatusUpdateError:'.json_encode($orderInfo->toArray()));
     }
 
+    /**
+     * @return void
+     * @throws Exception
+     */
+    protected function couponLock(): void
+    {
+        if ($this->couponId <= 0) return;
+
+        $couponInfo = $this->userCouponModel->where('id', $this->couponId)->where('user_id',$this->userId)->first();
+
+        if (empty($couponInfo)) return;
+
+        $couponInfo->status = CouponCode::COUPON_STATUS_USED;
+        $couponInfo->use_time = date('Y-m-d H:i:s');
+
+        if (date('Y-m-d H:i:s') > $couponInfo->validity_end_time) throw new Exception('优惠券已过期');
+
+        if (!$couponInfo->save()) throw new Exception('couponLock:error:couponLockUpdateError:'.json_encode($couponInfo->toArray()));
+    }
+
+    /**
+     * @return void
+     * @throws ErrException
+     */
+    protected function rollbackCouponLock(): void
+    {
+        if ($this->couponId <= 0) return;
+
+        $couponInfo = $this->userCouponModel->where('id', $this->couponId)->where('user_id',$this->userId)->first();
+
+        if (empty($couponInfo)) return;
+
+        if ($couponInfo->status != CouponCode::COUPON_STATUS_USED) return;
+
+        $couponInfo->status = CouponCode::COUPON_STATUS_UNUSED;
+        $couponInfo->use_time = '1970-01-01 00:00:00';
+
+        if (!$couponInfo->save()) throw new ErrException('系统错误-rollback_coupon失败');
+    }
+
     /**
      * @param int $type
      * @param string $value