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

app/common/dao/store/order/StoreOrderDao.php

@@ -607,24 +607,27 @@ class StoreOrderDao extends BaseDao
     }
 
     /**
-     * @param $orderId
-     * @return CommonEntity
+     * @param array $orderIdList
+     * @return CommonEntity[]
      */
-    public function getStoreOrderEntityByOrderId($orderId): CommonEntity
+    public function getStoreOrderEntityListByOrderIdList(array $orderIdList): array
     {
-        $data = [];
+        $entityList = [];
         try {
             /** @var StoreOrder $model */
             $model = $this->getModel();
             $dataRes = $model::getDB()
-                ->where('order_id', '=', $orderId)
-                ->find();
+                ->whereIn('order_id', $orderIdList)
+                ->select()
+                ->toArray();
             if (!empty($dataRes)) {
-                $data = $dataRes->toArray();
+                $entityList = array_map(function ($data) {
+                    return StoreOrderEntity::newInstance($data);
+                }, $dataRes);
             }
         } catch (\Exception $e) {
 
         }
-        return StoreOrderEntity::newInstance($data);
+        return $entityList;
     }
 }

app/common/dao/system/merchant/MerchantContributionDao.php

@@ -0,0 +1,45 @@
+<?php
+
+namespace app\common\dao\system\merchant;
+
+
+use app\common\dao\BaseDao;
+use app\common\model\system\merchant\MerchantContribution;
+use app\entity\CommonEntity;
+use app\entity\data\merchant\MerchantContributionEntity;
+
+
+class MerchantContributionDao extends BaseDao
+{
+
+    protected function getModel(): string
+    {
+        return MerchantContribution::class;
+    }
+
+    /**
+     * 根据商家的让利比例 获取对应的 配置信息
+     * @param float $profitSharing
+     * @return CommonEntity
+     */
+    public function getMerchantContributionEntityByProfitSharing(float $profitSharing): CommonEntity
+    {
+        $data = [];
+        try {
+            /** @var MerchantContribution $model */
+            $model = $this->getModel();
+            $dataRes = $model::getDB()->select()->toArray();
+            if (!empty($dataRes)) {
+                foreach ($dataRes as $item) {
+                    if ($item['start'] <= $profitSharing && $item['end'] >= $profitSharing) {
+                        $data = $item;
+                        break;
+                    }
+                }
+            }
+        } catch (\Exception $e) {
+
+        }
+        return MerchantContributionEntity::newInstance($data);
+    }
+}

app/common/dao/user/UserBillDao.php

@@ -12,10 +12,14 @@ namespace app\common\dao\user;
 
 
 use app\common\dao\BaseDao;
+use app\common\enum\user\UserBillEnum;
 use app\common\model\BaseModel;
 use app\common\model\user\UserBill;
 use app\entity\CommonEntity;
 use app\entity\data\user\UserBillEntity;
+use think\db\exception\DataNotFoundException;
+use think\db\exception\DbException;
+use think\db\exception\ModelNotFoundException;
 
 /**
  * Class UserBillDao
@@ -206,4 +210,30 @@ class UserBillDao extends BaseDao
         }
         return UserBillEntity::newInstance($data);
     }
+
+    /**
+     * @param string $typeShop
+     * @param array $orderIdList
+     * @return UserBillEntity[]
+     */
+    public function getUserBillEntityListByOrderIdListAndPending(string $typeShop, array $orderIdList): array
+    {
+        $entityList = [];
+        try {
+            $dataList = UserBill::getDB()
+                ->where('type_shop', '=', $typeShop)
+                ->whereIn('order_id', $orderIdList)
+                ->where('status', '=', UserBillEnum::STATUS['PENDING']['code'])
+                ->select()
+                ->toArray();
+            if (!empty($dataList)) {
+                $entityList = array_map(function ($data) {
+                    return UserBillEntity::newInstance($data);
+                }, $dataList);
+            }
+        } catch (DataNotFoundException|ModelNotFoundException|DbException $e) {
+
+        }
+        return $entityList;
+    }
 }

app/common/dao/user/UserSignFenrunDao.php

@@ -0,0 +1,14 @@
+<?php
+
+namespace app\common\dao\user;
+
+use app\common\dao\BaseDao;
+use app\common\model\user\UserSignFenrun;
+
+class UserSignFenrunDao extends BaseDao
+{
+    protected function getModel(): string
+    {
+        return UserSignFenrun::class;
+    }
+}

app/common/enum/CommonEnum.php

@@ -56,6 +56,8 @@ class CommonEnum
     const CALCULATE_THE_NUMBER_OF_DECIMAL_PLACES = 5;
     // 金额保留小数点位 超出部分舍弃
     const DECIMAL_PLACES_OF_THE_AMOUNT = 2;
+    // 平台手续费(汇付通道服务费)
+    const HUIFU_COMMISSION_CHARGE = 0.0038;
 
     // 订单 收益 的分配
     const ORDER_EARNING_ALLOCATION = [
@@ -220,14 +222,6 @@ class CommonEnum
                     'Ratio' => ['code' => 0.35 * 0.5, 'name' => '将利润的35%中的5%，当做养老金分配给推荐人']
                 ]
             ],
-            'Share' => [
-                'BrokeragePrice' => [
-                    'Ratio' => ['code' => 0.35 * 0.03 * 0.9, 'name' => '将利润的 35% 中的 3% 中的 90%，做为分享奖励的佣金部分'],
-                ],
-                'Fugou' => [
-                    'Ratio' => ['code' => 0.35 * 0.03 * 0.1, 'name' => '将利润的 35% 中的 3% 中的 10%，做为分享奖励的复购部分'],
-                ]
-            ],
             'Lock' => [
                 'BrokeragePrice' => [
                     'Ratio' => ['code' => 0.35 * 0.05 * 0.9, 'name' => '将利润的 35% 中的 5% 中的 90%，做为锁客奖励的佣金部分'],

app/common/enum/user/UserSignFenrunEnum.php

@@ -0,0 +1,18 @@
+<?php
+
+namespace app\common\enum\user;
+
+use app\common\enum\CommonEnum;
+
+class UserSignFenrunEnum extends CommonEnum
+{
+    // 状态枚举
+    const STATUS = [
+        'Settled' => ['code' => 1, 'name' => '已结算'],
+        'Invalid' => ['code' => 0, 'name' => '已失效'],
+        'Unsettled' => ['code' => -1, 'name' => '未结算'],
+    ];
+
+    // 订单类型枚举
+    const ORDER_TYPE = parent::ORDER_TYPE;
+}

app/common/enum/user/UserSignJingdouEnum.php

@@ -18,4 +18,6 @@ class UserSignJingdouEnum extends CommonEnum
         'Gift' => ['code' => 1, 'name' => '赠送'],
         'Consume' => ['code' => 2, 'name' => '消耗'],
     ];
+
+    const ORDER_TYPE = parent::ORDER_TYPE;
 }

app/common/model/system/merchant/MerchantContribution.php

@@ -0,0 +1,20 @@
+<?php
+
+namespace app\common\model\system\merchant;
+
+
+use app\common\model\BaseModel;
+
+class MerchantContribution extends BaseModel
+{
+
+    public static function tablePk(): string
+    {
+        return 'id';
+    }
+
+    public static function tableName(): string
+    {
+        return 'merchant_contribution';
+    }
+}

app/common/model/user/UserSignFenrun.php

@@ -0,0 +1,19 @@
+<?php
+
+namespace app\common\model\user;
+
+use app\common\model\BaseModel;
+
+class UserSignFenrun extends BaseModel
+{
+
+    public static function tablePk(): string
+    {
+        return 'id';
+    }
+
+    public static function tableName(): string
+    {
+        return 'user_sign_fenrun';
+    }
+}

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

@@ -22,6 +22,7 @@ use app\common\enum\store\StoreOrderEnum;
 use app\common\enum\user\UserBillEnum;
 use app\common\enum\user\UserEnum;
 use app\common\enum\user\UserPvLogEnum;
+use app\common\enum\user\UserSignFenrunEnum;
 use app\common\enum\user\UserSignFugouEnum;
 use app\common\enum\user\UserSignGongxianEnum;
 use app\common\enum\user\UserSignHongbaoEnum;
@@ -52,15 +53,19 @@ 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;
+use app\common\repositories\system\merchant\MerchantCategoryRepository;
+use app\common\repositories\system\merchant\MerchantContributionRepository;
 use app\common\repositories\system\merchant\MerchantRepository;
 use app\common\repositories\merchant\MerchantRepository as m;
 use app\common\repositories\user\UserAddressRepository;
 use app\common\repositories\user\UserBillRepository;
 use app\common\repositories\user\UserPvLogRepository;
 use app\common\repositories\user\UserRepository;
+use app\common\repositories\user\UserSignFenrunRepository;
 use app\common\repositories\user\UserSignFugouRepository;
 use app\common\repositories\user\UserSignGongxianRepository;
 use app\common\repositories\user\UserSignHongbaoRepository;
+use app\common\repositories\user\UserSignJingdouRepository;
 use app\common\repositories\user\UserSignScoreRepository;
 use app\common\repositories\user\UserThirdRepository;
 use app\common\repositories\wechat\RoutineQrcodeRepository;
@@ -10991,7 +10996,10 @@ class StoreOrderRepository extends BaseRepository
             // 创建订单
             /** @var StoreOrderEntity $storeOrderEntity */
             $storeOrderEntity = StoreOrderEntity::newInstance();
-            $storeOrderEntity->setCommissionRate((float)$merchantRepository->get($cartEntity->getMerId())->mer_commission_rate)
+            // $huifuCommissionRate = CommonEnum::HUIFU_COMMISSION_CHARGE;
+            // ->setCommissionRate(现金 * $huifuCommissionRate)
+            $storeOrderEntity
+                ->setExtensionOne($productAttrValueEntity->getExtensionOne())
                 // 二级佣金 此字段已被用于分佣比例
                 ->setExtensionTwo($productAttrValueEntity->getExtensionTwo())
                 ->setOrderSn($this->getNewOrderId() . ($num++))
@@ -11057,6 +11065,9 @@ class StoreOrderRepository extends BaseRepository
             $storeOrderEntityList[$key] = $storeOrderEntity;
             $storeOrderIdList[] = $storeOrderEntity->getOrderId();
 
+            // 生成奖励数据
+            $this->createRewardMechanismByStoreOrderId($storeOrderEntity->getOrderId());
+
             // 将每件商品设计到的优惠券要取消掉
 
             // 准备订单的 状态数据
@@ -11245,8 +11256,6 @@ class StoreOrderRepository extends BaseRepository
                 'status' => StoreOrderEnum::STATUS['WAITING_SHIPMENT']['code'],
                 'distribution_mode' => StoreOrderEnum::DISTRIBUTION_MODE['ExpressDelivery']
             ]);
-
-
             foreach ($storeOrderEntityList as $storeOrderEntity) {
 
             }
@@ -11261,12 +11270,31 @@ class StoreOrderRepository extends BaseRepository
      */
     public function getStoreOrderEntityByOrderId(int $orderId): StoreOrderEntity
     {
-        /** @var StoreOrderEntity $storeOrderEntity */
-        $storeOrderEntity = $this->dao->getStoreOrderEntityByOrderId($orderId);
-        return $storeOrderEntity;
+        $entityList = $this->getStoreOrderEntityListByOrderIdList([$orderId]);
+        $entity = array_shift($entityList);
+        if ($entity instanceof StoreOrderEntity) {
+            return $entity;
+        } else {
+            /** @var StoreOrderEntity */
+            return StoreOrderEntity::newInstance();
+        }
+    }
+
+    /**
+     * @param array $orderIdList
+     * @return StoreOrderEntity[]
+     */
+    public function getStoreOrderEntityListByOrderIdList(array $orderIdList): array
+    {
+        return $this->dao->getStoreOrderEntityListByOrderIdList($orderIdList);
     }
 
-    public function createCommissionByStoreOrderEntity(int $orderId)
+    /**
+     * 根据 订单ID 来生 成奖励数据（待生效）
+     * @param int $orderId
+     * @return void
+     */
+    public function createRewardMechanismByStoreOrderId(int $orderId)
     {
         /** @var StoreOrderRepository $storeOrderRepository */
         $storeOrderRepository = app()->make(StoreOrderRepository::class);
@@ -11698,6 +11726,10 @@ class StoreOrderRepository extends BaseRepository
                 }
             }
         } else {
+            /** @var MerchantRepository $merchantRepository */
+            $merchantRepository = app()->make(MerchantRepository::class);
+            $merchantEntity = $merchantRepository->getMerchantEntityByMerchantId($storeOrderEntity->getMerId());
+
             // 为消费者 初始化 添加养老金记录
             $yanglaojin = bcmul($storeOrderEntity->getConPri(), CommonEnum::ORDER_EARNING_ALLOCATION['CommercialDistrict']['Self']['YangLaoJin']['Ratio']['code'], CommonEnum::DECIMAL_PLACES_OF_THE_AMOUNT);
             /** @var UserBillRepository $userBillRepository */
@@ -11750,7 +11782,18 @@ class StoreOrderRepository extends BaseRepository
                 $storeOrderEntity->getOrderId()
             );
 
-            // 分润记录 todo
+            // 分润记录
+            if (!empty($merchantEntity->getUid())) {
+                /** @var UserSignFenrunRepository $userSignFenrunRepository */
+                $userSignFenrunRepository = app()->make(UserSignFenrunRepository::class);
+                $userSignFenrunRepository->addUserSingFenrun(
+                    $merchantEntity->getUid(),
+                    $storeOrderEntity->getConPri(),
+                    '商贸区下单产生分润值',
+                    UserSignFenrunEnum::ORDER_TYPE['Platform']['code'],
+                    $storeOrderEntity->getOrderId()
+                );
+            }
 
             // 给老用户的奖励 红包
             if ($userEntity->getIsOld()) {
@@ -11850,19 +11893,19 @@ class StoreOrderRepository extends BaseRepository
                 }
             }
 
-            // 锁客收益 todo
+            // 锁客收益
             if (!empty($userEntity->getMerId())) {
                 /** @var MerchantRepository $merchantRepository */
                 $merchantRepository = app()->make(MerchantRepository::class);
-                $merchantEntity = $merchantRepository->getMerchantEntityByMerchantId($userEntity->getMerId());
-                if ($merchantEntity->getStatus() == MerchantEnum::STATUS['Normal']['code'] && !empty($merchantEntity->getUid())) {
+                $merchantEntityByLock = $merchantRepository->getMerchantEntityByMerchantId($userEntity->getMerId());
+                if ($merchantEntityByLock->getStatus() == MerchantEnum::STATUS['Normal']['code'] && !empty($merchantEntityByLock->getUid())) {
                     // 计算 佣金
-                    $brokeragePriceByMerId = bcmul($storeOrderEntity->getConPri(), CommonEnum::ORDER_EARNING_ALLOCATION['WonderfulLiving']['Lock']['BrokeragePrice']['Ratio']['code'], CommonEnum::DECIMAL_PLACES_OF_THE_AMOUNT);
+                    $brokeragePriceByMerId = bcmul($storeOrderEntity->getConPri(), CommonEnum::ORDER_EARNING_ALLOCATION['CommercialDistrict']['Lock']['BrokeragePrice']['Ratio']['code'], CommonEnum::DECIMAL_PLACES_OF_THE_AMOUNT);
                     // 添加佣金记录
                     /** @var UserBillRepository $userBillRepository */
                     $userBillRepository = app()->make(UserBillRepository::class);
                     $userBillRepository->addUserBill(
-                        $merchantEntity->getUid(),
+                        $merchantEntityByLock->getUid(),
                         UserBillEnum::TYPE_SHOP['Platform']['code'],
                         $storeOrderEntity->getOrderId(),
                         UserBillEnum::COMMISSION_TYPE['LOCKED_CUSTOMER']['code'],
@@ -11871,12 +11914,12 @@ class StoreOrderRepository extends BaseRepository
                     );
 
                     // 计算 复购金
-                    $fugouByMerId = bcmul($storeOrderEntity->getConPri(), CommonEnum::ORDER_EARNING_ALLOCATION['WonderfulLiving']['Lock']['Fugou']['Ratio']['code'], CommonEnum::DECIMAL_PLACES_OF_THE_AMOUNT);
+                    $fugouByMerId = bcmul($storeOrderEntity->getConPri(), CommonEnum::ORDER_EARNING_ALLOCATION['CommercialDistrict']['Lock']['Fugou']['Ratio']['code'], CommonEnum::DECIMAL_PLACES_OF_THE_AMOUNT);
                     // 添加复购金记录
                     /** @var UserSignFugouRepository $userSignFugouRepository */
                     $userSignFugouRepository = app()->make(UserSignFugouRepository::class);
                     $userSignFugouRepository->addUserSingFugou(
-                        $merchantEntity->getUid(),
+                        $merchantEntityByLock->getUid(),
                         UserSignFugouEnum::TYPE['Give']['code'],
                         $fugouByMerId,
                         '锁客复购金（精彩生活区商品赠送）',
@@ -11886,7 +11929,119 @@ class StoreOrderRepository extends BaseRepository
                 }
             }
 
-            // 商户收益 todo
+            // 商户收益 给商户 京豆
+            /** @var MerchantContributionRepository $merchantContributionRepository */
+            $merchantContributionRepository = app()->make(MerchantContributionRepository::class);
+            $merchantContributionEntity = $merchantContributionRepository->getMerchantContributionEntityByProfitSharing($storeOrderEntity->getExtensionOne());
+            if (!empty($merchantContributionEntity->getId())) {
+                /** @var UserSignJingdouRepository $userSignJingdouRepository */
+                $userSignJingdouRepository = app()->make(UserSignJingdouRepository::class);
+                $userSignJingdouRepository->addUserSingJingdou(
+                    $merchantEntity->getUid(),
+                    UserSignJingdouEnum::TYPE['Gift']['code'],
+                    bcmul($storeOrderEntity->getConPri(), $merchantContributionEntity->getJd(), CommonEnum::DECIMAL_PLACES_OF_THE_AMOUNT),
+                    $storeOrderEntity->getMerId(),
+                    '线上用户消费商家获得京豆',
+                    UserSignFugouEnum::ORDER_TYPE['Platform']['code'],
+                    $storeOrderEntity->getOrderId()
+                );
+            }
+        }
+    }
+
+    public function settlementOrderByOrderIdList(array $orderIdList)
+    {
+        /** @var StoreOrderRepository $storeOrderRepository */
+        $storeOrderRepository = app()->make(StoreOrderRepository::class);
+        $storeOrderEntityList = $storeOrderRepository->getStoreOrderEntityListByOrderIdList($orderIdList);
+        if (!empty($storeOrderEntityList)) {
+            $existOrderIdList = array_map(function ($storeOrderEntity) {
+                if ($storeOrderEntity->getIsSettlement() == StoreOrderEnum::IS_SETTLEMENT['NO']['code']) {
+                    return $storeOrderEntity->getOrderId();
+                }
+            }, $storeOrderEntityList);
+
+            /** @var UserBillRepository $userBillRepository */
+            $userBillRepository = app()->make(UserBillRepository::class);
+            $userBillEntityList = $userBillRepository->getUserBillEntityListByOrderIdListAndPending(UserBillEnum::TYPE_SHOP['Platform']['code'], $existOrderIdList);
+            if (!empty($userBillEntityList)) {
+                foreach ($userBillEntityList as $userBillEntity) {
+                    if ($userBillEntity->getCommissionType() == UserBillEnum::COMMISSION_TYPE['PENSION']['code']) {
+                        // 养老金 todo
+                    }
+                }
+            }
+
+
+
+            foreach ($storeOrderEntityList as $storeOrderEntity) {
+                // 结算养老金
+                $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(
+                    $storeOrderEntity->getUid(),
+                    UserBillEnum::TYPE_SHOP['Platform']['code'],
+                    $storeOrderEntity->getOrderId(),
+                    UserBillEnum::COMMISSION_TYPE['PENSION']['code'],
+                    $yanglaojin,
+                    '购买精彩生活商品赠送养老金'
+                );
+
+                // 为用户初始胡 贡献值
+                $gongxian = bcmul($storeOrderEntity->getConPri(), CommonEnum::ORDER_EARNING_ALLOCATION['WonderfulLiving']['Self']['Gongxian']['Ratio']['code'], CommonEnum::DECIMAL_PLACES_OF_THE_AMOUNT);
+                /** @var UserSignGongxianRepository $userSignGongxianRepository */
+                $userSignGongxianRepository = app()->make(UserSignGongxianRepository::class);
+                $userSignGongxianRepository->addUserSingGongxian(
+                    $storeOrderEntity->getUid(),
+                    UserSignGongxianEnum::TYPE['Give']['code'],
+                    $gongxian,
+                    '购买精彩生活商品赠送贡献值',
+                    UserSignGongxianEnum::ORDER_TYPE['Platform']['code'],
+                    $storeOrderEntity->getOrderId()
+                );
+
+                // 初始化 PV
+                $pv = bcmul($storeOrderEntity->getConPri(), CommonEnum::ORDER_EARNING_ALLOCATION['WonderfulLiving']['Self']['Pv']['Ratio']['code'], CommonEnum::DECIMAL_PLACES_OF_THE_AMOUNT);
+                /** @var UserPvLogRepository $userPvLogRepository */
+                $userPvLogRepository = app()->make(UserPvLogRepository::class);
+                $userPvLogRepository->addUserPvLog(
+                    $storeOrderEntity->getUid(),
+                    $pv,
+                    '购买精彩生活商品赠送PV值',
+                    UserPvLogEnum::ORDER_TYPE['Platform']['code'],
+                    $storeOrderEntity->getOrderId()
+                );
+
+                // 初始化积分
+                $score = bcmul($storeOrderEntity->getConPri(), CommonEnum::ORDER_EARNING_ALLOCATION['WonderfulLiving']['Self']['Score']['Ratio']['code'], CommonEnum::DECIMAL_PLACES_OF_THE_AMOUNT);
+                /** @var UserSignScoreRepository $userSignScoreRepository */
+                $userSignScoreRepository = app()->make(UserSignScoreRepository::class);
+                $userSignScoreRepository->addUserSingScore(
+                    $storeOrderEntity->getUid(),
+                    UserSignScoreEnum::SOURCE_TYPE['SelfOrder']['code'],
+                    UserSignScoreEnum::PM['Income']['code'],
+                    $score,
+                    '购买精彩生活商品赠送积分',
+                    UserSignHongbaoEnum::ORDER_TYPE['Platform']['code'],
+                    $storeOrderEntity->getOrderId()
+                );
+
+                // 给老用户的奖励 红包
+                if ($userEntity->getIsOld()) {
+                    $hongbao =  bcmul($storeOrderEntity->getConPri(), CommonEnum::ORDER_EARNING_ALLOCATION['WonderfulLiving']['Self']['Hongbao']['Ratio']['code'], CommonEnum::DECIMAL_PLACES_OF_THE_AMOUNT);
+                    /** @var UserSignHongbaoRepository $userSignHongbaoRepository */
+                    $userSignHongbaoRepository = app()->make(UserSignHongbaoRepository::class);
+                    $userSignHongbaoRepository->addUserSingHongbao(
+                        $storeOrderEntity->getUid(),
+                        UserSignHongbaoEnum::TYPE['ConsumptionGift']['code'],
+                        $hongbao,
+                        '购买精彩生活商品赠送红包',
+                        UserSignHongbaoEnum::ORDER_TYPE['Platform']['code'],
+                        $storeOrderEntity->getOrderId()
+                    );
+                }
+            }
         }
     }
 }

app/common/repositories/system/merchant/MerchantContributionRepository.php

@@ -0,0 +1,35 @@
+<?php
+
+namespace app\common\repositories\system\merchant;
+
+use app\common\dao\system\merchant\MerchantContributionDao;
+use app\common\repositories\BaseRepository;
+use app\entity\data\merchant\MerchantContributionEntity;
+
+class MerchantContributionRepository extends BaseRepository
+{
+    /**
+     * @var MerchantContributionDao
+     */
+    protected $dao;
+
+    /**
+     * @param MerchantContributionDao $dao
+     */
+    public function __construct(MerchantContributionDao $dao)
+    {
+        $this->dao = $dao;
+    }
+
+    /**
+     * 根据商家的让利比例 获取对应的 配置信息
+     * @param float $profitSharing
+     * @return MerchantContributionEntity
+     */
+    public function getMerchantContributionEntityByProfitSharing(float $profitSharing): MerchantContributionEntity
+    {
+        /** @var MerchantContributionEntity $entity */
+        $entity = $this->dao->getMerchantContributionEntityByProfitSharing($profitSharing);
+        return $entity;
+    }
+}

app/common/repositories/user/UserBillRepository.php

@@ -5,7 +5,7 @@
  * @author xaboy
  * @day 2020-05-07
  *
- * 
+ *
  */
 
 namespace app\common\repositories\user;
@@ -468,4 +468,15 @@ class UserBillRepository extends BaseRepository
             throw new ValidateException('更新记录状态失败');
         }
     }
+
+    /**
+     * 获取Bill实体集合 根据 订单类型 订单Id集合 待结算状态
+     * @param string $typeShop
+     * @param array $orderIdList
+     * @return UserBillEntity[]
+     */
+    public function getUserBillEntityListByOrderIdListAndPending(string $typeShop, array $orderIdList): array
+    {
+        return $this->dao->getUserBillEntityListByOrderIdListAndPending($typeShop, $orderIdList);
+    }
 }

app/common/repositories/user/UserSignFenrunRepository.php

@@ -0,0 +1,73 @@
+<?php
+
+namespace app\common\repositories\user;
+
+use app\common\dao\user\UserSignFenrunDao;
+use app\common\enum\user\UserSignFenrunEnum;
+use app\common\repositories\BaseRepository;
+use app\common\repositories\store\order\StoreOrderRepository;
+use app\entity\data\user\UserSignFenrunEntity;
+use think\exception\ValidateException;
+
+class UserSignFenrunRepository extends BaseRepository
+{
+    public function __construct(UserSignFenrunDao $dao)
+    {
+        $this->dao = $dao;
+    }
+
+    public function create($data)
+    {
+        return $this->dao->create($data);
+    }
+
+    /**
+     * 写入分润记录
+     * @param UserSignFenrunEntity $userSignFenrunEntity
+     * @return UserSignFenrunEntity
+     */
+    public function createByEntity(UserSignFenrunEntity $userSignFenrunEntity): UserSignFenrunEntity
+    {
+        $result = $this->dao->create($userSignFenrunEntity->toUnderlineArray())->toArray();
+        /** @var UserSignFenrunEntity $entity */
+        $entity = UserSignFenrunEntity::newInstance($result);
+        return $entity;
+    }
+
+    /**
+     * 添加分润记录
+     * @param int $uid
+     * @param float $number
+     * @param string $mark
+     * @param string $orderType
+     * @param string $orderId
+     * @return UserSignFenrunEntity
+     */
+    public function addUserSingFenrun(int $uid, float $number, string $mark = '', string $orderType = '', string $orderId = ''): UserSignFenrunEntity
+    {
+        if (!empty($orderType)) {
+            if (!empty($orderId)) {
+                if ($orderType == UserSignFenrunEnum::ORDER_TYPE['Platform']['code']) {
+                    /** @var StoreOrderRepository $storeOrderRepository */
+                    $storeOrderRepository = app()->make(StoreOrderRepository::class);
+                    $storeOrderEntity = $storeOrderRepository->getStoreOrderEntityByOrderId((int)$orderId);
+                    if (empty($storeOrderEntity->getOrderId())) {
+                        throw new ValidateException('未查询到订单信息');
+                    }
+                }
+            }
+        }
+
+        /** @var UserSignFenrunEntity $userSignFenrunEntity */
+        $userSignFenrunEntity = UserSignFenrunEntity::newInstance();
+        $userSignFenrunEntity->setUid($uid)
+            ->setNumber($number)
+            ->setMark($mark)
+            ->setOrderType($orderType)
+            ->setOrderId($orderId)
+            ->setAddtime(time())
+            ->setStatus(UserSignFenrunEnum::STATUS['Unsettled']['code']);
+
+        return $this->createByEntity($userSignFenrunEntity);
+    }
+}

app/common/repositories/user/UserSignJingdouRepository.php

@@ -3,7 +3,11 @@
 namespace app\common\repositories\user;
 
 use app\common\dao\user\UserSignJingdouDao;
+use app\common\enum\user\UserSignJingdouEnum;
 use app\common\repositories\BaseRepository;
+use app\common\repositories\store\order\StoreOrderRepository;
+use app\entity\data\user\UserSignJingdouEntity;
+use think\exception\ValidateException;
 
 class UserSignJingdouRepository extends BaseRepository
 {
@@ -16,4 +20,57 @@ class UserSignJingdouRepository extends BaseRepository
     {
         return $this->dao->create($data);
     }
+
+    /**
+     * 写入京豆记录
+     * @param UserSignJingdouEntity $userSignJingdouEntity
+     * @return UserSignJingdouEntity
+     */
+    public function createByEntity(UserSignJingdouEntity $userSignJingdouEntity): UserSignJingdouEntity
+    {
+        $result = $this->dao->create($userSignJingdouEntity->toUnderlineArray())->toArray();
+        /** @var UserSignJingdouEntity $entity */
+        $entity = UserSignJingdouEntity::newInstance($result);
+        return $entity;
+    }
+
+    /**
+     * 添加京豆记录
+     * @param int $uid
+     * @param int $type
+     * @param float $number
+     * @param string $mark
+     * @param string $orderType
+     * @param string $orderId
+     * @return UserSignJingdouEntity
+     */
+    public function addUserSingJingdou(int $uid, int $type, float $number, int $merId, string $mark = '', string $orderType = '', string $orderId = ''): UserSignJingdouEntity
+    {
+        if (!empty($orderType)) {
+            if (!empty($orderId)) {
+                if ($orderType == UserSignJingdouEnum::ORDER_TYPE['Platform']['code']) {
+                    /** @var StoreOrderRepository $storeOrderRepository */
+                    $storeOrderRepository = app()->make(StoreOrderRepository::class);
+                    $storeOrderEntity = $storeOrderRepository->getStoreOrderEntityByOrderId((int)$orderId);
+                    if (empty($storeOrderEntity->getOrderId())) {
+                        throw new ValidateException('未查询到订单信息');
+                    }
+                }
+            }
+        }
+
+        /** @var UserSignJingdouEntity $userSignJingdouEntity */
+        $userSignJingdouEntity = UserSignJingdouEntity::newInstance();
+        $userSignJingdouEntity->setUid($uid)
+            ->setType($type)
+            ->setNumber($number)
+            ->setMerId($merId)
+            ->setMark($mark)
+            ->setOrderType($orderType)
+            ->setOrderId($orderId)
+            ->setAddtime(time())
+            ->setStatus(UserSignJingdouEnum::STATUS['PendingConfirmation']['code']);
+
+        return $this->createByEntity($userSignJingdouEntity);
+    }
 }

app/entity/data/merchant/MerchantContributionEntity.php

@@ -0,0 +1,161 @@
+<?php
+
+namespace app\entity\data\merchant;
+
+use app\entity\data\DataEntity;
+
+class MerchantContributionEntity extends DataEntity
+{
+    public $id = 0;  // 自增id
+    public $title = '';  // 名称
+    public $start = 0;  // 开始百分数
+    public $end = 0;  // 结束百分数
+    public $type = '赠送';  // 类型
+    public $jd = 0.00;  // 京豆
+    public $value = 0.00;  // 贡献值
+    public $createTime = 0;  // 创建时间
+
+    /**
+     * @return int
+     */
+    public function getId(): int
+    {
+        return $this->id;
+    }
+
+    /**
+     * @param int $id
+     * @return MerchantContributionEntity
+     */
+    public function setId(int $id): MerchantContributionEntity
+    {
+        $this->id = $id;
+        return $this;
+    }
+
+    /**
+     * @return string
+     */
+    public function getTitle(): string
+    {
+        return $this->title;
+    }
+
+    /**
+     * @param string $title
+     * @return MerchantContributionEntity
+     */
+    public function setTitle(string $title): MerchantContributionEntity
+    {
+        $this->title = $title;
+        return $this;
+    }
+
+    /**
+     * @return int
+     */
+    public function getStart(): int
+    {
+        return $this->start;
+    }
+
+    /**
+     * @param int $start
+     * @return MerchantContributionEntity
+     */
+    public function setStart(int $start): MerchantContributionEntity
+    {
+        $this->start = $start;
+        return $this;
+    }
+
+    /**
+     * @return int
+     */
+    public function getEnd(): int
+    {
+        return $this->end;
+    }
+
+    /**
+     * @param int $end
+     * @return MerchantContributionEntity
+     */
+    public function setEnd(int $end): MerchantContributionEntity
+    {
+        $this->end = $end;
+        return $this;
+    }
+
+    /**
+     * @return string
+     */
+    public function getType(): string
+    {
+        return $this->type;
+    }
+
+    /**
+     * @param string $type
+     * @return MerchantContributionEntity
+     */
+    public function setType(string $type): MerchantContributionEntity
+    {
+        $this->type = $type;
+        return $this;
+    }
+
+    /**
+     * @return float
+     */
+    public function getJd(): float
+    {
+        return $this->jd;
+    }
+
+    /**
+     * @param float $jd
+     * @return MerchantContributionEntity
+     */
+    public function setJd(float $jd): MerchantContributionEntity
+    {
+        $this->jd = $jd;
+        return $this;
+    }
+
+    /**
+     * @return float
+     */
+    public function getValue(): float
+    {
+        return $this->value;
+    }
+
+    /**
+     * @param float $value
+     * @return MerchantContributionEntity
+     */
+    public function setValue(float $value): MerchantContributionEntity
+    {
+        $this->value = $value;
+        return $this;
+    }
+
+    /**
+     * @return int
+     */
+    public function getCreateTime(): int
+    {
+        return $this->createTime;
+    }
+
+    /**
+     * @param int $createTime
+     * @return MerchantContributionEntity
+     */
+    public function setCreateTime(int $createTime): MerchantContributionEntity
+    {
+        $this->createTime = $createTime;
+        return $this;
+    }
+}

app/entity/data/store/StoreOrderEntity.php

@@ -1557,20 +1557,20 @@ class StoreOrderEntity extends DataEntity
     }
 
     /**
-     * @return null
+     * @return float
      */
-    public function getConPri()
+    public function getConPri(): float
     {
-        return $this->conPri;
+        return (float)$this->conPri;
     }
 
     /**
-     * @param null $conPri
+     * @param mixed $conPri
      * @return StoreOrderEntity
      */
-    public function setConPri($conPri)
+    public function setConPri($conPri): StoreOrderEntity
     {
-        $this->conPri = $conPri;
+        $this->conPri = (float)$conPri;
         return $this;
     }
 

app/entity/data/user/UserSignFenrunEntity.php

@@ -0,0 +1,199 @@
+<?php
+
+namespace app\entity\data\user;
+
+use app\entity\data\DataEntity;
+
+class UserSignFenrunEntity extends DataEntity
+{
+    public $id = 0;  // 自增id
+    public $uid = 0;  // 会员id
+    public $number = 0.00;  // 数量
+    public $status = 0;  // 状态1已结算 0-已失效 -1未结算
+    public $mark = '';  // 备注
+    public $desc = '';  // 描述
+    public $orderId = '';  // 订单id
+    public $orderType = '';  // 订单类型。关联订单ID
+    public $settlementTime = null;  // 结算时间
+    public $addtime = 0;
+
+    /**
+     * @return int
+     */
+    public function getId(): int
+    {
+        return $this->id;
+    }
+
+    /**
+     * @param int $id
+     * @return UserSignFenrunEntity
+     */
+    public function setId(int $id): UserSignFenrunEntity
+    {
+        $this->id = $id;
+        return $this;
+    }
+
+    /**
+     * @return int
+     */
+    public function getUid(): int
+    {
+        return $this->uid;
+    }
+
+    /**
+     * @param int $uid
+     * @return UserSignFenrunEntity
+     */
+    public function setUid(int $uid): UserSignFenrunEntity
+    {
+        $this->uid = $uid;
+        return $this;
+    }
+
+    /**
+     * @return float
+     */
+    public function getNumber(): float
+    {
+        return $this->number;
+    }
+
+    /**
+     * @param float $number
+     * @return UserSignFenrunEntity
+     */
+    public function setNumber(float $number): UserSignFenrunEntity
+    {
+        $this->number = $number;
+        return $this;
+    }
+
+    /**
+     * @return int
+     */
+    public function getStatus(): int
+    {
+        return $this->status;
+    }
+
+    /**
+     * @param int $status
+     * @return UserSignFenrunEntity
+     */
+    public function setStatus(int $status): UserSignFenrunEntity
+    {
+        $this->status = $status;
+        return $this;
+    }
+
+    /**
+     * @return string
+     */
+    public function getMark(): string
+    {
+        return $this->mark;
+    }
+
+    /**
+     * @param string $mark
+     * @return UserSignFenrunEntity
+     */
+    public function setMark(string $mark): UserSignFenrunEntity
+    {
+        $this->mark = $mark;
+        return $this;
+    }
+
+    /**
+     * @return string
+     */
+    public function getDesc(): string
+    {
+        return $this->desc;
+    }
+
+    /**
+     * @param string $desc
+     * @return UserSignFenrunEntity
+     */
+    public function setDesc(string $desc): UserSignFenrunEntity
+    {
+        $this->desc = $desc;
+        return $this;
+    }
+
+    /**
+     * @return string
+     */
+    public function getOrderId(): string
+    {
+        return $this->orderId;
+    }
+
+    /**
+     * @param string $orderId
+     * @return UserSignFenrunEntity
+     */
+    public function setOrderId(string $orderId): UserSignFenrunEntity
+    {
+        $this->orderId = $orderId;
+        return $this;
+    }
+
+    /**
+     * @return string
+     */
+    public function getOrderType(): string
+    {
+        return $this->orderType;
+    }
+
+    /**
+     * @param string $orderType
+     * @return UserSignFenrunEntity
+     */
+    public function setOrderType(string $orderType): UserSignFenrunEntity
+    {
+        $this->orderType = $orderType;
+        return $this;
+    }
+
+    /**
+     * @return mixed
+     */
+    public function getSettlementTime()
+    {
+        return $this->settlementTime;
+    }
+
+    /**
+     * @param mixed $settlementTime
+     * @return UserSignFenrunEntity
+     */
+    public function setSettlementTime($settlementTime): UserSignFenrunEntity
+    {
+        $this->settlementTime = $settlementTime;
+        return $this;
+    }
+
+    /**
+     * @return int
+     */
+    public function getAddtime(): int
+    {
+        return $this->addtime;
+    }
+
+    /**
+     * @param int $addtime
+     * @return UserSignFenrunEntity
+     */
+    public function setAddtime(int $addtime): UserSignFenrunEntity
+    {
+        $this->addtime = $addtime;
+        return $this;
+    }  // 添加时间
+}