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

app/common/dao/store/coupon/StoreCouponProductDao.php

@@ -14,6 +14,7 @@ namespace app\common\dao\store\coupon;
 use app\common\dao\BaseDao;
 use app\common\model\BaseModel;
 use app\common\model\store\coupon\StoreCouponProduct;
+use app\entity\data\store\StoreCouponProductEntity;
 use think\Collection;
 use think\db\exception\DataNotFoundException;
 use think\db\exception\DbException;
@@ -71,4 +72,28 @@ class StoreCouponProductDao extends BaseDao
     {
         return StoreCouponProduct::getDB()->whereIn('product_id', $productId)->column('coupon_id');
     }
+
+    /**
+     * @param int $couponId
+     * @return StoreCouponProductEntity[]
+     */
+    public function getStoreCouponProductEntityListByCouponId(int $couponId): array
+    {
+        $entityList = [];
+        try {
+            /** @var StoreCouponProduct $model */
+            $model = $this->getModel();
+            $dataListRes = $model::getDB()
+                ->where('coupon_id', '=', $couponId)
+                ->select()
+                ->toArray();
+            if (!empty($dataListRes)) {
+                foreach ($dataListRes as $data) {
+                    $entityList[] = StoreCouponProductEntity::newInstance($data);
+                }
+            }
+        } catch (\Exception $e) {
+        }
+        return $entityList;
+    }
 }

app/common/repositories/store/coupon/StoreCouponProductRepository.php

@@ -13,6 +13,7 @@ namespace app\common\repositories\store\coupon;
 
 use app\common\dao\store\coupon\StoreCouponProductDao;
 use app\common\repositories\BaseRepository;
+use app\entity\data\store\StoreCouponProductEntity;
 
 /**
  * Class StoreCouponProductRepository
@@ -32,4 +33,13 @@ class StoreCouponProductRepository extends BaseRepository
     {
         $this->dao = $dao;
     }
+
+    /**
+     * @param int $couponId
+     * @return StoreCouponProductEntity[]
+     */
+    public function getStoreCouponProductEntityListByCouponId(int $couponId): array
+    {
+        return $this->dao->getStoreCouponProductEntityListByCouponId($couponId);
+    }
 }

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

@@ -11594,6 +11594,8 @@ class StoreOrderRepository extends BaseRepository
         $yanglaojin = 0.00;
         $totalPrice = 0.00;
         $totalNum = 0;
+        // 记录每类商品 在此笔订单中的金额
+        // 商品 => 此笔订单内此商品总价
         $productPriceMap = [];
         $validTotalPrice = 0.00;
         $productCart = [];
@@ -11649,7 +11651,7 @@ class StoreOrderRepository extends BaseRepository
             // 计算养老金
             $yanglaojin = bcadd($yanglaojin, $productRepository->yanglaojin($cartEntity->getProductId()), 2);
 
-            // 验证是否是秒杀产品
+            // 验证是否是秒杀产品 如果是秒杀产品，并且设置了 大仓会员价 则将大仓会员价 设置为 商品价格
             if ($productEntity->getSeckill() == ProductEnum::SECKILL['Yes']['code'] && !is_null($productEntity->getDcPrice()) && $productEntity->getDcPrice() > 0.00) {
                 // 获取 在活动期间内的 秒杀活动记录
                 $seckillEntity = $seckillRepository->getSeckillEntityByProductId($cartEntity->getProductId());
@@ -11663,6 +11665,7 @@ class StoreOrderRepository extends BaseRepository
             // type => '商品类型：1：普通商品。2：爆款商品。3：消费积分商品 。5：会员专享商品（城中大仓）6：每日免费领商品 7:商户特殊商品 8：共富会员商品 9:共富高级会员商品 10:高级会员商品 11村代理商品(废弃) 12镇代理商品(废弃) 13县代理商品(废弃)  14- 合伙人商品 15 股权商品 16合伙人+股权商品',
             // ProductType => 0.普通商品 1.秒杀商品
             $productEntity->setProductType($productEntity->getType());
+
             // 计算单价
             $price = bcmul($cartEntity->getCartNum(), $productAttrValueEntity->getPrice(), 2);
             // 计算总价
@@ -11776,14 +11779,43 @@ class StoreOrderRepository extends BaseRepository
 
 
             $merchantMap[$cartEntity->getMerId()]['merchantEntity'] = $merchantEntity;
+            $merchantMap[$cartEntity->getMerId()]['productIdListByCart'][] = $cartEntity->getProductId();
         }
 
 
         foreach ($merchantMap as $merId => $item) {
+            // 当前商户的实体信息
             /** @var MerchantEntity $merchantEntity */
             $merchantEntity = $item['merchantEntity'];
-            // 计算优惠金额
+            // 当前订单中 从当前商户中选择的商品列表
+            $productIdListByCart = $item['productIdListByCart'];
+
+            // 查询 当前用户 在当前 店铺的 优惠券
             $storeCouponUserEntityList = $storeCouponUserRepository->getValidStoreCouponUserEntityListByMerIdAndUid($merchantEntity->getMerId(), $userEntity->getUid());
+            foreach ($storeCouponUserEntityList as $storeCouponUserEntity) {
+                // 如果不能明确当前优惠券的 获取方式 ，则忽略当前的优惠券的有效性
+                if (empty($storeCouponUserEntity->getType())) {
+                    continue;
+                }
+                // 优惠卷关联商品 辅助表
+                $storeCouponProductEntityList = $storeCouponProductRepository->getStoreCouponProductEntityListByCouponId($storeCouponUserEntity->getCouponId());
+
+                foreach ($storeCouponProductEntityList as $storeCouponProductEntity) {
+                    // 如果当前 优惠券 所关联的 此 商品 不在当前购买的商品列表中，则说明此条关联记录 无用
+                    if (!in_array($storeCouponProductEntity->getProductId(), $productIdListByCart)) {
+                        continue;
+                    }
+
+                }
+
+                // 获取 当前消费者 有没有 从该商家发型的优惠券里 进行领取
+                $couponCountByMerIdUid = $storeCouponRepository->validMerCouponExists($merchantEntity->getMerId(), $userEntity->getUid());
+                if ($couponCountByMerIdUid > 0) {
+
+                }
+
+
+            }
 
         }
 

app/entity/data/store/StoreCouponProductEntity.php

@@ -0,0 +1,66 @@
+<?php
+
+namespace app\entity\data\store;
+
+use app\entity\data\DataEntity;
+
+class StoreCouponProductEntity extends DataEntity
+{
+    public $productId = 0;  // 产品id
+    public $couponId = 0;   // 优惠卷id
+    public $createTime = null;  // 添加时间
+
+    /**
+     * @return int
+     */
+    public function getProductId(): int
+    {
+        return $this->productId;
+    }
+
+    /**
+     * @param int $productId
+     * @return StoreCouponProductEntity
+     */
+    public function setProductId(int $productId): StoreCouponProductEntity
+    {
+        $this->productId = $productId;
+        return $this;
+    }
+
+    /**
+     * @return int
+     */
+    public function getCouponId(): int
+    {
+        return $this->couponId;
+    }
+
+    /**
+     * @param int $couponId
+     * @return StoreCouponProductEntity
+     */
+    public function setCouponId(int $couponId): StoreCouponProductEntity
+    {
+        $this->couponId = $couponId;
+        return $this;
+    }
+
+    /**
+     * @return null
+     */
+    public function getCreateTime()
+    {
+        return $this->createTime;
+    }
+
+    /**
+     * @param null $createTime
+     * @return StoreCouponProductEntity
+     */
+    public function setCreateTime($createTime)
+    {
+        $this->createTime = $createTime;
+        return $this;
+    }
+}