Merge branch 'refs/heads/dev' into dev-sc-260204

app/command/MemberAreaOrderIndependentAccount.php

@@ -2,6 +2,7 @@
 
 namespace app\command;
 
+use app\common\enum\CommonEnum;
 use app\common\model\store\order\StoreOrder;
 use app\common\repositories\store\order\StoreOrderRepository;
 use think\console\Command;
@@ -21,7 +22,8 @@ class MemberAreaOrderIndependentAccount extends Command
     protected function execute(Input $input, Output $output)
     {
         // @todo 会员专区订单分账
-        $this->doMemberAreaOrderIndependentAccount([496]);
+        $this->doMemberAreaOrderIndependentAccount([CommonEnum::DESIGN_MERCHANT_ID['MemberZone']['code']]);
+        $this->doSharedProsperityOrderIndependentAccount([CommonEnum::DESIGN_MERCHANT_ID['SharedProsperity']['code']]);
     }
 
     /**
@@ -77,4 +79,54 @@ class MemberAreaOrderIndependentAccount extends Command
 
     }
 
+    /**
+     * 共富区订单分账
+     *
+     * @param $merId
+     * @param $timeLimit
+     * @return void
+     * @throws \think\db\exception\DataNotFoundException
+     * @throws \think\db\exception\DbException
+     * @throws \think\db\exception\ModelNotFoundException
+     */
+    private function doSharedProsperityOrderIndependentAccount($merId = [], $timeLimit = 30)
+    {
+        $dst_mer_id = CommonEnum::DESIGN_MERCHANT_ID['SharedProsperity']['code'];
+
+        // 商户信息
+        $merchants = [];
+
+        // 已支付、未结算  注意，会员专区之前可能没有去及时 更新结算状态 'is_settlement' => 1,
+        $where = ['paid' => 1, 'is_del' => 0, 'is_system_del' => 0, 'is_independentaccount' => 0];
+        // 订单状态（0：待发货；1：待收货；2：待评价；3：已完成；4已申请退款；-1：已退款）5未支付 6已取消'
+        // $status = [2, 3]; ->whereIn('status', $status)
+        // 普通订单
+        $cursor = Db::table('rrx_store_order')->where($where)->where('pay_type', 'in', '1,2,4')
+            ->where('fzone_pay_price', '>', 0.00)
+            ->whereIn('mer_id', $merId)->cursor();
+
+        /** @var StoreOrderRepository $storeOrderRepository */
+        $storeOrderRepository = app()->make(StoreOrderRepository::class);
+
+        foreach ($cursor as $key => $value) {
+            if (!isset($merchants[$value['mer_id']])) {
+                $merchants[$value['mer_id']] = Db::name('merchant')->where('mer_id', $value['mer_id'])->find();
+            }
+            $group_order = Db::name('store_group_order')->alias('sgo')->where('sgo.group_order_id', $value['group_order_id'])->find();
+
+            $independentAccount = $storeOrderRepository->getIndependentAccount($value, $group_order, $dst_mer_id, $merchants[$value['mer_id']]['hf_member_id']);
+
+            $isSuccessed = $storeOrderRepository->prepareExecuteIndependentAccount(
+                $value, $group_order, $independentAccount['api_key'], $independentAccount['hf_platform_member_id'], '', $value['fzone_pay_price'], 0
+            );
+            if ($isSuccessed) {
+                Db::name("log")->insert(array('data' => '共富区-订单分账：' . json_encode($value, JSON_FORCE_OBJECT)));// 日志记录
+
+                $order = StoreOrder::getInstance()->where('order_id', $value['order_id'])->find();
+                $order->is_independentaccount = 1;
+                $order->save();
+            }
+        }
+
+    }
 }

app/common/enum/shared/SharedProsperityBalanceLogEnum.php

@@ -16,5 +16,16 @@ class SharedProsperityBalanceLogEnum extends CommonEnum
     const TYPE = [
         'PARTNER' => ['code' => 1, 'name' => '合伙人分红'],
         'GROUP' => ['code' => 2, 'name' => '共富奖'],
+        'DIRECT_REFERRAL' => ['code' => 3, 'name' => '直推奖'],
+        'LOCKED_CUSTOMER' => ['code' => 7, 'name' => '锁客收益'],
+        'PLATFORM_REWARD' => ['code' => 8, 'name' => '平台奖励'],
+        'SHARE_EARNINGS' => ['code' => 20, 'name' => '分享收益'],
+    ];
+
+    // 状态
+    const STATUS = [
+        'PENDING' => ['code' => 0, 'name' => '待确定'],
+        'VALID' => ['code' => 1, 'name' => '有效'],
+        'INVALID' => ['code' => -1, 'name' => '无效'],
     ];
 }

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

@@ -40,12 +40,14 @@ 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;
 use think\facade\Db;
 use think\facade\Log;
 use think\model\Relation;
+use Throwable;
 
 /**
  * Class StoreGroupOrderRepository
@@ -196,7 +198,7 @@ class StoreGroupOrderRepository extends BaseRepository
                     $storeOrderRepository->closeStoreOrder($storeOrderEntity, $uid, $changeMessage, $remark);
                 }
             });
-        } catch (\Throwable $e) {
+        } catch (Throwable $e) {
             throw new ValidateException('关闭订单失败:' . json_encode([
                     'error_message' => $e->getMessage(),
                     'error_file' => $e->getFile(),
@@ -795,7 +797,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;
         }
 
@@ -913,7 +922,7 @@ class StoreGroupOrderRepository extends BaseRepository
                     $storeGroupOrderRepository->storeGroupOrderPaySuccess($storeGroupOrderEntity->getGroupOrderId());
                 }
             });
-        } catch (\Throwable  $e) {
+        } catch (Throwable  $e) {
             Log::error('StoreGroupOrderRepository-createStoreGroupOrder：' . $e->getMessage());
             return [
                 'code' => 10001,
@@ -933,7 +942,7 @@ class StoreGroupOrderRepository extends BaseRepository
      * @param string $rand 当现金支付时，汇付会在订单尾部跟一个随机数
      * @param string|null $payOpenId 当现金支付时，付款人的Id
      * @return void
-     * @throws DbException
+     * @throws Throwable
      */
     public function storeGroupOrderPaySuccess(int $groupOrderId, string $rand = '', string $payOpenId = null): void
     {
@@ -970,8 +979,9 @@ class StoreGroupOrderRepository extends BaseRepository
             // 生成奖励数据
             $storeOrderRepository->createRewardMechanismByStoreOrderId($storeOrderEntity->getOrderId());
 
-            if ($storeOrderEntity->getMerId() == CommonEnum::DESIGN_MERCHANT_ID['MemberZone']['code']) {
+            if (in_array($storeOrderEntity->getMerId(), [CommonEnum::DESIGN_MERCHANT_ID['MemberZone']['code'], CommonEnum::DESIGN_MERCHANT_ID['SharedProsperity']['code']])) {
                 // 会员专区的 订单立即结算
+                // 共富区的订单立即结算
                 $settlementOrderIdList[] = $storeOrderEntity->getOrderId();
             }
 

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,15 @@ class StoreOrderRepository extends BaseRepository
         /** @var StoreOrderRepository $storeOrderRepository */
         $storeOrderRepository = app()->make(StoreOrderRepository::class);
         $storeOrderEntity = $storeOrderRepository->getStoreOrderEntityByOrderId($orderId);
+        $yanglaojin = null;
+        if (!empty($storeOrderEntity->getPensionJson()) && is_array($storeOrderEntity->getPensionJson())) {
+            // 当有商品单独设置养老金比例时，下单时，会将该商品 规格内 单独设置的养老金比例 保存下来，该养老金比例 是根据商品售价来计算的
+            $storeOrderPensionJsonEntity = StoreOrderPensionJsonEntity::newInstance($storeOrderEntity->getPensionJson());
+            if ($storeOrderPensionJsonEntity->getPensionIs()) {
+                $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 +11111,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 +11628,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(
@@ -12517,6 +12531,9 @@ class StoreOrderRepository extends BaseRepository
                                 // 精彩生活区 走宝塔定时任务 调用 great_life_order_independent_account 命令
                             } elseif ($storeOrderEntity->getMerId() == CommonEnum::DESIGN_MERCHANT_ID['Repurchase']['code']) {
                                 // 复购区不用分账，没有现金支付 只用复购金支付
+                            } elseif ($storeOrderEntity->getMerId() == CommonEnum::DESIGN_MERCHANT_ID['SharedProsperity']['code']) {
+                                // 共富区分账
+                                $storeOrderRepository->sharedProsperityOrderIndependentAccount($storeOrderEntity->getOrderSn(), $storeOrderEntity->getPayType());
                             } else {
                                 // 商贸区 走宝塔定时任务 调用 commercial_area_order_independent_account 命令
                             }
@@ -12530,6 +12547,52 @@ class StoreOrderRepository extends BaseRepository
         }
     }
 
+    /**
+     * 共富区订单分账
+     *
+     * @param $merId
+     * @param $timeLimit
+     * @return void
+     * @throws \think\db\exception\DataNotFoundException
+     * @throws \think\db\exception\DbException
+     * @throws \think\db\exception\ModelNotFoundException
+     */
+    private function sharedProsperityOrderIndependentAccount($orderSn, $payType)
+    {
+        $dst_mer_id = CommonEnum::DESIGN_MERCHANT_ID['SharedProsperity']['code'];
+        // 商户信息
+        $merchants = [];
+        // 已支付、未结算  注意，会员专区之前可能没有去及时 更新结算状态 'is_settlement' => 1,
+        $where = ['paid' => 1, 'is_del' => 0, 'is_system_del' => 0, 'is_independentaccount' => 0, 'order_sn' => $orderSn];
+        // 订单状态（0：待发货；1：待收货；2：待评价；3：已完成；4已申请退款；-1：已退款）5未支付 6已取消'
+        // $status = [2, 3]; ->whereIn('status', $status)
+        // 普通订单
+        $cursor = Db::table('rrx_store_order')->where($where)->where('pay_type', '=', $payType)
+            ->where('fzone_pay_price', '>', 0.00)
+            ->whereIn('mer_id', CommonEnum::DESIGN_MERCHANT_ID['SharedProsperity']['code'])->cursor();
+        /** @var StoreOrderRepository $storeOrderRepository */
+        $storeOrderRepository = app()->make(StoreOrderRepository::class);
+        foreach ($cursor as $key => $value) {
+            if (!isset($merchants[$value['mer_id']])) {
+                $merchants[$value['mer_id']] = Db::name('merchant')->where('mer_id', $value['mer_id'])->find();
+            }
+            $group_order = Db::name('store_group_order')->alias('sgo')->where('sgo.group_order_id', $value['group_order_id'])->find();
+
+            $independentAccount = $storeOrderRepository->getIndependentAccount($value, $group_order, $dst_mer_id, $merchants[$value['mer_id']]['hf_member_id']);
+
+            $isSuccessed = $storeOrderRepository->prepareExecuteIndependentAccount(
+                $value, $group_order, $independentAccount['api_key'], $independentAccount['hf_platform_member_id'], '', $value['fzone_pay_price'], 0
+            );
+            if ($isSuccessed) {
+                Db::name("log")->insert(array('data' => '共富区-订单分账：' . json_encode($value, JSON_FORCE_OBJECT)));// 日志记录
+
+                $order = StoreOrder::getInstance()->where('order_id', $value['order_id'])->find();
+                $order->is_independentaccount = 1;
+                $order->save();
+            }
+        }
+    }
+
     public function useKillOrderRewards($groupOrderId, $orderId, $uid,$adminId)
     {
         if (empty($orderId) || empty($groupOrderId) || empty($uid)) {

app/common/repositories/store/product/ProductRepository.php

@@ -177,7 +177,7 @@ class ProductRepository extends BaseRepository
             }
 
             if (is_array($data['icon_type'])) {
-                $data['icon_type'] = json_encode($data['icon_type'], JSON_UNESCAPED_UNICODE);
+                $data['icon_type'] = $data['icon_type'] ? json_encode($data['icon_type'], JSON_UNESCAPED_UNICODE) : null;
             }
 
             $pension = bcsub($data['attrValue'][0]['price'], bcmul($data['attrValue'][0]['price'], $data['commission'], 2), 2);
@@ -271,7 +271,7 @@ class ProductRepository extends BaseRepository
                 }
             }
             if (is_array($data['icon_type'])) {
-                $data['icon_type'] = json_encode($data['icon_type'], JSON_UNESCAPED_UNICODE);
+                $data['icon_type'] = $data['icon_type'] ? json_encode($data['icon_type'], JSON_UNESCAPED_UNICODE) : null;
             }
             $param['attr'] = $data['attr'] ?? '';
             $param['attrValue'] = $data['attrValue'] ?? '';

app/common/repositories/user/UserBillRepository.php

@@ -12,14 +12,19 @@ namespace app\common\repositories\user;
 
 
 use app\common\dao\BaseDao;
+use app\common\dao\shared\SharedProsperityBalanceLogDao;
 use app\common\dao\user\UserBillDao;
 use app\common\enum\CommonEnum;
+use app\common\enum\shared\SharedProsperityBalanceLogEnum;
 use app\common\enum\user\UserBillEnum;
 use app\common\enum\user\UserCertificationEnum;
 use app\common\model\user\UserBill;
 use app\common\repositories\BaseRepository;
 use app\common\repositories\gzc\GzcLogRepository;
+use app\common\repositories\shared\SharedProsperityUserRepository;
 use app\common\repositories\store\order\StoreOrderRepository;
+use app\entity\data\shared\SharedProsperityBalanceLogEntity;
+use app\entity\data\shared\SharedProsperityUserEntity;
 use app\entity\data\user\UserBillEntity;
 use app\entity\data\user\UserCertificationEntity;
 use app\entity\data\user\UserEntity;
@@ -584,7 +589,12 @@ class UserBillRepository extends BaseRepository
                     ->setStatus(UserBillEnum::STATUS['VALID']['code'])
                     ->setTakeTime(time());
 
-                if ($userBillEntity->getCommissionType() == UserBillEnum::COMMISSION_TYPE['DIRECT_REFERRAL']['code']) {
+                if (in_array($userBillEntity->getCommissionType(), [
+                    UserBillEnum::COMMISSION_TYPE['DIRECT_REFERRAL']['code'],
+                    UserBillEnum::COMMISSION_TYPE['LOCKED_CUSTOMER']['code'],
+                    UserBillEnum::COMMISSION_TYPE['PLATFORM_REWARD']['code'],
+                    UserBillEnum::COMMISSION_TYPE['SHARE_EARNINGS']['code']
+                ])) {
                     // 直推奖
                     if (is_null($updateUserEntity->getBrokeragePrice())) {
                         $updateUserEntity->setBrokeragePrice($userEntity->getBrokeragePrice());

app/controller/api/Auth.php

@@ -897,7 +897,7 @@ class Auth extends BaseController
         $SharedProsperityUserPv = 0;
         $SharedProsperityTeamPv = 0;
         $SharedProsperityGroupId = 0;
-        $SharedProsperityUser = Db::name('shared_prosperity_user')->where('user_id', $user['uid'])->value('id,partner_level,pv');
+        $SharedProsperityUser = Db::name('shared_prosperity_user')->where('user_id', $user['uid'])->field('id,partner_level,pv')->find();
         if ($SharedProsperityUser) {
             $isSharedProsperity = true;
             $SharedProsperityLevel = $SharedProsperityUser['partner_level'];
@@ -911,7 +911,6 @@ class Auth extends BaseController
             // 团员身份
             $groupId = Db::name('shared_prosperity_group_user')->where('user_id', $user['uid'])->value('group_id');
             if ($groupId) $SharedProsperityGroupId = $groupId;
-
         }
         $data['isSharedProsperity'] = $isSharedProsperity;
         $data['SharedProsperityLevel'] = $SharedProsperityLevel;
@@ -919,6 +918,23 @@ class Auth extends BaseController
         $data['SharedProsperityTeamPv'] = $SharedProsperityTeamPv;
         $data['SharedProsperityGroupId'] = $SharedProsperityGroupId;
 
+        // 查询会员体系团队pv
+        $memberTeamPvLog = false;
+        $sql = "select getUserLevelId({$user['uid']}) as uids";
+        try {
+            $spread_user_list = Db::query($sql);
+        } catch (\Exception $exception) {
+            return app('json')->fail($exception->getMessage());
+        }
+
+        $spread_user_list = explode(",", trim($spread_user_list[0]['uids'], '$,'));
+        $pvLog = Db::name('user_pv_log')
+            ->whereIn('uid',$spread_user_list)
+            ->limit(1)
+            ->select()
+            ->toArray();
+        if ($pvLog) $memberTeamPvLog = true;
+        $data['memberTeamPvLog'] = $memberTeamPvLog;
 
         return app('json')->success($data );
     }

app/controller/api/Notify.php

@@ -202,7 +202,26 @@ class Notify
                             }
 
                             // 3、支付成功 处理逻辑
-                            $storeGroupOrderRepository->storeGroupOrderPaySuccess($storeGroupOrderEntity->getGroupOrderId());
+                            try {
+                                Db::transaction(function () use (
+                                    $storeGroupOrderRepository,
+                                    $storeGroupOrderEntity
+                                ) {
+                                    $storeGroupOrderRepository->storeGroupOrderPaySuccess($storeGroupOrderEntity->getGroupOrderId());
+                                });
+                            } catch (\Throwable $e) {
+                                Db::name("log")
+                                    ->insert([
+                                        'data' => '【订单支付回调】【结算订单失败】:时间：' . date('Y-m-d H:i:s', time()) . '；订单编号：' . $groupOrderSn_Rand . '；订单失败原因：' . json_encode([
+                                                'error_message' => $e->getMessage(),
+                                                'error_file' => $e->getFile(),
+                                                'error_line' => $e->getLine(),
+                                                'error_code' => $e->getCode(),
+                                                'exception_class' => get_class($e),
+                                                'trace' => $e->getTraceAsString()
+                                            ], JSON_UNESCAPED_UNICODE)
+                                    ]);
+                            }
                             /*
                             $group_order = Db::name('store_group_order')->where('group_order_sn', $requestId[0])->find();
                             $uid = $group_order['uid'];

app/controller/api/user/User.php

@@ -13,6 +13,7 @@ namespace app\controller\api\user;
 use app\common\repositories\article\AgreementRepository;
 use app\common\repositories\merchant\order\OrderGzcRepository;
 use app\common\repositories\merchant\order\OrderMerchantRepository;
+use app\common\repositories\shared\SharedProsperityUserRepository;
 use app\common\repositories\store\product\ProductRepository;
 use app\common\repositories\user\UnionUsersRepository;
 use app\controller\api\merchant\sxy\Access;
@@ -182,6 +183,11 @@ class User extends BaseController
     {
         $user = $this->request->userInfo();
         $user->append(['one_level_count', 'lock_brokerage', 'two_level_count', 'spread_total', 'yesterday_brokerage', 'total_extract', 'total_brokerage']);
+
+        /** @var SharedProsperityUserRepository $sharedProsperityUserRepository */
+        $sharedProsperityUserRepository = app()->make(SharedProsperityUserRepository::class);
+        $sharedProsperityUserEntity = $sharedProsperityUserRepository->getSharedProsperityUserEntityByUserId($user->uid);
+
         $data = [
             'lock_brokerage'         => $user->lock_brokerage,
             'one_level_count'        => $user->one_level_count,
@@ -191,6 +197,7 @@ class User extends BaseController
             'total_extract'          => $user->total_extract,
             'total_brokerage'        => $user->total_brokerage,
             'brokerage_price'        => $user->brokerage_price,
+            'shared_prosperity_balance'        => $sharedProsperityUserEntity->getBalance()?:0.00,
             'member_brokerage_price' => $user->member_brokerage_price,
             'now_money'              => $user->now_money,
             'broken_day'             => (int)systemConfig('lock_brokerage_timer')
@@ -3819,6 +3826,11 @@ class User extends BaseController
         $uid = $this->request->uid();
         // 佣金余额
         $data['brokerage_price'] = Db::name('user')->where('uid', $uid)->value('brokerage_price');
+
+        /** @var SharedProsperityUserRepository $sharedProsperityUserRepository */
+        $sharedProsperityUserRepository = app()->make(SharedProsperityUserRepository::class);
+        $sharedProsperityUserEntity = $sharedProsperityUserRepository->getSharedProsperityUserEntityByUserId($uid);
+        $data['shared_prosperity_balance'] = $sharedProsperityUserEntity->getBalance();
         // 总收益
         $data['sum_amount'] = Db::name('user_bill')
             ->where('uid', $uid)

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;
+    }
+}