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

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

@@ -16,6 +16,8 @@ use app\common\model\BaseModel;
 use app\common\model\store\order\StoreOrder;
 use app\common\model\user\User;
 use app\common\repositories\user\UserRepository;
+use app\entity\CommonEntity;
+use app\entity\data\store\StoreOrderEntity;
 use think\facade\Db;
 
 /**
@@ -603,4 +605,26 @@ class StoreOrderDao extends BaseDao
         $userData = Db::query($sql);
         return array_column($userData, 'amount', 'uid');
     }
+
+    /**
+     * @param $orderId
+     * @return CommonEntity
+     */
+    public function getStoreOrderEntityByOrderId($orderId): CommonEntity
+    {
+        $data = [];
+        try {
+            /** @var StoreOrder $model */
+            $model = $this->getModel();
+            $dataRes = $model::getDB()
+                ->where('order_id', '=', $orderId)
+                ->find();
+            if (!empty($dataRes)) {
+                $data = $dataRes->toArray();
+            }
+        } catch (\Exception $e) {
+
+        }
+        return StoreOrderEntity::newInstance($data);
+    }
 }

app/common/dao/user/UserSignFugouDao.php

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

app/common/dao/user/UserSignJingdouDao.php

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

app/common/dao/user/UserSignScoreDao.php

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

app/common/dao/user/UserSignVrDao.php

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

app/common/enum/CommonEnum.php

@@ -18,4 +18,30 @@ class CommonEnum
         'Yes' => ['code' => 1, 'name' => '已删除'],
         'Pending' => ['code' => 2, 'name' => '待删除']
     ];
+
+    // 订单类型：根据业务需要进一步扩展
+    const ORDER_TYPE = [
+        'Platform' => ['code' => 0, 'name' => '平台'],
+        'DuoduoJinbao' => ['code' => 1, 'name' => '多多进宝'],
+        'Vipshop' => ['code' => 2, 'name' => '唯品会'],
+        'SuningYigou' => ['code' => 3, 'name' => '苏宁易购'],
+        'NetEaseKaola' => ['code' => 4, 'name' => '网易考拉'],
+        'TaobaoKe' => ['code' => 5, 'name' => '淘宝客'],
+        'JingdongUnion' => ['code' => 6, 'name' => '京东联盟'],
+        'Eleme' => ['code' => 7, 'name' => '饿了么'],
+        'Online' => ['code' => 8, 'name' => '线上'],
+        'MobileTopUp' => ['code' => 9, 'name' => '话费'],
+        'Offline' => ['code' => 10, 'name' => '线下'],
+        'Platform-Group' => ['code' => 1000, 'name' => '平台-GroupId'], // 该中类型时，依然是 平台订单，只不过 表中的order_id 存储的是
+        'XingfuXiaodian' => ['code' => 2001, 'name' => '幸福小店'],
+    ];
+
+    CONST YANGLAOJIN = [
+        'Ratio' => ['code' => 0.3, 'name' => '30%']
+    ];
+
+    CONST PV = [
+        'Ratio' => ['code' => 0.35, 'name' => '35%']
+    ];
+
 }

app/common/enum/store/StoreGroupOrderEnum.php

@@ -0,0 +1,42 @@
+<?php
+
+namespace app\common\enum\store;
+
+use app\common\enum\CommonEnum;
+
+class StoreGroupOrderEnum extends CommonEnum
+{
+    // 支付方式
+    const PAY_TYPE = [
+        'BALANCE' => ['code' => 0, 'name' => '余额支付'],
+        'WECHAT' => ['code' => 1, 'name' => '微信支付'],
+        'MINI_PROGRAM' => ['code' => 2, 'name' => '小程序支付'],
+        'H5' => ['code' => 3, 'name' => 'H5支付'],
+        'ALIPAY' => ['code' => 4, 'name' => '支付宝支付'],
+    ];
+
+    // 分账状态
+    const SPLIT_STATUS = [
+        'NOT_SPLIT' => ['code' => 0, 'name' => '未分账'],
+        'SPLIT_SUCCESS' => ['code' => 1, 'name' => '分账成功'],
+        'SPLIT_FAILED' => ['code' => 2, 'name' => '分账失败'],
+    ];
+
+    // 是否提醒
+    const IS_REMIND = [
+        'NO' => ['code' => 0, 'name' => '不提醒'],
+        'YES' => ['code' => 1, 'name' => '提醒'],
+    ];
+
+    // 是否为测试订单
+    const TEST_ORDER = [
+        'NO' => ['code' => 0, 'name' => '不是测试订单'],
+        'YES' => ['code' => 1, 'name' => '是测试订单'],
+    ];
+
+    // 支付状态
+    const PAID = [
+        'NO' => ['code' => 0, 'name' => '未支付'],
+        'YES' => ['code' => 1, 'name' => '已支付'],
+    ];
+}

app/common/enum/store/StoreOrderEnum.php

@@ -46,4 +46,64 @@ class StoreOrderEnum extends CommonEnum
         'C1-Fugou' => ['code' => 'c1', 'name' => '复购金'],
     ];
 
+    // 订单状态
+    const STATUS = [
+        'WAITING_SHIPMENT' => ['code' => 0, 'name' => '待发货'],
+        'WAITING_RECEIVE' => ['code' => 1, 'name' => '待收货'],
+        'WAITING_EVALUATION' => ['code' => 2, 'name' => '待评价'],
+        'COMPLETED' => ['code' => 3, 'name' => '已完成'],
+        'REFUND_REQUESTED' => ['code' => 4, 'name' => '已申请退款'],
+        'REFUNDED' => ['code' => -1, 'name' => '已退款'],
+        'UNPAID' => ['code' => 5, 'name' => '未支付'],
+        'CANCELLED' => ['code' => 6, 'name' => '已取消'],
+    ];
+
+    // 支付状态
+    const PAID_STATUS = [
+        'UNPAID' => ['code' => 0, 'name' => '未支付'],
+        'PAID' => ['code' => 1, 'name' => '已支付'],
+    ];
+
+    // 支付方式
+    const PAY_TYPE = [
+        'BALANCE' => ['code' => 0, 'name' => '余额支付'],
+        'WECHAT' => ['code' => 1, 'name' => '微信支付'],
+        'MINI_PROGRAM' => ['code' => 2, 'name' => '小程序支付'],
+        'ALIPAY' => ['code' => 4, 'name' => '支付宝支付'],
+        'SPECIAL_MERCHANT_POINTS' => ['code' => 5, 'name' => '特殊商户积分'],
+    ];
+
+    // 订单类型
+    const ORDER_TYPE = [
+        'ORDINARY' => ['code' => 0, 'name' => '普通订单'],
+        'PICKUP' => ['code' => 1, 'name' => '自提订单'],
+    ];
+
+    // 发货类型
+    const DELIVERY_TYPE = [
+        'DELIVERY' => ['code' => 1, 'name' => '发货'],
+        'DELIVERY_PERSON' => ['code' => 2, 'name' => '送货'],
+        'VIRTUAL' => ['code' => 3, 'name' => '虚拟商品'],
+    ];
+
+    // 是否分账
+    const IS_INDEPENDENT_ACCOUNT = [
+        'NO' => ['code' => 0, 'name' => '否'],
+        'YES' => ['code' => 1, 'name' => '是'],
+    ];
+
+    // 退款状态
+    const REFUND_STATUS = [
+        'WAITING_REVIEW' => ['code' => 0, 'name' => '待审核'],
+        'REVIEW_FAILED' => ['code' => -1, 'name' => '审核未通过'],
+        'WAITING_RETURN' => ['code' => 1, 'name' => '待退货'],
+        'WAITING_RECEIVE' => ['code' => 2, 'name' => '待收货'],
+        'REFUNDED' => ['code' => 3, 'name' => '已退款'],
+    ];
+
+    // 支付状态
+    const PAID = [
+        'NO' => ['code' => 0, 'name' => '未支付'],
+        'YES' => ['code' => 1, 'name' => '已支付'],
+    ];
 }

app/common/enum/user/UserBillEnum.php

@@ -0,0 +1,73 @@
+<?php
+
+namespace app\common\enum\user;
+
+use app\common\enum\CommonEnum;
+
+class UserBillEnum extends CommonEnum
+{
+    // 收支类型
+    const PM = [
+        'EXPEND' => ['code' => 0, 'name' => '支出'],
+        'INCOME' => ['code' => 1, 'name' => '获得'],
+    ];
+
+    // 状态
+    const STATUS = [
+        'PENDING' => ['code' => 0, 'name' => '待确定'],
+        'VALID' => ['code' => 1, 'name' => '有效'],
+        'INVALID' => ['code' => -1, 'name' => '无效'],
+    ];
+
+    // 佣金类型
+    const COMMISSION_TYPE = [
+        'AGENT_FEE' => ['code' => 1, 'name' => '代理费'],
+        'CONSUMPTION_COMMISSION' => ['code' => 2, 'name' => '消费佣金'],
+        'DIRECT_REFERRAL' => ['code' => 3, 'name' => '直推奖'],
+        'REGION_COMMISSION' => ['code' => 4, 'name' => '辖区佣金'],
+        'PENSION' => ['code' => 5, 'name' => '养老金'],
+        'AD_FEE' => ['code' => 6, 'name' => '广告费'],
+        'LOCKED_CUSTOMER' => ['code' => 7, 'name' => '锁客收益'],
+        'PLATFORM_REWARD' => ['code' => 8, 'name' => '平台奖励'],
+        'CHANNEL_DEALER' => ['code' => 9, 'name' => '渠道商'],
+        'SHOP_REWARD' => ['code' => 10, 'name' => '推广店铺收益'],
+        'PARTNER_DIVIDEND' => ['code' => 11, 'name' => '合伙人分红'],
+        'JOINT_CREATOR_DIVIDEND' => ['code' => 12, 'name' => '联创分红'],
+        'EQUITY_DIVIDEND' => ['code' => 13, 'name' => '股权分红'],
+        'SHARE_EARNINGS' => ['code' => 20, 'name' => '分享收益']
+    ];
+
+    // 账单来源
+    const SOURCE = [
+        'ONLINE' => ['code' => 0, 'name' => '线上'],
+        'OFFLINE' => ['code' => 1, 'name' => '线下'],
+    ];
+
+    // 订单类型
+    const ORDER_TYPE = [
+        'SELF_OPERATED' => ['code' => 1, 'name' => '自营'],
+        'THIRD_PARTY' => ['code' => 2, 'name' => '第三方'],
+    ];
+
+    // 红积分佣金类型
+    const IS_RED_BROKERAGE = [
+        'NORMAL' => ['code' => 0, 'name' => '正常佣金'],
+        'RED' => ['code' => 1, 'name' => '红积分对冲佣金'],
+    ];
+
+    // 公证处状态
+    const GZC_STATUS = [
+        'NOT_ENTERED' => ['code' => 0, 'name' => '未进入'],
+        'ENTERED' => ['code' => 1, 'name' => '已进入'],
+    ];
+
+    // 是否成功发起
+    const IS_GZC = [
+        'NOT_STARTED' => ['code' => 0, 'name' => '未发起'],
+        'STARTED' => ['code' => 1, 'name' => '已发起'],
+        'SUCCESS' => ['code' => 2, 'name' => '已成功'],
+    ];
+
+    // 类型商店
+    const TYPE_SHOP = parent::ORDER_TYPE;
+}

app/common/enum/user/UserSignFugouEnum.php

@@ -0,0 +1,38 @@
+<?php
+
+namespace app\common\enum\user;
+
+use app\common\enum\CommonEnum;
+
+class UserSignFugouEnum extends CommonEnum
+{
+    // 1-有效 0-失效 -1待确认
+    const STATUS = [
+        'Valid' => ['code' => 1, 'name' => '有效'],
+        'Invalid' => ['code' => 0, 'name' => '失效'],
+        'Pending' => ['code' => -1, 'name' => '待确认'],
+    ];
+
+    // 1代理费 2 消费佣金 3直推奖 4辖区佣金 5养老金 6广告费 7锁客收益 8平台奖励 9渠道商 10推广店铺收益 11合伙人分红 12联创分红 13股权分红
+    const COMMISSION_TYPE = [
+        'AgentFee' => ['code' => 1, 'name' => '代理费'],
+        'ConsumeCommission' => ['code' => 2, 'name' => '消费佣金'],
+        'DirectPushReward' => ['code' => 3, 'name' => '直推奖'],
+        'AreaCommission' => ['code' => 4, 'name' => '辖区佣金'],
+        'Pension' => ['code' => 5, 'name' => '养老金'],
+        'AdFee' => ['code' => 6, 'name' => '广告费'],
+        'CustomerLockRevenue' => ['code' => 7, 'name' => '锁客收益'],
+        'PlatformReward' => ['code' => 8, 'name' => '平台奖励'],
+        'ChannelDistributor' => ['code' => 9, 'name' => '渠道商'],
+        'StorePromotionRevenue' => ['code' => 10, 'name' => '推广店铺收益'],
+        'PartnerDividend' => ['code' => 11, 'name' => '合伙人分红'],
+        'CoFounderDividend' => ['code' => 12, 'name' => '联创分红'],
+        'EquityDividend' => ['code' => 13, 'name' => '股权分红'],
+    ];
+
+    // 1赠送，2消耗
+    const TYPE = [
+        'Give' => ['code' => 1, 'name' => '赠送'],
+        'Consume' => ['code' => 2, 'name' => '消耗'],
+    ];
+}

app/common/enum/user/UserSignJingdouEnum.php

@@ -0,0 +1,21 @@
+<?php
+
+namespace app\common\enum\user;
+
+use app\common\enum\CommonEnum;
+
+class UserSignJingdouEnum extends CommonEnum
+{
+    // 京豆状态
+    const STATUS = [
+        'Valid' => ['code' => 1, 'name' => '有效'],
+        'Invalid' => ['code' => 0, 'name' => '失效'],
+        'PendingConfirmation' => ['code' => -1, 'name' => '待确认'],
+    ];
+
+    // 京豆类型
+    const TYPE = [
+        'Gift' => ['code' => 1, 'name' => '赠送'],
+        'Consume' => ['code' => 2, 'name' => '消耗'],
+    ];
+}

app/common/enum/user/UserSignScoreEnum.php

@@ -0,0 +1,30 @@
+<?php
+
+namespace app\common\enum\user;
+
+use app\common\enum\CommonEnum;
+
+class UserSignScoreEnum extends CommonEnum
+{
+    // 1-收入，2-支出
+    const PM = [
+        'Income' => ['code' => 1, 'name' => '收入'],
+        'Expend' => ['code' => 2, 'name' => '支出'],
+    ];
+
+    // 积分状态：1-有效，0-失效，-1-待确认
+    const STATUS = [
+        'Valid' => ['code' => 1, 'name' => '有效'],
+        'Invalid' => ['code' => 0, 'name' => '失效'],
+        'Pending' => ['code' => -1, 'name' => '待确认'],
+    ];
+
+    // 积分来源类型：1-签到，2-分享好友注册赠送，3-自己下单赠送，4-好友下单赠送，5-购买产品消耗
+    const SOURCE_TYPE = [
+        'SignIn' => ['code' => 1, 'name' => '签到'],
+        'ShareRegister' => ['code' => 2, 'name' => '分享好友注册赠送'],
+        'SelfOrder' => ['code' => 3, 'name' => '自己下单赠送'],
+        'FriendOrder' => ['code' => 4, 'name' => '好友下单赠送'],
+        'BuyProduct' => ['code' => 5, 'name' => '购买产品消耗'],
+    ];
+}

app/common/enum/user/UserSignVrEnum.php

@@ -0,0 +1,14 @@
+<?php
+
+namespace app\common\enum\user;
+
+use app\common\enum\CommonEnum;
+
+class UserSignVrEnum extends CommonEnum
+{
+    // 1-兑换，2-消耗
+    const TYPE = [
+        'Exchange' => ['code' => 1, 'name' => '兑换'],
+        'Consume' => ['code' => 2, 'name' => '消耗'],
+    ];
+}

app/common/model/user/UserSignFugou.php

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

app/common/model/user/UserSignJingdou.php

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

app/common/model/user/UserSignScore.php

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

app/common/model/user/UserSignVr.php

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

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

@@ -13,10 +13,16 @@ namespace app\common\repositories\store\order;
 
 use app\common\dao\store\order\StoreOrderDao;
 use app\common\enum\CommonEnum;
+use app\common\enum\merchant\MerchantEnum;
 use app\common\enum\shipping\ShippingTemplateEnum;
 use app\common\enum\store\CartEnum;
 use app\common\enum\store\ProductEnum;
+use app\common\enum\store\StoreGroupOrderEnum;
 use app\common\enum\store\StoreOrderEnum;
+use app\common\enum\user\UserBillEnum;
+use app\common\enum\user\UserSignJingdouEnum;
+use app\common\enum\user\UserSignScoreEnum;
+use app\common\enum\user\UserSignVrEnum;
 use app\common\model\store\order\StoreGroupOrder;
 use app\common\model\store\order\StoreOrder;
 use app\common\model\store\order\StoreRefundOrder;
@@ -57,6 +63,7 @@ use app\entity\data\store\CartEntity;
 use app\entity\data\store\StoreGroupOrderEntity;
 use app\entity\data\store\StoreOrderEntity;
 use app\entity\data\user\AddressEntity;
+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\StoreOrderCreateRequestEntity;
@@ -65,6 +72,7 @@ use app\model\common\TbOrderModel;
 use app\traits\GongApiRequest;
 use app\traits\HuiPay;
 use app\traits\ShouxinyiApiRequest;
+use app\utils\ArrayUtil;
 use Carbon\Carbon;
 use crmeb\jobs\PayGiveCouponJob;
 use crmeb\jobs\SendSmsJob;
@@ -10650,6 +10658,14 @@ class StoreOrderRepository extends BaseRepository
      */
     public function createOrderNew(StoreOrderCreateRequestEntity $storeOrderCreateRequestEntity, UserEntity $userEntity, array $cartEntityList, AddressEntity $addressEntity, ShareEntity $shareEntity)
     {
+        // 参数处理
+        $cartEntityList = array_combine(
+            array_map(function ($cartEntity) {
+                return $cartEntity->getCartId();
+            }, $cartEntityList),
+            $cartEntityList
+        );
+
         // 购物车
         /** @var StoreCartRepository $storeCartRepository */
         $storeCartRepository = app()->make(StoreCartRepository::class);
@@ -10692,13 +10708,19 @@ class StoreOrderRepository extends BaseRepository
         /** @var ShippingTemplateRegionRepository $shippingTemplateRegionRepository */
         $shippingTemplateRegionRepository = app()->make(ShippingTemplateRegionRepository::class);
 
-        /** @var UserRepository $UserRepository */
+        /** @var UserRepository $userRepository */
         $userRepository = app()->make(UserRepository::class);
         /** @var StoreOrderRepository $storeOrderRepository */
         $storeOrderRepository = app()->make(StoreOrderRepository::class);
         /** @var StoreGroupOrderRepository $storeGroupOrderRepository */
         $storeGroupOrderRepository = app()->make(StoreGroupOrderRepository::class);
+        /** @var StoreOrderStatusRepository $storeOrderStatusRepository */
+        $storeOrderStatusRepository = app()->make(StoreOrderStatusRepository::class);
+        /** @var StoreOrderProductRepository $storeOrderProductRepository */
+        $storeOrderProductRepository = app()->make(StoreOrderProductRepository::class);
 
+        // 技术
+        $num = 0;
         // 记录 用户 在指定商家的 优惠券
         $storeCouponUserEntityListByMerIdMap = [];
         // 当前优惠金额
@@ -10725,9 +10747,12 @@ class StoreOrderRepository extends BaseRepository
         $totalCost = 0.00;
         // 订单实体表
         $storeOrderEntityList = [];
+        // 商品 信息
+        $storeProductEntityMap = [];
+        $storeProductAttrValueEntityMap = [];
 
         // 循环购物车 对购物车内的商品 进行条件验证 以及根据不同的商品 计算邮费
-        foreach ($cartEntityList as $numKey => $cartEntity) {
+        foreach ($cartEntityList as $cartId => $cartEntity) {
             // 验证商户
             $merchantEntity = $merchantRepository->getMerchantEntityByMerchantId($cartEntity->getMerId());
             if (empty($merchantEntity->getMerId())) {
@@ -10742,13 +10767,14 @@ class StoreOrderRepository extends BaseRepository
             if ($productEntity->getMerId() != $merchantEntity->getMerId()) {
                 throw new ValidateException('商家已下架该产品');
             }
+            $storeProductEntityMap[$productEntity->getProductId()] = $productEntity;
 
             // 获取购物车商品属性信息
             $productAttrValueEntity = $productAttrValueRepository->getProductAttrValueEntityByUnique($cartEntity->getProductAttrUnique());
             if (empty($productAttrValueEntity->getProductId())) {
                 throw new ValidateException('未查询到商品属性信息');
             }
-
+            $storeProductAttrValueEntityMap[$cartEntity->getProductAttrUnique()] = $productAttrValueEntity;
             // 判断订单是否已失效
             if ($cartEntity->getIsFail() == CartEnum::IS_FAIL['Yes']['code']) {
                 throw new ValidateException($productEntity->getStoreName() . ' 已失效');
@@ -10954,7 +10980,7 @@ class StoreOrderRepository extends BaseRepository
             $storeOrderEntity->setCommissionRate((float)$merchantRepository->get($cartEntity->getMerId())->mer_commission_rate)
                 // 二级佣金 此字段已被用于分佣比例
                 ->setExtensionTwo($productAttrValueEntity->getExtensionTwo())
-                ->setOrderSn($this->getNewOrderId() . ($numKey + 1))
+                ->setOrderSn($this->getNewOrderId() . ($num++))
                 ->setUid($cartEntity->getUid())
                 ->setRealName($addressEntity->getRealName())
                 ->setUserPhone($addressEntity->getPhone())
@@ -10984,6 +11010,76 @@ class StoreOrderRepository extends BaseRepository
             $storeOrderEntityList[] = $storeOrderEntity;
         }
 
+
+        /** @var StoreGroupOrderEntity $storeGroupOrderEntity */
+        $storeGroupOrderEntity = StoreGroupOrderEntity::newInstance();
+        $storeGroupOrderEntity->setUid($userEntity->getUid())
+            ->setGroupOrderSn($this->getNewOrderId() . '0')
+            ->setTotalPostage($totalPostage)
+            ->setTotalPrice($totalPrice)
+            ->setTotalNum($totalNum)
+            ->setRealName($addressEntity->getRealName())
+            ->setUserPhone($addressEntity->getPhone())
+            ->setUserAddress($addressEntity->getProvince() . $addressEntity->getCity() . $addressEntity->getDistrict() . $addressEntity->getDetail())
+            ->setPayPrice($totalPrice)
+            ->setPayPostage($totalPostage)
+            ->setCost($totalCost)
+            ->setPayType($storeOrderCreateRequestEntity->getPayType())
+            ->setFzonePaytype($storeOrderCreateRequestEntity->getFzonePayType());
+        $storeGroupOrderCreateResultModel = $storeGroupOrderRepository->create($storeGroupOrderEntity->toUnderlineArray());
+        $storeGroupOrderEntity->setGroupOrderId($storeGroupOrderCreateResultModel->group_order_id);
+
+        $storeOrderStatusDataList = [];
+        $storeOrderProductDataList = [];
+        $storeOrderIdList = [];
+        foreach ($storeOrderEntityList as $key => $storeOrderEntity) {
+            // 获取当前 订单绑定的购物车
+            $cartEntity = $cartEntityList[$storeOrderEntity->getCartId()];
+
+            // 将订单数据 写入数据库 并完善实体
+            $storeOrderEntity->setGroupOrderId($storeGroupOrderEntity->getGroupOrderId());
+            $storeOrderResultModel = $storeOrderRepository->create($storeOrderEntity->toUnderlineArray());
+            $storeOrderEntity->setOrderId($storeOrderResultModel->order_id);
+            $storeOrderEntityList[$key] = $storeOrderEntity;
+            $storeOrderIdList[] = $storeOrderEntity->getOrderId();
+
+            // 将每件商品设计到的优惠券要取消掉
+
+            // 准备订单的 状态数据
+            $storeOrderStatusDataList[] = [
+                'order_id' => $storeOrderEntity->getOrderId(),
+                'change_message' => '订单生成',
+                'change_type' => 'create'
+            ];
+
+            // 准备订单的
+            $storeOrderProductDataList[] = [
+                'order_id' => $storeOrderEntity->getOrderId(),
+                'cart_id' => $storeOrderEntity->getCartId(),
+                'uid' => $storeOrderEntity->getUid(),
+                'product_id' => $cartEntity->getProductId(),
+                'product_price' => $storeOrderEntity->getTotalPrice(),
+                // 一级佣金
+                'extension_one' => 0.00,
+                // 二级佣金
+                'extension_two' => 0.00,
+                'product_sku' => $cartEntity->getProductAttrUnique(),
+                'product_num' => $cartEntity->getCartNum(),
+                'refund_num' => $cartEntity->getCartNum(),
+                'type' => $storeProductEntityMap[$cartEntity->getProductId()]->getType(),
+                'cart_info' => json_encode([
+                    'product' => $storeProductEntityMap[$cartEntity->getProductId()]->toUnderlineArray(),
+                    'productAttr' => $storeProductAttrValueEntityMap[$cartEntity->getProductAttrUnique()]->toUnderlineArray(),
+                    'product_type' => $cartEntity->getProductType()
+                ])
+            ];
+        }
+
+        $storeOrderStatusRepository->insertAll($storeOrderStatusDataList);
+
+        $storeOrderProductRepository->insertAll($storeOrderProductDataList);
+
+        $paySuccess = false;
         // 验证支付方式
         /** @var FzonePayTypeEntity $fzonePayTypeEntity */
         $fzonePayTypeEntity = FzonePayTypeEntity::newInstance($storeOrderCreateRequestEntity->getFzonePayType());
@@ -10991,64 +11087,232 @@ class StoreOrderRepository extends BaseRepository
             if ($fzonePayTypeEntity->getPrice() > $userEntity->getVr() || $fzonePayTypeEntity->getOther() > $userEntity->getScore()) {
                 throw new ValidateException('支付失败，VR或积分不足！');
             }
+            // 修改用户的VR值 和 积分值
+            // 修改用户VR
+            $userRepository->updateUserVr(
+                $userEntity->getUid(),
+                UserSignVrEnum::TYPE['Consume']['code'],
+                $fzonePayTypeEntity->getPrice(),
+                '购买商品，订单编号：'.$storeGroupOrderEntity->getGroupOrderSn(),
+                CommonEnum::ORDER_TYPE['Platform-Group']['code'],
+                $storeGroupOrderEntity->getGroupOrderId()
+            );
+            // 修改用户积分
+            $userRepository->updateUserScore(
+                $userEntity->getUid(),
+                UserSignScoreEnum::PM['Expend']['code'],
+                $fzonePayTypeEntity->getOther(),
+                '购买商品，订单编号：'.$storeGroupOrderEntity->getGroupOrderSn(),
+                CommonEnum::ORDER_TYPE['Platform-Group']['code'],
+                $storeGroupOrderEntity->getGroupOrderId()
+            );
+            $paySuccess = true;
         } else if ($fzonePayTypeEntity->getType() == StoreOrderEnum::FZONE_PAY_TYPE['B2-Cash+Score']['code']) {
             if ($fzonePayTypeEntity->getOther() > $userEntity->getScore()) {
                 throw new ValidateException('支付失败，积分不足！');
             }
+            // 修改用户积分
+            $userRepository->updateUserScore(
+                $userEntity->getUid(),
+                UserSignScoreEnum::PM['Expend']['code'],
+                $fzonePayTypeEntity->getOther(),
+                '购买商品，订单编号：'.$storeGroupOrderEntity->getGroupOrderSn(),
+                CommonEnum::ORDER_TYPE['Platform-Group']['code'],
+                $storeGroupOrderEntity->getGroupOrderId()
+            );
         } else if ($fzonePayTypeEntity->getType() == StoreOrderEnum::FZONE_PAY_TYPE['B3-VR+Jingdou']['code']) {
             if ($fzonePayTypeEntity->getPrice() > $userEntity->getVr() || $fzonePayTypeEntity->getOther() > $userEntity->getJingdou()) {
                 throw new ValidateException('支付失败，VR或京豆不足！');
             }
+            // 修改用户VR
+            $userRepository->updateUserVr(
+                $userEntity->getUid(),
+                UserSignVrEnum::TYPE['Consume']['code'],
+                $fzonePayTypeEntity->getPrice(),
+                '购买商品，订单编号：'.$storeGroupOrderEntity->getGroupOrderSn(),
+                CommonEnum::ORDER_TYPE['Platform-Group']['code'],
+                $storeGroupOrderEntity->getGroupOrderId()
+            );
+            // 修改用户jingdou
+            $userRepository->updateUserJingdou(
+                $userEntity->getUid(),
+                UserSignJingdouEnum::TYPE['Consume']['code'],
+                $fzonePayTypeEntity->getOther(),
+                '购买商品，订单编号：'.$storeGroupOrderEntity->getGroupOrderSn(),
+                CommonEnum::ORDER_TYPE['Platform-Group']['code'],
+                $storeGroupOrderEntity->getGroupOrderId()
+            );
+            $paySuccess = true;
         } else if ($fzonePayTypeEntity->getType() == StoreOrderEnum::FZONE_PAY_TYPE['B4-Cash+Jingdou']['code']) {
             if ($fzonePayTypeEntity->getPrice() > $userEntity->getVr() || $fzonePayTypeEntity->getOther() > $userEntity->getJingdou()) {
                 throw new ValidateException('支付失败，京豆不足！');
             }
+            // 修改用户jingdou
+            $userRepository->updateUserJingdou(
+                $userEntity->getUid(),
+                UserSignJingdouEnum::TYPE['Consume']['code'],
+                $fzonePayTypeEntity->getOther(),
+                '购买商品，订单编号：'.$storeGroupOrderEntity->getGroupOrderSn(),
+                CommonEnum::ORDER_TYPE['Platform-Group']['code'],
+                $storeGroupOrderEntity->getGroupOrderId()
+            );
         } else if ($fzonePayTypeEntity->getType() == StoreOrderEnum::FZONE_PAY_TYPE['B5-VR']['code']) {
             if ($fzonePayTypeEntity->getPrice() > $userEntity->getVr()) {
                 throw new ValidateException('支付失败，VR不足！');
             }
+            // 修改用户VR
+            $userRepository->updateUserVr(
+                $userEntity->getUid(),
+                UserSignVrEnum::TYPE['Consume']['code'],
+                $fzonePayTypeEntity->getPrice(),
+                '购买商品，订单编号：'.$storeGroupOrderEntity->getGroupOrderSn(),
+                CommonEnum::ORDER_TYPE['Platform-Group']['code'],
+                $storeGroupOrderEntity->getGroupOrderId()
+            );
+            $paySuccess = true;
         } else if ($fzonePayTypeEntity->getType() == StoreOrderEnum::FZONE_PAY_TYPE['A1-VR']['code']) {
             if ($fzonePayTypeEntity->getPrice() > $userEntity->getVr()) {
                 throw new ValidateException('支付失败，VR不足！');
             }
+            // 修改用户VR
+            $userRepository->updateUserVr(
+                $userEntity->getUid(),
+                UserSignVrEnum::TYPE['Consume']['code'],
+                $fzonePayTypeEntity->getPrice(),
+                '购买商品，订单编号：'.$storeGroupOrderEntity->getGroupOrderSn(),
+                CommonEnum::ORDER_TYPE['Platform-Group']['code'],
+                $storeGroupOrderEntity->getGroupOrderId()
+            );
+            $paySuccess = true;
         } else if ($fzonePayTypeEntity->getType() == StoreOrderEnum::FZONE_PAY_TYPE['A2-Cash']['code']) {
 
         } else if ($fzonePayTypeEntity->getType() == StoreOrderEnum::FZONE_PAY_TYPE['A3-Cash+VR']['code']) {
             if ($fzonePayTypeEntity->getOther() > $userEntity->getVr()) {
                 throw new ValidateException('支付失败，VR不足！');
             }
+            // 修改用户VR
+            $userRepository->updateUserVr(
+                $userEntity->getUid(),
+                UserSignVrEnum::TYPE['Consume']['code'],
+                $fzonePayTypeEntity->getOther(),
+                '购买商品，订单编号：'.$storeGroupOrderEntity->getGroupOrderSn(),
+                CommonEnum::ORDER_TYPE['Platform-Group']['code'],
+                $storeGroupOrderEntity->getGroupOrderId()
+            );
         } else if ($fzonePayTypeEntity->getType() == StoreOrderEnum::FZONE_PAY_TYPE['C1-Fugou']['code']) {
             if ($fzonePayTypeEntity->getOther() > $userEntity->getFugou()) {
                 throw new ValidateException('支付失败，复购金不足！');
             }
+            // 修改用户复购金
+            $userRepository->updateUserFugou(
+                $userEntity->getUid(),
+                UserSignVrEnum::TYPE['Consume']['code'],
+                $fzonePayTypeEntity->getPrice(),
+                '购买商品，订单编号：'.$storeGroupOrderEntity->getGroupOrderSn(),
+                CommonEnum::ORDER_TYPE['Platform-Group']['code'],
+                $storeGroupOrderEntity->getGroupOrderId()
+            );
+            $paySuccess = true;
         } else {
             throw new ValidateException('支付失败，支付方式错误！');
         }
 
-        /** @var StoreGroupOrderEntity $storeGroupOrderEntity */
-        $storeGroupOrderEntity = StoreGroupOrderEntity::newInstance();
-        $storeGroupOrderEntity->setUid($userEntity->getUid())
-            ->setGroupOrderSn($this->getNewOrderId() . '0')
-            ->setTotalPostage($totalPostage)
-            ->setTotalPrice($totalPrice)
-            ->setTotalNum($totalNum)
-            ->setRealName($addressEntity->getRealName())
-            ->setUserPhone($addressEntity->getPhone())
-            ->setUserAddress($addressEntity->getProvince() . $addressEntity->getCity() . $addressEntity->getDistrict() . $addressEntity->getDetail())
-            ->setPayPrice($totalPrice)
-            ->setPayPostage($totalPostage)
-            ->setCost($totalCost)
-            ->setPayType($storeOrderCreateRequestEntity->getPayType())
-            ->setFzonePaytype($storeOrderCreateRequestEntity->getFzonePayType());
-        $storeGroupOrderCreateResultModel = $storeGroupOrderRepository->create($storeGroupOrderEntity->toUnderlineArray());
-        $storeGroupOrderEntity->setGroupOrderId($storeGroupOrderCreateResultModel->group_order_id);
+        // 非涉及到现金 控件成功后 直接结算
+        if ($paySuccess) {
+            // 修改订单的 支付状态
+            $storeGroupOrderRepository->update($storeGroupOrderEntity->getGroupOrderId(), [
+                'paid' => StoreGroupOrderEnum::PAID['YES']['code'],
+                'pay_time' => date('Y-m-d H:i:s')
+            ]);
+
+            $storeOrderRepository->updates($storeOrderIdList, [
+                'paid' => StoreOrderEnum::PAID['YES']['code'],
+                'pay_time' => date('Y-m-d H:i:s'),
+                'status' => StoreOrderEnum::STATUS['WAITING_SHIPMENT']['code'],
+                'distribution_mode' => StoreOrderEnum::DISTRIBUTION_MODE['ExpressDelivery']
+            ]);
+
+
+            foreach ($storeOrderEntityList as $storeOrderEntity) {
+                // 精彩生活区
+                if ($storeOrderEntity->getMerId() == CommonEnum::DESIGN_MERCHANT_ID['WonderfulLiving']['code']) {
+                    $ylj_pri = bcmul($storeOrderEntity->getConPri(), CommonEnum::YANGLAOJIN['Ratio']['code'], 2);
 
-        foreach ($storeOrderEntityList as $storeOrderEntity) {
-             $storeOrderEntity->setGroupOrderId($storeGroupOrderEntity->getGroupOrderId());
-         }
+                    $pv = bcmul($storeOrderEntity->getConPri(), CommonEnum::PV['Ratio']['code'], 2);
 
 
+                }
+            }
+        }
 
         return [];
     }
+
+    /**
+     * @param int $orderId
+     * @return StoreOrderEntity
+     */
+    public function getStoreOrderEntityByOrderId(int $orderId): StoreOrderEntity
+    {
+        /** @var StoreOrderEntity $storeOrderEntity */
+        $storeOrderEntity = $this->dao->getStoreOrderEntityByOrderId($orderId);
+        return $storeOrderEntity;
+    }
+
+    public function addGzcLog(int $uid, string $userName, string $mobile, string $userCard, float $pension, string $orderSn, int $payType, int $orderType)
+    {
+
+    }
+
+    public function addUserBillLog(int $uid, int $typeShop, int $orderId, int $commissionType, float $number, string $mark, int $status = 0, int $gzc = 0)
+    {
+        /** @var UserRepository $userRepository */
+        $userRepository = app()->make(UserRepository::class);
+        $userEntity = $userRepository->getUserEntityByUid($uid);
+        if (empty($userEntity->getUid())) {
+            throw new ValidateException('未查询到用户信息');
+        }
+
+        $orderSn = '';
+        $merId = 0;
+
+        if ($typeShop == UserBillEnum::TYPE_SHOP['Platform']['code']) {
+            /** @var StoreOrderRepository $storeOrderRepository */
+            $storeOrderRepository = app()->make(StoreOrderRepository::class);
+            $storeOrderEntity = $storeOrderRepository->getStoreOrderEntityByOrderId($orderId);
+            if (empty($storeOrderEntity->getOrderId())) {
+                throw new ValidateException('未查询到订单信息');
+            }
+            $orderId = $storeOrderEntity->getOrderId();
+            $orderSn = $storeOrderEntity->getOrderSn();
+            $merId = $storeOrderEntity->getMerId();
+        }
+
+
+        $takeTime = 0;
+        if ($status == UserBillEnum::STATUS['VALID']['code']) {
+            $takeTime = time();
+        }
+
+        /** @var UserBillEntity $userBillEntity */
+        $userBillEntity = UserBillEntity::newInstance();
+        $userBillEntity->setUid($userEntity->getUid())
+            ->setLinkId($orderId)
+            ->setPm(UserBillEnum::PM['INCOME']['code'])
+            ->setTitle(ArrayUtil::getEnumNameByCode($commissionType, UserBillEnum::COMMISSION_TYPE))
+            ->setCategory('now_money')
+            ->setType('commission')
+            ->setNumber($number)
+            ->setMark($mark)
+            ->setStatus($status)
+            ->setCommissionType($commissionType)
+            ->setOrderSn($orderSn)
+            ->setTypeShop($typeShop)
+            ->setMerId($merId)
+            ->setSource(UserBillEnum::SOURCE['ONLINE']['code'])
+            ->setOrderType(UserBillEnum::ORDER_TYPE['SELF_OPERATED']['code'])
+            ->setIsRedBrokerage(UserBillEnum::IS_RED_BROKERAGE['NORMAL']['code'])
+            ->setGzc($gzc)
+            ->setTakeTime($takeTime);
+    }
 }

app/common/repositories/user/UserRepository.php

@@ -15,6 +15,10 @@ use alipay\aop\AlipayConfig;
 use alipay\aop\AopCertClient;
 use app\common\dao\BaseDao;
 use app\common\dao\user\UserDao;
+use app\common\enum\user\UserSignFugouEnum;
+use app\common\enum\user\UserSignJingdouEnum;
+use app\common\enum\user\UserSignScoreEnum;
+use app\common\enum\user\UserSignVrEnum;
 use app\common\model\merchant\order\OrderMerchant;
 use app\common\model\user\User;
 use app\common\model\wechat\WechatUser;
@@ -27,6 +31,10 @@ use app\controller\api\store\product\Jd;
 use app\controller\api\store\product\Vip;
 use app\controller\api\user\Im;
 use app\entity\data\user\UserEntity;
+use app\entity\data\user\UserSignFugouEntity;
+use app\entity\data\user\UserSignJingdouEntity;
+use app\entity\data\user\UserSignScoreEntity;
+use app\entity\data\user\UserSignVrEntity;
 use app\traits\GzcApiRequest;
 use crmeb\exceptions\AuthException;
 use crmeb\jobs\SendNewPeopleCouponJob;
@@ -4393,4 +4401,196 @@ class UserRepository extends BaseRepository
         $userEntity = $this->dao->getUserEntityByUid($uid);
         return $userEntity;
     }
+
+    /**
+     * 更新用户积分 并 写入积分变动记录
+     * @param int $uid
+     * @param int $type
+     * @param float $score
+     * @param string $mark
+     * @param string $orderType
+     * @param string $orderId
+     * @return float
+     */
+    public function updateUserScore(int $uid, int $type, float $score, string $mark = '', string $orderType = '', string $orderId = ''): float
+    {
+        $userEntity = $this->getUserEntityByUid($uid);
+        if (empty($userEntity->getUid())) {
+            throw new ValidateException('未查询到用户信息');
+        }
+        if ($type == UserSignScoreEnum::PM['Expend']['code']) {
+            $surplus = bcsub($userEntity->getScore(), $score, 2);
+            if ($surplus < 0.00) {
+                throw new ValidateException('用户积分不足');
+            }
+        } else {
+            $surplus = bcadd($userEntity->getScore(), $score, 2);
+        }
+        try {
+            $this->dao->update($uid, ['score' => $surplus]);
+
+            /** @var UserSignScoreEntity $userSignScoreEntity */
+            $userSignScoreEntity = UserSignScoreEntity::newInstance();
+            $userSignScoreEntity->setUid($uid)
+                ->setPm($type)
+                ->setRewardScore($score)
+                ->setAddtime(time())
+                ->setStatus(UserSignScoreEnum::STATUS['Valid']['code'])
+                ->setOrderType($orderType)
+                ->setOrderId($orderId)
+                ->setMark($mark)
+                ->setSurplus($surplus);
+
+            /** @var UserSignScoreRepository $userSignScoreRepository */
+            $userSignScoreRepository = app()->make(UserSignScoreRepository::class);
+            $userSignScoreRepository->create($userSignScoreEntity->toUnderlineArray());
+        } catch (DbException $e) {
+            throw new ValidateException('更新积分失败');
+        }
+        return (float)$surplus;
+    }
+
+    /**
+     * 更新用户Vr 并 写入Vr变动记录
+     * @param int $uid
+     * @param int $type
+     * @param float $vr
+     * @param string $mark
+     * @param string $orderType
+     * @param string $orderId
+     * @return float
+     */
+    public function updateUserVr(int $uid, int $type, float $vr, string $mark = '', string $orderType = '', string $orderId = ''): float
+    {
+        $userEntity = $this->getUserEntityByUid($uid);
+        if (empty($userEntity->getUid())) {
+            throw new ValidateException('未查询到用户信息');
+        }
+        if ($type == UserSignVrEnum::TYPE['Consume']['code']) {
+            $surplus = bcsub($userEntity->getVr(), $vr, 2);
+            if ($surplus < 0.00) {
+                throw new ValidateException('用户VR不足');
+            }
+        } else {
+            $surplus = bcadd($userEntity->getVr(), $vr, 2);
+        }
+        try {
+            $this->dao->update($uid, ['vr' => $surplus]);
+
+            /** @var UserSignVrEntity $userSignVrEntity */
+            $userSignVrEntity = UserSignVrEntity::newInstance();
+            $userSignVrEntity->setUid($uid)
+                ->setType($type)
+                ->setNumber($vr)
+                ->setAddtime(time())
+                ->setOrderType($orderType)
+                ->setOrderId($orderId)
+                ->setMark($mark)
+                ->setSurplus($surplus);
+
+            /** @var UserSignVrRepository $userSignVrRepository */
+            $userSignVrRepository = app()->make(UserSignVrRepository::class);
+            $userSignVrRepository->create($userSignVrEntity->toUnderlineArray());
+        } catch (DbException $e) {
+            throw new ValidateException('更新VR失败');
+        }
+        return (float)$surplus;
+    }
+
+    /**
+     * 更新用户京豆 并 写入 京豆变动记录
+     * @param int $uid
+     * @param int $type
+     * @param float $jingdou
+     * @param string $mark
+     * @param string $orderType
+     * @param string $orderId
+     * @param int $merId
+     * @return float
+     */
+    public function updateUserJingdou(int $uid, int $type, float $jingdou, string $mark = '', string $orderType = '', string $orderId = '', int $merId = 0): float
+    {
+        $userEntity = $this->getUserEntityByUid($uid);
+        if (empty($userEntity->getUid())) {
+            throw new ValidateException('未查询到用户信息');
+        }
+        if ($type == UserSignJingdouEnum::TYPE['Consume']['code']) {
+            $surplus = bcsub($userEntity->getJingdou(), $jingdou, 2);
+            if ($surplus < 0.00) {
+                throw new ValidateException('用户京豆不足');
+            }
+        } else {
+            $surplus = bcadd($userEntity->getJingdou(), $jingdou, 2);
+        }
+        try {
+            $this->dao->update($uid, ['jingdou' => $surplus]);
+
+            /** @var UserSignJingdouEntity $userSignJingdouEntity */
+            $userSignJingdouEntity = UserSignJingdouEntity::newInstance();
+            $userSignJingdouEntity->setUid($uid)
+                ->setType($type)
+                ->setStatus(UserSignJingdouEnum::STATUS['Valid']['code'])
+                ->setNumber($jingdou)
+                ->setAddtime(time())
+                ->setOrderType($orderType)
+                ->setOrderId($orderId)
+                ->setMark($mark)
+                ->setSurplus($surplus);
+
+            /** @var UserSignJingdouRepository $userSignJingdouRepository */
+            $userSignJingdouRepository = app()->make(UserSignJingdouRepository::class);
+            $userSignJingdouRepository->create($userSignJingdouEntity->toUnderlineArray());
+        } catch (DbException $e) {
+            throw new ValidateException('更新京豆失败');
+        }
+        return (float)$surplus;
+    }
+
+    /**
+     * 更新用户复购金 并 写入 复购金变动记录
+     * @param int $uid
+     * @param int $type
+     * @param float $fugou
+     * @param string $mark
+     * @param string $orderType
+     * @param string $orderId
+     * @return float
+     */
+    public function updateUserFugou(int $uid, int $type, float $fugou, string $mark = '', string $orderType = '', string $orderId = ''): float
+    {
+        $userEntity = $this->getUserEntityByUid($uid);
+        if (empty($userEntity->getUid())) {
+            throw new ValidateException('未查询到用户信息');
+        }
+        if ($type == UserSignFugouEnum::TYPE['Consume']['code']) {
+            $surplus = bcsub($userEntity->getFugou(), $fugou, 2);
+            if ($surplus < 0.00) {
+                throw new ValidateException('用户京豆不足');
+            }
+        } else {
+            $surplus = bcadd($userEntity->getFugou(), $fugou, 2);
+        }
+        try {
+            $this->dao->update($uid, ['fugou' => $surplus]);
+
+            /** @var UserSignFugouEntity $userSignFugouEntity */
+            $userSignFugouEntity = UserSignFugouEntity::newInstance();
+            $userSignFugouEntity->setUid($uid)
+                ->setType($type)
+                ->setStatus(UserSignFugouEnum::STATUS['Valid']['code'])
+                ->setNumber($fugou)
+                ->setAddtime(time())
+                ->setOrderType($orderType)
+                ->setOrderId($orderId)
+                ->setMark($mark)
+                ->setSurplus($surplus);
+
+            /** @var UserSignFugouRepository $userSignFugouRepository */
+            $userSignFugouRepository = app()->make(UserSignFugouRepository::class);
+            $userSignFugouRepository->create($userSignFugouEntity->toUnderlineArray());
+        } catch (DbException $e) {
+            throw new ValidateException('更新京豆失败');
+        }
+        return (float)$surplus;
+    }
 }

app/common/repositories/user/UserSignFugouRepository.php

@@ -0,0 +1,19 @@
+<?php
+
+namespace app\common\repositories\user;
+
+use app\common\dao\user\UserSignFugouDao;
+use app\common\repositories\BaseRepository;
+
+class UserSignFugouRepository extends BaseRepository
+{
+    public function __construct(UserSignFugouDao $dao)
+    {
+        $this->dao = $dao;
+    }
+
+    public function create($data)
+    {
+        return $this->dao->create($data);
+    }
+}

app/common/repositories/user/UserSignJingdouRepository.php

@@ -0,0 +1,19 @@
+<?php
+
+namespace app\common\repositories\user;
+
+use app\common\dao\user\UserSignJingdouDao;
+use app\common\repositories\BaseRepository;
+
+class UserSignJingdouRepository extends BaseRepository
+{
+    public function __construct(UserSignJingdouDao $dao)
+    {
+        $this->dao = $dao;
+    }
+
+    public function create($data)
+    {
+        return $this->dao->create($data);
+    }
+}

app/common/repositories/user/UserSignScoreRepository.php

@@ -0,0 +1,19 @@
+<?php
+
+namespace app\common\repositories\user;
+
+use app\common\dao\user\UserSignScoreDao;
+use app\common\repositories\BaseRepository;
+
+class UserSignScoreRepository extends BaseRepository
+{
+    public function __construct(UserSignScoreDao $dao)
+    {
+        $this->dao = $dao;
+    }
+
+    public function create($data)
+    {
+        return $this->dao->create($data);
+    }
+}

app/common/repositories/user/UserSignVrRepository.php

@@ -0,0 +1,19 @@
+<?php
+
+namespace app\common\repositories\user;
+
+use app\common\dao\user\UserSignVrDao;
+use app\common\repositories\BaseRepository;
+
+class UserSignVrRepository extends BaseRepository
+{
+    public function __construct(UserSignVrDao $dao)
+    {
+        $this->dao = $dao;
+    }
+
+    public function create($data)
+    {
+        return $this->dao->create($data);
+    }
+}

app/entity/data/user/UserBillEntity.php

@@ -0,0 +1,523 @@
+<?php
+
+namespace app\entity\data\user;
+
+use app\entity\data\DataEntity;
+
+class UserBillEntity extends DataEntity
+{
+    public $billId = 0;  // 用户账单id
+    public $uid = 0;  // 用户uid
+    public $linkId = 0;  // 关联订单id
+    public $pm = 0;  // 收支类型 0 = 支出 1 = 获得
+    public $title = '';  // 账单标题
+    public $category = '';  // 明细种类
+    public $type = '';  // 明细类型
+    public $number = 0.00;  // 明细数字
+    public $balance = 0.00;  // 剩余
+    public $mark = '';  // 备注
+    public $createTime = '';  // 添加时间
+    public $status = 1;  // 状态 0 = 待确定 1 = 有效 -1 = 无效
+    public $commissionType = 0;  // 佣金类型
+    public $orderSn = '';  // 订单号
+    public $tripartite = 0;  // 第三方类型
+    public $typeShop = 0;  // 类型商店 0平台1多多进宝2唯品会3苏宁易购4网易考拉5淘宝客6京东联盟7饿了么8线上9话费
+    public $merId = 0;  // 商户id
+    public $source = 0;  // 账单来源 1 线下 0线上
+    public $orderType = 1;  // 订单类型 1自营  2 第三方
+    public $isRedBrokerage = 0;  // 红积分对冲佣金类型 0正常佣金 1红积分对冲佣金
+    public $gzc = 0;  // 公证处状态 0：未进入 1：已进入
+    public $isGzc = 0;  // 是否成功发起 0：未发起 1：已发起 2：已成功
+    public $takeTime = 0;  // 结算时间
+    public $districtId = 0;  // 区域id
+    public $streetId = 0;  // 街道id
+    public $month = '';  // 月份
+    public $num = 1;  // 份数
+
+    /**
+     * @return int
+     */
+    public function getBillId(): int
+    {
+        return $this->billId;
+    }
+
+    /**
+     * @param int $billId
+     * @return UserBillEntity
+     */
+    public function setBillId(int $billId): UserBillEntity
+    {
+        $this->billId = $billId;
+        return $this;
+    }
+
+    /**
+     * @return int
+     */
+    public function getUid(): int
+    {
+        return $this->uid;
+    }
+
+    /**
+     * @param int $uid
+     * @return UserBillEntity
+     */
+    public function setUid(int $uid): UserBillEntity
+    {
+        $this->uid = $uid;
+        return $this;
+    }
+
+    /**
+     * @return int
+     */
+    public function getLinkId(): int
+    {
+        return $this->linkId;
+    }
+
+    /**
+     * @param int $linkId
+     * @return UserBillEntity
+     */
+    public function setLinkId(int $linkId): UserBillEntity
+    {
+        $this->linkId = $linkId;
+        return $this;
+    }
+
+    /**
+     * @return int
+     */
+    public function getPm(): int
+    {
+        return $this->pm;
+    }
+
+    /**
+     * @param int $pm
+     * @return UserBillEntity
+     */
+    public function setPm(int $pm): UserBillEntity
+    {
+        $this->pm = $pm;
+        return $this;
+    }
+
+    /**
+     * @return string
+     */
+    public function getTitle(): string
+    {
+        return $this->title;
+    }
+
+    /**
+     * @param string $title
+     * @return UserBillEntity
+     */
+    public function setTitle(string $title): UserBillEntity
+    {
+        $this->title = $title;
+        return $this;
+    }
+
+    /**
+     * @return string
+     */
+    public function getCategory(): string
+    {
+        return $this->category;
+    }
+
+    /**
+     * @param string $category
+     * @return UserBillEntity
+     */
+    public function setCategory(string $category): UserBillEntity
+    {
+        $this->category = $category;
+        return $this;
+    }
+
+    /**
+     * @return string
+     */
+    public function getType(): string
+    {
+        return $this->type;
+    }
+
+    /**
+     * @param string $type
+     * @return UserBillEntity
+     */
+    public function setType(string $type): UserBillEntity
+    {
+        $this->type = $type;
+        return $this;
+    }
+
+    /**
+     * @return float
+     */
+    public function getNumber(): float
+    {
+        return $this->number;
+    }
+
+    /**
+     * @param float $number
+     * @return UserBillEntity
+     */
+    public function setNumber(float $number): UserBillEntity
+    {
+        $this->number = $number;
+        return $this;
+    }
+
+    /**
+     * @return float
+     */
+    public function getBalance(): float
+    {
+        return $this->balance;
+    }
+
+    /**
+     * @param float $balance
+     * @return UserBillEntity
+     */
+    public function setBalance(float $balance): UserBillEntity
+    {
+        $this->balance = $balance;
+        return $this;
+    }
+
+    /**
+     * @return string
+     */
+    public function getMark(): string
+    {
+        return $this->mark;
+    }
+
+    /**
+     * @param string $mark
+     * @return UserBillEntity
+     */
+    public function setMark(string $mark): UserBillEntity
+    {
+        $this->mark = $mark;
+        return $this;
+    }
+
+    /**
+     * @return string
+     */
+    public function getCreateTime(): string
+    {
+        return $this->createTime;
+    }
+
+    /**
+     * @param string $createTime
+     * @return UserBillEntity
+     */
+    public function setCreateTime(string $createTime): UserBillEntity
+    {
+        $this->createTime = $createTime;
+        return $this;
+    }
+
+    /**
+     * @return int
+     */
+    public function getStatus(): int
+    {
+        return $this->status;
+    }
+
+    /**
+     * @param int $status
+     * @return UserBillEntity
+     */
+    public function setStatus(int $status): UserBillEntity
+    {
+        $this->status = $status;
+        return $this;
+    }
+
+    /**
+     * @return int
+     */
+    public function getCommissionType(): int
+    {
+        return $this->commissionType;
+    }
+
+    /**
+     * @param int $commissionType
+     * @return UserBillEntity
+     */
+    public function setCommissionType(int $commissionType): UserBillEntity
+    {
+        $this->commissionType = $commissionType;
+        return $this;
+    }
+
+    /**
+     * @return string
+     */
+    public function getOrderSn(): string
+    {
+        return $this->orderSn;
+    }
+
+    /**
+     * @param string $orderSn
+     * @return UserBillEntity
+     */
+    public function setOrderSn(string $orderSn): UserBillEntity
+    {
+        $this->orderSn = $orderSn;
+        return $this;
+    }
+
+    /**
+     * @return int
+     */
+    public function getTripartite(): int
+    {
+        return $this->tripartite;
+    }
+
+    /**
+     * @param int $tripartite
+     * @return UserBillEntity
+     */
+    public function setTripartite(int $tripartite): UserBillEntity
+    {
+        $this->tripartite = $tripartite;
+        return $this;
+    }
+
+    /**
+     * @return int
+     */
+    public function getTypeShop(): int
+    {
+        return $this->typeShop;
+    }
+
+    /**
+     * @param int $typeShop
+     * @return UserBillEntity
+     */
+    public function setTypeShop(int $typeShop): UserBillEntity
+    {
+        $this->typeShop = $typeShop;
+        return $this;
+    }
+
+    /**
+     * @return int
+     */
+    public function getMerId(): int
+    {
+        return $this->merId;
+    }
+
+    /**
+     * @param int $merId
+     * @return UserBillEntity
+     */
+    public function setMerId(int $merId): UserBillEntity
+    {
+        $this->merId = $merId;
+        return $this;
+    }
+
+    /**
+     * @return int
+     */
+    public function getSource(): int
+    {
+        return $this->source;
+    }
+
+    /**
+     * @param int $source
+     * @return UserBillEntity
+     */
+    public function setSource(int $source): UserBillEntity
+    {
+        $this->source = $source;
+        return $this;
+    }
+
+    /**
+     * @return int
+     */
+    public function getOrderType(): int
+    {
+        return $this->orderType;
+    }
+
+    /**
+     * @param int $orderType
+     * @return UserBillEntity
+     */
+    public function setOrderType(int $orderType): UserBillEntity
+    {
+        $this->orderType = $orderType;
+        return $this;
+    }
+
+    /**
+     * @return int
+     */
+    public function getIsRedBrokerage(): int
+    {
+        return $this->isRedBrokerage;
+    }
+
+    /**
+     * @param int $isRedBrokerage
+     * @return UserBillEntity
+     */
+    public function setIsRedBrokerage(int $isRedBrokerage): UserBillEntity
+    {
+        $this->isRedBrokerage = $isRedBrokerage;
+        return $this;
+    }
+
+    /**
+     * @return int
+     */
+    public function getGzc(): int
+    {
+        return $this->gzc;
+    }
+
+    /**
+     * @param int $gzc
+     * @return UserBillEntity
+     */
+    public function setGzc(int $gzc): UserBillEntity
+    {
+        $this->gzc = $gzc;
+        return $this;
+    }
+
+    /**
+     * @return int
+     */
+    public function getIsGzc(): int
+    {
+        return $this->isGzc;
+    }
+
+    /**
+     * @param int $isGzc
+     * @return UserBillEntity
+     */
+    public function setIsGzc(int $isGzc): UserBillEntity
+    {
+        $this->isGzc = $isGzc;
+        return $this;
+    }
+
+    /**
+     * @return int
+     */
+    public function getTakeTime(): int
+    {
+        return $this->takeTime;
+    }
+
+    /**
+     * @param int $takeTime
+     * @return UserBillEntity
+     */
+    public function setTakeTime(int $takeTime): UserBillEntity
+    {
+        $this->takeTime = $takeTime;
+        return $this;
+    }
+
+    /**
+     * @return int
+     */
+    public function getDistrictId(): int
+    {
+        return $this->districtId;
+    }
+
+    /**
+     * @param int $districtId
+     * @return UserBillEntity
+     */
+    public function setDistrictId(int $districtId): UserBillEntity
+    {
+        $this->districtId = $districtId;
+        return $this;
+    }
+
+    /**
+     * @return int
+     */
+    public function getStreetId(): int
+    {
+        return $this->streetId;
+    }
+
+    /**
+     * @param int $streetId
+     * @return UserBillEntity
+     */
+    public function setStreetId(int $streetId): UserBillEntity
+    {
+        $this->streetId = $streetId;
+        return $this;
+    }
+
+    /**
+     * @return string
+     */
+    public function getMonth(): string
+    {
+        return $this->month;
+    }
+
+    /**
+     * @param string $month
+     * @return UserBillEntity
+     */
+    public function setMonth(string $month): UserBillEntity
+    {
+        $this->month = $month;
+        return $this;
+    }
+
+    /**
+     * @return int
+     */
+    public function getNum(): int
+    {
+        return $this->num;
+    }
+
+    /**
+     * @param int $num
+     * @return UserBillEntity
+     */
+    public function setNum(int $num): UserBillEntity
+    {
+        $this->num = $num;
+        return $this;
+    }
+
+}

app/entity/data/user/UserSignFugouEntity.php

@@ -0,0 +1,256 @@
+<?php
+
+namespace app\entity\data\user;
+
+use app\entity\data\DataEntity;
+
+class UserSignFugouEntity 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 $surplus = 0.00;  // 剩余
+    public $orderType = '';  // 订单类型。关联订单ID
+    public $commissionType = 0;  // 佣金类型：1代理费 2 消费佣金 3直推奖 4辖区佣金 5养老金 6广告费 7锁客收益 8平台奖励 9渠道商 10推广店铺收益 11合伙人分红 12联创分红 13股权分红
+    public $type = null;  // 复购金类型：1赠送，2消耗
+    public $settlementTime = null;  // 结算时间
+    public $addtime = 0;  // 添加时间
+
+    /**
+     * @return int
+     */
+    public function getId(): int
+    {
+        return $this->id;
+    }
+
+    /**
+     * @param int $id
+     * @return UserSignFugouEntity
+     */
+    public function setId(int $id): UserSignFugouEntity
+    {
+        $this->id = $id;
+        return $this;
+    }
+
+    /**
+     * @return int
+     */
+    public function getUid(): int
+    {
+        return $this->uid;
+    }
+
+    /**
+     * @param int $uid
+     * @return UserSignFugouEntity
+     */
+    public function setUid(int $uid): UserSignFugouEntity
+    {
+        $this->uid = $uid;
+        return $this;
+    }
+
+    /**
+     * @return float
+     */
+    public function getNumber(): float
+    {
+        return $this->number;
+    }
+
+    /**
+     * @param float $number
+     * @return UserSignFugouEntity
+     */
+    public function setNumber(float $number): UserSignFugouEntity
+    {
+        $this->number = $number;
+        return $this;
+    }
+
+    /**
+     * @return int
+     */
+    public function getStatus(): int
+    {
+        return $this->status;
+    }
+
+    /**
+     * @param int $status
+     * @return UserSignFugouEntity
+     */
+    public function setStatus(int $status): UserSignFugouEntity
+    {
+        $this->status = $status;
+        return $this;
+    }
+
+    /**
+     * @return string
+     */
+    public function getMark(): string
+    {
+        return $this->mark;
+    }
+
+    /**
+     * @param string $mark
+     * @return UserSignFugouEntity
+     */
+    public function setMark(string $mark): UserSignFugouEntity
+    {
+        $this->mark = $mark;
+        return $this;
+    }
+
+    /**
+     * @return string
+     */
+    public function getDesc(): string
+    {
+        return $this->desc;
+    }
+
+    /**
+     * @param string $desc
+     * @return UserSignFugouEntity
+     */
+    public function setDesc(string $desc): UserSignFugouEntity
+    {
+        $this->desc = $desc;
+        return $this;
+    }
+
+    /**
+     * @return string
+     */
+    public function getOrderId(): string
+    {
+        return $this->orderId;
+    }
+
+    /**
+     * @param string $orderId
+     * @return UserSignFugouEntity
+     */
+    public function setOrderId(string $orderId): UserSignFugouEntity
+    {
+        $this->orderId = $orderId;
+        return $this;
+    }
+
+    /**
+     * @return float
+     */
+    public function getSurplus(): float
+    {
+        return $this->surplus;
+    }
+
+    /**
+     * @param float $surplus
+     * @return UserSignFugouEntity
+     */
+    public function setSurplus(float $surplus): UserSignFugouEntity
+    {
+        $this->surplus = $surplus;
+        return $this;
+    }
+
+    /**
+     * @return string
+     */
+    public function getOrderType(): string
+    {
+        return $this->orderType;
+    }
+
+    /**
+     * @param string $orderType
+     * @return UserSignFugouEntity
+     */
+    public function setOrderType(string $orderType): UserSignFugouEntity
+    {
+        $this->orderType = $orderType;
+        return $this;
+    }
+
+    /**
+     * @return int
+     */
+    public function getCommissionType(): int
+    {
+        return $this->commissionType;
+    }
+
+    /**
+     * @param int $commissionType
+     * @return UserSignFugouEntity
+     */
+    public function setCommissionType(int $commissionType): UserSignFugouEntity
+    {
+        $this->commissionType = $commissionType;
+        return $this;
+    }
+
+    /**
+     * @return null
+     */
+    public function getType()
+    {
+        return $this->type;
+    }
+
+    /**
+     * @param null $type
+     * @return UserSignFugouEntity
+     */
+    public function setType($type)
+    {
+        $this->type = $type;
+        return $this;
+    }
+
+    /**
+     * @return null
+     */
+    public function getSettlementTime()
+    {
+        return $this->settlementTime;
+    }
+
+    /**
+     * @param null $settlementTime
+     * @return UserSignFugouEntity
+     */
+    public function setSettlementTime($settlementTime)
+    {
+        $this->settlementTime = $settlementTime;
+        return $this;
+    }
+
+    /**
+     * @return int
+     */
+    public function getAddtime(): int
+    {
+        return $this->addtime;
+    }
+
+    /**
+     * @param int $addtime
+     * @return UserSignFugouEntity
+     */
+    public function setAddtime(int $addtime): UserSignFugouEntity
+    {
+        $this->addtime = $addtime;
+        return $this;
+    }
+}

app/entity/data/user/UserSignJingdouEntity.php

@@ -0,0 +1,256 @@
+<?php
+
+namespace app\entity\data\user;
+
+use app\entity\data\DataEntity;
+
+class UserSignJingdouEntity extends DataEntity
+{
+    public $id = 0;  // 自增id
+    public $uid = 0;  // 会员id
+    public $merId = 0;  // 商户id
+    public $number = 0.00;  // 赠送数量
+    public $status = 0;  // 京豆状态：1-有效 0-失效 -1待确认
+    public $mark = '';  // 备注
+    public $desc = '';  // 描述
+    public $orderId = '';  // 订单id
+    public $surplus = 0.00;  // 剩余
+    public $orderType = '';  // 订单类型。关联订单ID
+    public $type = null;  // 京豆类型：1赠送，2消耗
+    public $settlementTime = null;  // 结算时间
+    public $addtime = 0;  // 添加时间
+
+    /**
+     * @return int
+     */
+    public function getId(): int
+    {
+        return $this->id;
+    }
+
+    /**
+     * @param int $id
+     * @return UserSignJingdouEntity
+     */
+    public function setId(int $id): UserSignJingdouEntity
+    {
+        $this->id = $id;
+        return $this;
+    }
+
+    /**
+     * @return int
+     */
+    public function getUid(): int
+    {
+        return $this->uid;
+    }
+
+    /**
+     * @param int $uid
+     * @return UserSignJingdouEntity
+     */
+    public function setUid(int $uid): UserSignJingdouEntity
+    {
+        $this->uid = $uid;
+        return $this;
+    }
+
+    /**
+     * @return int
+     */
+    public function getMerId(): int
+    {
+        return $this->merId;
+    }
+
+    /**
+     * @param int $merId
+     * @return UserSignJingdouEntity
+     */
+    public function setMerId(int $merId): UserSignJingdouEntity
+    {
+        $this->merId = $merId;
+        return $this;
+    }
+
+    /**
+     * @return float
+     */
+    public function getNumber(): float
+    {
+        return $this->number;
+    }
+
+    /**
+     * @param float $number
+     * @return UserSignJingdouEntity
+     */
+    public function setNumber(float $number): UserSignJingdouEntity
+    {
+        $this->number = $number;
+        return $this;
+    }
+
+    /**
+     * @return int
+     */
+    public function getStatus(): int
+    {
+        return $this->status;
+    }
+
+    /**
+     * @param int $status
+     * @return UserSignJingdouEntity
+     */
+    public function setStatus(int $status): UserSignJingdouEntity
+    {
+        $this->status = $status;
+        return $this;
+    }
+
+    /**
+     * @return string
+     */
+    public function getMark(): string
+    {
+        return $this->mark;
+    }
+
+    /**
+     * @param string $mark
+     * @return UserSignJingdouEntity
+     */
+    public function setMark(string $mark): UserSignJingdouEntity
+    {
+        $this->mark = $mark;
+        return $this;
+    }
+
+    /**
+     * @return string
+     */
+    public function getDesc(): string
+    {
+        return $this->desc;
+    }
+
+    /**
+     * @param string $desc
+     * @return UserSignJingdouEntity
+     */
+    public function setDesc(string $desc): UserSignJingdouEntity
+    {
+        $this->desc = $desc;
+        return $this;
+    }
+
+    /**
+     * @return string
+     */
+    public function getOrderId(): string
+    {
+        return $this->orderId;
+    }
+
+    /**
+     * @param string $orderId
+     * @return UserSignJingdouEntity
+     */
+    public function setOrderId(string $orderId): UserSignJingdouEntity
+    {
+        $this->orderId = $orderId;
+        return $this;
+    }
+
+    /**
+     * @return float
+     */
+    public function getSurplus(): float
+    {
+        return $this->surplus;
+    }
+
+    /**
+     * @param float $surplus
+     * @return UserSignJingdouEntity
+     */
+    public function setSurplus(float $surplus): UserSignJingdouEntity
+    {
+        $this->surplus = $surplus;
+        return $this;
+    }
+
+    /**
+     * @return string
+     */
+    public function getOrderType(): string
+    {
+        return $this->orderType;
+    }
+
+    /**
+     * @param string $orderType
+     * @return UserSignJingdouEntity
+     */
+    public function setOrderType(string $orderType): UserSignJingdouEntity
+    {
+        $this->orderType = $orderType;
+        return $this;
+    }
+
+    /**
+     * @return null
+     */
+    public function getType()
+    {
+        return $this->type;
+    }
+
+    /**
+     * @param null $type
+     * @return UserSignJingdouEntity
+     */
+    public function setType($type)
+    {
+        $this->type = $type;
+        return $this;
+    }
+
+    /**
+     * @return null
+     */
+    public function getSettlementTime()
+    {
+        return $this->settlementTime;
+    }
+
+    /**
+     * @param null $settlementTime
+     * @return UserSignJingdouEntity
+     */
+    public function setSettlementTime($settlementTime)
+    {
+        $this->settlementTime = $settlementTime;
+        return $this;
+    }
+
+    /**
+     * @return int
+     */
+    public function getAddtime(): int
+    {
+        return $this->addtime;
+    }
+
+    /**
+     * @param int $addtime
+     * @return UserSignJingdouEntity
+     */
+    public function setAddtime(int $addtime): UserSignJingdouEntity
+    {
+        $this->addtime = $addtime;
+        return $this;
+    }
+}

app/entity/data/user/UserSignScoreEntity.php

@@ -0,0 +1,294 @@
+<?php
+
+namespace app\entity\data\user;
+
+use app\entity\data\DataEntity;
+
+class UserSignScoreEntity extends DataEntity
+{
+    public $id = 0;  // 自增id
+    public $uid = 0;  // 会员id
+    public $continuityDay = 0;  // 连续签到几天
+    public $rewardScore = 0.00;  // 赠送积分数量
+    public $signinTime = 0;  // 签到时间
+    public $sourceUid = 0;  // 赠送积分来源用户id
+    public $status = 0;  // 积分状态：1-有效，0-失效，-1待确认
+    public $mark = '';  // 备注
+    public $orderId = '';  // 订单id
+    public $pm = 1;  // 1-收入，2-支出
+    public $surplus = 0.00;  // 剩余
+    public $orderType = '';  // 订单类型，关联订单ID
+    public $addtime = 0;  // 添加时间
+    public $sourceType = 1;  // 积分来源类型：1签到，2分享好友注册赠送，3自己下单赠送，4好友下单赠送，5购买产品消耗
+    public $settlementTime = 0;  // 结算时间
+
+    /**
+     * @return int
+     */
+    public function getId(): int
+    {
+        return $this->id;
+    }
+
+    /**
+     * @param int $id
+     * @return UserSignScoreEntity
+     */
+    public function setId(int $id): UserSignScoreEntity
+    {
+        $this->id = $id;
+        return $this;
+    }
+
+    /**
+     * @return int
+     */
+    public function getUid(): int
+    {
+        return $this->uid;
+    }
+
+    /**
+     * @param int $uid
+     * @return UserSignScoreEntity
+     */
+    public function setUid(int $uid): UserSignScoreEntity
+    {
+        $this->uid = $uid;
+        return $this;
+    }
+
+    /**
+     * @return int
+     */
+    public function getContinuityDay(): int
+    {
+        return $this->continuityDay;
+    }
+
+    /**
+     * @param int $continuityDay
+     * @return UserSignScoreEntity
+     */
+    public function setContinuityDay(int $continuityDay): UserSignScoreEntity
+    {
+        $this->continuityDay = $continuityDay;
+        return $this;
+    }
+
+    /**
+     * @return float
+     */
+    public function getRewardScore(): float
+    {
+        return $this->rewardScore;
+    }
+
+    /**
+     * @param float $rewardScore
+     * @return UserSignScoreEntity
+     */
+    public function setRewardScore(float $rewardScore): UserSignScoreEntity
+    {
+        $this->rewardScore = $rewardScore;
+        return $this;
+    }
+
+    /**
+     * @return int
+     */
+    public function getSigninTime(): int
+    {
+        return $this->signinTime;
+    }
+
+    /**
+     * @param int $signinTime
+     * @return UserSignScoreEntity
+     */
+    public function setSigninTime(int $signinTime): UserSignScoreEntity
+    {
+        $this->signinTime = $signinTime;
+        return $this;
+    }
+
+    /**
+     * @return int
+     */
+    public function getSourceUid(): int
+    {
+        return $this->sourceUid;
+    }
+
+    /**
+     * @param int $sourceUid
+     * @return UserSignScoreEntity
+     */
+    public function setSourceUid(int $sourceUid): UserSignScoreEntity
+    {
+        $this->sourceUid = $sourceUid;
+        return $this;
+    }
+
+    /**
+     * @return int
+     */
+    public function getStatus(): int
+    {
+        return $this->status;
+    }
+
+    /**
+     * @param int $status
+     * @return UserSignScoreEntity
+     */
+    public function setStatus(int $status): UserSignScoreEntity
+    {
+        $this->status = $status;
+        return $this;
+    }
+
+    /**
+     * @return string
+     */
+    public function getMark(): string
+    {
+        return $this->mark;
+    }
+
+    /**
+     * @param string $mark
+     * @return UserSignScoreEntity
+     */
+    public function setMark(string $mark): UserSignScoreEntity
+    {
+        $this->mark = $mark;
+        return $this;
+    }
+
+    /**
+     * @return string
+     */
+    public function getOrderId(): string
+    {
+        return $this->orderId;
+    }
+
+    /**
+     * @param string $orderId
+     * @return UserSignScoreEntity
+     */
+    public function setOrderId(string $orderId): UserSignScoreEntity
+    {
+        $this->orderId = $orderId;
+        return $this;
+    }
+
+    /**
+     * @return int
+     */
+    public function getPm(): int
+    {
+        return $this->pm;
+    }
+
+    /**
+     * @param int $pm
+     * @return UserSignScoreEntity
+     */
+    public function setPm(int $pm): UserSignScoreEntity
+    {
+        $this->pm = $pm;
+        return $this;
+    }
+
+    /**
+     * @return float
+     */
+    public function getSurplus(): float
+    {
+        return $this->surplus;
+    }
+
+    /**
+     * @param float $surplus
+     * @return UserSignScoreEntity
+     */
+    public function setSurplus(float $surplus): UserSignScoreEntity
+    {
+        $this->surplus = $surplus;
+        return $this;
+    }
+
+    /**
+     * @return string
+     */
+    public function getOrderType(): string
+    {
+        return $this->orderType;
+    }
+
+    /**
+     * @param string $orderType
+     * @return UserSignScoreEntity
+     */
+    public function setOrderType(string $orderType): UserSignScoreEntity
+    {
+        $this->orderType = $orderType;
+        return $this;
+    }
+
+    /**
+     * @return int
+     */
+    public function getAddtime(): int
+    {
+        return $this->addtime;
+    }
+
+    /**
+     * @param int $addtime
+     * @return UserSignScoreEntity
+     */
+    public function setAddtime(int $addtime): UserSignScoreEntity
+    {
+        $this->addtime = $addtime;
+        return $this;
+    }
+
+    /**
+     * @return int
+     */
+    public function getSourceType(): int
+    {
+        return $this->sourceType;
+    }
+
+    /**
+     * @param int $sourceType
+     * @return UserSignScoreEntity
+     */
+    public function setSourceType(int $sourceType): UserSignScoreEntity
+    {
+        $this->sourceType = $sourceType;
+        return $this;
+    }
+
+    /**
+     * @return int
+     */
+    public function getSettlementTime(): int
+    {
+        return $this->settlementTime;
+    }
+
+    /**
+     * @param int $settlementTime
+     * @return UserSignScoreEntity
+     */
+    public function setSettlementTime(int $settlementTime): UserSignScoreEntity
+    {
+        $this->settlementTime = $settlementTime;
+        return $this;
+    }
+}

app/entity/data/user/UserSignVrEntity.php

@@ -0,0 +1,218 @@
+<?php
+
+namespace app\entity\data\user;
+
+use app\entity\data\DataEntity;
+
+class UserSignVrEntity extends DataEntity
+{
+    public $id = 0;  // 自增id
+    public $uid = 0;  // 会员id
+    public $number = 0.00;  // 赠送数量
+    public $mark = '';  // 备注
+    public $desc = '';  // 描述
+    public $orderId = '';  // 订单id
+    public $surplus = 0.00;  // 剩余
+    public $orderType = '';  // 订单类型，关联订单ID
+    public $type = 0;  // vr类型：1兑换，2消耗
+    public $settlementTime = null;  // 结算时间
+    public $addtime = 0;  // 添加时间
+
+    /**
+     * @return int
+     */
+    public function getId(): int
+    {
+        return $this->id;
+    }
+
+    /**
+     * @param int $id
+     * @return UserSignVrEntity
+     */
+    public function setId(int $id): UserSignVrEntity
+    {
+        $this->id = $id;
+        return $this;
+    }
+
+    /**
+     * @return int
+     */
+    public function getUid(): int
+    {
+        return $this->uid;
+    }
+
+    /**
+     * @param int $uid
+     * @return UserSignVrEntity
+     */
+    public function setUid(int $uid): UserSignVrEntity
+    {
+        $this->uid = $uid;
+        return $this;
+    }
+
+    /**
+     * @return float
+     */
+    public function getNumber(): float
+    {
+        return $this->number;
+    }
+
+    /**
+     * @param float $number
+     * @return UserSignVrEntity
+     */
+    public function setNumber(float $number): UserSignVrEntity
+    {
+        $this->number = $number;
+        return $this;
+    }
+
+    /**
+     * @return string
+     */
+    public function getMark(): string
+    {
+        return $this->mark;
+    }
+
+    /**
+     * @param string $mark
+     * @return UserSignVrEntity
+     */
+    public function setMark(string $mark): UserSignVrEntity
+    {
+        $this->mark = $mark;
+        return $this;
+    }
+
+    /**
+     * @return string
+     */
+    public function getDesc(): string
+    {
+        return $this->desc;
+    }
+
+    /**
+     * @param string $desc
+     * @return UserSignVrEntity
+     */
+    public function setDesc(string $desc): UserSignVrEntity
+    {
+        $this->desc = $desc;
+        return $this;
+    }
+
+    /**
+     * @return string
+     */
+    public function getOrderId(): string
+    {
+        return $this->orderId;
+    }
+
+    /**
+     * @param string $orderId
+     * @return UserSignVrEntity
+     */
+    public function setOrderId(string $orderId): UserSignVrEntity
+    {
+        $this->orderId = $orderId;
+        return $this;
+    }
+
+    /**
+     * @return float
+     */
+    public function getSurplus(): float
+    {
+        return $this->surplus;
+    }
+
+    /**
+     * @param float $surplus
+     * @return UserSignVrEntity
+     */
+    public function setSurplus(float $surplus): UserSignVrEntity
+    {
+        $this->surplus = $surplus;
+        return $this;
+    }
+
+    /**
+     * @return string
+     */
+    public function getOrderType(): string
+    {
+        return $this->orderType;
+    }
+
+    /**
+     * @param string $orderType
+     * @return UserSignVrEntity
+     */
+    public function setOrderType(string $orderType): UserSignVrEntity
+    {
+        $this->orderType = $orderType;
+        return $this;
+    }
+
+    /**
+     * @return int
+     */
+    public function getType(): int
+    {
+        return $this->type;
+    }
+
+    /**
+     * @param int $type
+     * @return UserSignVrEntity
+     */
+    public function setType(int $type): UserSignVrEntity
+    {
+        $this->type = $type;
+        return $this;
+    }
+
+    /**
+     * @return null
+     */
+    public function getSettlementTime()
+    {
+        return $this->settlementTime;
+    }
+
+    /**
+     * @param null $settlementTime
+     * @return UserSignVrEntity
+     */
+    public function setSettlementTime($settlementTime)
+    {
+        $this->settlementTime = $settlementTime;
+        return $this;
+    }
+
+    /**
+     * @return int
+     */
+    public function getAddtime(): int
+    {
+        return $this->addtime;
+    }
+
+    /**
+     * @param int $addtime
+     * @return UserSignVrEntity
+     */
+    public function setAddtime(int $addtime): UserSignVrEntity
+    {
+        $this->addtime = $addtime;
+        return $this;
+    }
+}

app/utils/ArrayUtil.php

@@ -27,4 +27,20 @@ class ArrayUtil
         }
         return $result;
     }
+
+    /**
+     * 根据 code 获取 name
+     * @param $code
+     * @param array $data
+     * @return mixed|null
+     */
+    public static function getEnumNameByCode($code, array $data = [])
+    {
+        foreach ($data as $datum) {
+            if (isset($datum['code']) && isset($datum['name']) && $datum['code'] === $code) {
+                return $datum['name'];
+            }
+        }
+        return null;
+    }
 }