Merge branch 'dev-sxb' into dev

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

@@ -85,6 +85,7 @@ use app\entity\data\user\UserAddressEntity;
 use app\entity\data\user\UserBillEntity;
 use app\entity\data\user\UserEntity;
 use app\entity\monomer\store\FzonePayTypeEntity;
+use app\entity\request\api\store\order\CalculatePostageRequestEntity;
 use app\entity\request\api\store\order\StoreOrderCreateRequestEntity;
 use app\model\common\JdOrderModel;
 use app\model\common\TbOrderModel;
@@ -11706,6 +11707,7 @@ class StoreOrderRepository extends BaseRepository
         $userEntity = $verifyResult['userEntity'];
         /** @var CartEntity[] $cartEntityList 发起创建订单的购物车列表 */
         $cartEntityList = $verifyResult['cartEntityList'];
+        /** @var CartEntity[] $cartEntityMap 发起创建订单的购物车映射 */
         $cartEntityMap = array_column($cartEntityList, null, 'cartId');
         $cartIdList = array_keys($cartEntityMap);
         /** @var UserAddressEntity $addressEntity 地址信息 */
@@ -11733,19 +11735,6 @@ class StoreOrderRepository extends BaseRepository
         // /** @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);
-
         // 商品
         /** @var ProductRepository $productRepository */
         $productRepository = app()->make(ProductRepository::class);
@@ -11835,85 +11824,13 @@ class StoreOrderRepository extends BaseRepository
 
             // 计算运费 获取该商品的运费模板 运费表
             // 判断商品是否是 供应链(微唯宝)商品
-            $postage = 0.00;
-            if (!empty($productAttrValueEntity->getGongSkuId())) {
-                $freight = GongApiRequest::freight($addressEntity->getCityId(), [['sku_id' => $productAttrValueEntity->getGongSkuId(), 'num' => $cartEntity->getCartNum()]]);
-                $postage = $freight['freight'] ?? 0;
-            } 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;
-                                break;
-                            }
-                        }
-                    }
-
-                    // 如果不包邮 则需要计算邮费
-                    if (!$isBaoYou){
-                        // 配送区域表
-                        $shippingTemplateRegionEntityList = $shippingTemplateRegionRepository->getShippingTemplateRegionEntityListByTempId($shippingTemplateEntity->getShippingTemplateId());
-                        if (empty($shippingTemplateRegionEntityList)) {
-                            throw new ValidateException($productEntity->getStoreName() . '此商品不支持该配送区域');
-                        }
-                        $isPeiSong = false;
-                        foreach ($shippingTemplateRegionEntityList as $shippingTemplateRegionEntity) {
-                            // 判断当前收货地址 是否在可配送区域内
-                            if (in_array($addressEntity->getCityId(), $shippingTemplateRegionEntity->getCityIdList()) || $shippingTemplateRegionEntity->getCityId() == 0) {
-                                // 比如 该商品 重量 5.03kg 首件重量 2kg 运费 2元  续件重量 3kg 续费3元
-                                // 那本次 运费就是 首件运费 + （（重量 - 首件重量）/续件重量） * 续费单价
-                                // 那本次 运费就是 2 + （（5.03 - 2）/3）向上取整 * 3 = 8
-                                // 首件（重量or体积） 运费计算
-                                if ($number > $shippingTemplateRegionEntity->getFirst()) {
-                                    // 数量（重量or体积） 超出 首件部分 也就是续费部分
-                                    $excess = bcsub($number, $shippingTemplateRegionEntity->getFirst(), 3);
-                                    // 查看 需 续费几次 并向上取整
-                                    $continueNum = ceil(bcdiv($excess, $shippingTemplateRegionEntity->getContinue(), 3));
-                                    $postage = bcmul($continueNum, $shippingTemplateRegionEntity->getContinuePrice(), 2);
-                                } else {
-                                    $postage = $shippingTemplateRegionEntity->getFirstPrice();
-                                }
-                                $isPeiSong = true;
-                                break;
-                            }
-                        }
-                        if (!$isPeiSong) {
-                            throw new ValidateException($productEntity->getStoreName() . '此商品不支持该配送区域');
-                        }
-                    }
-                }
-            }
+            // $postage = $this->calculatePostage(
+            //     $productEntity,
+            //     $productAttrValueEntity,
+            //     $cartEntity->getCartNum(),
+            //     $addressEntity->getCityId()
+            // );
+            $postage = 0.00; // 默认全都包邮s
 
             // 汇付手续费 （订单价格 + 邮费） * 汇付手续费比例
             $commissionRate = bcmul(bcadd($price, $postage, CommonEnum::DECIMAL_PLACES_OF_THE_AMOUNT), CommonEnum::HUIFU_COMMISSION_CHARGE, CommonEnum::DECIMAL_PLACES_OF_THE_AMOUNT);
@@ -11970,7 +11887,7 @@ class StoreOrderRepository extends BaseRepository
                 ->setSeckill($productSeckillEntity->getId())
                 ->setYouhuiPrice($youhuiPrice)
                 ->setDouhuomall(empty($productEntity->getSpuId())?StoreOrderEnum::DOHUOMALL['PlatformOrder']['code']:StoreOrderEnum::DOHUOMALL['SupplyChainOrder']['code'])
-                ->setDouhuomallStatus(StoreOrderEnum::DOHUOMALL_STATUS['NotSubmittedToWeiweiBao']['code'])
+                ->setDouhuomallStatus(empty($productEntity->getSpuId()) ? null : StoreOrderEnum::DOHUOMALL_STATUS['NotSubmittedToWeiweiBao']['code'])
                 ->setFzonePaytype($storeOrderCreateRequestEntity->getFzonePayType())
                 ->setConPri($serviceMoney);
             $storeOrderEntityList[] = $storeOrderEntity;
@@ -12291,4 +12208,143 @@ class StoreOrderRepository extends BaseRepository
             'storeProductAttrValueEntityMap' => $storeProductAttrValueEntityMap,
         ];
     }
+
+    /**
+     * 根据 商品属性 唯一值、城市ID、数量 计算运费
+     * @param CalculatePostageRequestEntity $calculatePostageRequestEntity
+     * @return float|int|mixed|string
+     */
+    public function getPostageByUniqueAndCityIdAndNum(CalculatePostageRequestEntity $calculatePostageRequestEntity)
+    {
+        // 商品属性
+        /** @var ProductAttrValueRepository $storeProductAttrValueRepository */
+        $storeProductAttrValueRepository = app()->make(ProductAttrValueRepository::class);
+        $storeProductAttrValueEntityList = $storeProductAttrValueRepository->getStoreProductAttrValueEntityByUnique($calculatePostageRequestEntity->getUnique());
+        if (empty($storeProductAttrValueEntityList->getProductId())) {
+            throw new ValidateException('未查询到商品属性信息');
+        }
+
+        // 商品
+        /** @var ProductRepository $storeProductRepository */
+        $storeProductRepository = app()->make(ProductRepository::class);
+        $storeProductEntity = $storeProductRepository->getStoreProductEntityByProductId($storeProductAttrValueEntityList->getProductId());
+        if (empty($storeProductEntity->getProductId())) {
+            throw new ValidateException('未查询到商品信息');
+        }
+
+        return $this->calculatePostage(
+            $storeProductEntity,
+            $storeProductAttrValueEntityList,
+            $calculatePostageRequestEntity->getNum(),
+            $calculatePostageRequestEntity->getCityId()
+        );
+    }
+
+    /**
+     * 计算运费
+     * @param StoreProductEntity $productEntity
+     * @param StoreProductAttrValueEntity $productAttrValueEntity
+     * @param int $num
+     * @param int $cityId
+     * @return float|int|mixed|string
+     */
+    public function calculatePostage(StoreProductEntity $productEntity, StoreProductAttrValueEntity $productAttrValueEntity, int $num, int $cityId)
+    {
+        // 获取 运费表数据  商品 对应的 运费模板
+        /** @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);
+        // 计算 该款商品 总金额
+        $price = bcmul($num, $productAttrValueEntity->getPrice(), CommonEnum::DECIMAL_PLACES_OF_THE_AMOUNT);
+        $postage = 0.00;
+
+        if (!empty($productAttrValueEntity->getGongSkuId())) {
+            $freight = GongApiRequest::freight($cityId, [['sku_id' => $productAttrValueEntity->getGongSkuId(), 'num' => $num]]);
+            $postage = $freight['freight'] ?? 0;
+        } 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($cityId, $shippingTemplateUndeliveryEntity->getCityIdList())) {
+                            throw new ValidateException($productEntity->getStoreName() . '此商品不支持该配送区域');
+                        }
+                    }
+                }
+
+                $isBaoYou = false;
+                $number = 0.00;
+                // 获取 当前商品的 计费方式 （计费方式 0=数量 1=重量 2=体积）
+                if ($shippingTemplateEntity->getType() == ShippingTemplateEnum::TYPE['Quantity']['code']) {
+                    $number = $num;
+                } else if ($shippingTemplateEntity->getType() == ShippingTemplateEnum::TYPE['Weight']['code']) {
+                    $number = bcmul($num, $productAttrValueEntity->getWeight(), 2);
+                } else {
+                    $number = bcmul($num, $productAttrValueEntity->getVolume(), 2);
+                }
+
+                // 获取 指定包邮信息 包邮信息表
+                $shippingTemplateFreeEntityList = $shippingTemplateFreeRepository->getShippingTemplateFreeEntityListByTempId($shippingTemplateEntity->getShippingTemplateId());
+                foreach ($shippingTemplateFreeEntityList as $shippingTemplateFreeEntity) {
+                    // 判断当前收货地址 是不是 在 指定 包邮 地点内
+                    if (in_array($cityId, $shippingTemplateFreeEntity->getCityIdList())) {
+                        // 判断当前 商品 是否符合 最高包邮数量上限 和 最低包邮金额
+                        if ($number <= $shippingTemplateFreeEntity->getNumber() && $price >= $shippingTemplateFreeEntity->getPrice()) {
+                            $isBaoYou = true;
+                            break;
+                        }
+                    }
+                }
+
+                // 如果不包邮 则需要计算邮费
+                if (!$isBaoYou) {
+                    // 配送区域表
+                    $shippingTemplateRegionEntityList = $shippingTemplateRegionRepository->getShippingTemplateRegionEntityListByTempId($shippingTemplateEntity->getShippingTemplateId());
+                    if (empty($shippingTemplateRegionEntityList)) {
+                        throw new ValidateException($productEntity->getStoreName() . '此商品不支持该配送区域');
+                    }
+                    $isPeiSong = false;
+                    foreach ($shippingTemplateRegionEntityList as $shippingTemplateRegionEntity) {
+                        // 判断当前收货地址 是否在可配送区域内
+                        if (in_array($cityId, $shippingTemplateRegionEntity->getCityIdList()) || $shippingTemplateRegionEntity->getCityId() == 0) {
+                            // 比如 该商品 重量 5.03kg 首件重量 2kg 运费 2元  续件重量 3kg 续费3元
+                            // 那本次 运费就是 首件运费 + （（重量 - 首件重量）/续件重量） * 续费单价
+                            // 那本次 运费就是 2 + （（5.03 - 2）/3）向上取整 * 3 = 8
+                            // 首件（重量or体积） 运费计算
+                            if ($number > $shippingTemplateRegionEntity->getFirst()) {
+                                // 数量（重量or体积） 超出 首件部分 也就是续费部分
+                                $excess = bcsub($number, $shippingTemplateRegionEntity->getFirst(), 3);
+                                // 查看 需 续费几次 并向上取整
+                                $continueNum = ceil(bcdiv($excess, $shippingTemplateRegionEntity->getContinue(), 3));
+                                $postage = bcmul($continueNum, $shippingTemplateRegionEntity->getContinuePrice(), 2);
+                            } else {
+                                $postage = $shippingTemplateRegionEntity->getFirstPrice();
+                            }
+                            $isPeiSong = true;
+                            break;
+                        }
+                    }
+                    if (!$isPeiSong) {
+                        throw new ValidateException($productEntity->getStoreName() . '此商品不支持该配送区域');
+                    }
+                }
+            }
+        }
+
+        return $postage;
+    }
 }

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

@@ -20,8 +20,10 @@ use app\common\repositories\store\product\ProductAttrValueRepository;
 use app\common\repositories\user\UserAddressRepository;
 use app\common\repositories\user\UserRepository;
 use app\entity\data\user\UserEntity;
+use app\entity\request\api\store\order\CalculatePostageRequestEntity;
 use app\entity\request\api\store\order\StoreOrderCreateRequestEntity;
 use app\traits\ShouxinyiApiRequest;
+use app\validate\api\store\order\CalculatePostageValidate;
 use app\validate\api\store\order\StoreOrderCreateValidate;
 use crmeb\basic\BaseController;
 use app\common\repositories\store\order\StoreCartRepository;
@@ -1999,4 +2001,30 @@ class StoreOrder extends BaseController
     }
 
 
+    /**
+     * 计算运费
+     *
+     * @param CalculatePostageValidate $calculatePostageValidate
+     * @return mixed
+     */
+    public function calculatePostage(CalculatePostageValidate $calculatePostageValidate)
+    {
+        // 1、接收参数
+        $calculatePostageValidateResult = $calculatePostageValidate->validateRequest();
+        // 如果验证失败，返回错误
+        if ($calculatePostageValidateResult['status'] == 'error') {
+            return app('json')->fail($calculatePostageValidateResult['message']);
+        }
+
+        // 验证通过，继续处理数据
+        /** @var CalculatePostageRequestEntity $calculatePostageRequestEntity */
+        $calculatePostageRequestEntity = $calculatePostageValidateResult['data'];
+
+        // 2. 获取运费
+        $postage = $this->repository->getPostageByUniqueAndCityIdAndNum($calculatePostageRequestEntity);
+
+        return app('json')->success([
+            'postage' => $postage
+        ]);
+    }
 }

app/entity/request/api/store/order/CalculatePostageRequestEntity.php

@@ -0,0 +1,69 @@
+<?php
+
+namespace app\entity\request\api\store\order;
+
+use app\entity\request\RequestCommonEntity;
+
+class CalculatePostageRequestEntity extends RequestCommonEntity
+{
+    // 收货地址 城市ID
+    public $cityId = 0;
+    // 商品ID
+    public $unique = '';
+    // 购买数量
+    public $num = 0;
+
+    /**
+     * @return int
+     */
+    public function getCityId(): int
+    {
+        return $this->cityId;
+    }
+
+    /**
+     * @param int $cityId
+     * @return CalculatePostageRequestEntity
+     */
+    public function setCityId(int $cityId): CalculatePostageRequestEntity
+    {
+        $this->cityId = $cityId;
+        return $this;
+    }
+
+    /**
+     * @return string
+     */
+    public function getUnique(): string
+    {
+        return $this->unique;
+    }
+
+    /**
+     * @param string $unique
+     * @return CalculatePostageRequestEntity
+     */
+    public function setUnique(string $unique): CalculatePostageRequestEntity
+    {
+        $this->unique = $unique;
+        return $this;
+    }
+
+    /**
+     * @return int
+     */
+    public function getNum(): int
+    {
+        return $this->num;
+    }
+
+    /**
+     * @param int $num
+     * @return CalculatePostageRequestEntity
+     */
+    public function setNum(int $num): CalculatePostageRequestEntity
+    {
+        $this->num = $num;
+        return $this;
+    }
+}

app/validate/api/store/order/CalculatePostageValidate.php

@@ -0,0 +1,42 @@
+<?php
+
+namespace app\validate\api\store\order;
+
+use app\entity\request\api\store\order\CalculatePostageRequestEntity;
+use app\validate\CommonValidate;
+use think\facade\Log;
+
+class CalculatePostageValidate extends CommonValidate
+{
+
+    protected $rule = [
+        'cityId' => 'require|integer|egt:0',
+        'unique' => 'require',
+        'num' => 'require|integer|gt:0'
+    ];
+
+    protected $message = [
+        'cityId.require' => '城市ID不能为空！',
+        'cityId.integer' => '城市ID必须是整数！',
+        'cityId.egt' => '城市ID必须大于等于0！',
+        'unique.require' => '唯一标识不能为空！',
+        'num.require' => '购买数量不能为空！',
+        'num.integer' => '购买数量必须是整数！',
+        'num.gt' => '购买数量必须大于0！'
+    ];
+
+    /**
+     * 将Request参数获取与验证封装到验证类中
+     *
+     * @return array
+     */
+    public function validateRequest(): array
+    {
+        $data = $this->request->param();
+        Log::info('request-api-store-order-CalculatePostage-params：' . json_encode($data));
+        if (!$this->check($data)) {
+            return ['status' => 'error', 'message' => $this->getError()];
+        }
+        return ['status' => 'success', 'data' => CalculatePostageRequestEntity::newInstance($data)];
+    }
+}

route/api.php

@@ -85,6 +85,8 @@ Route::group('api/', function () {
             Route::post('tests/:order_sn', '/tests');
             Route::post('create', '/createOrder');//创建订单
             Route::post('createNew', '/createOrderNew');//创建订单
+            // 通过 商品ID 商品数量 ，使用商品选用的运费模板 计算邮费
+            Route::get('calculatePostage', '/calculatePostage');
             Route::post('delete', '/delete');//删除订单
             Route::post('create_annual_cost', '/create_annual_costorder');
             Route::post('create_activation_code_order', '/create_activation_code_order');