API-下单-如果养老金单独设置开关开启，则养老金采用针对下单的商品规格单独设置的值pension进行分配养老金

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

@@ -40,6 +40,7 @@ use app\entity\data\store\StoreProductEntity;
 use app\entity\data\user\UserAddressEntity;
 use app\entity\data\user\UserEntity;
 use app\entity\monomer\store\FzonePayTypeEntity;
+use app\entity\monomer\store\StoreOrderPensionJsonEntity;
 use app\entity\request\api\store\order\StoreOrderCreateRequestEntity;
 use think\db\exception\DbException;
 use think\exception\ValidateException;
@@ -795,7 +796,14 @@ class StoreGroupOrderRepository extends BaseRepository
                 ->setDouhuomall(empty($productEntity->getSpuId()) ? StoreOrderEnum::DOHUOMALL['PlatformOrder']['code'] : StoreOrderEnum::DOHUOMALL['SupplyChainOrder']['code'])
                 ->setDouhuomallStatus(empty($productEntity->getSpuId()) ? null : StoreOrderEnum::DOHUOMALL_STATUS['NotSubmittedToWeiweiBao']['code'])
                 ->setFzonePaytype($storeOrderCreateRequestEntity->getFzonePayType())
-                ->setConPri($serviceMoney);
+                ->setConPri($serviceMoney)
+                ->setPensionJson(
+                    StoreOrderPensionJsonEntity::newInstance()
+                        ->setPensionIs($productEntity->getPensionIs())
+                        ->setPension($productEntity->getPension())
+                        ->setAttrValuePensionNum($productAttrValueEntity->getPensionNum())
+                        ->toArray()
+                );
             $storeOrderEntityList[] = $storeOrderEntity;
         }
 

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

@@ -102,6 +102,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\monomer\store\StoreOrderPensionJsonEntity;
 use app\entity\request\api\store\order\CalculatePostageRequestEntity;
 use app\entity\request\api\store\order\StoreOrderCreateRequestEntity;
 use app\model\common\JdOrderModel;
@@ -11086,6 +11087,14 @@ class StoreOrderRepository extends BaseRepository
         /** @var StoreOrderRepository $storeOrderRepository */
         $storeOrderRepository = app()->make(StoreOrderRepository::class);
         $storeOrderEntity = $storeOrderRepository->getStoreOrderEntityByOrderId($orderId);
+        $storeOrderPensionJsonEntity = StoreOrderPensionJsonEntity::newInstance();
+        $yanglaojin = null;
+        if (!empty($storeOrderEntity->getPensionJson()) && is_array($storeOrderEntity->getPensionJson())) {
+            // 当有商品单独设置养老金比例时，下单时，会将该商品 规格内 单独设置的养老金比例 保存下来，该养老金比例 是根据商品售价来计算的
+            $storeOrderPensionJsonEntity = StoreOrderPensionJsonEntity::newInstance($storeOrderEntity->getPensionJson());
+            $pensionProportion = bcdiv((string)$storeOrderPensionJsonEntity->getAttrValuePensionNum(), '100', CommonEnum::CALCULATE_THE_NUMBER_OF_DECIMAL_PLACES);
+            $yanglaojin = bcmul((string)$storeOrderEntity->getTotalPrice(), $pensionProportion, CommonEnum::DECIMAL_PLACES_OF_THE_AMOUNT);
+        }
 
         /** @var UserRepository $userRepository */
         $userRepository = app()->make(UserRepository::class);
@@ -11101,7 +11110,9 @@ class StoreOrderRepository extends BaseRepository
         // 精彩生活区
         if ($storeOrderEntity->getMerId() == CommonEnum::DESIGN_MERCHANT_ID['WonderfulLiving']['code']) {
             // 为消费者 初始化 添加养老金记录
-            $yanglaojin = bcmul($storeOrderEntity->getConPri(), CommonEnum::ORDER_EARNING_ALLOCATION['WonderfulLiving']['Self']['YangLaoJin']['Ratio']['code'], CommonEnum::DECIMAL_PLACES_OF_THE_AMOUNT);
+            if (is_null($yanglaojin)) {
+                $yanglaojin = bcmul($storeOrderEntity->getConPri(), CommonEnum::ORDER_EARNING_ALLOCATION['WonderfulLiving']['Self']['YangLaoJin']['Ratio']['code'], CommonEnum::DECIMAL_PLACES_OF_THE_AMOUNT);
+            }
             /** @var UserBillRepository $userBillRepository */
             $userBillRepository = app()->make(UserBillRepository::class);
             $userBillRepository->addUserBill(
@@ -11616,7 +11627,9 @@ class StoreOrderRepository extends BaseRepository
             }
 
             // 为消费者 初始化 添加养老金记录
-            $yanglaojin = bcmul($storeOrderEntity->getTotalPrice(), CommonEnum::ORDER_EARNING_ALLOCATION['SharedProsperity']['Self']['YangLaoJin']['Ratio']['code'], CommonEnum::DECIMAL_PLACES_OF_THE_AMOUNT);
+            if (is_null($yanglaojin)) {
+                $yanglaojin = bcmul($storeOrderEntity->getTotalPrice(), CommonEnum::ORDER_EARNING_ALLOCATION['SharedProsperity']['Self']['YangLaoJin']['Ratio']['code'], CommonEnum::DECIMAL_PLACES_OF_THE_AMOUNT);
+            }
             /** @var UserBillRepository $userBillRepository */
             $userBillRepository = app()->make(UserBillRepository::class);
             $userBillRepository->addUserBill(

app/entity/data/store/StoreOrderEntity.php

@@ -99,6 +99,7 @@ class StoreOrderEntity extends DataEntity
     public $fzonePayOther = null;  // 组合支付other
     public $fzonePayNote = null;  // 组合支付备注
     public $fzonePayType = null;
+    public $pensionJson = null; // 养老金设置（将当前商品的养老金分配设置保存一份）
 
     /**
      * @return mixed
@@ -1746,6 +1747,30 @@ class StoreOrderEntity extends DataEntity
         return $this;
     }
 
+    /**
+     * @return mixed
+     */
+    public function getPensionJson()
+    {
+        if (is_json($this->pensionJson)) {
+            return json_decode($this->pensionJson, true);
+        }
+        return $this->pensionJson;
+    }
+
+    /**
+     * @param mixed $pensionJson
+     * @return StoreOrderEntity
+     */
+    public function setPensionJson($pensionJson): StoreOrderEntity
+    {
+        if (is_array($pensionJson)) {
+            $pensionJson = json_encode($pensionJson, JSON_UNESCAPED_UNICODE);
+        }
+        $this->pensionJson = $pensionJson;
+        return $this;
+    }
+
     public function deconstructionFzonePaytype()
     {
         if (!empty($this->getFzonePayType()) && is_array(json_decode($this->getFzonePayType(), true))) {

app/entity/monomer/store/FzonePayTypeEntity.php

@@ -2,9 +2,9 @@
 
 namespace app\entity\monomer\store;
 
-use app\entity\data\DataEntity;
+use app\entity\monomer\MonomerEntity;
 
-class FzonePayTypeEntity extends DataEntity
+class FzonePayTypeEntity extends MonomerEntity
 {
     public $type = '';
     public $price = 0.00;

app/entity/monomer/store/StoreOrderPensionJsonEntity.php

@@ -0,0 +1,66 @@
+<?php
+
+namespace app\entity\monomer\store;
+
+use app\entity\monomer\MonomerEntity;
+
+class StoreOrderPensionJsonEntity extends MonomerEntity
+{
+    public $pensionIs = 0; // 是否 单独设置百分比
+    public $pension = 0.00; // 商品外部展示的要老金数据
+    public $attrValuePensionNum = 0.00; // 针对每个规格设置的 该规格养老金分配比例
+
+    /**
+     * @return int
+     */
+    public function getPensionIs(): int
+    {
+        return $this->pensionIs;
+    }
+
+    /**
+     * @param mixed $pensionIs
+     * @return StoreOrderPensionJsonEntity
+     */
+    public function setPensionIs($pensionIs): StoreOrderPensionJsonEntity
+    {
+        $this->pensionIs = (int)$pensionIs;
+        return $this;
+    }
+
+    /**
+     * @return float
+     */
+    public function getPension(): float
+    {
+        return $this->pension;
+    }
+
+    /**
+     * @param mixed $pension
+     * @return StoreOrderPensionJsonEntity
+     */
+    public function setPension($pension): StoreOrderPensionJsonEntity
+    {
+        $this->pension = (float)$pension;
+        return $this;
+    }
+
+    /**
+     * @return float
+     */
+    public function getAttrValuePensionNum(): float
+    {
+        return $this->attrValuePensionNum;
+    }
+
+    /**
+     * @param mixed $attrValuePensionNum
+     * @return StoreOrderPensionJsonEntity
+     */
+    public function setAttrValuePensionNum($attrValuePensionNum): StoreOrderPensionJsonEntity
+    {
+        $this->attrValuePensionNum = (float)$attrValuePensionNum;
+        return $this;
+    }
+}