优化用户下单方法-进行中

app/common/dao/user/UserSignScoreDao.php

@@ -11,6 +11,7 @@ use app\entity\data\user\UserSignScoreEntity;
 use think\db\exception\DataNotFoundException;
 use think\db\exception\DbException;
 use think\db\exception\ModelNotFoundException;
+use think\facade\Log;
 
 class UserSignScoreDao extends BaseDao
 {
@@ -36,6 +37,8 @@ class UserSignScoreDao extends BaseDao
                 ->whereIn('id', $idList)
                 ->select()
                 ->toArray();
+            Log::info('$dataRes - getUserSignScoreEntityListByIdList');
+            Log::info($dataRes);
             if (!empty($dataRes)) {
                 $entityList = array_map(function ($data) {
                     return UserSignScoreEntity::newInstance($data);

app/common/repositories/store/order/StoreOrderRepository.php

@@ -11992,15 +11992,10 @@ class StoreOrderRepository extends BaseRepository
             ->setPayType($storeOrderCreateRequestEntity->getPayType())
             ->setFzonePaytype($storeOrderCreateRequestEntity->getFzonePayType());
 
-        // 5、验证是否 可以进行支付
-        /** @var FzonePayTypeEntity $fzonePayTypeEntity */
-        $fzonePayTypeEntity = FzonePayTypeEntity::newInstance($storeOrderCreateRequestEntity->getFzonePayType());
-        $paySuccess = $this->abatement($userEntity, $storeGroupOrderEntity, $fzonePayTypeEntity);
-
-        // 5、写入数据
+        // 4、写入数据
         Db::startTrans();
         try {
-            // 5.1 更细库存
+            // 4.1 更细库存
             foreach ($productStockList as $item) {
                 $productRepository->descStock($item['productId'], $item['cartNum']);
             }
@@ -12008,15 +12003,20 @@ class StoreOrderRepository extends BaseRepository
                 $productAttrValueRepository->descStock($item['productId'], $item['unique'], $item['cartNum']);
             }
 
-            // 5.2 修改 购物车状态
+            // 4.2 修改 购物车状态
             $storeCartRepository->updateIsPayByCartIdList($cartIdList);
 
-            // 5.3 写入 组合订单 (支付订单)
+            // 4.3 写入 组合订单 (支付订单)
             /** @var StoreGroupOrderRepository $storeGroupOrderRepository */
             $storeGroupOrderRepository = app()->make(StoreGroupOrderRepository::class);
             $storeGroupOrderEntity = $storeGroupOrderRepository->createByEntity($storeGroupOrderEntity);
 
-            // 5.4 写入订单数据
+            // 4.4 验证是否 可以进行支付
+            /** @var FzonePayTypeEntity $fzonePayTypeEntity */
+            $fzonePayTypeEntity = FzonePayTypeEntity::newInstance($storeOrderCreateRequestEntity->getFzonePayType());
+            $paySuccess = $this->abatement($userEntity, $storeGroupOrderEntity, $fzonePayTypeEntity);
+
+            // 4.5 写入订单数据
             $storeOrderStatusDataList = [];
             $storeOrderProductDataList = [];
             $storeOrderIdList = [];
@@ -12063,17 +12063,17 @@ class StoreOrderRepository extends BaseRepository
                 ];
             }
 
-            // 5.5 订单操作记录表
+            // 4.6 订单操作记录表
             /** @var StoreOrderStatusRepository $storeOrderStatusRepository */
             $storeOrderStatusRepository = app()->make(StoreOrderStatusRepository::class);
             $storeOrderStatusRepository->insertAll($storeOrderStatusDataList);
 
-            // 5.6 订单购物详情表
+            // 4.7 订单购物详情表
             /** @var StoreOrderProductRepository $storeOrderProductRepository */
             $storeOrderProductRepository = app()->make(StoreOrderProductRepository::class);
             $storeOrderProductRepository->insertAll($storeOrderProductDataList);
 
-            // 5.7 支付成功后 发放奖励
+            // 4.8 支付成功后 发放奖励
             // 非现金 支付成功后 直接结算
             if ($paySuccess) {
                 // 修改订单的 支付状态
@@ -12152,7 +12152,7 @@ class StoreOrderRepository extends BaseRepository
         $storeCartRepository = app()->make(StoreCartRepository::class);
         $cartEntityList = $storeCartRepository->getCartEntityListByCartIdList($storeOrderCreateRequestEntity->getCartIdList());
         if (empty($cartEntityList) || count($storeOrderCreateRequestEntity->getCartIdList()) != count($cartEntityList)) {
-            throw new ValidateException('获取购物车内容失败');
+            throw new ValidateException('未查询到购物车信息');
         }
 
         $merchantIdList = [];
@@ -12213,6 +12213,11 @@ class StoreOrderRepository extends BaseRepository
 
         // 确认购物车内 微唯宝 的商品 是否满足发货
         foreach ($cartEntityList as $cartEntity) {
+            // 验证用户
+            if ($cartEntity->getUid() != $userEntity->getUid()) {
+                throw new ValidateException('获取购物车内容失败');
+            }
+
             // 验证商户
             if (empty($merchantEntityMap[$cartEntity->getMerId()])) {
                 throw new ValidateException('未查询到商户信息');
@@ -12237,6 +12242,10 @@ class StoreOrderRepository extends BaseRepository
             if ($cartEntity->getIsFail() == CartEnum::IS_FAIL['Yes']['code']) {
                 throw new ValidateException($productEntity->getStoreName() . ' 已失效');
             }
+            // 判断订单是否已失效
+            if ($cartEntity->getIsPay() == CartEnum::IS_PAY['Yes']['code']) {
+                throw new ValidateException($productEntity->getStoreName() . ' 已下单');
+            }
 
             // 如果商品类型是 普通商品 ，则判断库存是否充足
             if ($cartEntity->getProductType() == CartEnum::PRODUCT_TYPE['Ordinary']['code']) {

app/controller/api/store/order/StoreOrder.php

@@ -115,12 +115,13 @@ class StoreOrder
      */
     public function createOrder(StoreCartRepository $cartRepository)
     {
-        $uid = $this->request->uid();
+        $uid = 1592;
         if (in_array($uid, [1592, 766])) {
-            $request = request();
+            $request = new Request();
             $storeOrderCreateValidate = new StoreOrderCreateValidate($request);
             return $this->createOrderNew($storeOrderCreateValidate);
         }
+        var_dump(123);
 
         $cartId = (array)$this->request->param('cart_id', []);
 

app/entity/data/user/UserSignScoreEntity.php

@@ -8,19 +8,19 @@ class UserSignScoreEntity extends DataEntity
 {
     public $id = null;  // 自增id
     public $uid = null;  // 会员id
-    public $continuity_day = null;  // 连续签到几天
-    public $reward_score = null;  // 赠送积分数量
-    public $signin_time = null;  // 签到时间
-    public $source_uid = null;  // 赠送积分来源用户id
+    public $continuityDay = null;  // 连续签到几天
+    public $rewardScore = null;  // 赠送积分数量
+    public $signinTime = null;  // 签到时间
+    public $sourceUid = null;  // 赠送积分来源用户id
     public $status = null;  // 积分状态1-有效 0-失效 -1待确认
     public $mark = null;  // 备注
-    public $order_id = null;  // 订单id
+    public $orderId = null;  // 订单id
     public $pm = null;  // 1-收入。2-支出
     public $surplus = null;  // 剩余
-    public $order_type = null;  // 订单类型。关联订单ID
+    public $orderType = null;  // 订单类型。关联订单ID
     public $addtime = null;  // 添加时间
-    public $source_type = null;  // 积分类型：1签到，2分享好友注册赠送，3自己下单赠送，4，好友下单赠送，5.购买产品消耗
-    public $settlement_time = null;  // 结算时间
+    public $sourceType = null;  // 积分类型：1签到，2分享好友注册赠送，3自己下单赠送，4，好友下单赠送，5.购买产品消耗
+    public $settlementTime = null;  // 结算时间
 
     /**
      * @return mixed
@@ -63,16 +63,16 @@ class UserSignScoreEntity extends DataEntity
      */
     public function getContinuityDay()
     {
-        return $this->continuity_day;
+        return $this->continuityDay;
     }
 
     /**
-     * @param mixed $continuity_day
+     * @param mixed $continuityDay
      * @return UserSignScoreEntity
      */
-    public function setContinuityDay($continuity_day): UserSignScoreEntity
+    public function setContinuityDay($continuityDay): UserSignScoreEntity
     {
-        $this->continuity_day = $continuity_day;
+        $this->continuityDay = $continuityDay;
         return $this;
     }
 
@@ -81,16 +81,16 @@ class UserSignScoreEntity extends DataEntity
      */
     public function getRewardScore()
     {
-        return $this->reward_score;
+        return $this->rewardScore;
     }
 
     /**
-     * @param mixed $reward_score
+     * @param mixed $rewardScore
      * @return UserSignScoreEntity
      */
-    public function setRewardScore($reward_score): UserSignScoreEntity
+    public function setRewardScore($rewardScore): UserSignScoreEntity
     {
-        $this->reward_score = $reward_score;
+        $this->rewardScore = $rewardScore;
         return $this;
     }
 
@@ -99,16 +99,16 @@ class UserSignScoreEntity extends DataEntity
      */
     public function getSigninTime()
     {
-        return $this->signin_time;
+        return $this->signinTime;
     }
 
     /**
-     * @param mixed $signin_time
+     * @param mixed $signinTime
      * @return UserSignScoreEntity
      */
-    public function setSigninTime($signin_time): UserSignScoreEntity
+    public function setSigninTime($signinTime): UserSignScoreEntity
     {
-        $this->signin_time = $signin_time;
+        $this->signinTime = $signinTime;
         return $this;
     }
 
@@ -117,16 +117,16 @@ class UserSignScoreEntity extends DataEntity
      */
     public function getSourceUid()
     {
-        return $this->source_uid;
+        return $this->sourceUid;
     }
 
     /**
-     * @param mixed $source_uid
+     * @param mixed $sourceUid
      * @return UserSignScoreEntity
      */
-    public function setSourceUid($source_uid): UserSignScoreEntity
+    public function setSourceUid($sourceUid): UserSignScoreEntity
     {
-        $this->source_uid = $source_uid;
+        $this->sourceUid = $sourceUid;
         return $this;
     }
 
@@ -171,16 +171,16 @@ class UserSignScoreEntity extends DataEntity
      */
     public function getOrderId()
     {
-        return $this->order_id;
+        return $this->orderId;
     }
 
     /**
-     * @param mixed $order_id
+     * @param mixed $orderId
      * @return UserSignScoreEntity
      */
-    public function setOrderId($order_id): UserSignScoreEntity
+    public function setOrderId($orderId): UserSignScoreEntity
     {
-        $this->order_id = $order_id;
+        $this->orderId = $orderId;
         return $this;
     }
 
@@ -225,16 +225,16 @@ class UserSignScoreEntity extends DataEntity
      */
     public function getOrderType()
     {
-        return $this->order_type;
+        return $this->orderType;
     }
 
     /**
-     * @param mixed $order_type
+     * @param mixed $orderType
      * @return UserSignScoreEntity
      */
-    public function setOrderType($order_type): UserSignScoreEntity
+    public function setOrderType($orderType): UserSignScoreEntity
     {
-        $this->order_type = $order_type;
+        $this->orderType = $orderType;
         return $this;
     }
 
@@ -261,16 +261,16 @@ class UserSignScoreEntity extends DataEntity
      */
     public function getSourceType()
     {
-        return $this->source_type;
+        return $this->sourceType;
     }
 
     /**
-     * @param mixed $source_type
+     * @param mixed $sourceType
      * @return UserSignScoreEntity
      */
-    public function setSourceType($source_type): UserSignScoreEntity
+    public function setSourceType($sourceType): UserSignScoreEntity
     {
-        $this->source_type = $source_type;
+        $this->sourceType = $sourceType;
         return $this;
     }
 
@@ -279,16 +279,16 @@ class UserSignScoreEntity extends DataEntity
      */
     public function getSettlementTime()
     {
-        return $this->settlement_time;
+        return $this->settlementTime;
     }
 
     /**
-     * @param mixed $settlement_time
+     * @param mixed $settlementTime
      * @return UserSignScoreEntity
      */
-    public function setSettlementTime($settlement_time): UserSignScoreEntity
+    public function setSettlementTime($settlementTime): UserSignScoreEntity
     {
-        $this->settlement_time = $settlement_time;
+        $this->settlementTime = $settlementTime;
         return $this;
     }
 }