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

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

@@ -12,8 +12,10 @@ namespace app\common\dao\store\coupon;
 
 
 use app\common\dao\BaseDao;
+use app\common\enum\store\StoreCouponUserEnum;
 use app\common\model\BaseModel;
 use app\common\model\store\coupon\StoreCouponUser;
+use app\entity\data\store\StoreCouponUserEntity;
 
 /**
  * Class StoreCouponUserDao
@@ -86,4 +88,35 @@ class StoreCouponUserDao extends BaseDao
     {
         return StoreCouponUser::getDB()->where('coupon_id', $couponId)->count();
     }
+
+    /**
+     * @param int $merId
+     * @param int $uid
+     * @return StoreCouponUserEntity[]
+     */
+    public function getValidStoreCouponUserEntityListByMerIdAndUid(int $merId, int $uid): array
+    {
+        $entityList = [];
+        try {
+            $dateTime = date('Y-m-d H:i:s');
+            /** @var StoreCouponUser $model */
+            $model = $this->getModel();
+            $dataListRes = $model::getDB()
+                ->where('mer_id', '=', $merId)
+                ->where('uid', '=', $uid)
+                ->where('status', '=', StoreCouponUserEnum::STATUS['Unused']['code'])
+                ->where('is_fail', '=', StoreCouponUserEnum::IS_FAIL['No']['code'])
+                ->where('start_time', '<=', $dateTime)
+                ->where('end_time', '>=', $dateTime)
+                ->select()
+                ->toArray();
+            if (!empty($dataListRes)) {
+                foreach ($dataListRes as $data) {
+                    $entityList[] = StoreCouponUserEntity::newInstance($data);
+                }
+            }
+        } catch (\Exception $e) {
+        }
+        return $entityList;
+    }
 }

app/common/dao/store/shipping/ShippingTemplateDao.php

@@ -7,6 +7,8 @@
  */
 namespace app\common\dao\store\shipping;
 
+use app\common\model\store\shipping\ShippingTemplate;
+use app\entity\data\shipping\ShippingTemplateEntity;
 use think\facade\Db;
 use app\common\dao\BaseDao;
 use app\common\model\store\shipping\ShippingTemplate as model;
@@ -86,4 +88,26 @@ class ShippingTemplateDao  extends BaseDao
     {
         return ($this->getModel())::getDB()->where('mer_id',$merId)->field('shipping_template_id,name')->select();
     }
+
+    /**
+     * @param int $shippingTemplateId
+     * @return \app\entity\CommonEntity
+     */
+    public function getShippingTemplateEntityByShippingTemplateId(int $shippingTemplateId): \app\entity\CommonEntity
+    {
+        $data = [];
+        try {
+            /** @var ShippingTemplate $model */
+            $model = $this->getModel();
+            $dataRes = $model::getDB()
+                ->where('shipping_template_id', '=', $shippingTemplateId)
+                ->find();
+            if (!empty($dataRes)) {
+                $data = $dataRes->toArray();
+            }
+        } catch (\Exception $e) {
+
+        }
+        return ShippingTemplateEntity::newInstance($data);
+    }
 }

app/common/dao/store/shipping/ShippingTemplateFreeDao.php

@@ -7,6 +7,7 @@
  */
 namespace app\common\dao\store\shipping;
 
+use app\entity\data\shipping\ShippingTemplateFreeEntity;
 use think\facade\Db;
 use app\common\dao\BaseDao;
 use app\common\model\store\shipping\ShippingTemplateFree as model;
@@ -64,4 +65,29 @@ class ShippingTemplateFreeDao  extends BaseDao
     {
         return ($this->getModel()::getDB())->insertAll($data);
     }
+
+    /**
+     * @param int $tempId
+     * @return ShippingTemplateFreeEntity[]
+     */
+    public function getShippingTemplateFreeEntityListByTempId(int $tempId): array
+    {
+        $entityList = [];
+        try {
+            /** @var model $model */
+            $model = $this->getModel();
+            $dataListRes = $model::getDB()
+                ->where('temp_id', '=', $tempId)
+                ->order('shipping_template_free_id DESC')
+                ->select()
+                ->toArray();
+            if (!empty($dataListRes)) {
+                foreach ($dataListRes as $data) {
+                    $entityList[] = ShippingTemplateFreeEntity::newInstance($data);
+                }
+            }
+        } catch (\Exception $e) {
+        }
+        return $entityList;
+    }
 }

app/common/dao/store/shipping/ShippingTemplateRegionDao.php

@@ -7,6 +7,7 @@
  */
 namespace app\common\dao\store\shipping;
 
+use app\entity\data\shipping\ShippingTemplateRegionEntity;
 use think\facade\Db;
 use app\common\dao\BaseDao;
 use app\common\model\store\shipping\ShippingTemplateRegion as model;
@@ -64,4 +65,28 @@ class ShippingTemplateRegionDao  extends BaseDao
         return ($this->getModel()::getDB())->insertAll($data);
     }
 
+    /**
+     * @param int $tempId
+     * @return ShippingTemplateRegionEntity[]
+     */
+    public function getShippingTemplateRegionEntityListByTempId(int $tempId): array
+    {
+        $entityList = [];
+        try {
+            /** @var model $model */
+            $model = $this->getModel();
+            $dataListRes = $model::getDB()
+                ->where('temp_id', '=', $tempId)
+                ->order('shipping_template_region_id DESC')
+                ->select()
+                ->toArray();
+            if (!empty($dataListRes)) {
+                foreach ($dataListRes as $data) {
+                    $entityList[] = ShippingTemplateRegionEntity::newInstance($data);
+                }
+            }
+        } catch (\Exception $e) {
+        }
+        return $entityList;
+    }
 }

app/common/dao/store/shipping/ShippingTemplateUndeliveryDao.php

@@ -8,6 +8,7 @@ namespace app\common\dao\store\shipping;
 
 use app\common\dao\BaseDao;
 use app\common\model\store\shipping\ShippingTemplateUndelivery as model;
+use app\entity\data\shipping\ShippingTemplateUndeliveryEntity;
 
 class ShippingTemplateUndeliveryDao  extends BaseDao
 {
@@ -51,4 +52,28 @@ class ShippingTemplateUndeliveryDao  extends BaseDao
         if($temp_id)
             ($this->getModel())::getDB()->where('temp_id','in',$temp_id)->delete();
     }
+
+    /**
+     * @param int $tempId
+     * @return ShippingTemplateUndeliveryEntity[]
+     */
+    public function getShippingTemplateUndeliveryEntityListByTempId(int $tempId): array
+    {
+        $entityList = [];
+        try {
+            /** @var model $model */
+            $model = $this->getModel();
+            $dataListRes = $model::getDB()
+                ->where('temp_id', '=', $tempId)
+                ->select()
+                ->toArray();
+            if (!empty($dataListRes)) {
+                foreach ($dataListRes as $data) {
+                    $entityList[] = ShippingTemplateUndeliveryEntity::newInstance($data);
+                }
+            }
+        } catch (\Exception $e) {
+        }
+        return $entityList;
+    }
 }

app/common/enum/shipping/ShippingTemplateEnum.php

@@ -0,0 +1,33 @@
+<?php
+
+namespace app\common\enum\shipping;
+
+use app\common\enum\CommonEnum;
+
+class ShippingTemplateEnum extends CommonEnum
+{
+    // 计费方式
+    const TYPE = [
+        'Quantity' => ['code' => 0, 'name' => '数量'],
+        'Weight' => ['code' => 1, 'name' => '重量'],
+        'Volume' => ['code' => 2, 'name' => '体积'],
+    ];
+
+    // 开启指定包邮
+    const APPOINT = [
+        'No' => ['code' => 0, 'name' => '未开启'],
+        'Yes' => ['code' => 1, 'name' => '已开启']
+    ];
+
+    // 开启指定区域不配送
+    const UNDELIVERY = [
+        'No' => ['code' => 0, 'name' => '未开启'],
+        'Yes' => ['code' => 1, 'name' => '已开启']
+    ];
+
+    // 默认模板
+    const IS_DEFAULT = [
+        'No' => ['code' => 0, 'name' => '否'],
+        'Yes' => ['code' => 1, 'name' => '是']
+    ];
+}

app/common/enum/store/StoreCouponUserEnum.php

@@ -0,0 +1,22 @@
+<?php
+
+namespace app\common\enum\store;
+
+use app\common\enum\CommonEnum;
+
+class StoreCouponUserEnum extends CommonEnum
+{
+
+    const STATUS = [
+        'Unused' => ['code' => 0, 'name' => '未使用'],
+        'Used' => ['code' => 1, 'name' => '已使用'],
+        'Expired' => ['code' => 2, 'name' => '已过期'],
+    ];
+
+    const IS_FAIL = [
+        'No' => ['code' => 0, 'name' => '未失效'],
+        'Yes' => ['code' => 1, 'name' => '失效']
+    ];
+
+
+}

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

@@ -14,6 +14,7 @@ namespace app\common\repositories\store\coupon;
 use app\common\dao\store\coupon\StoreCouponUserDao;
 use app\common\model\store\coupon\StoreCoupon;
 use app\common\repositories\BaseRepository;
+use app\entity\data\store\StoreCouponUserEntity;
 use think\facade\Db;
 use think\db\exception\DataNotFoundException;
 use think\db\exception\DbException;
@@ -151,4 +152,13 @@ class StoreCouponUserRepository extends BaseRepository
         return compact('count', 'list',"query");
     }
 
+    /**
+     * @param int $merId
+     * @param int $uid
+     * @return StoreCouponUserEntity[]
+     */
+    public function getValidStoreCouponUserEntityListByMerIdAndUid(int $merId, int $uid): array
+    {
+        return $this->dao->getValidStoreCouponUserEntityListByMerIdAndUid($merId, $uid);
+    }
 }

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

@@ -12,6 +12,7 @@ namespace app\common\repositories\store\order;
 
 
 use app\common\dao\store\order\StoreOrderDao;
+use app\common\enum\shipping\ShippingTemplateEnum;
 use app\common\enum\store\CartEnum;
 use app\common\enum\store\ProductEnum;
 use app\common\model\store\order\StoreGroupOrder;
@@ -31,6 +32,10 @@ use app\common\repositories\store\MerchantTakeRepository;
 use app\common\repositories\store\product\ProductAttrValueRepository;
 use app\common\repositories\store\product\ProductRepository;
 use app\common\repositories\store\shipping\ExpressRepository;
+use app\common\repositories\store\shipping\ShippingTemplateFreeRepository;
+use app\common\repositories\store\shipping\ShippingTemplateRegionRepository;
+use app\common\repositories\store\shipping\ShippingTemplateRepository;
+use app\common\repositories\store\shipping\ShippingTemplateUndeliveRepository;
 use app\common\repositories\store\StoreSeckillActiveRepository;
 use app\common\repositories\system\attachment\AttachmentRepository;
 use app\common\repositories\system\merchant\FinancialRecordRepository;
@@ -43,6 +48,7 @@ use app\common\repositories\user\UserThirdRepository;
 use app\common\repositories\wechat\RoutineQrcodeRepository;
 use app\common\repositories\wechat\WechatUserRepository;
 use app\controller\api\user\Volunteer;
+use app\entity\data\merchant\MerchantEntity;
 use app\entity\data\product\ShareEntity;
 use app\entity\data\store\CartEntity;
 use app\entity\data\user\AddressEntity;
@@ -11537,9 +11543,11 @@ class StoreOrderRepository extends BaseRepository
 
     /**
      * @param CartEntity[] $cartEntityList
+     * @param AddressEntity $addressEntity
+     * @param UserEntity $userEntity
      * @return array
      */
-    public function cartIdByOrderInfoNew(array $cartEntityList)
+    public function cartIdByOrderInfoNew(array $cartEntityList, AddressEntity $addressEntity, UserEntity $userEntity)
     {
         // 商户
         /** @var MerchantRepository $merchantRepository */
@@ -11556,22 +11564,42 @@ class StoreOrderRepository extends BaseRepository
         // 商户设置秒杀商品关联表
         /** @var StoreSeckillActiveRepository $storeSeckillActiveRepository */
         $storeSeckillActiveRepository = app()->make(StoreSeckillActiveRepository::class);
+
         // 优惠券 列表（商户or平台）
         /** @var StoreCouponRepository $storeCouponRepository */
         $storeCouponRepository = app()->make(StoreCouponRepository::class);
         // 优惠券 商品 关联表
         /** @var StoreCouponProductRepository $storeCouponProductRepository */
         $storeCouponProductRepository = app()->make(StoreCouponProductRepository::class);
-
-        $list = [];
+        // 用户的优惠券领取记录
+        /** @var StoreCouponUserRepository $storeCouponUserRepository */
+        $storeCouponUserRepository = app()->make(StoreCouponUserRepository::class);
+
+        // 获取 运费表数据  商品 对应的 运费模板
+        /** @var ShippingTemplateRepository $shippingTemplateRepository */
+        $shippingTemplateRepository = app()->make(ShippingTemplateRepository::class);
+        // 获取  商品 对应的 运费模板 de 指定不配送区域表
+        /** @var ShippingTemplateUndeliveRepository $shippingTemplateUndeliveRepository */
+        $shippingTemplateUndeliveRepository = app()->make(ShippingTemplateUndeliveRepository::class);
+        // 获取  商品 对应的 运费模板 de 指定包邮信息表
+        /** @var ShippingTemplateFreeRepository $shippingTemplateFreeRepository */
+        $shippingTemplateFreeRepository = app()->make(ShippingTemplateFreeRepository::class);
+        // 获取  商品 对应的 运费模板 de 配送区域表
+        /** @var ShippingTemplateRegionRepository $shippingTemplateRegionRepository */
+        $shippingTemplateRegionRepository = app()->make(ShippingTemplateRegionRepository::class);
+
+        $merchantMap = [];
         $yanglaojin = 0.00;
-        $price = 0.00;
         $totalPrice = 0.00;
         $totalNum = 0;
         $productPriceMap = [];
         $validTotalPrice = 0.00;
-        $product_cart = [];
+        $productCart = [];
+        // $address ? ($noDeliver ? 'noDeliver' : 'finish') : 'noAddress'
+        $status = 'noAddress';
+        $postage = 0.00;
 
+        // 循环购物车 对购物车内的商品 进行条件验证 以及根据不同的商品 计算邮费
         foreach ($cartEntityList as $cartEntity) {
             // 验证商户
             $merchantEntity = $merchantRepository->getMerchantEntityByMerchantId($cartEntity->getMerId());
@@ -11629,6 +11657,99 @@ 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);
+            // 计算总价
+            $totalPrice = bcadd($totalPrice, $price, 2);
+            // 计算总数
+            $totalNum = bcadd($totalNum, $cartEntity->getCartNum(), 2);
+
+            // 如果是 普通商品 product_type 类型 0=普通产品
+            if ($cartEntity->getProductType() == CartEnum::PRODUCT_TYPE['Ordinary']['code']) {
+                $productPriceMap[$cartEntity->getProductId()] = bcadd($productPriceMap[$cartEntity->getProductId()] ?? 0, $price, 2);
+                $validTotalPrice = bcadd($validTotalPrice, $price, 2);
+            }
+
+            $productCart[$cartEntity->getProductId()][] = $cartEntity->getCartId();
+
+
+            // 计算运费 获取该商品的运费模板 运费表
+            // TODO  注意 这个地址好像有问题，我再 客户端->收货地址管理中 （rrx_user_address）增加的廊坊市 对应的城市编号是（code_list）315 且city_id 字段的值是 2，而我再后台设置 可配送地址时 ，廊坊市对应的编码是 58247
+            // 判断商品是否是 供应链(微唯宝)商品
+            if (!empty($productAttrValueEntity->getGongSkuId())) {
+                $freight = GongApiRequest::freight($addressEntity->getCityId(), [['sku_id' => $productAttrValueEntity->getGongSkuId(), 'num' => $cartEntity->getCartNum()]]);
+                $freight = $freight['freight'] ?? 0;
+                $postage = bcadd($postage, $freight, 2);
+            } else {
+                $shippingTemplateEntity = $shippingTemplateRepository->getShippingTemplateEntityByShippingTemplateId($productEntity->getTempId());
+                if (empty($shippingTemplateEntity->getShippingTemplateId())) {
+                    throw new ValidateException('未查询到商品所绑定的运费模板');
+                } else {
+                    // 判断是否开启 开启指定区域不配送
+                    if ($shippingTemplateEntity->getUndelivery() == ShippingTemplateEnum::UNDELIVERY['Yes']['code']) {
+                        // 获取运费模板的 指定不配送区域列表
+                        $shippingTemplateUndeliveryEntityList = $shippingTemplateUndeliveRepository->getShippingTemplateUndeliveryEntityListByTempId($shippingTemplateEntity->getShippingTemplateId());
+                        foreach ($shippingTemplateUndeliveryEntityList as $shippingTemplateUndeliveryEntity) {
+                            // 验证 此次配送地址 是否在不配送区域中
+                            if (in_array($addressEntity->getCityId(), $shippingTemplateUndeliveryEntity->getCityIdList())) {
+                                throw new ValidateException($productEntity->getStoreName() . '此商品不支持该配送区域');
+                            }
+                        }
+                    }
+
+                    $isBaoYou = false;
+                    $number = 0.00;
+                    // 获取 当前商品的 计费方式 （计费方式 0=数量 1=重量 2=体积）
+                    if ($shippingTemplateEntity->getType() == ShippingTemplateEnum::TYPE['Quantity']['code']) {
+                        $number = $cartEntity->getCartNum();
+                    } else if ($shippingTemplateEntity->getType() == ShippingTemplateEnum::TYPE['Weight']['code']) {
+                        $number = bcmul($cartEntity->getCartNum(), $productAttrValueEntity->getWeight(), 2);
+                    } else {
+                        $number = bcmul($cartEntity->getCartNum(), $productAttrValueEntity->getVolume(), 2);
+                    }
+
+                    // 获取 指定包邮信息 包邮信息表
+                    $shippingTemplateFreeEntityList = $shippingTemplateFreeRepository->getShippingTemplateFreeEntityListByTempId($shippingTemplateEntity->getShippingTemplateId());
+                    foreach ($shippingTemplateFreeEntityList as $shippingTemplateFreeEntity) {
+                        // 判断当前收货地址 是不是 在 指定 包邮 地点内
+                        if (in_array($addressEntity->getCityId(), $shippingTemplateFreeEntity->getCityIdList())) {
+                            // 判断当前 商品 是否符合 最高包邮数量上限 和 最低包邮金额
+                            if ($number <= $shippingTemplateFreeEntity->getNumber() && $price >= $shippingTemplateFreeEntity->getPrice()) {
+                                $isBaoYou = true;
+                            }
+                        }
+                    }
+
+                    // 如果不包邮 则需要计算邮费
+                    if (!$isBaoYou){
+                        // 配送区域表
+                        $shippingTemplateRegionEntityList = $shippingTemplateRegionRepository->getShippingTemplateRegionEntityListByTempId($shippingTemplateEntity->getShippingTemplateId());
+                        foreach ($shippingTemplateRegionEntityList as $shippingTemplateRegionEntity) {
+                            // 判断当前收货地址 是否在可配送区域内
+                            if (in_array($addressEntity->getCityId(), $shippingTemplateRegionEntity->getCityIdList())) {
+                                // 比如 该商品 重量 5.03kg 首件重量 2kg 运费 2元  续件重量 3kg 续费3元
+                                // 那本次 运费就是 首件运费 + （（重量 - 首件重量）/续件重量） * 续费单价
+                                // 那本次 运费就是 2 + （（5.03 - 2）/3）向上取整 * 3 = 8
+                                // 首件（重量or体积） 运费计算
+                                $postage = bcadd($postage, $shippingTemplateRegionEntity->getFirstPrice(), 2);
+                                if ($number > $shippingTemplateRegionEntity->getFirst()) {
+                                    // 数量（重量or体积） 超出 首件部分 也就是续费部分
+                                    $excess = bcsub($number, $shippingTemplateRegionEntity->getFirst(), 3);
+                                    // 查看 需 续费几次 并向上取整
+                                    $continueNum = ceil(bcdiv($excess, $shippingTemplateRegionEntity->getContinue(), 3));
+                                    $continueCost = bcmul($continueNum, $shippingTemplateRegionEntity->getContinuePrice(), 2);
+                                    $postage = bcadd($postage, $continueCost, 2);
+                                }
+                            }
+                        }
+                    }
+                }
+            }
+
             // // 将商户 存贮
             // $merchantEntityArr = $merchantEntity->toArray();
             //
@@ -11650,51 +11771,31 @@ class StoreOrderRepository extends BaseRepository
             // $list[$cartEntity->getMerId()] = $merchantEntityArr;
             // $list[$cartEntity->getMerId()]['hasCoupon'] = 0;
             // // 应该还有商品信息等数据
-            // $list[$cartEntity->getMerId()]['list'][] = $cartEntity->toArray();
-
-
-            // ??? 暂时不理解这一步
-            // 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);
-            // 计算总价
-            $totalPrice = bcadd($totalPrice, $price, 2);
-            // 计算总数
-            $totalNum = bcadd($totalNum, $cartEntity->getCartNum(), 2);
 
-            // 如果是 普通商品 product_type 类型 0=普通产品
-            if ($cartEntity->getProductType() == CartEnum::PRODUCT_TYPE['Ordinary']['code']) {
-                $productPriceMap[$cartEntity->getProductId()] = bcadd($productPriceMap[$cartEntity->getProductId()] ?? 0, $price, 2);
-
-            }
 
-            $product_cart[$cartEntityList->getProductId()] = [$cartEntityList->getCartId()];
-
-            // unset($cartInfo['list'][$_k]['product']['temp']);
-            // $cartInfo['list'][$_k] = $cart;
-            // if (!$address || !$cart['product']['temp']) {
-            //     $cartInfo['list'][$_k]['undelivered'] = true;
-            //     $noDeliver = true;
-            //     continue;
-            // }
+            $merchantMap[$cartEntity->getMerId()]['merchantEntity'] = $merchantEntity;
         }
 
 
+        foreach ($merchantMap as $merId => $item) {
+            /** @var MerchantEntity $merchantEntity */
+            $merchantEntity = $item['merchantEntity'];
+            // 计算优惠金额
+            $storeCouponUserEntityList = $storeCouponUserRepository->getValidStoreCouponUserEntityListByMerIdAndUid($merchantEntity->getMerId(), $userEntity->getUid());
 
+        }
 
 
 
         return [
-            // 'youhui_price' => 0.00, // 随机减金额
-            // 'order_price' => set_price_rtrim($order_price),
-            // 'total_price' => set_price_rtrim($order_total_price), // 订单总价
-            // 'address' => $address,
-            // 'order' => $merchantInfo,
-            // 'status' => $address ? ($noDeliver ? 'noDeliver' : 'finish') : 'noAddress',
-            // 'is_dacang_vip_product' => $is_dacang_vip_product,
-            // 'youhui_price_key' => $uid_youhui_price_str ?? ''
+            'youhui_price' => 0.00, // 随机减金额
+            'order_price' => 0.00,
+            'total_price' => 0.00, // 订单总价
+            'address' => $address,
+            'order' => $merchantInfo,
+            'status' => $status,
+            'is_dacang_vip_product' => $is_dacang_vip_product,
+            'youhui_price_key' => $uid_youhui_price_str ?? ''
         ];
     }
 }

app/common/repositories/store/shipping/ShippingTemplateFreeRepository.php

@@ -8,6 +8,7 @@ namespace app\common\repositories\store\shipping;
 
 use app\common\repositories\BaseRepository;
 use app\common\dao\store\shipping\ShippingTemplateFreeDao as dao;
+use app\entity\data\shipping\ShippingTemplateFreeEntity;
 
 class ShippingTemplateFreeRepository extends BaseRepository
 {
@@ -66,4 +67,13 @@ class ShippingTemplateFreeRepository extends BaseRepository
     {
         return $this->dao->insertAll($data);
     }
+
+    /**
+     * @param int $tempId
+     * @return ShippingTemplateFreeEntity[]
+     */
+    public function getShippingTemplateFreeEntityListByTempId(int $tempId): array
+    {
+        return $this->dao->getShippingTemplateFreeEntityListByTempId($tempId);
+    }
 }

app/common/repositories/store/shipping/ShippingTemplateRegionRepository.php

@@ -8,6 +8,7 @@ namespace app\common\repositories\store\shipping;
 
 use app\common\repositories\BaseRepository;
 use app\common\dao\store\shipping\ShippingTemplateRegionDao as dao;
+use app\entity\data\shipping\ShippingTemplateRegionEntity;
 
 class ShippingTemplateRegionRepository extends BaseRepository
 {
@@ -68,4 +69,12 @@ class ShippingTemplateRegionRepository extends BaseRepository
         return $this->dao->insertAll($data);
     }
 
+    /**
+     * @param int $tempId
+     * @return ShippingTemplateRegionEntity[]
+     */
+    public function getShippingTemplateRegionEntityListByTempId(int $tempId): array
+    {
+        return $this->dao->getShippingTemplateRegionEntityListByTempId($tempId);
+    }
 }

app/common/repositories/store/shipping/ShippingTemplateRepository.php

@@ -10,6 +10,7 @@ namespace app\common\repositories\store\shipping;
 use app\common\repositories\BaseRepository;
 use app\common\dao\store\shipping\ShippingTemplateDao as dao;
 use app\common\repositories\store\product\ProductRepository;
+use app\entity\data\shipping\ShippingTemplateEntity;
 use think\facade\Db;
 
 class ShippingTemplateRepository extends BaseRepository
@@ -230,4 +231,14 @@ class ShippingTemplateRepository extends BaseRepository
         return $this->create($data);
     }
 
+    /**
+     * @param int $shippingTemplateId
+     * @return ShippingTemplateEntity
+     */
+    public function getShippingTemplateEntityByShippingTemplateId(int $shippingTemplateId): ShippingTemplateEntity
+    {
+        /** @var ShippingTemplateEntity $entity */
+        $entity = $this->dao->getShippingTemplateEntityByShippingTemplateId($shippingTemplateId);
+        return $entity;
+    }
 }

app/common/repositories/store/shipping/ShippingTemplateUndeliveRepository.php

@@ -9,6 +9,7 @@ namespace app\common\repositories\store\shipping;
 
 use app\common\repositories\BaseRepository;
 use app\common\dao\store\shipping\ShippingTemplateUndeliveryDao as dao;
+use app\entity\data\shipping\ShippingTemplateUndeliveryEntity;
 
 class ShippingTemplateUndeliveRepository extends BaseRepository
 {
@@ -55,5 +56,12 @@ class ShippingTemplateUndeliveRepository extends BaseRepository
         }
     }
 
-
+    /**
+     * @param int $tempId
+     * @return ShippingTemplateUndeliveryEntity[]
+     */
+    public function getShippingTemplateUndeliveryEntityListByTempId(int $tempId): array
+    {
+        return $this->dao->getShippingTemplateUndeliveryEntityListByTempId($tempId);
+    }
 }

app/entity/data/shipping/ShippingTemplateEntity.php

@@ -0,0 +1,180 @@
+<?php
+
+namespace app\entity\data\shipping;
+
+use app\entity\data\DataEntity;
+
+class ShippingTemplateEntity extends DataEntity
+{
+    public $shippingTemplateId = 0;  // 编号
+    public $name = '';  // 模板名称
+    public $type = 1;  // 计费方式 0=数量 1=重量 2=体积
+    public $appoint = 0;  // 开启指定包邮
+    public $undelivery = 0;  // 开启指定区域不配送
+    public $merId = 0;  // 商户 id
+    public $isDefault = 0;  // 默认模板
+    public $sort = 0;  // 排序
+    public $createTime = null;  // 添加时间
+
+    /**
+     * @return int
+     */
+    public function getShippingTemplateId(): int
+    {
+        return $this->shippingTemplateId;
+    }
+
+    /**
+     * @param int $shippingTemplateId
+     * @return ShippingTemplateEntity
+     */
+    public function setShippingTemplateId(int $shippingTemplateId): ShippingTemplateEntity
+    {
+        $this->shippingTemplateId = $shippingTemplateId;
+        return $this;
+    }
+
+    /**
+     * @return string
+     */
+    public function getName(): string
+    {
+        return $this->name;
+    }
+
+    /**
+     * @param string $name
+     * @return ShippingTemplateEntity
+     */
+    public function setName(string $name): ShippingTemplateEntity
+    {
+        $this->name = $name;
+        return $this;
+    }
+
+    /**
+     * @return int
+     */
+    public function getType(): int
+    {
+        return $this->type;
+    }
+
+    /**
+     * @param int $type
+     * @return ShippingTemplateEntity
+     */
+    public function setType(int $type): ShippingTemplateEntity
+    {
+        $this->type = $type;
+        return $this;
+    }
+
+    /**
+     * @return int
+     */
+    public function getAppoint(): int
+    {
+        return $this->appoint;
+    }
+
+    /**
+     * @param int $appoint
+     * @return ShippingTemplateEntity
+     */
+    public function setAppoint(int $appoint): ShippingTemplateEntity
+    {
+        $this->appoint = $appoint;
+        return $this;
+    }
+
+    /**
+     * @return int
+     */
+    public function getUndelivery(): int
+    {
+        return $this->undelivery;
+    }
+
+    /**
+     * @param int $undelivery
+     * @return ShippingTemplateEntity
+     */
+    public function setUndelivery(int $undelivery): ShippingTemplateEntity
+    {
+        $this->undelivery = $undelivery;
+        return $this;
+    }
+
+    /**
+     * @return int
+     */
+    public function getMerId(): int
+    {
+        return $this->merId;
+    }
+
+    /**
+     * @param int $merId
+     * @return ShippingTemplateEntity
+     */
+    public function setMerId(int $merId): ShippingTemplateEntity
+    {
+        $this->merId = $merId;
+        return $this;
+    }
+
+    /**
+     * @return int
+     */
+    public function getIsDefault(): int
+    {
+        return $this->isDefault;
+    }
+
+    /**
+     * @param int $isDefault
+     * @return ShippingTemplateEntity
+     */
+    public function setIsDefault(int $isDefault): ShippingTemplateEntity
+    {
+        $this->isDefault = $isDefault;
+        return $this;
+    }
+
+    /**
+     * @return int
+     */
+    public function getSort(): int
+    {
+        return $this->sort;
+    }
+
+    /**
+     * @param int $sort
+     * @return ShippingTemplateEntity
+     */
+    public function setSort(int $sort): ShippingTemplateEntity
+    {
+        $this->sort = $sort;
+        return $this;
+    }
+
+    /**
+     * @return null
+     */
+    public function getCreateTime()
+    {
+        return $this->createTime;
+    }
+
+    /**
+     * @param null $createTime
+     * @return ShippingTemplateEntity
+     */
+    public function setCreateTime($createTime)
+    {
+        $this->createTime = $createTime;
+        return $this;
+    }
+}

app/entity/data/shipping/ShippingTemplateFreeEntity.php

@@ -0,0 +1,127 @@
+<?php
+
+namespace app\entity\data\shipping;
+
+use app\entity\data\DataEntity;
+
+class ShippingTemplateFreeEntity extends DataEntity
+{
+    public $shippingTemplateFreeId = 0;  // 编号
+    public $tempId = 0;  // 模板ID
+    public $cityId = '';  // 城市ID /id/id/id/id/
+    public $cityIdList = [];  // 城市ID []
+    public $number = 0;  // 包邮件数
+    public $price = 0.00;  // 包邮金额
+
+    /**
+     * @return int
+     */
+    public function getShippingTemplateFreeId(): int
+    {
+        return $this->shippingTemplateFreeId;
+    }
+
+    /**
+     * @param int $shippingTemplateFreeId
+     * @return ShippingTemplateFreeEntity
+     */
+    public function setShippingTemplateFreeId(int $shippingTemplateFreeId): ShippingTemplateFreeEntity
+    {
+        $this->shippingTemplateFreeId = $shippingTemplateFreeId;
+        return $this;
+    }
+
+    /**
+     * @return int
+     */
+    public function getTempId(): int
+    {
+        return $this->tempId;
+    }
+
+    /**
+     * @param int $tempId
+     * @return ShippingTemplateFreeEntity
+     */
+    public function setTempId(int $tempId): ShippingTemplateFreeEntity
+    {
+        $this->tempId = $tempId;
+        return $this;
+    }
+
+    /**
+     * @return string
+     */
+    public function getCityId(): string
+    {
+        return $this->cityId;
+    }
+
+    /**
+     * @param string $cityId
+     * @return ShippingTemplateFreeEntity
+     */
+    public function setCityId(string $cityId): ShippingTemplateFreeEntity
+    {
+        $this->cityId = $cityId;
+        $cityIdList = explode("/", $this->cityId);
+        $cityIdList = array_filter($cityIdList); // 删除空元素
+        $cityIdList = array_values($cityIdList); // 重建数组索引
+        $this->setCityIdList($cityIdList);
+        return $this;
+    }
+
+    /**
+     * @return array
+     */
+    public function getCityIdList(): array
+    {
+        return $this->cityIdList;
+    }
+
+    /**
+     * @param array $cityIdList
+     * @return ShippingTemplateFreeEntity
+     */
+    public function setCityIdList(array $cityIdList): ShippingTemplateFreeEntity
+    {
+        $this->cityIdList = $cityIdList;
+        return $this;
+    }
+
+    /**
+     * @return int
+     */
+    public function getNumber(): int
+    {
+        return $this->number;
+    }
+
+    /**
+     * @param int $number
+     * @return ShippingTemplateFreeEntity
+     */
+    public function setNumber(int $number): ShippingTemplateFreeEntity
+    {
+        $this->number = $number;
+        return $this;
+    }
+
+    /**
+     * @return float
+     */
+    public function getPrice(): float
+    {
+        return $this->price;
+    }
+
+    /**
+     * @param float $price
+     * @return ShippingTemplateFreeEntity
+     */
+    public function setPrice(float $price): ShippingTemplateFreeEntity
+    {
+        $this->price = $price;
+        return $this;
+    }
+}

app/entity/data/shipping/ShippingTemplateRegionEntity.php

@@ -0,0 +1,165 @@
+<?php
+
+namespace app\entity\data\shipping;
+
+use app\entity\data\DataEntity;
+
+class ShippingTemplateRegionEntity extends DataEntity
+{
+    public $shippingTemplateRegionId = 0;  // 编号
+    public $tempId = 0;  // 模板ID
+    public $cityId = '';  // 城市ID /id/id/id/
+    public $cityIdList = [];  // 城市ID []
+    public $first = '0.00';  // 首件
+    public $firstPrice = '0.00';  // 首件运费
+    public $continue = '0.00';  // 续件
+    public $continuePrice = '0.00';  // 续件运费
+
+    /**
+     * @return int
+     */
+    public function getShippingTemplateRegionId(): int
+    {
+        return $this->shippingTemplateRegionId;
+    }
+
+    /**
+     * @param int $shippingTemplateRegionId
+     * @return ShippingTemplateRegionEntity
+     */
+    public function setShippingTemplateRegionId(int $shippingTemplateRegionId): ShippingTemplateRegionEntity
+    {
+        $this->shippingTemplateRegionId = $shippingTemplateRegionId;
+        return $this;
+    }
+
+    /**
+     * @return int
+     */
+    public function getTempId(): int
+    {
+        return $this->tempId;
+    }
+
+    /**
+     * @param int $tempId
+     * @return ShippingTemplateRegionEntity
+     */
+    public function setTempId(int $tempId): ShippingTemplateRegionEntity
+    {
+        $this->tempId = $tempId;
+        return $this;
+    }
+
+    /**
+     * @return string
+     */
+    public function getCityId(): string
+    {
+        return $this->cityId;
+    }
+
+    /**
+     * @param string $cityId
+     * @return ShippingTemplateRegionEntity
+     */
+    public function setCityId(string $cityId): ShippingTemplateRegionEntity
+    {
+        $this->cityId = $cityId;
+        $cityIdList = explode("/", $this->cityId);
+        $cityIdList = array_filter($cityIdList); // 删除空元素
+        $cityIdList = array_values($cityIdList); // 重建数组索引
+        $this->setCityIdList($cityIdList);
+        return $this;
+    }
+
+    /**
+     * @return array
+     */
+    public function getCityIdList(): array
+    {
+        return $this->cityIdList;
+    }
+
+    /**
+     * @param array $cityIdList
+     * @return ShippingTemplateRegionEntity
+     */
+    public function setCityIdList(array $cityIdList): ShippingTemplateRegionEntity
+    {
+        $this->cityIdList = $cityIdList;
+        return $this;
+    }
+
+    /**
+     * @return string
+     */
+    public function getFirst(): string
+    {
+        return $this->first;
+    }
+
+    /**
+     * @param string $first
+     * @return ShippingTemplateRegionEntity
+     */
+    public function setFirst(string $first): ShippingTemplateRegionEntity
+    {
+        $this->first = $first;
+        return $this;
+    }
+
+    /**
+     * @return string
+     */
+    public function getFirstPrice(): string
+    {
+        return $this->firstPrice;
+    }
+
+    /**
+     * @param string $firstPrice
+     * @return ShippingTemplateRegionEntity
+     */
+    public function setFirstPrice(string $firstPrice): ShippingTemplateRegionEntity
+    {
+        $this->firstPrice = $firstPrice;
+        return $this;
+    }
+
+    /**
+     * @return string
+     */
+    public function getContinue(): string
+    {
+        return $this->continue;
+    }
+
+    /**
+     * @param string $continue
+     * @return ShippingTemplateRegionEntity
+     */
+    public function setContinue(string $continue): ShippingTemplateRegionEntity
+    {
+        $this->continue = $continue;
+        return $this;
+    }
+
+    /**
+     * @return string
+     */
+    public function getContinuePrice(): string
+    {
+        return $this->continuePrice;
+    }
+
+    /**
+     * @param string $continuePrice
+     * @return ShippingTemplateRegionEntity
+     */
+    public function setContinuePrice(string $continuePrice): ShippingTemplateRegionEntity
+    {
+        $this->continuePrice = $continuePrice;
+        return $this;
+    }
+}

app/entity/data/shipping/ShippingTemplateUndeliveryEntity.php

@@ -0,0 +1,89 @@
+<?php
+
+namespace app\entity\data\shipping;
+
+use app\entity\data\DataEntity;
+
+class ShippingTemplateUndeliveryEntity extends DataEntity
+{
+    public $shippingTemplateUndeliveryId = 0;  // 编号
+    public $tempId = 0;  // 模板ID
+    public $cityId = '';  // 城市ID /id/id/id/
+    public $cityIdList = [];  // 城市ID []
+
+    /**
+     * @return int
+     */
+    public function getShippingTemplateUndeliveryId(): int
+    {
+        return $this->shippingTemplateUndeliveryId;
+    }
+
+    /**
+     * @param int $shippingTemplateUndeliveryId
+     * @return ShippingTemplateUndeliveryEntity
+     */
+    public function setShippingTemplateUndeliveryId(int $shippingTemplateUndeliveryId): ShippingTemplateUndeliveryEntity
+    {
+        $this->shippingTemplateUndeliveryId = $shippingTemplateUndeliveryId;
+        return $this;
+    }
+
+    /**
+     * @return int
+     */
+    public function getTempId(): int
+    {
+        return $this->tempId;
+    }
+
+    /**
+     * @param int $tempId
+     * @return ShippingTemplateUndeliveryEntity
+     */
+    public function setTempId(int $tempId): ShippingTemplateUndeliveryEntity
+    {
+        $this->tempId = $tempId;
+        return $this;
+    }
+
+    /**
+     * @return string
+     */
+    public function getCityId(): string
+    {
+        return $this->cityId;
+    }
+
+    /**
+     * @param string $cityId
+     * @return ShippingTemplateUndeliveryEntity
+     */
+    public function setCityId(string $cityId): ShippingTemplateUndeliveryEntity
+    {
+        $this->cityId = $cityId;
+        $cityIdList = explode("/", $this->cityId);
+        $cityIdList = array_filter($cityIdList); // 删除空元素
+        $cityIdList = array_values($cityIdList); // 重建数组索引
+        $this->setCityIdList($cityIdList);
+        return $this;
+    }
+
+    /**
+     * @return array
+     */
+    public function getCityIdList(): array
+    {
+        return $this->cityIdList;
+    }
+
+    /**
+     * @param array $cityIdList
+     * @return ShippingTemplateUndeliveryEntity
+     */
+    public function setCityIdList(array $cityIdList): ShippingTemplateUndeliveryEntity
+    {
+        $this->cityIdList = $cityIdList;
+        return $this;
+    }
+}

app/entity/data/store/StoreCouponUserEntity.php

@@ -0,0 +1,275 @@
+<?php
+
+namespace app\entity\data\store;
+
+use app\entity\data\DataEntity;
+
+class StoreCouponUserEntity extends DataEntity
+{
+    public $couponUserId = 0;  // 优惠券发放记录id
+    public $couponId = 0;  // 兑换的项目id
+    public $merId = 0;  // 商户 id
+    public $uid = 0;  // 优惠券所属用户
+    public $couponTitle = '';  // 优惠券名称
+    public $couponPrice = '0.00';  // 优惠券的面值
+    public $useMinPrice = '0.00';  // 最低消费多少金额可用优惠券
+    public $createTime = null;  // 优惠券创建时间
+    public $startTime = null;  // 优惠券开启时间
+    public $endTime = null;  // 优惠券结束时间
+    public $useTime = null;  // 使用时间
+    public $type = 'send';  // 获取方式
+    public $status = 0;  // 状态（0：未使用，1：已使用, 2:已过期）
+    public $isFail = 0;  // 是否有效
+
+    /**
+     * @return int
+     */
+    public function getCouponUserId(): int
+    {
+        return $this->couponUserId;
+    }
+
+    /**
+     * @param int $couponUserId
+     * @return StoreCouponUserEntity
+     */
+    public function setCouponUserId(int $couponUserId): StoreCouponUserEntity
+    {
+        $this->couponUserId = $couponUserId;
+        return $this;
+    }
+
+    /**
+     * @return int
+     */
+    public function getCouponId(): int
+    {
+        return $this->couponId;
+    }
+
+    /**
+     * @param int $couponId
+     * @return StoreCouponUserEntity
+     */
+    public function setCouponId(int $couponId): StoreCouponUserEntity
+    {
+        $this->couponId = $couponId;
+        return $this;
+    }
+
+    /**
+     * @return int
+     */
+    public function getMerId(): int
+    {
+        return $this->merId;
+    }
+
+    /**
+     * @param int $merId
+     * @return StoreCouponUserEntity
+     */
+    public function setMerId(int $merId): StoreCouponUserEntity
+    {
+        $this->merId = $merId;
+        return $this;
+    }
+
+    /**
+     * @return int
+     */
+    public function getUid(): int
+    {
+        return $this->uid;
+    }
+
+    /**
+     * @param int $uid
+     * @return StoreCouponUserEntity
+     */
+    public function setUid(int $uid): StoreCouponUserEntity
+    {
+        $this->uid = $uid;
+        return $this;
+    }
+
+    /**
+     * @return string
+     */
+    public function getCouponTitle(): string
+    {
+        return $this->couponTitle;
+    }
+
+    /**
+     * @param string $couponTitle
+     * @return StoreCouponUserEntity
+     */
+    public function setCouponTitle(string $couponTitle): StoreCouponUserEntity
+    {
+        $this->couponTitle = $couponTitle;
+        return $this;
+    }
+
+    /**
+     * @return string
+     */
+    public function getCouponPrice(): string
+    {
+        return $this->couponPrice;
+    }
+
+    /**
+     * @param string $couponPrice
+     * @return StoreCouponUserEntity
+     */
+    public function setCouponPrice(string $couponPrice): StoreCouponUserEntity
+    {
+        $this->couponPrice = $couponPrice;
+        return $this;
+    }
+
+    /**
+     * @return string
+     */
+    public function getUseMinPrice(): string
+    {
+        return $this->useMinPrice;
+    }
+
+    /**
+     * @param string $useMinPrice
+     * @return StoreCouponUserEntity
+     */
+    public function setUseMinPrice(string $useMinPrice): StoreCouponUserEntity
+    {
+        $this->useMinPrice = $useMinPrice;
+        return $this;
+    }
+
+    /**
+     * @return null
+     */
+    public function getCreateTime()
+    {
+        return $this->createTime;
+    }
+
+    /**
+     * @param null $createTime
+     * @return StoreCouponUserEntity
+     */
+    public function setCreateTime($createTime)
+    {
+        $this->createTime = $createTime;
+        return $this;
+    }
+
+    /**
+     * @return null
+     */
+    public function getStartTime()
+    {
+        return $this->startTime;
+    }
+
+    /**
+     * @param null $startTime
+     * @return StoreCouponUserEntity
+     */
+    public function setStartTime($startTime)
+    {
+        $this->startTime = $startTime;
+        return $this;
+    }
+
+    /**
+     * @return null
+     */
+    public function getEndTime()
+    {
+        return $this->endTime;
+    }
+
+    /**
+     * @param null $endTime
+     * @return StoreCouponUserEntity
+     */
+    public function setEndTime($endTime)
+    {
+        $this->endTime = $endTime;
+        return $this;
+    }
+
+    /**
+     * @return null
+     */
+    public function getUseTime()
+    {
+        return $this->useTime;
+    }
+
+    /**
+     * @param null $useTime
+     * @return StoreCouponUserEntity
+     */
+    public function setUseTime($useTime)
+    {
+        $this->useTime = $useTime;
+        return $this;
+    }
+
+    /**
+     * @return string
+     */
+    public function getType(): string
+    {
+        return $this->type;
+    }
+
+    /**
+     * @param string $type
+     * @return StoreCouponUserEntity
+     */
+    public function setType(string $type): StoreCouponUserEntity
+    {
+        $this->type = $type;
+        return $this;
+    }
+
+    /**
+     * @return int
+     */
+    public function getStatus(): int
+    {
+        return $this->status;
+    }
+
+    /**
+     * @param int $status
+     * @return StoreCouponUserEntity
+     */
+    public function setStatus(int $status): StoreCouponUserEntity
+    {
+        $this->status = $status;
+        return $this;
+    }
+
+    /**
+     * @return int
+     */
+    public function getIsFail(): int
+    {
+        return $this->isFail;
+    }
+
+    /**
+     * @param int $isFail
+     * @return StoreCouponUserEntity
+     */
+    public function setIsFail(int $isFail): StoreCouponUserEntity
+    {
+        $this->isFail = $isFail;
+        return $this;
+    }
+}