Merge branch 'dev'

app/common/dao/gzc/GzcLogDao.php

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

app/common/dao/product/ProductSeckillDao.php

@@ -0,0 +1,45 @@
+<?php
+
+namespace app\common\dao\product;
+
+use app\common\dao\BaseDao;
+use app\common\enum\product\SeckillEnum;
+use app\common\model\product\ProductSeckillModel;
+use app\entity\CommonEntity;
+use app\entity\data\product\ProductSeckillEntity;
+
+class ProductSeckillDao extends BaseDao
+{
+    /**
+     * @return string
+     */
+    protected function getModel(): string
+    {
+        return ProductSeckillModel::class;
+    }
+
+    /**
+     * 根据 shareId 获取分享实体
+     * @param int $productId
+     * @return CommonEntity
+     */
+    public function getProductSeckillEntityByProductId(int $productId): CommonEntity
+    {
+        $data = [];
+        try {
+            /** @var ProductSeckillModel $model */
+            $model = $this->getModel();
+            $dataRes = $model::getDB()
+                ->where('product_id', '=', $productId)
+                ->where("`seckill_date` <= '" . date('Y-m-d H:i:s') . "'")
+                ->where("status", '=', SeckillEnum::STATUS['Open']['code'])
+                ->find();
+            if (!empty($dataRes)) {
+                $data = $dataRes->toArray();
+            }
+        } catch (\Exception $e) {
+
+        }
+        return ProductSeckillEntity::newInstance($data);
+    }
+}

app/common/dao/product/ShareDao.php

@@ -0,0 +1,42 @@
+<?php
+
+namespace app\common\dao\product;
+
+use app\common\dao\BaseDao;
+use app\common\model\product\ShareModel;
+use app\entity\CommonEntity;
+use app\entity\data\product\ShareEntity;
+
+class ShareDao extends BaseDao
+{
+    /**
+     * @return string
+     */
+    protected function getModel(): string
+    {
+        return ShareModel::class;
+    }
+
+    /**
+     * 根据 shareId 获取分享实体
+     * @param int $shareId
+     * @return CommonEntity
+     */
+    public function getShareEntityByShareId(int $shareId): CommonEntity
+    {
+        $shareData = [];
+        try {
+            /** @var ShareModel $model */
+            $model = $this->getModel();
+            $shareDataRes = $model::getDB()
+                ->where('id', '=', $shareId)
+                ->find();
+            if (!empty($shareDataRes)) {
+                $shareData = $shareDataRes->toArray();
+            }
+        } catch (\Exception $e) {
+
+        }
+        return ShareEntity::newInstance($shareData);
+    }
+}

app/common/dao/store/StoreSeckillActiveDao.php

@@ -5,12 +5,14 @@
  * @author Qinii
  * @day 2020-07-30
  *
- * 
+ *
  */
 namespace app\common\dao\store;
 
+use app\common\enum\store\SeckillActiveEnum;
 use app\common\model\store\StoreSeckillActive;
 use app\common\dao\BaseDao;
+use app\entity\data\store\SeckillActiveEntity;
 
 class StoreSeckillActiveDao extends BaseDao
 {
@@ -129,4 +131,30 @@ class StoreSeckillActiveDao extends BaseDao
             });
         return $query;
     }
+
+    /**
+     * 根据 商品ID 获取当前生效的 活动记录
+     * @param int $productId
+     * @return \app\entity\CommonEntity
+     */
+    public function getSeckillActiveEntityByProductIdInActive(int $productId): \app\entity\CommonEntity
+    {
+        $data = [];
+        try {
+            /** @var StoreSeckillActive $model */
+            $model = $this->getModel();
+            $dataRes = $model::getDB()
+                ->where('product_id', '=', $productId)
+                ->where("`start_time` <= '" . time() . "'")
+                ->where("`end_time` >= '" . time() . "'")
+                ->where("status", '=', SeckillActiveEnum::STATUS['Active']['code'])
+                ->find();
+            if (!empty($dataRes)) {
+                $data = $dataRes->toArray();
+            }
+        } catch (\Exception $e) {
+
+        }
+        return SeckillActiveEntity::newInstance($data);
+    }
 }

app/common/dao/store/coupon/StoreCouponProductDao.php

@@ -14,6 +14,7 @@ namespace app\common\dao\store\coupon;
 use app\common\dao\BaseDao;
 use app\common\model\BaseModel;
 use app\common\model\store\coupon\StoreCouponProduct;
+use app\entity\data\store\StoreCouponProductEntity;
 use think\Collection;
 use think\db\exception\DataNotFoundException;
 use think\db\exception\DbException;
@@ -71,4 +72,28 @@ class StoreCouponProductDao extends BaseDao
     {
         return StoreCouponProduct::getDB()->whereIn('product_id', $productId)->column('coupon_id');
     }
+
+    /**
+     * @param int $couponId
+     * @return StoreCouponProductEntity[]
+     */
+    public function getStoreCouponProductEntityListByCouponId(int $couponId): array
+    {
+        $entityList = [];
+        try {
+            /** @var StoreCouponProduct $model */
+            $model = $this->getModel();
+            $dataListRes = $model::getDB()
+                ->where('coupon_id', '=', $couponId)
+                ->select()
+                ->toArray();
+            if (!empty($dataListRes)) {
+                foreach ($dataListRes as $data) {
+                    $entityList[] = StoreCouponProductEntity::newInstance($data);
+                }
+            }
+        } catch (\Exception $e) {
+        }
+        return $entityList;
+    }
 }

app/common/dao/store/coupon/StoreCouponUserDao.php

@@ -12,8 +12,10 @@ namespace app\common\dao\store\coupon;
 
 
 use app\common\dao\BaseDao;
+use app\common\enum\store\StoreCouponUserEnum;
 use app\common\model\BaseModel;
 use app\common\model\store\coupon\StoreCouponUser;
+use app\entity\data\store\StoreCouponUserEntity;
 
 /**
  * Class StoreCouponUserDao
@@ -86,4 +88,35 @@ class StoreCouponUserDao extends BaseDao
     {
         return StoreCouponUser::getDB()->where('coupon_id', $couponId)->count();
     }
+
+    /**
+     * @param int $merId
+     * @param int $uid
+     * @return StoreCouponUserEntity[]
+     */
+    public function getValidStoreCouponUserEntityListByMerIdAndUid(int $merId, int $uid): array
+    {
+        $entityList = [];
+        try {
+            $dateTime = date('Y-m-d H:i:s');
+            /** @var StoreCouponUser $model */
+            $model = $this->getModel();
+            $dataListRes = $model::getDB()
+                ->where('mer_id', '=', $merId)
+                ->where('uid', '=', $uid)
+                ->where('status', '=', StoreCouponUserEnum::STATUS['Unused']['code'])
+                ->where('is_fail', '=', StoreCouponUserEnum::IS_FAIL['No']['code'])
+                ->where('start_time', '<=', $dateTime)
+                ->where('end_time', '>=', $dateTime)
+                ->select()
+                ->toArray();
+            if (!empty($dataListRes)) {
+                foreach ($dataListRes as $data) {
+                    $entityList[] = StoreCouponUserEntity::newInstance($data);
+                }
+            }
+        } catch (\Exception $e) {
+        }
+        return $entityList;
+    }
 }

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

@@ -12,8 +12,11 @@ namespace app\common\dao\store\order;
 
 
 use app\common\dao\BaseDao;
+use app\common\enum\store\CartEnum;
 use app\common\model\BaseModel;
 use app\common\model\store\order\StoreCart;
+use app\entity\CommonEntity;
+use app\entity\data\store\CartEntity;
 use think\Collection;
 use think\db\exception\DataNotFoundException;
 use think\db\exception\DbException;
@@ -155,4 +158,64 @@ class StoreCartDao extends BaseDao
         })->leftJoin('StoreOrderProduct B', 'A.cart_id = B.cart_id')
             ->field('sum(B.product_num) as pay_num,sum(B.product_price) as pay_price,A.source_id')->group('A.source_id')->select();
     }
+
+    /**
+     * @param int $cartId
+     * @return CommonEntity
+     */
+    public function getCartEntityByCartId(int $cartId): CommonEntity
+    {
+        $storeCartData = [];
+        try {
+            /** @var StoreCart  $model */
+            $model = $this->getModel();
+            $storeCartDataRes = $model::getDB()
+                ->where('cart_id', $cartId)
+                ->find();
+            if (!empty($storeCartDataRes)) {
+                $storeCartData = $storeCartDataRes->toArray();
+            }
+        } catch (\Exception $e) {
+        }
+        return CartEntity::newInstance($storeCartData);
+    }
+
+    /**
+     * @param array $cartIdList
+     * @return CartEntity[]
+     */
+    public function getCartEntityListByCartIdList(array $cartIdList): array
+    {
+        $entityList = [];
+        try {
+            /** @var StoreCart  $model */
+            $model = $this->getModel();
+            $dataListRes = $model::getDB()
+                ->whereIn('cart_id', $cartIdList)
+                ->select()
+                ->toArray();
+            if (!empty($dataListRes)) {
+                foreach ($dataListRes as $data) {
+                    $entityList[] = CartEntity::newInstance($data);
+                }
+            }
+        } catch (\Exception $e) {
+        }
+        return $entityList;
+    }
+
+    /**
+     * @param array $cartIdList
+     * @param int $isPay
+     * @return int
+     * @throws DbException
+     */
+    public function updateIsPayByCartIdList(array $cartIdList, int $isPay = CartEnum::IS_PAY['Yes']['code']): int
+    {
+        /** @var StoreCart $model */
+        $model = $this->getModel();
+        return $model::getDB()
+            ->whereIn('cart_id', $cartIdList)
+            ->update(['is_pay' => $isPay]);
+    }
 }

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

@@ -5,14 +5,18 @@
  * @author xaboy
  * @day 2020/6/8
  *
- * 
+ *
  */
 
 namespace app\common\dao\store\order;
 
 
 use app\common\dao\BaseDao;
+use app\common\enum\store\StoreGroupOrderEnum;
 use app\common\model\store\order\StoreGroupOrder;
+use app\entity\CommonEntity;
+use app\entity\data\store\StoreGroupOrderEntity;
+use think\db\exception\DbException;
 
 /**
  * Class StoreGroupOrderDao
@@ -43,7 +47,7 @@ class StoreGroupOrderDao extends BaseDao
     {
         return StoreGroupOrder::when($uid, function ($query, $uid) {
             $query->where('uid', $uid);
-        })->where('is_del', 0)->where('test_order',0)->where('paid', 0)->count();
+        })->where('is_del', 0)->where('test_order', 0)->where('paid', 0)->count();
     }
 
     /**
@@ -89,4 +93,46 @@ class StoreGroupOrderDao extends BaseDao
     {
         return StoreGroupOrder::getDB()->where('pay_type', 0)->where('uid', $uid)->sum('pay_price') ?: 0;
     }
+
+    /**
+     * @param array $groupOrderIdList
+     * @return CommonEntity[]
+     */
+    public function getStoreGroupOrderEntityListByGroupOrderIdList(array $groupOrderIdList): array
+    {
+        $entityList = [];
+        try {
+            /** @var StoreGroupOrder $model */
+            $model = $this->getModel();
+            $dataRes = $model::getDB()
+                ->whereIn('group_order_id', $groupOrderIdList)
+                ->select()
+                ->toArray();
+            if (!empty($dataRes)) {
+                $entityList = array_map(function ($data) {
+                    return StoreGroupOrderEntity::newInstance($data);
+                }, $dataRes);
+            }
+        } catch (\Exception $e) {
+
+        }
+        return $entityList;
+    }
+
+    /**
+     * @param $groupOrderId
+     * @return int
+     * @throws DbException
+     */
+    public function paySuccess($groupOrderId): int
+    {
+        /** @var StoreGroupOrder $model */
+        $model = $this->getModel();
+        return $model::getDB()
+            ->where('group_order_id', '=', $groupOrderId)
+            ->update([
+                'paid' => StoreGroupOrderEnum::PAID['YES']['code'],
+                'pay_time' => date('Y-m-d H:i:s')
+            ]);
+    }
 }

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,29 @@ class StoreOrderDao extends BaseDao
         $userData = Db::query($sql);
         return array_column($userData, 'amount', 'uid');
     }
+
+    /**
+     * @param array $orderIdList
+     * @return CommonEntity[]
+     */
+    public function getStoreOrderEntityListByOrderIdList(array $orderIdList): array
+    {
+        $entityList = [];
+        try {
+            /** @var StoreOrder $model */
+            $model = $this->getModel();
+            $dataRes = $model::getDB()
+                ->whereIn('order_id', $orderIdList)
+                ->select()
+                ->toArray();
+            if (!empty($dataRes)) {
+                $entityList = array_map(function ($data) {
+                    return StoreOrderEntity::newInstance($data);
+                }, $dataRes);
+            }
+        } catch (\Exception $e) {
+
+        }
+        return $entityList;
+    }
 }

app/common/dao/store/product/ProductAttrValueDao.php

@@ -9,6 +9,8 @@ namespace app\common\dao\store\product;
 
 use app\common\dao\BaseDao;
 use app\common\model\store\product\ProductAttrValue as model;
+use app\entity\CommonEntity;
+use app\entity\data\store\StoreProductAttrValueEntity;
 use think\facade\Db;
 
 /**
@@ -256,4 +258,29 @@ class ProductAttrValueDao extends BaseDao
             });
         return $query;
     }
+
+    /**
+     * @param array $uniqueList
+     * @return CommonEntity[]
+     */
+    public function getStoreProductAttrValueEntityListByUniqueList(array $uniqueList): array
+    {
+        $entityList = [];
+        try {
+            /** @var model $model */
+            $model = $this->getModel();
+            $dataRes = $model::getDB()
+                ->whereIn('unique', $uniqueList)
+                ->select()
+                ->toArray();
+            if (!empty($dataRes)) {
+                $entityList = array_map(function ($data) {
+                    return StoreProductAttrValueEntity::newInstance($data);
+                }, $dataRes);
+            }
+        } catch (\Exception $e) {
+
+        }
+        return $entityList;
+    }
 }

app/common/dao/store/product/ProductDao.php

@@ -8,8 +8,11 @@
 namespace app\common\dao\store\product;
 
 use app\common\dao\BaseDao;
+use app\common\enum\store\ProductEnum;
 use app\common\model\store\product\Product as model;
 use app\common\repositories\store\StoreCategoryRepository;
+use app\entity\CommonEntity;
+use app\entity\data\store\StoreProductEntity;
 use think\Exception;
 use think\facade\Db;
 
@@ -415,4 +418,34 @@ class ProductDao extends BaseDao
             'is_gift_bag'   => 0,
         ];
     }
+
+    /**
+     * @param array $idList
+     * @return CommonEntity[]
+     */
+    public function getUserSignGongxianEntityListByIdList(array $idList): array
+    {
+        $entityList = [];
+        try {
+            /** @var model $model */
+            $model = $this->getModel();
+            $dataRes = $model::getDB()
+                ->whereIn('product_id', $idList)
+                ->where('is_del', '=', ProductEnum::IS_DEL['No']['code'])
+                ->where('status', '=', ProductEnum::STATUS['Approved']['code'])
+                ->where('is_used', '=', ProductEnum::IS_USED['Yes']['code'])
+                ->where('is_show', '=', ProductEnum::IS_SHOW['Yes']['code'])
+                ->where('mer_status', '=', ProductEnum::MER_STATUS['Yes']['code'])
+                ->select()
+                ->toArray();
+            if (!empty($dataRes)) {
+                $entityList = array_map(function ($data) {
+                    return StoreProductEntity::newInstance($data);
+                }, $dataRes);
+            }
+        } catch (\Exception $e) {
+
+        }
+        return $entityList;
+    }
 }

app/common/dao/store/shipping/ShippingTemplateDao.php

@@ -7,6 +7,8 @@
  */
 namespace app\common\dao\store\shipping;
 
+use app\common\model\store\shipping\ShippingTemplate;
+use app\entity\data\shipping\ShippingTemplateEntity;
 use think\facade\Db;
 use app\common\dao\BaseDao;
 use app\common\model\store\shipping\ShippingTemplate as model;
@@ -86,4 +88,26 @@ class ShippingTemplateDao  extends BaseDao
     {
         return ($this->getModel())::getDB()->where('mer_id',$merId)->field('shipping_template_id,name')->select();
     }
+
+    /**
+     * @param int $shippingTemplateId
+     * @return \app\entity\CommonEntity
+     */
+    public function getShippingTemplateEntityByShippingTemplateId(int $shippingTemplateId): \app\entity\CommonEntity
+    {
+        $data = [];
+        try {
+            /** @var ShippingTemplate $model */
+            $model = $this->getModel();
+            $dataRes = $model::getDB()
+                ->where('shipping_template_id', '=', $shippingTemplateId)
+                ->find();
+            if (!empty($dataRes)) {
+                $data = $dataRes->toArray();
+            }
+        } catch (\Exception $e) {
+
+        }
+        return ShippingTemplateEntity::newInstance($data);
+    }
 }

app/common/dao/store/shipping/ShippingTemplateFreeDao.php

@@ -7,6 +7,7 @@
  */
 namespace app\common\dao\store\shipping;
 
+use app\entity\data\shipping\ShippingTemplateFreeEntity;
 use think\facade\Db;
 use app\common\dao\BaseDao;
 use app\common\model\store\shipping\ShippingTemplateFree as model;
@@ -64,4 +65,29 @@ class ShippingTemplateFreeDao  extends BaseDao
     {
         return ($this->getModel()::getDB())->insertAll($data);
     }
+
+    /**
+     * @param int $tempId
+     * @return ShippingTemplateFreeEntity[]
+     */
+    public function getShippingTemplateFreeEntityListByTempId(int $tempId): array
+    {
+        $entityList = [];
+        try {
+            /** @var model $model */
+            $model = $this->getModel();
+            $dataListRes = $model::getDB()
+                ->where('temp_id', '=', $tempId)
+                ->order('shipping_template_free_id DESC')
+                ->select()
+                ->toArray();
+            if (!empty($dataListRes)) {
+                foreach ($dataListRes as $data) {
+                    $entityList[] = ShippingTemplateFreeEntity::newInstance($data);
+                }
+            }
+        } catch (\Exception $e) {
+        }
+        return $entityList;
+    }
 }

app/common/dao/store/shipping/ShippingTemplateRegionDao.php

@@ -7,6 +7,7 @@
  */
 namespace app\common\dao\store\shipping;
 
+use app\entity\data\shipping\ShippingTemplateRegionEntity;
 use think\facade\Db;
 use app\common\dao\BaseDao;
 use app\common\model\store\shipping\ShippingTemplateRegion as model;
@@ -64,4 +65,28 @@ class ShippingTemplateRegionDao  extends BaseDao
         return ($this->getModel()::getDB())->insertAll($data);
     }
 
+    /**
+     * @param int $tempId
+     * @return ShippingTemplateRegionEntity[]
+     */
+    public function getShippingTemplateRegionEntityListByTempId(int $tempId): array
+    {
+        $entityList = [];
+        try {
+            /** @var model $model */
+            $model = $this->getModel();
+            $dataListRes = $model::getDB()
+                ->where('temp_id', '=', $tempId)
+                ->order('shipping_template_region_id DESC')
+                ->select()
+                ->toArray();
+            if (!empty($dataListRes)) {
+                foreach ($dataListRes as $data) {
+                    $entityList[] = ShippingTemplateRegionEntity::newInstance($data);
+                }
+            }
+        } catch (\Exception $e) {
+        }
+        return $entityList;
+    }
 }

app/common/dao/store/shipping/ShippingTemplateUndeliveryDao.php

@@ -8,6 +8,7 @@ namespace app\common\dao\store\shipping;
 
 use app\common\dao\BaseDao;
 use app\common\model\store\shipping\ShippingTemplateUndelivery as model;
+use app\entity\data\shipping\ShippingTemplateUndeliveryEntity;
 
 class ShippingTemplateUndeliveryDao  extends BaseDao
 {
@@ -51,4 +52,28 @@ class ShippingTemplateUndeliveryDao  extends BaseDao
         if($temp_id)
             ($this->getModel())::getDB()->where('temp_id','in',$temp_id)->delete();
     }
+
+    /**
+     * @param int $tempId
+     * @return ShippingTemplateUndeliveryEntity[]
+     */
+    public function getShippingTemplateUndeliveryEntityListByTempId(int $tempId): array
+    {
+        $entityList = [];
+        try {
+            /** @var model $model */
+            $model = $this->getModel();
+            $dataListRes = $model::getDB()
+                ->where('temp_id', '=', $tempId)
+                ->select()
+                ->toArray();
+            if (!empty($dataListRes)) {
+                foreach ($dataListRes as $data) {
+                    $entityList[] = ShippingTemplateUndeliveryEntity::newInstance($data);
+                }
+            }
+        } catch (\Exception $e) {
+        }
+        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/system/merchant/MerchantDao.php

@@ -12,8 +12,11 @@ namespace app\common\dao\system\merchant;
 
 
 use app\common\dao\BaseDao;
+use app\common\enum\merchant\MerchantEnum;
 use app\common\model\system\merchant\Merchant;
 use app\common\model\user\User;
+use app\entity\CommonEntity;
+use app\entity\data\merchant\MerchantEntity;
 use think\db\BaseQuery;
 use think\db\exception\DataNotFoundException;
 use think\db\exception\DbException;
@@ -226,4 +229,53 @@ class MerchantDao extends BaseDao
     }
 
 
+    /**
+     * 根据 商户ID 获取 未删除的 商户信息
+     * @param int $merId
+     * @return \app\entity\CommonEntity
+     */
+    public function getMerchantEntityByMerchantId(int $merId): \app\entity\CommonEntity
+    {
+        $data = [];
+        try {
+            /** @var Merchant $model */
+            $model = $this->getModel();
+            $dataRes = $model::getDB()
+                ->where('mer_id', '=', $merId)
+                ->where('is_del', '=', MerchantEnum::IS_DEL['No']['code'])
+                ->find();
+            if (!empty($dataRes)) {
+                $data = $dataRes->toArray();
+            }
+        } catch (\Exception $e) {
+
+        }
+        return MerchantEntity::newInstance($data);
+    }
+
+    /**
+     * @param array $idList
+     * @return CommonEntity[]
+     */
+    public function getMerchantEntityListByMerchantIdList(array $idList): array
+    {
+        $entityList = [];
+        try {
+            /** @var Merchant $model */
+            $model = $this->getModel();
+            $dataRes = $model::getDB()
+                ->whereIn('mer_id', $idList)
+                ->where('is_del', '=', MerchantEnum::IS_DEL['No']['code'])
+                ->select()
+                ->toArray();
+            if (!empty($dataRes)) {
+                $entityList = array_map(function ($data) {
+                    return MerchantEntity::newInstance($data);
+                }, $dataRes);
+            }
+        } catch (\Exception $e) {
+
+        }
+        return $entityList;
+    }
 }

app/common/dao/user/UserAddressDao.php

@@ -12,7 +12,10 @@ namespace app\common\dao\user;
 
 
 use app\common\dao\BaseDao;
+use app\common\enum\CommonEnum;
 use app\common\model\user\UserAddress as model;
+use app\entity\CommonEntity;
+use app\entity\data\user\UserAddressEntity;
 
 class UserAddressDao extends BaseDao
 {
@@ -42,4 +45,28 @@ class UserAddressDao extends BaseDao
     {
         return (($this->getModel()::getDB())->where('uid',$uid));
     }
+
+    /**
+     * 根据 地址ID 获取地址实体
+     * @param int $addressId
+     * @return CommonEntity
+     */
+    public function getAddressEntityByAddressId(int $addressId): CommonEntity
+    {
+        $addressData = [];
+        try {
+            /** @var model $model */
+            $model = $this->getModel();
+            $addressDataRes = $model::getDB()
+                ->where('address_id', '=', $addressId)
+                ->where('is_del', '=', CommonEnum::IS_DEL['No']['code'])
+                ->find();
+            if (!empty($addressDataRes)) {
+                $addressData = $addressDataRes->toArray();
+            }
+        } catch (\Exception $e) {
+
+        }
+        return UserAddressEntity::newInstance($addressData);
+    }
 }

app/common/dao/user/UserBillDao.php

@@ -12,8 +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
@@ -186,4 +192,66 @@ class UserBillDao extends BaseDao
         return UserBill::getDB()->group('type')->column('title,type');
     }
 
+    /**
+     * @param array $billIdList
+     * @return UserBillEntity[]
+     */
+    public function getUserBillEntityListByBillIdList(array $billIdList): array
+    {
+        $entityList = [];
+        try {
+            $dataList = UserBill::getDB()
+                ->whereIn('bill_id', $billIdList)
+                ->select()
+                ->toArray();
+            if (!empty($dataList)) {
+                $entityList = array_map(function ($data) {
+                    return UserBillEntity::newInstance($data);
+                }, $dataList);
+            }
+        } catch (DataNotFoundException|ModelNotFoundException|DbException $e) {
+
+        }
+        return $entityList;
+    }
+
+    /**
+     * @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('link_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;
+    }
+
+    /**
+     * 批量更新
+     * @param $dataList
+     * @return array
+     */
+    public function saveAll($dataList): array
+    {
+        try {
+            return $this->getModel()::getInstance()->allowField(array_keys(reset($dataList)))->saveAll($dataList)->toArray();
+        } catch (\Exception $e) {
+            return [];
+        }
+    }
 }

app/common/dao/user/UserCertification.php

@@ -1,40 +0,0 @@
-<?php
-/**
- * @package merchant
- *
- * @author xaboy
- * @day 2020-04-28
- *
- * 
- */
-
-namespace app\common\dao\user;
-
-
-use app\common\dao\BaseDao;
-use app\common\model\BaseModel;
-
-
-/**
- * Class UserDao
- * @package app\common\dao\user
- * @author xaboy
- * @day 2020-04-28
- */
-class UserCertification extends BaseDao
-{
-
-    /**
-     * @return BaseModel
-     * @author xaboy
-     * @day 2020-03-30
-     */
-    protected function getModel(): string
-    {
-        return \app\common\model\user\UserCertification::class;
-    }
-
-
-
-
-}

app/common/dao/user/UserCertificationDao.php

@@ -0,0 +1,102 @@
+<?php
+/**
+ * @package merchant
+ *
+ * @author xaboy
+ * @day 2020-04-28
+ *
+ *
+ */
+
+namespace app\common\dao\user;
+
+
+use app\common\dao\BaseDao;
+use app\common\model\BaseModel;
+use app\common\model\user\UserCertification;
+use app\entity\data\user\UserCertificationEntity;
+use think\db\exception\DataNotFoundException;
+use think\db\exception\DbException;
+use think\db\exception\ModelNotFoundException;
+
+
+/**
+ * Class UserDao
+ * @package app\common\dao\user
+ * @author xaboy
+ * @day 2020-04-28
+ */
+class UserCertificationDao extends BaseDao
+{
+
+    /**
+     * @return BaseModel
+     * @author xaboy
+     * @day 2020-03-30
+     */
+    protected function getModel(): string
+    {
+        return UserCertification::class;
+    }
+
+    /**
+     * @param array $idList
+     * @return UserCertificationEntity[]
+     */
+    public function getUserCertificationEntityListByIdList(array $idList): array
+    {
+        $entityList = [];
+        try {
+            $dataList = UserCertification::getDB()
+                ->whereIn('id', $idList)
+                ->select()
+                ->toArray();
+            if (!empty($dataList)) {
+                $entityList = array_map(function ($data) {
+                    return UserCertificationEntity::newInstance($data);
+                }, $dataList);
+            }
+        } catch (DataNotFoundException|ModelNotFoundException|DbException $e) {
+
+        }
+        return $entityList;
+    }
+
+    /**
+     * @param array $uidList
+     * @return UserCertificationEntity[]
+     */
+    public function getUserCertificationEntityListByUidList(array $uidList): array
+    {
+        $entityList = [];
+        try {
+            $dataList = UserCertification::getDB()
+                ->whereIn('uid', $uidList)
+                ->select()
+                ->toArray();
+            if (!empty($dataList)) {
+                $entityList = array_map(function ($data) {
+                    return UserCertificationEntity::newInstance($data);
+                }, $dataList);
+            }
+        } catch (DataNotFoundException|ModelNotFoundException|DbException $e) {
+
+        }
+        return $entityList;
+    }
+
+    /**
+     * @param $mobile
+     * @return array|\think\db\BaseQuery|\think\Model|null
+     * @throws DataNotFoundException
+     * @throws DbException
+     * @throws ModelNotFoundException
+     * @author 史晨
+     * @date 2025/10/20 17:21
+     * 获取用户实名信息
+     */
+    public function getUserCertification($mobile)
+    {
+        return $this->getModel()::getDB()->where('mobile', $mobile)->find();
+    }
+}

app/common/dao/user/UserDao.php

@@ -12,9 +12,12 @@ namespace app\common\dao\user;
 
 
 use app\common\dao\BaseDao;
+use app\common\enum\user\UserEnum;
 use app\common\model\BaseModel;
 use app\common\model\user\User;
 use app\common\repositories\user\UserRepository;
+use app\entity\CommonEntity;
+use app\entity\data\user\UserEntity;
 use think\db\BaseQuery;
 use think\db\exception\DataNotFoundException;
 use think\db\exception\DbException;
@@ -406,4 +409,51 @@ class UserDao extends BaseDao
         return $this::getModel()::getDB()->where('test_user', '=', 1)->whereOr('is_del', '=', 1)->column('uid');
     }
 
+    /**
+     * @param array $uidList
+     * @return UserEntity[]
+     */
+    public function getUserEntityListByUidList(array $uidList): array
+    {
+        $entityList = [];
+        try {
+            $dataList = User::getDB()
+                ->whereIn('uid', $uidList)
+                ->where('is_del', '=', UserEnum::IS_DEL['No']['code'])
+                ->select()
+                ->toArray();
+            if (!empty($dataList)) {
+                $entityList = array_map(function ($data) {
+                    return UserEntity::newInstance($data);
+                }, $dataList);
+            }
+        } catch (DataNotFoundException|ModelNotFoundException|DbException $e) {
+
+        }
+        return $entityList;
+    }
+
+    /**
+     * 批量更新
+     * @param $dataList
+     * @return array
+     */
+    public function saveAll($dataList): array
+    {
+        try {
+            return $this->getModel()::getInstance()->allowField(array_keys(reset($dataList)))->saveAll($dataList)->toArray();
+        } catch (\Exception $e) {
+            return [];
+        }
+    }
+
+    /**
+     * @param $userId
+     * @return array
+     * 获取直推用户ID
+     */
+    public function getDirectUserIds($userId)
+    {
+        return $this::getModel()::getDB()->where('level_id', '=', $userId)->column('uid');
+    }
 }

app/common/dao/user/UserPvLogDao.php

@@ -0,0 +1,89 @@
+<?php
+
+namespace app\common\dao\user;
+
+use app\common\dao\BaseDao;
+use app\common\enum\user\UserPvLogEnum;
+use app\common\model\BaseModel;
+use app\common\model\user\UserPvLog;
+use app\entity\CommonEntity;
+use app\entity\data\user\UserPvLogEntity;
+use think\db\exception\DataNotFoundException;
+use think\db\exception\DbException;
+use think\db\exception\ModelNotFoundException;
+
+class UserPvLogDao extends BaseDao
+{
+    /**
+     * @return BaseModel
+     */
+    protected function getModel(): string
+    {
+        return UserPvLog::class;
+    }
+
+    /**
+     * @param array $idList
+     * @return CommonEntity[]
+     */
+    public function getUserPvLogEntityListByIdList(array $idList): array
+    {
+        $entityList = [];
+        try {
+            /** @var UserPvLog $model */
+            $model = $this->getModel();
+            $dataRes = $model::getDB()
+                ->whereIn('id', $idList)
+                ->select()
+                ->toArray();
+            if (!empty($dataRes)) {
+                $entityList = array_map(function ($data) {
+                    return UserPvLogEntity::newInstance($data);
+                }, $dataRes);
+            }
+        } catch (\Exception $e) {
+
+        }
+        return $entityList;
+    }
+
+    /**
+     * @param string $orderType
+     * @param array $orderIdList
+     * @return UserPvLogEntity[]
+     */
+    public function getUserPvLogEntityListByOrderIdListAndPending(string $orderType, array $orderIdList): array
+    {
+        $entityList = [];
+        try {
+            $dataList = UserPvLog::getDB()
+                ->where('order_type', '=', $orderType)
+                ->whereIn('order_id', $orderIdList)
+                ->where('status', '=', UserPvLogEnum::STATUS['PendingConfirmation']['code'])
+                ->select()
+                ->toArray();
+            if (!empty($dataList)) {
+                $entityList = array_map(function ($data) {
+                    return UserPvLogEntity::newInstance($data);
+                }, $dataList);
+            }
+        } catch (DataNotFoundException|ModelNotFoundException|DbException $e) {
+
+        }
+        return $entityList;
+    }
+
+    /**
+     * 批量更新
+     * @param $dataList
+     * @return array
+     */
+    public function saveAll($dataList): array
+    {
+        try {
+            return $this->getModel()::getInstance()->allowField(array_keys(reset($dataList)))->saveAll($dataList)->toArray();
+        } catch (\Exception $e) {
+            return [];
+        }
+    }
+}

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/dao/user/UserSignFugouDao.php

@@ -0,0 +1,91 @@
+<?php
+
+namespace app\common\dao\user;
+
+use app\common\dao\BaseDao;
+use app\common\enum\user\UserSignFugouEnum;
+use app\common\model\BaseModel;
+use app\common\model\user\UserSignFugou;
+use app\entity\CommonEntity;
+use app\entity\data\user\UserSignFugouEntity;
+use think\db\exception\DataNotFoundException;
+use think\db\exception\DbException;
+use think\db\exception\ModelNotFoundException;
+
+class UserSignFugouDao extends BaseDao
+{
+    /**
+     * @return BaseModel
+     */
+    protected function getModel(): string
+    {
+        return UserSignFugou::class;
+    }
+
+    /**
+     * @param array $idList
+     * @return CommonEntity[]
+     */
+    public function getUserSignFugouEntityListByIdList(array $idList): array
+    {
+        $entityList = [];
+        try {
+            /** @var UserSignFugou $model */
+            $model = $this->getModel();
+            $dataRes = $model::getDB()
+                ->whereIn('id', $idList)
+                ->select()
+                ->toArray();
+            if (!empty($dataRes)) {
+                $entityList = array_map(function ($data) {
+                    return UserSignFugouEntity::newInstance($data);
+                }, $dataRes);
+            }
+        } catch (\Exception $e) {
+
+        }
+        return $entityList;
+    }
+
+    /**
+     * @param string $orderType
+     * @param array $orderIdList
+     * @return UserSignFugouEntity[]
+     */
+    public function getUserSignFugouEntityListByOrderIdListAndPending(string $orderType, array $orderIdList): array
+    {
+        $entityList = [];
+        try {
+            /** @var UserSignFugou $model */
+            $model = $this->getModel();
+            $dataList = $model::getDB()
+                ->where('order_type', '=', $orderType)
+                ->whereIn('order_id', $orderIdList)
+                ->where('status', '=', UserSignFugouEnum::STATUS['Pending']['code'])
+                ->select()
+                ->toArray();
+            if (!empty($dataList)) {
+                $entityList = array_map(function ($data) {
+                    return UserSignFugouEntity::newInstance($data);
+                }, $dataList);
+            }
+        } catch (DataNotFoundException|ModelNotFoundException|DbException $e) {
+
+        }
+        return $entityList;
+    }
+
+    /**
+     * 批量更新
+     * @param $dataList
+     * @return array
+     */
+    public function saveAll($dataList): array
+    {
+        try {
+            return $this->getModel()::getInstance()->allowField(array_keys(reset($dataList)))->saveAll($dataList)->toArray();
+        } catch (\Exception $e) {
+            return [];
+        }
+    }
+}

app/common/dao/user/UserSignGongxianDao.php

@@ -0,0 +1,89 @@
+<?php
+
+namespace app\common\dao\user;
+
+use app\common\dao\BaseDao;
+use app\common\enum\user\UserSignGongxianEnum;
+use app\common\model\BaseModel;
+use app\common\model\user\UserSignGongxian;
+use app\entity\CommonEntity;
+use app\entity\data\user\UserSignGongxianEntity;
+use think\db\exception\DataNotFoundException;
+use think\db\exception\DbException;
+use think\db\exception\ModelNotFoundException;
+
+class UserSignGongxianDao extends BaseDao
+{
+    /**
+     * @return BaseModel
+     */
+    protected function getModel(): string
+    {
+        return UserSignGongxian::class;
+    }
+
+    /**
+     * @param array $idList
+     * @return CommonEntity[]
+     */
+    public function getUserSignGongxianEntityListByIdList(array $idList): array
+    {
+        $entityList = [];
+        try {
+            /** @var UserSignGongxian $model */
+            $model = $this->getModel();
+            $dataRes = $model::getDB()
+                ->whereIn('id', $idList)
+                ->select()
+                ->toArray();
+            if (!empty($dataRes)) {
+                $entityList = array_map(function ($data) {
+                    return UserSignGongxianEntity::newInstance($data);
+                }, $dataRes);
+            }
+        } catch (\Exception $e) {
+
+        }
+        return $entityList;
+    }
+
+    /**
+     * @param string $orderType
+     * @param array $orderIdList
+     * @return UserSignGongxianEntity[]
+     */
+    public function getUserSignGongxianEntityListByOrderIdListAndPending(string $orderType, array $orderIdList): array
+    {
+        $entityList = [];
+        try {
+            $dataList = UserSignGongxian::getDB()
+                ->where('order_type', '=', $orderType)
+                ->whereIn('order_id', $orderIdList)
+                ->where('status', '=', UserSignGongxianEnum::STATUS['PendingConfirmation']['code'])
+                ->select()
+                ->toArray();
+            if (!empty($dataList)) {
+                $entityList = array_map(function ($data) {
+                    return UserSignGongxianEntity::newInstance($data);
+                }, $dataList);
+            }
+        } catch (DataNotFoundException|ModelNotFoundException|DbException $e) {
+
+        }
+        return $entityList;
+    }
+
+    /**
+     * 批量更新
+     * @param $dataList
+     * @return array
+     */
+    public function saveAll($dataList): array
+    {
+        try {
+            return $this->getModel()::getInstance()->allowField(array_keys(reset($dataList)))->saveAll($dataList)->toArray();
+        } catch (\Exception $e) {
+            return [];
+        }
+    }
+}

app/common/dao/user/UserSignHongbaoDao.php

@@ -0,0 +1,89 @@
+<?php
+
+namespace app\common\dao\user;
+
+use app\common\dao\BaseDao;
+use app\common\enum\user\UserSignHongbaoEnum;
+use app\common\model\BaseModel;
+use app\common\model\user\UserSignHongbao;
+use app\entity\CommonEntity;
+use app\entity\data\user\UserSignHongbaoEntity;
+use think\db\exception\DataNotFoundException;
+use think\db\exception\DbException;
+use think\db\exception\ModelNotFoundException;
+
+class UserSignHongbaoDao extends BaseDao
+{
+    /**
+     * @return BaseModel
+     */
+    protected function getModel(): string
+    {
+        return UserSignHongbao::class;
+    }
+
+    /**
+     * @param array $idList
+     * @return CommonEntity[]
+     */
+    public function getUserSignHongbaoEntityListByIdList(array $idList): array
+    {
+        $entityList = [];
+        try {
+            /** @var UserSignHongbao $model */
+            $model = $this->getModel();
+            $dataRes = $model::getDB()
+                ->whereIn('id', $idList)
+                ->select()
+                ->toArray();
+            if (!empty($dataRes)) {
+                $entityList = array_map(function ($data) {
+                    return UserSignHongbaoEntity::newInstance($data);
+                }, $dataRes);
+            }
+        } catch (\Exception $e) {
+
+        }
+        return $entityList;
+    }
+
+    /**
+     * @param string $orderType
+     * @param array $orderIdList
+     * @return UserSignHongbaoEntity[]
+     */
+    public function getUserSignHongbaoEntityListByOrderIdListAndPending(string $orderType, array $orderIdList): array
+    {
+        $entityList = [];
+        try {
+            $dataList = UserSignHongbao::getDB()
+                ->where('order_type', '=', $orderType)
+                ->whereIn('order_id', $orderIdList)
+                ->where('status', '=', UserSignHongbaoEnum::STATUS['PendingConfirmation']['code'])
+                ->select()
+                ->toArray();
+            if (!empty($dataList)) {
+                $entityList = array_map(function ($data) {
+                    return UserSignHongbaoEntity::newInstance($data);
+                }, $dataList);
+            }
+        } catch (DataNotFoundException|ModelNotFoundException|DbException $e) {
+
+        }
+        return $entityList;
+    }
+
+    /**
+     * 批量更新
+     * @param $dataList
+     * @return array
+     */
+    public function saveAll($dataList): array
+    {
+        try {
+            return $this->getModel()::getInstance()->allowField(array_keys(reset($dataList)))->saveAll($dataList)->toArray();
+        } catch (\Exception $e) {
+            return [];
+        }
+    }
+}

app/common/dao/user/UserSignJingdouDao.php

@@ -0,0 +1,41 @@
+<?php
+
+namespace app\common\dao\user;
+
+use app\common\dao\BaseDao;
+use app\common\model\user\UserSignJingdou;
+use app\entity\CommonEntity;
+use app\entity\data\user\UserSignJingdouEntity;
+
+class UserSignJingdouDao extends BaseDao
+{
+    protected function getModel(): string
+    {
+        return UserSignJingdou::class;
+    }
+
+    /**
+     * @param array $idList
+     * @return CommonEntity[]
+     */
+    public function getStoreSignJingdouEntityListByIdList(array $idList): array
+    {
+        $entityList = [];
+        try {
+            /** @var UserSignJingdou $model */
+            $model = $this->getModel();
+            $dataRes = $model::getDB()
+                ->whereIn('id', $idList)
+                ->select()
+                ->toArray();
+            if (!empty($dataRes)) {
+                $entityList = array_map(function ($data) {
+                    return UserSignJingdouEntity::newInstance($data);
+                }, $dataRes);
+            }
+        } catch (\Exception $e) {
+
+        }
+        return $entityList;
+    }
+}

app/common/dao/user/UserSignScoreDao.php

@@ -0,0 +1,90 @@
+<?php
+
+namespace app\common\dao\user;
+
+use app\common\dao\BaseDao;
+use app\common\enum\user\UserSignScoreEnum;
+use app\common\model\BaseModel;
+use app\common\model\user\UserSignScore;
+use app\entity\CommonEntity;
+use app\entity\data\user\UserSignScoreEntity;
+use think\db\exception\DataNotFoundException;
+use think\db\exception\DbException;
+use think\db\exception\ModelNotFoundException;
+use think\facade\Log;
+
+class UserSignScoreDao extends BaseDao
+{
+    /**
+     * @return BaseModel
+     */
+    protected function getModel(): string
+    {
+        return UserSignScore::class;
+    }
+
+    /**
+     * @param array $idList
+     * @return CommonEntity[]
+     */
+    public function getUserSignScoreEntityListByIdList(array $idList): array
+    {
+        $entityList = [];
+        try {
+            /** @var UserSignScore $model */
+            $model = $this->getModel();
+            $dataRes = $model::getDB()
+                ->whereIn('id', $idList)
+                ->select()
+                ->toArray();
+            if (!empty($dataRes)) {
+                $entityList = array_map(function ($data) {
+                    return UserSignScoreEntity::newInstance($data);
+                }, $dataRes);
+            }
+        } catch (\Exception $e) {
+
+        }
+        return $entityList;
+    }
+
+    /**
+     * @param string $orderType
+     * @param array $orderIdList
+     * @return UserSignScoreEntity[]
+     */
+    public function getUserSignScoreEntityListByOrderIdListAndPending(string $orderType, array $orderIdList): array
+    {
+        $entityList = [];
+        try {
+            $dataList = UserSignScore::getDB()
+                ->where('order_type', '=', $orderType)
+                ->whereIn('order_id', $orderIdList)
+                ->where('status', '=', UserSignScoreEnum::STATUS['Pending']['code'])
+                ->select()
+                ->toArray();
+            if (!empty($dataList)) {
+                $entityList = array_map(function ($data) {
+                    return UserSignScoreEntity::newInstance($data);
+                }, $dataList);
+            }
+        } catch (DataNotFoundException|ModelNotFoundException|DbException $e) {
+
+        }
+        return $entityList;
+    }
+
+    /**
+     * 批量更新
+     * @param $dataList
+     * @return array
+     */
+    public function saveAll($dataList): array
+    {
+        try {
+            return $this->getModel()::getInstance()->allowField(array_keys(reset($dataList)))->saveAll($dataList)->toArray();
+        } catch (\Exception $e) {
+            return [];
+        }
+    }
+}

app/common/dao/user/UserSignVrDao.php

@@ -0,0 +1,59 @@
+<?php
+
+namespace app\common\dao\user;
+
+use app\common\dao\BaseDao;
+use app\common\model\BaseModel;
+use app\common\model\user\UserSignVr;
+use app\entity\CommonEntity;
+use app\entity\data\user\UserSignVrEntity;
+
+class UserSignVrDao extends BaseDao
+{
+    /**
+     * @return BaseModel
+     */
+    protected function getModel(): string
+    {
+        return UserSignVr::class;
+    }
+
+    /**
+     * @param array $idList
+     * @return CommonEntity[]
+     */
+    public function getUserSignVrEntityListByIdList(array $idList): array
+    {
+        $entityList = [];
+        try {
+            /** @var UserSignVr $model */
+            $model = $this->getModel();
+            $dataRes = $model::getDB()
+                ->whereIn('id', $idList)
+                ->select()
+                ->toArray();
+            if (!empty($dataRes)) {
+                $entityList = array_map(function ($data) {
+                    return UserSignVrEntity::newInstance($data);
+                }, $dataRes);
+            }
+        } catch (\Exception $e) {
+
+        }
+        return $entityList;
+    }
+
+    /**
+     * 批量更新
+     * @param $dataList
+     * @return array
+     */
+    public function saveAll($dataList): array
+    {
+        try {
+            return $this->getModel()::getInstance()->allowField(array_keys(reset($dataList)))->saveAll($dataList)->toArray();
+        } catch (\Exception $e) {
+            return [];
+        }
+    }
+}

app/common/dao/user/ZeroUserLineDao.php

@@ -0,0 +1,30 @@
+<?php
+/**
+ * zero user line dao
+ */
+namespace app\common\dao\user;
+
+
+use app\common\dao\BaseDao;
+use app\common\model\user\ZeroUserLine;
+
+class ZeroUserLineDao extends BaseDao
+{
+    protected function getModel(): string
+    {
+        return ZeroUserLine::class;
+    }
+
+    /**
+     * @param $where
+     * @param $page
+     * @param $limit
+     * @return mixed
+     * 获取列表
+     */
+    public function getList($where, $page, $limit)
+    {
+        $model = $this->getModel();
+        return $model::getDB()->where($where)->order('id','desc')->paginate(['page' => $page, 'list_rows' => $limit]);
+    }
+}

app/common/enum/CommonEnum.php

@@ -0,0 +1,255 @@
+<?php
+
+namespace app\common\enum;
+
+class CommonEnum
+{
+
+    // 系统指定的 商户ID
+    const DESIGN_MERCHANT_ID = [
+        'MemberZone' => ['code' => 496, 'name' => '会员专区'],
+        'WonderfulLiving' => ['code' => 439, 'name' => '精彩生活区'],
+        'Repurchase' => ['code' => 491, 'name' => '复购区'],
+    ];
+
+
+    const IS_DEL = [
+        'No' => ['code' => 0, 'name' => '未删除'],
+        '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 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 USER_GROUP = [
+        'RegularUser' => ['code' => 1, 'name' => '普通用户'],
+        'Salesperson' => ['code' => 2, 'name' => '业务员'],
+        'SalesManager' => ['code' => 3, 'name' => '业务经理'],
+        'JuniorPartner' => ['code' => 4, 'name' => '初级合伙人'],
+        'Mid-LevelPartner' => ['code' => 5, 'name' => '中级合伙人'],
+        'SeniorPartner' => ['code' => 6, 'name' => '中级合伙人'],
+        'Director' => ['code' => 7, 'name' => '董事']
+    ];
+
+    // 直推奖励的分配比例
+    const DIRECT_REFERRAL_BONUS = [
+        'BrokeragePrice' => ['code' => 0.9, 'name' => '直推奖励的佣金部分'],
+        'Fugou' => ['code' => 0.1, 'name' => '直推奖励的佣金部分']
+    ];
+
+    // 计算式小数点保留位数 超出位数 舍弃
+    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 = [
+        // 精彩生活区
+        'WonderfulLiving' => [
+            'Self' => [
+                'YangLaoJin' => [ // 钱
+                    'Ratio' => ['code' => 0.3, 'name' => '将利润的30%，当做养老金分配给下单人']
+                ],
+                'Hongbao' => [ // 钱
+                    'Ratio' => ['code' => 0.1575, 'name' => '将利润的35% * 45%，当做红包分配给下单人，前提下单人是老用户（35% * 45%）']
+                ],
+                'Score' => [ // 钱
+                    'Ratio' => ['code' => 0.35, 'name' => '将利润的35%，当做积分值分配给下单人']
+                ],
+                'Pv' => [ // 数据 算业绩
+                    'Ratio' => ['code' => 0.35, 'name' => '将利润的35%，当做PV值分配给下单人']
+                ],
+                'Gongxian' => [ // 数据 升级用
+                    'Ratio' => ['code' => 0.35, 'name' => '将利润的35%，当做贡献值分配给下单人']
+                ]
+            ],
+            'Spread' => [
+                'BrokeragePrice' => [
+                    'Ratio' => ['code' => 0.35 * 0.9, 'name' => '将商品利润中 用户身份对应分配比例 的推荐人可分配利润中 35% * 90% ，直推奖励的佣金部分'],
+                ],
+                'Fugou' => [
+                    'Ratio' => ['code' => 0.35 * 0.1, 'name' => '将商品利润中 用户身份对应分配比例 的推荐人可分配利润中 35% * 10% ，直推奖励的复购部分'],
+                ],
+                'Gongxian' => [
+                    'Ratio' => ['code' => 0.35, 'name' => '将利润的35%，当做贡献值分配给推荐人']
+                ],
+                'Score' => [
+                    'Ratio' => ['code' => 0.35, 'name' => '将商品利润中 用户身份对应分配比例 的推荐人可分配利润中 35%，当做积分值分配给推荐人']
+                ],
+                'YangLaoJin' => [
+                    '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%，做为锁客奖励的佣金部分'],
+                ],
+                'Fugou' => [
+                    'Ratio' => ['code' => 0.35 * 0.05 * 0.1, 'name' => '将利润的 35% 中的 5% 中的 10%，做为锁客奖励的复购部分'],
+                ]
+            ]
+        ],
+        'MemberZone' => [
+            'Fixed' => [
+                'Basic' => [ // 售价 => 基础计算价格 (历史原因：原价是1000、2000...等，后来单间成本价上调了180，所以售价调整了，考虑到涨价前后的奖励应保持一致，所以设置了基础计算值)
+                    '1180.00' => 1000.00,
+                    '2360.00' => 2000.00,
+                    '5900.00' => 5000.00,
+                    '9440.00' => 8000.00,
+                    '10620.00' => 9000.00,
+                    '11800.00' => 10000.00
+                ]
+            ],
+            'Self' => [
+                // 养老金比例
+                'YangLaoJin' => [
+                    'Ratio' => ['code' => 0.035, 'name' => '将3.5%，当做养老金分配给下单人']
+                ],
+                'Gongxian' => [
+                    'Ratio' => ['code' => 0.7, 'name' => '将利润的35%，当做贡献值分配给下单人']
+                ],
+                'Pv' => [
+                    'Ratio' => ['code' => 0.7, 'name' => '将70%，当做PV值分配给下单人']
+                ],
+                'Score' => [
+                    'Ratio' => ['code' => 0.7, 'name' => '将利润的35%，当做积分值分配给下单人']
+                ]
+            ],
+            'Spread' => [
+                'IdentityRatio' => [
+                    1 => 0.1,
+                    2 => 0.3,
+                    3 => 0.3,
+                    4 => 0.3,
+                    5 => 0.3,
+                    6 => 0.3,
+                    7 => 0.3,
+                ],
+                'BrokeragePrice' => [
+                    'Ratio' => ['code' => 0.9, 'name' => '直推奖励的佣金部分'],
+                ],
+                'Fugou' => [
+                    'Ratio' => ['code' => 0.1, 'name' => '直推奖励的复购部分'],
+                ],
+                'Gongxian' => [
+                    'Ratio' => ['code' => 0.7, 'name' => '将70%，当做贡献值分配给推荐人'],
+                    'RegularUserRatio' => ['code' => 0.7 * 0.3, 'name' => '将70% * 30%，当做贡献值分配给推荐人(普通用户)'],
+                ],
+                'Score' => [
+                    'Ratio' => ['code' => 0.7, 'name' => '将用户身份等级对应的直推分润的70%，当做积分值分配给推荐人']
+                ],
+                'YangLaoJin' => [
+                    'Ratio' => ['code' => 0.035, 'name' => '将3.5%，当做养老金分配给推荐人']
+                ]
+            ]
+        ],
+        'Repurchase' => [
+            'Self' => [
+                // 养老金比例
+                'YangLaoJin' => [
+                    'Ratio' => ['code' => 0.5, 'name' => '将50%，当做养老金分配给下单人']
+                ]
+            ],
+            'SpreadDirectly' => [
+                // 养老金比例 直接推荐人
+                'YangLaoJin' => [
+                    'Ratio' => ['code' => 0.3, 'name' => '将30%，当做养老金分配给直推人']
+                ]
+            ],
+            'SpreadIndirectly' => [
+                // 养老金比例 间接推荐人
+                'YangLaoJin' => [
+                    'Ratio' => ['code' => 0.2, 'name' => '将20%，当做养老金分配给间推人']
+                ]
+            ]
+        ],
+        'CommercialDistrict' => [
+            'Self' => [
+                'YangLaoJin' => [ // 钱
+                    'Ratio' => ['code' => 0.3, 'name' => '将利润的30%，当做养老金分配给下单人']
+                ],
+                'Hongbao' => [ // 钱
+                    'Ratio' => ['code' => 0.35 * 0.45, 'name' => '将利润的35% * 45%，当做红包分配给下单人，前提下单人是老用户（35% * 45%）']
+                ],
+                'Score' => [ // 钱
+                    'Ratio' => ['code' => 0.35, 'name' => '将利润的35%，当做积分值分配给下单人']
+                ],
+                'Pv' => [ // 数据 算业绩
+                    'Ratio' => ['code' => 0.35, 'name' => '将利润的35%，当做PV值分配给下单人']
+                ],
+                'Gongxian' => [ // 数据 升级用
+                    'Ratio' => ['code' => 0.35, 'name' => '将利润的35%，当做贡献值分配给下单人']
+                ]
+            ],
+            'Spread' => [
+                'BrokeragePrice' => [
+                    'Ratio' => ['code' => 0.35 * 0.9, 'name' => '将商品利润中 用户身份对应分配比例 的推荐人可分配利润中 35% * 90% ，直推奖励的佣金部分'],
+                ],
+                'Fugou' => [
+                    'Ratio' => ['code' => 0.35 * 0.1, 'name' => '将商品利润中 用户身份对应分配比例 的推荐人可分配利润中 35% * 10% ，直推奖励的复购部分'],
+                ],
+                'Gongxian' => [
+                    'Ratio' => ['code' => 0.35, 'name' => '将利润的35%，当做贡献值分配给推荐人']
+                ],
+                'Score' => [
+                    'Ratio' => ['code' => 0.35, 'name' => '将商品利润中 用户身份对应分配比例 的推荐人可分配利润中 35%，当做积分值分配给推荐人']
+                ],
+                'YangLaoJin' => [
+                    'Ratio' => ['code' => 0.35 * 0.5, 'name' => '将利润的35%中的5%，当做养老金分配给推荐人']
+                ]
+            ],
+            'Lock' => [
+                'BrokeragePrice' => [
+                    'Ratio' => ['code' => 0.35 * 0.05 * 0.9, 'name' => '将利润的 35% 中的 5% 中的 90%，做为锁客奖励的佣金部分'],
+                ],
+                'Fugou' => [
+                    'Ratio' => ['code' => 0.35 * 0.05 * 0.1, 'name' => '将利润的 35% 中的 5% 中的 10%，做为锁客奖励的复购部分'],
+                ]
+            ]
+        ]
+    ];
+
+}

app/common/enum/gzc/GzcLogEnum.php

@@ -0,0 +1,27 @@
+<?php
+
+namespace app\common\enum\gzc;
+
+use app\common\enum\CommonEnum;
+
+class GzcLogEnum extends CommonEnum
+{
+    // 账号类型
+    const ACCOUNT_TYPE = [
+        'Bank' => ['code' => 1, 'name' => '银行卡'],
+        'Alipay' => ['code' => 2, 'name' => '支付宝'],
+        'Wxpay' => ['code' => 3, 'name' => '微信'],
+    ];
+
+    // 公证处是否已发起入账
+    const GZC_STATUS = [
+        'NotInitiated' => ['code' => 0, 'name' => '未发起'],
+        'Initiated' => ['code' => 1, 'name' => '已发起'],
+    ];
+
+    // 是否入账成功
+    const SUCCESS_STATUS = [
+        'Failed' => ['code' => 0, 'name' => '入账失败'],
+        'Success' => ['code' => 1, 'name' => '入账成功'],
+    ];
+}

app/common/enum/merchant/MerchantEnum.php

@@ -0,0 +1,64 @@
+<?php
+
+namespace app\common\enum\merchant;
+
+use app\common\enum\CommonEnum;
+
+class MerchantEnum extends CommonEnum
+{
+    const IS_DEL = parent::IS_DEL;
+
+    // 商户类型
+    const MER_TYPE = [
+        'Normal' => ['code' => 0, 'name' => '普通商户'],
+        'Tea' => ['code' => 1, 'name' => '一壶茶'],
+    ];
+
+    // 商户级别
+    const MERCHANT_LEVEL = [
+        'Low' => ['code' => 0, 'name' => '低级商户'],
+        'High' => ['code' => 1, 'name' => '高级商户'],
+    ];
+
+    // 是否体验店
+    const IS_EXPERIENCE = [
+        'No' => ['code' => 0, 'name' => '否'],
+        'Yes' => ['code' => 1, 'name' => '是'],
+    ];
+
+    // 是否连锁店
+    const MER_CHAIN = [
+        'No' => ['code' => 0, 'name' => '不是'],
+        'Yes' => ['code' => 1, 'name' => '是'],
+    ];
+
+    // 是否已缴纳保证金
+    const BZJ = [
+        'No' => ['code' => 0, 'name' => '否'],
+        'Yes' => ['code' => 1, 'name' => '是'],
+    ];
+
+    // 商户状态
+    const MER_STATE = [
+        'Open' => ['code' => 1, 'name' => '开启'],
+        'Close' => ['code' => 0, 'name' => '关闭'],
+    ];
+
+    // 商户审核状态
+    const IS_AUDIT = [
+        'NotAudited' => ['code' => 0, 'name' => '不审核'],
+        'Audited' => ['code' => 1, 'name' => '审核'],
+    ];
+
+    // 海科商户结算状态
+    const HAIKE_SETTLE_STATUS = [
+        'NotSettled' => ['code' => '0', 'name' => '未结算'],
+        'Settled' => ['code' => '1', 'name' => '已结算'],
+    ];
+
+    // 商户是否禁用
+    const STATUS = [
+        'Locked' => ['code' => 0, 'name' => '锁定'],
+        'Normal' => ['code' => 1, 'name' => '正常'],
+    ];
+}

app/common/enum/product/SeckillEnum.php

@@ -0,0 +1,14 @@
+<?php
+
+namespace app\common\enum\product;
+
+use app\common\enum\CommonEnum;
+
+class SeckillEnum extends CommonEnum
+{
+    const STATUS = [
+        'Close' => ['code' => 0, 'name' => '关闭'],
+        'Open' => ['code' => 1, 'name' => '开启'],
+        'Over' => ['code' => 2, 'name' => '已结束']
+    ];
+}

app/common/enum/shipping/ShippingTemplateEnum.php

@@ -0,0 +1,33 @@
+<?php
+
+namespace app\common\enum\shipping;
+
+use app\common\enum\CommonEnum;
+
+class ShippingTemplateEnum extends CommonEnum
+{
+    // 计费方式
+    const TYPE = [
+        'Quantity' => ['code' => 0, 'name' => '数量'],
+        'Weight' => ['code' => 1, 'name' => '重量'],
+        'Volume' => ['code' => 2, 'name' => '体积'],
+    ];
+
+    // 开启指定包邮
+    const APPOINT = [
+        'No' => ['code' => 0, 'name' => '未开启'],
+        'Yes' => ['code' => 1, 'name' => '已开启']
+    ];
+
+    // 开启指定区域不配送
+    const UNDELIVERY = [
+        'No' => ['code' => 0, 'name' => '未开启'],
+        'Yes' => ['code' => 1, 'name' => '已开启']
+    ];
+
+    // 默认模板
+    const IS_DEFAULT = [
+        'No' => ['code' => 0, 'name' => '否'],
+        'Yes' => ['code' => 1, 'name' => '是']
+    ];
+}

app/common/enum/store/CartEnum.php

@@ -0,0 +1,23 @@
+<?php
+
+namespace app\common\enum\store;
+
+use app\common\enum\CommonEnum;
+
+class CartEnum extends CommonEnum
+{
+    const PRODUCT_TYPE = [
+        'Ordinary' => ['code' => 0, 'name' => '普通产品']
+    ];
+
+    const IS_FAIL = [
+        'No' => ['code' => 0, 'name' => '未失效'],
+        'Yes' => ['code' => 1, 'name' => '失效']
+    ];
+
+    // 是否已购买 '0 = 未购买 1 = 已购买'
+    const IS_PAY = [
+        'No' => ['code' => 0, 'name' => '未购买'],
+        'Yes' => ['code' => 1, 'name' => '已购买']
+    ];
+}

app/common/enum/store/ProductEnum.php

@@ -0,0 +1,39 @@
+<?php
+
+namespace app\common\enum\store;
+
+use app\common\enum\CommonEnum;
+
+class ProductEnum extends CommonEnum
+{
+    const IS_DEL = parent::IS_DEL;
+
+    const STATUS = [
+        'Pending' => ['code' => 0, 'name' => '审核中'],
+        'Approved' => ['code' => 1, 'name' => '审核通过'],
+        'Rejected' => ['code' => -1, 'name' => '未通过'],
+        'Withdrawn' => ['code' => -2, 'name' => '下架'],
+    ];
+
+    const IS_SHOW = [
+        'No' => ['code' => 0, 'name' => '未上架'],
+        'Yes' => ['code' => 1, 'name' => '上架']
+    ];
+
+    const IS_USED = [
+        'No' => ['code' => 0, 'name' => '隐藏'],
+        'Yes' => ['code' => 1, 'name' => '显示']
+    ];
+
+    const MER_STATUS = [
+        'No' => ['code' => 0, 'name' => '非正常'],
+        'Yes' => ['code' => 1, 'name' => '正常']
+    ];
+
+
+    // 是否秒杀
+    const SECKILL = [
+        'No' => ['code' => 0, 'name' => '否'],
+        'Yes' => ['code' => 1, 'name' => '是']
+    ];
+}

app/common/enum/store/SeckillActiveEnum.php

@@ -0,0 +1,13 @@
+<?php
+
+namespace app\common\enum\store;
+
+use app\common\enum\CommonEnum;
+
+class SeckillActiveEnum extends CommonEnum
+{
+    const STATUS = [
+        'Active' => ['code' => 0, 'name' => '进行中'],
+        'Finish' => ['code' => 1, 'name' => '已结束']
+    ];
+}

app/common/enum/store/StoreCouponUserEnum.php

@@ -0,0 +1,22 @@
+<?php
+
+namespace app\common\enum\store;
+
+use app\common\enum\CommonEnum;
+
+class StoreCouponUserEnum extends CommonEnum
+{
+
+    const STATUS = [
+        'Unused' => ['code' => 0, 'name' => '未使用'],
+        'Used' => ['code' => 1, 'name' => '已使用'],
+        'Expired' => ['code' => 2, 'name' => '已过期'],
+    ];
+
+    const IS_FAIL = [
+        'No' => ['code' => 0, 'name' => '未失效'],
+        'Yes' => ['code' => 1, 'name' => '失效']
+    ];
+
+
+}

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

@@ -0,0 +1,116 @@
+<?php
+
+namespace app\common\enum\store;
+
+use app\common\enum\CommonEnum;
+
+class StoreOrderEnum extends CommonEnum
+{
+    // 配送方式
+    const DISTRIBUTION_MODE = [
+        'ExpressDelivery' => ['code' => 1, 'name' => '快递'],
+        'Self-Pickup' => ['code' => 2, 'name' => '自提'],
+        'MerchantDelivery' => ['code' => 3, 'name' => '配送']
+    ];
+
+    // 订单类型
+    const DOHUOMALL = [
+        'PlatformOrder' => ['code' => 0, 'name' => '平台订单'],
+        'SupplyChainOrder' => ['code' => 1, 'name' => '供应链订单']
+    ];
+
+    // 供应链订单状态
+    const DOHUOMALL_STATUS = [
+        'Failed' => ['code' => 0, 'name' => '失败'],
+        'PendingPayment' => ['code' => 1, 'name' => '待付款'],
+        'PendingShipment' => ['code' => 2, 'name' => '待发货'],
+        'PendingReceipt' => ['code' => 3, 'name' => '待收货'],
+        'Completed' => ['code' => 4, 'name' => '已完成'],
+        'Cancelled' => ['code' => 5, 'name' => '已取消'],
+        'InAfterSale' => ['code' => 6, 'name' => '售后中'],
+        'AfterSaleCompleted' => ['code' => 7, 'name' => '售后完成'],
+        'Rejected' => ['code' => 8, 'name' => '拒收'],
+        'NotSubmittedToWeiweiBao' => ['code' => 9, 'name' => '还未提交到微唯保']
+    ];
+
+    // 组合支付类型 （考虑到这个区分 A或B 在此步骤毫无意义，划分混乱） A：会员专区 B：精彩生活区 C：复购区
+    const FZONE_PAY_TYPE = [
+        'B1-VR+Score' => ['code' => 'b1', 'name' => 'VR+积分'],
+        'B2-Cash+Score' => ['code' => 'b2', 'name' => '现金+积分'],
+        'B3-VR+Jingdou' => ['code' => 'b3', 'name' => 'VR+京豆'],
+        'B4-Cash+Jingdou' => ['code' => 'b4', 'name' => '现金+京豆'],
+        'B5-VR' => ['code' => 'b5', 'name' => 'VR'],
+        'B6-Cash' => ['code' => 'b6', 'name' => '现金'],
+        'A1-VR' => ['code' => 'a1', 'name' => 'VR'],
+        'A2-Cash' => ['code' => 'a2', 'name' => '现金'],
+        'A3-Cash+VR' => ['code' => 'a3', 'name' => '现金+VR'],
+        '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' => '已支付'],
+    ];
+
+    // 是否已结算 is_settlement
+    const IS_SETTLEMENT = [
+        'NO' => ['code' => 0, 'name' => '未结算'],
+        'YES' => ['code' => 1, 'name' => '已结算'],
+    ];
+}

app/common/enum/user/UserBillEnum.php

@@ -0,0 +1,68 @@
+<?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 CATEGORY = [
+        'NowMoney' => ['code' => 'now_money', 'name' => 'now_money']
+    ];
+
+    // 明细类型  commission佣金
+    const TYPE = [
+        'Commission' => ['code' => 'commission', 'name' => '佣金']
+    ];
+
+    // 状态
+    const STATUS = [
+        'PENDING' => ['code' => 0, 'name' => '待确定'],
+        'VALID' => ['code' => 1, 'name' => '有效'],
+        'INVALID' => ['code' => -1, 'name' => '无效'],
+    ];
+
+    // 佣金类型
+    const COMMISSION_TYPE = parent::COMMISSION_TYPE;
+
+    // 账单来源
+    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/UserCertificationEnum.php

@@ -0,0 +1,15 @@
+<?php
+
+namespace app\common\enum\user;
+
+use app\common\enum\CommonEnum;
+
+class UserCertificationEnum extends CommonEnum
+{
+    // 用户认证状态枚举
+    const STATUS = [
+        'Pending' => ['code' => 0, 'name' => '未审核'],
+        'Approved' => ['code' => 1, 'name' => '已通过'],
+        'Rejected' => ['code' => 2, 'name' => '已拒绝'],
+    ];
+}

app/common/enum/user/UserEnum.php

@@ -0,0 +1,15 @@
+<?php
+
+namespace app\common\enum\user;
+
+use app\common\enum\CommonEnum;
+
+class UserEnum extends CommonEnum
+{
+    const IS_DEL = parent::IS_DEL;
+
+    const STATUS = [
+        'Disabled' => ['code' => 0, 'name' => '禁用'],
+        'Normal' => ['code' => 1, 'name' => '正常']
+    ];
+}

app/common/enum/user/UserPvLogEnum.php

@@ -0,0 +1,17 @@
+<?php
+
+namespace app\common\enum\user;
+
+use app\common\enum\CommonEnum;
+
+class UserPvLogEnum extends CommonEnum
+{
+    // 1-有效，0-失效，-1-待确认
+    const STATUS = [
+        'Valid' => ['code' => 1, 'name' => '有效'],
+        'Invalid' => ['code' => 0, 'name' => '失效'],
+        'PendingConfirmation' => ['code' => -1, 'name' => '待确认'],
+    ];
+
+    const ORDER_TYPE = parent::ORDER_TYPE;
+}

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/UserSignFugouEnum.php

@@ -0,0 +1,26 @@
+<?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 = parent::COMMISSION_TYPE;
+
+    // 1赠送，2消耗
+    const TYPE = [
+        'Give' => ['code' => 1, 'name' => '赠送'],
+        'Consume' => ['code' => 2, 'name' => '消耗'],
+    ];
+
+    const ORDER_TYPE = parent::ORDER_TYPE;
+}

app/common/enum/user/UserSignGongxianEnum.php

@@ -0,0 +1,24 @@
+<?php
+
+namespace app\common\enum\user;
+
+use app\common\enum\CommonEnum;
+
+class UserSignGongxianEnum extends CommonEnum
+{
+    // 贡献值状态
+    const STATUS = [
+        'Valid' => ['code' => 1, 'name' => '有效'],
+        'Invalid' => ['code' => 0, 'name' => '失效'],
+        'PendingConfirmation' => ['code' => -1, 'name' => '待确认'],
+    ];
+
+    // 贡献值类型
+    const TYPE = [
+        'Give' => ['code' => 1, 'name' => '赠送'],
+        'Consume' => ['code' => 2, 'name' => '消耗'],
+    ];
+
+    // 订单类型（可以根据实际需求扩展订单类型）
+    const ORDER_TYPE = parent::ORDER_TYPE;
+}

app/common/enum/user/UserSignHongbaoEnum.php

@@ -0,0 +1,24 @@
+<?php
+
+namespace app\common\enum\user;
+
+use app\common\enum\CommonEnum;
+
+class UserSignHongbaoEnum extends CommonEnum
+{
+    // 1-有效，0-失效，-1-待确认
+    const STATUS = [
+        'Valid' => ['code' => 1, 'name' => '有效'],
+        'Invalid' => ['code' => 0, 'name' => '失效'],
+        'PendingConfirmation' => ['code' => -1, 'name' => '待确认'],
+    ];
+
+    // 1-消费赠送，2-消耗
+    const TYPE = [
+        'ConsumptionGift' => ['code' => 1, 'name' => '消费赠送'],
+        'Consumption' => ['code' => 2, 'name' => '消耗'],
+    ];
+
+    // 订单类型（可以根据实际需求扩展订单类型）
+    const ORDER_TYPE = parent::ORDER_TYPE;
+}

app/common/enum/user/UserSignJingdouEnum.php

@@ -0,0 +1,23 @@
+<?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' => '消耗'],
+    ];
+
+    const ORDER_TYPE = parent::ORDER_TYPE;
+}

app/common/enum/user/UserSignScoreEnum.php

@@ -0,0 +1,32 @@
+<?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' => '购买产品消耗'],
+    ];
+
+    const ORDER_TYPE = parent::ORDER_TYPE;
+}

app/common/enum/user/UserSignVrEnum.php

@@ -0,0 +1,16 @@
+<?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' => '消耗'],
+    ];
+
+    const ORDER_TYPE = parent::ORDER_TYPE;
+}

app/common/enum/user/ZeroUserEnum.php

@@ -0,0 +1,31 @@
+<?php
+
+namespace app\common\enum\user;
+
+use app\common\enum\CommonEnum;
+
+class ZeroUserEnum extends CommonEnum
+{
+    // 状态
+    const STATUS = [
+        0 => '失效',
+        1 => '正常',
+        2 => '合并',
+    ];
+    const STATUS_MAP = [
+        'FAILURE' => ['code' => 0, 'name' => '失效'],
+        'NORMAL' => ['code' => 1, 'name' => '正常'],
+        'MERGE' => ['code' => 2, 'name' => '合并'],
+    ];
+
+
+    // 是否带走团队
+    const IS_REMOVE = [
+        0 => '保留',
+        1 => '带走'
+    ];
+    const IS_REMOVE_MAP = [
+        'NO' => ['code' => 0, 'name' => '保留'],
+        'YES' => ['code' => 1, 'name' => '带走'],
+    ];
+}

app/common/model/Region.php

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

app/common/model/gzc/GzcLog.php

@@ -0,0 +1,27 @@
+<?php
+/**
+ * @package merchant
+ *
+ * @author xaboy
+ * @day 2020/5/30
+ *
+ *
+ */
+
+namespace app\common\model\gzc;
+
+use app\common\model\BaseModel;
+
+class GzcLog extends BaseModel
+{
+
+    public static function tablePk(): string
+    {
+        return 'id';
+    }
+
+    public static function tableName(): string
+    {
+        return 'gzc_logs';
+    }
+}

app/common/model/product/ProductSeckillModel.php

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

app/common/model/product/ShareModel.php

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

app/common/model/store/shipping/ShippingTemplateFree.php

@@ -8,6 +8,7 @@
 namespace app\common\model\store\shipping;
 
 use app\common\model\BaseModel;
+use app\common\model\Region;
 
 class ShippingTemplateFree extends BaseModel
 {
@@ -41,7 +42,8 @@ class ShippingTemplateFree extends BaseModel
         $result = [];
         if(is_array($city_id)){
             foreach ($city_id as $v){
-                $result[] = [City::where('city_id',$v)->value('parent_id') ?? 0,intval($v) ];
+                // $result[] = [City::where('city_id',$v)->value('parent_id') ?? 0,intval($v) ];
+                $result[] = [Region::where('id',$v)->value('pid') ?? 0,intval($v) ];
             }
         }
         return $result;

app/common/model/store/shipping/ShippingTemplateRegion.php

@@ -8,6 +8,7 @@
 namespace app\common\model\store\shipping;
 
 use app\common\model\BaseModel;
+use app\common\model\Region;
 
 class ShippingTemplateRegion extends BaseModel
 {
@@ -40,7 +41,8 @@ class ShippingTemplateRegion extends BaseModel
         $result = [];
         if(is_array($city_id)){
             foreach ($city_id as $v){
-                $result[] = [City::where('city_id',$v)->value('parent_id') ?? 0,intval($v) ];
+                // $result[] = [City::where('city_id',$v)->value('parent_id') ?? 0,intval($v) ];
+                $result[] = [Region::where('id',$v)->value('pid') ?? 0,intval($v) ];
             }
         }
         return $result;

app/common/model/store/shipping/ShippingTemplateUndelivery.php

@@ -8,6 +8,7 @@
 namespace app\common\model\store\shipping;
 
 use app\common\model\BaseModel;
+use app\common\model\Region;
 
 class ShippingTemplateUndelivery extends BaseModel
 {
@@ -40,7 +41,8 @@ class ShippingTemplateUndelivery extends BaseModel
         $result = [];
         if(is_array($city_id)){
             foreach ($city_id as $v){
-                $result[] = [City::where('city_id',$v)->value('parent_id') ?? 0,intval($v) ];
+                // $result[] = [City::where('city_id',$v)->value('parent_id') ?? 0,intval($v) ];
+                $result[] = [Region::where('id',$v)->value('pid') ?? 0,intval($v) ];
             }
         }else{
             $result['city_id'] = [];

app/common/model/system/ApiRequestLog.php

@@ -0,0 +1,128 @@
+<?php
+/**
+ * @package merchant
+ *
+ * @author xaboy
+ * @day 2025-09-15
+ *
+ * 
+ */
+
+namespace app\common\model\system;
+
+use app\common\model\BaseModel;
+
+class ApiRequestLog extends BaseModel
+{
+
+    /**
+     * @return string
+     * @author xaboy
+     * @day 2025-09-15
+     */
+    public static function tablePk(): string
+    {
+        return 'log_id';
+    }
+
+    /**
+     * @return string
+     * @author xaboy
+     * @day 2025-09-15
+     */
+    public static function tableName(): string
+    {
+        return 'api_request_log';
+    }
+
+    /**
+     * 记录接口请求日志
+     * @param array $data
+     * @return bool
+     */
+    public static function record(array $data): bool
+    {
+        try {
+            $logData = [
+                'request_id' => $data['request_id'] ?? self::generateRequestId(),
+                'app_type' => $data['app_type'] ?? '',
+                'request_method' => $data['request_method'] ?? '',
+                'request_url' => $data['request_url'] ?? '',
+                'request_params' => isset($data['request_params']) ? json_encode($data['request_params'], JSON_UNESCAPED_UNICODE) : null,
+                'request_headers' => isset($data['request_headers']) ? json_encode($data['request_headers'], JSON_UNESCAPED_UNICODE) : null,
+                'request_ip' => $data['request_ip'] ?? '',
+                'user_agent' => $data['user_agent'] ?? '',
+                'user_id' => $data['user_id'] ?? 0,
+                'merchant_id' => $data['merchant_id'] ?? 0,
+                'admin_id' => $data['admin_id'] ?? 0,
+                'response_code' => $data['response_code'] ?? 0,
+                'response_data' => isset($data['response_data']) ? json_encode($data['response_data'], JSON_UNESCAPED_UNICODE) : null,
+                'response_time' => $data['response_time'] ?? 0,
+                'error_message' => $data['error_message'] ?? '',
+            ];
+
+            return self::create($logData) !== false;
+        } catch (\Exception $e) {
+            // 记录日志失败时不中断主流程
+            return false;
+        }
+    }
+
+    /**
+     * 生成请求唯一标识
+     * @return string
+     */
+    private static function generateRequestId(): string
+    {
+        return md5(uniqid('api_request_', true) . mt_rand(1000, 9999));
+    }
+
+    /**
+     * 根据请求ID查找日志
+     * @param string $requestId
+     * @return array|null
+     */
+    public static function findByRequestId(string $requestId): ?array
+    {
+        $log = self::getDB()->where('request_id', $requestId)->find();
+        return $log ? $log->toArray() : null;
+    }
+
+    /**
+     * 获取指定时间范围内的日志列表
+     * @param string $startTime
+     * @param string $endTime
+     * @param int $page
+     * @param int $limit
+     * @return array
+     */
+    public static function getListByTimeRange(string $startTime, string $endTime, int $page = 1, int $limit = 20): array
+    {
+        $query = self::getDB()
+            ->where('create_time', '>=', $startTime)
+            ->where('create_time', '<=', $endTime)
+            ->order('log_id', 'desc');
+
+        $total = $query->count();
+        $list = $query->page($page, $limit)->select()->toArray();
+
+        return [
+            'list' => $list,
+            'total' => $total,
+            'page' => $page,
+            'limit' => $limit,
+            'total_page' => ceil($total / $limit)
+        ];
+    }
+
+    /**
+     * 清理过期日志
+     * @param int $days 保留天数
+     * @return int
+     */
+    public static function clearExpiredLogs(int $days = 30): int
+    {
+        $expireTime = date('Y-m-d H:i:s', strtotime("-$days days"));
+        return self::getDB()->where('create_time', '<', $expireTime)->delete();
+    }
+}

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/UserPvLog.php

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

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/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/UserSignGongxian.php

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

app/common/model/user/UserSignHongbao.php

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

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/model/user/ZeroUserLine.php

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

app/common/repositories/finance/FinanceRepository.php

@@ -1953,7 +1953,6 @@ class FinanceRepository extends BaseRepository
         $query = Db::name('user_pv_log')
         ->alias('uss')
         ->leftJoin('user u', 'u.uid=uss.uid')
-        ->leftJoin('store_order o', 'o.order_id=uss.order_id')
         ->when(isset($params['uid']) && $params['uid'] != '', function ($query) use ($params) {
             $query->where('uss.uid', $params['uid']);
         })
@@ -1976,49 +1975,46 @@ class FinanceRepository extends BaseRepository
 
         //导出数据
         $is_excel = request()->param('is_excel', 0);
-        if($is_excel == 1){
+        if ($is_excel == 1) {
             $date['list'] = $this->date_where($query, $where['date'], 'uss.addtime', '-', 2)
-            ->field('uss.id,uss.addtime,u.nickname,u.phone,uss.pv,o.order_sn,uss.status,uss.mark,u.score')
-            ->order('uss.id', 'desc')
-            ->select();
+                ->field('uss.id,uss.addtime,u.nickname,u.phone,uss.pv,uss.order_id,uss.status,uss.mark')
+                ->order('uss.id', 'desc')
+                ->select();
             $arr = [];
-            foreach ($date['list'] as $k=>$item){
+            foreach ($date['list'] as $k => $item) {
                 switch ($item['status']) {
-                    case '1':
-                        $item['status'] = '有效';
-                        break;
-                    case '-1':
-                        $item['status'] = '待确认';
-                        break;
-                    case '0':
-                        $item['status'] = '已失效';
-                        break;
+                    case '1': $statusLabel = '有效'; break;
+                    case '-1': $statusLabel = '待确认'; break;
+                    case '0': $statusLabel = '已失效'; break;
+                    default: $statusLabel = (string)$item['status'];
                 }
-                $arr[] = array(
+                $addtimeFormatted = is_numeric($item['addtime']) ? date('Y-m-d H:i:s', $item['addtime']) : $item['addtime'];
+                $arr[] = [
                     $item['id'],
-                    date('Y-m-d H:i:s', $item['addtime']),
+                    $addtimeFormatted,
                     $item['nickname'],
                     $item['phone'],
                     $item['pv'],
-                    $item['status'],
-                    $item['order_sn'],
+                    $statusLabel,
+                    $item['order_id'],
                     $item['mark']
-                );
+                ];
             }
             return $this->getStatisticsExcel([
-                'ID','时间','用户昵称','手机号','PV数','状态','关联订单','说名',
+                'ID', '时间', '用户昵称', '手机号', 'PV数', '状态', '关联订单号', '说明',
             ], $arr, 'PV统计');
         }
 
 
+
         $date['list'] = $this->date_where($query, $where['date'], 'uss.addtime', '-', 2)
-            ->field('uss.id,uss.addtime,u.nickname,u.phone,uss.pv,o.order_sn,uss.status,uss.mark,u.score')
+            ->field('uss.id,uss.addtime,u.nickname,u.phone,uss.pv,uss.order_id,uss.status,uss.mark,u.score')
             ->page($page, $limit)
             ->order('uss.id', 'desc')
             ->select()
             ->each(function ($item) {
-                $item['mark'] = $item['mark'];
-                $item['addtime'] = date('Y-m-d H:i:s', $item['addtime']);
+                $item['addtime'] = is_numeric($item['addtime']) ? date('Y-m-d H:i:s', $item['addtime']) : $item['addtime'];
+                $item['order_sn'] = $item['order_id'];
                 return $item;
             });
         $date['count'] = $query->count();

app/common/repositories/gzc/GzcLogRepository.php

@@ -0,0 +1,88 @@
+<?php
+
+namespace app\common\repositories\gzc;
+
+use app\common\dao\gzc\GzcLogDao;
+use app\common\enum\CommonEnum;
+use app\common\repositories\BaseRepository;
+use app\common\repositories\store\order\StoreOrderRepository;
+use app\entity\data\gzc\GzcLogEntity;
+use think\exception\ValidateException;
+
+class GzcLogRepository extends BaseRepository
+{
+    public function __construct(GzcLogDao $dao)
+    {
+        $this->dao = $dao;
+    }
+
+    public function create($data)
+    {
+        return $this->dao->create($data);
+    }
+
+    /**
+     * @param GzcLogEntity $gzcLogEntity
+     * @return GzcLogEntity
+     */
+    public function createByEntity(GzcLogEntity $gzcLogEntity): GzcLogEntity
+    {
+        $result = $this->create($gzcLogEntity->toUnderlineArray())->toArray();
+        /** @var GzcLogEntity $entity */
+        $entity = GzcLogEntity::newInstance($result);
+        return $entity;
+    }
+
+    /**
+     * 添加 公证处记录
+     * @param int $uid
+     * @param string $userName
+     * @param string $mobile
+     * @param string $userCard
+     * @param int $orderType
+     * @param string $orderId
+     * @param float $pension
+     * @param int $payType
+     * @return GzcLogEntity
+     */
+    public function addGzcLog(int $uid, string $userName, string $mobile, string $userCard, int $orderType, string $orderId, float $pension, int $payType = 0): GzcLogEntity
+    {
+        $linkId = 0;
+        $orderSn = '';
+        $payTime = '';
+        if ($orderType == CommonEnum::ORDER_TYPE['Platform']['code']) {
+            /** @var StoreOrderRepository $storeOrderRepository */
+            $storeOrderRepository = app()->make(StoreOrderRepository::class);
+            $storeOrderEntity = $storeOrderRepository->getStoreOrderEntityByOrderId((int)$orderId);
+            if (empty($storeOrderEntity->getOrderId())) {
+                throw new ValidateException('未查询到订单信息');
+            }
+            $orderSn = $storeOrderEntity->getOrderSn();
+            $payTime = $storeOrderEntity->getPayTime();
+            $payType = 3;// 默认是微信
+            if ($storeOrderEntity->getFzonePayNote() != "现金") {
+                $payType = 4;
+            }
+        }
+
+        $createTime = date('Y-m-d H:i:s');
+        /** @var GzcLogEntity $gzcLogEntity */
+        $gzcLogEntity = GzcLogEntity::newInstance();
+        $gzcLogEntity->setUid($uid)
+            ->setPlatformNo('IN10' . (int)(microtime(true) * 1000) . mt_rand(10000, 99999))
+            ->setUserName($userName)
+            ->setMobile($mobile)
+            ->setUserCard($userCard)
+            ->setPension($pension)
+            ->setOutTradeNo($orderSn)
+            ->setAccountType($payType)
+            ->setOrderType($orderType)
+            ->setPayTime($payTime)
+            ->setCreateTime($createTime)
+            ->setUpdateTime($createTime)
+            ->setLinkId($orderId);
+
+        return $this->createByEntity($gzcLogEntity);
+    }
+
+}

app/common/repositories/product/ProductSeckillRepository.php

@@ -0,0 +1,26 @@
+<?php
+
+namespace app\common\repositories\product;
+
+use app\common\dao\product\ProductSeckillDao;
+use app\common\repositories\BaseRepository;
+use app\entity\data\product\ProductSeckillEntity;
+
+class ProductSeckillRepository extends BaseRepository
+{
+    public function __construct(ProductSeckillDao $dao)
+    {
+        $this->dao = $dao;
+    }
+
+    /**
+     * @param int $productId
+     * @return ProductSeckillEntity
+     */
+    public function getProductSeckillEntityByProductId(int $productId): ProductSeckillEntity
+    {
+        /** @var ProductSeckillEntity $entity */
+        $entity = $this->dao->getProductSeckillEntityByProductId($productId);
+        return $entity;
+    }
+}

app/common/repositories/product/ShareRepository.php

@@ -0,0 +1,26 @@
+<?php
+
+namespace app\common\repositories\product;
+
+use app\common\dao\product\ShareDao;
+use app\common\repositories\BaseRepository;
+use app\entity\data\product\ShareEntity;
+
+class ShareRepository extends BaseRepository
+{
+    public function __construct(ShareDao $dao)
+    {
+        $this->dao = $dao;
+    }
+
+    /**
+     * @param int $shareId
+     * @return ShareEntity
+     */
+    public function getShareEntityByShareId(int $shareId): ShareEntity
+    {
+        /** @var ShareEntity $shareEntity */
+        $shareEntity = $this->dao->getShareEntityByShareId($shareId);
+        return $shareEntity;
+    }
+}

app/common/repositories/store/StoreSeckillActiveRepository.php

@@ -11,8 +11,7 @@ namespace app\common\repositories\store;
 
 use app\common\dao\store\StoreSeckillActiveDao;
 use app\common\repositories\BaseRepository;
-use FormBuilder\Factory\Elm;
-use think\facade\Route;
+use app\entity\data\store\SeckillActiveEntity;
 
 class StoreSeckillActiveRepository extends BaseRepository
 {
@@ -30,4 +29,16 @@ class StoreSeckillActiveRepository extends BaseRepository
     {
         $this->dao = $dao;
     }
+
+    /**
+     * 根据 商品ID 获取当前生效的 活动记录
+     * @param int $productId
+     * @return SeckillActiveEntity
+     */
+    public function getSeckillActiveEntityByProductIdInActive(int $productId): SeckillActiveEntity
+    {
+        /** @var SeckillActiveEntity $seckillActiveEntity */
+        $seckillActiveEntity = $this->dao->getSeckillActiveEntityByProductIdInActive($productId);
+        return $seckillActiveEntity;
+    }
 }

app/common/repositories/store/coupon/StoreCouponProductRepository.php

@@ -13,6 +13,7 @@ namespace app\common\repositories\store\coupon;
 
 use app\common\dao\store\coupon\StoreCouponProductDao;
 use app\common\repositories\BaseRepository;
+use app\entity\data\store\StoreCouponProductEntity;
 
 /**
  * Class StoreCouponProductRepository
@@ -32,4 +33,13 @@ class StoreCouponProductRepository extends BaseRepository
     {
         $this->dao = $dao;
     }
+
+    /**
+     * @param int $couponId
+     * @return StoreCouponProductEntity[]
+     */
+    public function getStoreCouponProductEntityListByCouponId(int $couponId): array
+    {
+        return $this->dao->getStoreCouponProductEntityListByCouponId($couponId);
+    }
 }

app/common/repositories/store/coupon/StoreCouponUserRepository.php

@@ -14,6 +14,7 @@ namespace app\common\repositories\store\coupon;
 use app\common\dao\store\coupon\StoreCouponUserDao;
 use app\common\model\store\coupon\StoreCoupon;
 use app\common\repositories\BaseRepository;
+use app\entity\data\store\StoreCouponUserEntity;
 use think\facade\Db;
 use think\db\exception\DataNotFoundException;
 use think\db\exception\DbException;
@@ -151,4 +152,13 @@ class StoreCouponUserRepository extends BaseRepository
         return compact('count', 'list',"query");
     }
 
+    /**
+     * @param int $merId
+     * @param int $uid
+     * @return StoreCouponUserEntity[]
+     */
+    public function getValidStoreCouponUserEntityListByMerIdAndUid(int $merId, int $uid): array
+    {
+        return $this->dao->getValidStoreCouponUserEntityListByMerIdAndUid($merId, $uid);
+    }
 }

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

@@ -12,10 +12,13 @@ namespace app\common\repositories\store\order;
 
 
 use app\common\dao\store\order\StoreCartDao;
+use app\common\enum\store\CartEnum;
 use app\common\repositories\BaseRepository;
 use app\common\repositories\store\coupon\StoreCouponProductRepository;
 use app\common\repositories\store\coupon\StoreCouponRepository;
 use app\common\repositories\store\product\ProductRepository;
+use app\entity\data\store\CartEntity;
+use think\db\exception\DbException;
 use think\facade\Db;
 
 /**
@@ -120,4 +123,37 @@ class StoreCartRepository extends BaseRepository
         ];
         return $this->dao->getWhereCount($where);
     }
+
+    /**
+     * 根据 购物车 ID 获取购物车实体
+     * @param int $cartId
+     * @return CartEntity
+     */
+    public function getCartEntityByCartId(int $cartId): CartEntity
+    {
+        /** @var CartEntity $cartEntity */
+        $cartEntity = $this->dao->getCartEntityByCartId($cartId);
+        return $cartEntity;
+    }
+
+    /**
+     * 根据 购物车 ID 获取购物车实体
+     * @param array $cartIdList
+     * @return CartEntity[]
+     */
+    public function getCartEntityListByCartIdList(array $cartIdList): array
+    {
+        return $this->dao->getCartEntityListByCartIdList($cartIdList);
+    }
+
+    /**
+     * @param array $cartIdList
+     * @param int $isPay
+     * @return int
+     * @throws DbException
+     */
+    public function updateIsPayByCartIdList(array $cartIdList, int $isPay = CartEnum::IS_PAY['Yes']['code']): int
+    {
+        return $this->dao->updateIsPayByCartIdList($cartIdList, $isPay);
+    }
 }

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

@@ -14,7 +14,9 @@ namespace app\common\repositories\store\order;
 use app\common\dao\store\order\StoreGroupOrderDao;
 use app\common\repositories\BaseRepository;
 use app\common\repositories\store\coupon\StoreCouponUserRepository;
+use app\entity\data\store\StoreGroupOrderEntity;
 use crmeb\jobs\CancelGroupOrderJob;
+use think\db\exception\DbException;
 use think\exception\ValidateException;
 use think\facade\Cache;
 use think\facade\Db;
@@ -45,7 +47,7 @@ class StoreGroupOrderRepository extends BaseRepository
      * @param $limit
      * @return array
      * @throws \think\db\exception\DataNotFoundException
-     * @throws \think\db\exception\DbException
+     * @throws DbException
      * @throws \think\db\exception\ModelNotFoundException
      * @author xaboy
      * @day 2020/6/10
@@ -67,7 +69,7 @@ class StoreGroupOrderRepository extends BaseRepository
      * @param $id
      * @return array|\think\Model|null
      * @throws \think\db\exception\DataNotFoundException
-     * @throws \think\db\exception\DbException
+     * @throws DbException
      * @throws \think\db\exception\ModelNotFoundException
      * @author xaboy
      * @day 2020/6/10
@@ -87,7 +89,7 @@ class StoreGroupOrderRepository extends BaseRepository
      * @param $id
      * @return array|\think\Model|null
      * @throws \think\db\exception\DataNotFoundException
-     * @throws \think\db\exception\DbException
+     * @throws DbException
      * @throws \think\db\exception\ModelNotFoundException
      * @author xaboy
      * @day 2020/6/10
@@ -114,7 +116,7 @@ class StoreGroupOrderRepository extends BaseRepository
      * @param $id
      * @return array|\think\Model|null
      * @throws \think\db\exception\DataNotFoundException
-     * @throws \think\db\exception\DbException
+     * @throws DbException
      * @throws \think\db\exception\ModelNotFoundException
      * @author xaboy
      * @day 2020/6/10
@@ -128,7 +130,7 @@ class StoreGroupOrderRepository extends BaseRepository
      * @param $id
      * @param null $uid
      * @throws \think\db\exception\DataNotFoundException
-     * @throws \think\db\exception\DbException
+     * @throws DbException
      * @throws \think\db\exception\ModelNotFoundException
      * @author xaboy
      * @day 2020/6/10
@@ -230,7 +232,7 @@ class StoreGroupOrderRepository extends BaseRepository
      * @param $product_id
      * @return array
      * @throws \think\db\exception\DataNotFoundException
-     * @throws \think\db\exception\DbException
+     * @throws DbException
      * @throws \think\db\exception\ModelNotFoundException
      */
     public function ProductOutCancel($product_id){
@@ -251,4 +253,56 @@ class StoreGroupOrderRepository extends BaseRepository
         return $order;
     }
 
+    /**
+     * @param int $orderId
+     * @return StoreGroupOrderEntity
+     */
+    public function getStoreGroupOrderEntityByGroupOrderId(int $orderId): StoreGroupOrderEntity
+    {
+        $entityList = $this->getStoreGroupOrderEntityListByGroupOrderIdList([$orderId]);
+        $entity = array_shift($entityList);
+        if ($entity instanceof StoreGroupOrderEntity) {
+            return $entity;
+        } else {
+            /** @var StoreGroupOrderEntity */
+            return StoreGroupOrderEntity::newInstance();
+        }
+    }
+
+    /**
+     * @param array $groupOrderIdList
+     * @return StoreGroupOrderEntity[]
+     */
+    public function getStoreGroupOrderEntityListByGroupOrderIdList(array $groupOrderIdList): array
+    {
+        return $this->dao->getStoreGroupOrderEntityListByGroupOrderIdList($groupOrderIdList);
+    }
+
+    public function create($data)
+    {
+        return $this->dao->create($data);
+    }
+
+    /**
+     * 写入贡献值记录
+     * @param StoreGroupOrderEntity $storeGroupOrderEntity
+     * @return StoreGroupOrderEntity
+     */
+    public function createByEntity(StoreGroupOrderEntity $storeGroupOrderEntity): StoreGroupOrderEntity
+    {
+        $result = $this->create($storeGroupOrderEntity->toUnderlineArray())->toArray();
+        /** @var StoreGroupOrderEntity $entity */
+        $entity = StoreGroupOrderEntity::newInstance($result);
+        return $entity;
+    }
+
+    /**
+     * @param $groupOrderId
+     * @return int
+     * @throws DbException
+     */
+    public function paySuccess($groupOrderId): int
+    {
+        return $this->dao->paySuccess($groupOrderId);
+    }
 }

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

@@ -8,6 +8,7 @@ namespace app\common\repositories\store\product;
 
 use app\common\repositories\BaseRepository;
 use app\common\dao\store\product\ProductAttrValueDao as dao;
+use app\entity\data\store\StoreProductAttrValueEntity;
 use app\traits\GongApiRequest;
 use think\exception\ValidateException;
 use crmeb\exceptions\AuthException;
@@ -159,4 +160,29 @@ class ProductAttrValueRepository extends BaseRepository
         }
         return true;
     }
+
+    /**
+     * @param string $unique
+     * @return StoreProductAttrValueEntity
+     */
+    public function getStoreProductAttrValueEntityByUnique(string $unique): StoreProductAttrValueEntity
+    {
+        $entityList = $this->getStoreProductAttrValueEntityListByUniqueList([$unique]);
+        $entity = array_shift($entityList);
+        if ($entity instanceof StoreProductAttrValueEntity) {
+            return $entity;
+        } else {
+            /** @var StoreProductAttrValueEntity */
+            return StoreProductAttrValueEntity::newInstance();
+        }
+    }
+
+    /**
+     * @param array $uniqueList
+     * @return StoreProductAttrValueEntity[]
+     */
+    public function getStoreProductAttrValueEntityListByUniqueList(array $uniqueList): array
+    {
+        return $this->dao->getStoreProductAttrValueEntityListByUniqueList($uniqueList);
+    }
 }

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

@@ -23,6 +23,7 @@ use app\common\repositories\user\UserVisitRepository;
 use app\common\repositories\wechat\RoutineQrcodeRepository;
 use app\common\repositories\wechat\WechatQrcodeRepository;
 use app\controller\merchant\gong\Goods;
+use app\entity\data\store\StoreProductEntity;
 use app\traits\ShouxinyiApiRequest;
 use crmeb\exceptions\ApiException;
 use crmeb\services\QrcodeService;
@@ -2113,4 +2114,29 @@ class ProductRepository extends BaseRepository
         //返佣总额 返利总额=（交易金额-手续费）*返利比例
         return decimal2(bcmul($price-$souxufees,$base_commission/100,3));
     }
+
+    /**
+     * @param int $productId
+     * @return StoreProductEntity
+     */
+    public function getStoreProductEntityByProductId(int $productId): StoreProductEntity
+    {
+        $entityList = $this->getStoreProductEntityListByProductIdList([$productId]);
+        $entity = array_shift($entityList);
+        if ($entity instanceof StoreProductEntity) {
+            return $entity;
+        } else {
+            /** @var StoreProductEntity */
+            return StoreProductEntity::newInstance();
+        }
+    }
+
+    /**
+     * @param array $idList
+     * @return StoreProductEntity[]
+     */
+    public function getStoreProductEntityListByProductIdList(array $idList): array
+    {
+        return $this->dao->getUserSignGongxianEntityListByIdList($idList);
+    }
 }

app/common/repositories/store/shipping/ShippingTemplateFreeRepository.php

@@ -8,6 +8,7 @@ namespace app\common\repositories\store\shipping;
 
 use app\common\repositories\BaseRepository;
 use app\common\dao\store\shipping\ShippingTemplateFreeDao as dao;
+use app\entity\data\shipping\ShippingTemplateFreeEntity;
 
 class ShippingTemplateFreeRepository extends BaseRepository
 {
@@ -66,4 +67,13 @@ class ShippingTemplateFreeRepository extends BaseRepository
     {
         return $this->dao->insertAll($data);
     }
+
+    /**
+     * @param int $tempId
+     * @return ShippingTemplateFreeEntity[]
+     */
+    public function getShippingTemplateFreeEntityListByTempId(int $tempId): array
+    {
+        return $this->dao->getShippingTemplateFreeEntityListByTempId($tempId);
+    }
 }

app/common/repositories/store/shipping/ShippingTemplateRegionRepository.php

@@ -8,6 +8,7 @@ namespace app\common\repositories\store\shipping;
 
 use app\common\repositories\BaseRepository;
 use app\common\dao\store\shipping\ShippingTemplateRegionDao as dao;
+use app\entity\data\shipping\ShippingTemplateRegionEntity;
 
 class ShippingTemplateRegionRepository extends BaseRepository
 {
@@ -68,4 +69,12 @@ class ShippingTemplateRegionRepository extends BaseRepository
         return $this->dao->insertAll($data);
     }
 
+    /**
+     * @param int $tempId
+     * @return ShippingTemplateRegionEntity[]
+     */
+    public function getShippingTemplateRegionEntityListByTempId(int $tempId): array
+    {
+        return $this->dao->getShippingTemplateRegionEntityListByTempId($tempId);
+    }
 }

app/common/repositories/store/shipping/ShippingTemplateRepository.php

@@ -10,6 +10,7 @@ namespace app\common\repositories\store\shipping;
 use app\common\repositories\BaseRepository;
 use app\common\dao\store\shipping\ShippingTemplateDao as dao;
 use app\common\repositories\store\product\ProductRepository;
+use app\entity\data\shipping\ShippingTemplateEntity;
 use think\facade\Db;
 
 class ShippingTemplateRepository extends BaseRepository
@@ -230,4 +231,14 @@ class ShippingTemplateRepository extends BaseRepository
         return $this->create($data);
     }
 
+    /**
+     * @param int $shippingTemplateId
+     * @return ShippingTemplateEntity
+     */
+    public function getShippingTemplateEntityByShippingTemplateId(int $shippingTemplateId): ShippingTemplateEntity
+    {
+        /** @var ShippingTemplateEntity $entity */
+        $entity = $this->dao->getShippingTemplateEntityByShippingTemplateId($shippingTemplateId);
+        return $entity;
+    }
 }

app/common/repositories/store/shipping/ShippingTemplateUndeliveRepository.php

@@ -9,6 +9,7 @@ namespace app\common\repositories\store\shipping;
 
 use app\common\repositories\BaseRepository;
 use app\common\dao\store\shipping\ShippingTemplateUndeliveryDao as dao;
+use app\entity\data\shipping\ShippingTemplateUndeliveryEntity;
 
 class ShippingTemplateUndeliveRepository extends BaseRepository
 {
@@ -55,5 +56,12 @@ class ShippingTemplateUndeliveRepository extends BaseRepository
         }
     }
 
-
+    /**
+     * @param int $tempId
+     * @return ShippingTemplateUndeliveryEntity[]
+     */
+    public function getShippingTemplateUndeliveryEntityListByTempId(int $tempId): array
+    {
+        return $this->dao->getShippingTemplateUndeliveryEntityListByTempId($tempId);
+    }
 }

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/system/merchant/MerchantRepository.php

@@ -24,6 +24,7 @@ use app\common\repositories\user\UserVisitRepository;
 use app\common\repositories\wechat\RoutineQrcodeRepository;
 use app\controller\admin\system\merchant\MerchantIntention;
 use app\controller\merchant\gong\Goods;
+use app\entity\data\merchant\MerchantEntity;
 use app\traits\HaikeApiRequest;
 use crmeb\services\QrcodeService;
 use crmeb\services\UploadService;
@@ -1011,6 +1012,30 @@ class MerchantRepository extends BaseRepository
 
     }
 
+    /**
+     * 根据 商户ID 获取 未删除的 商户信息
+     * @param int $merchantId
+     * @return MerchantEntity
+     */
+    public function getMerchantEntityByMerchantId(int $merchantId): MerchantEntity
+    {
+        $entityList = $this->getMerchantEntityListByMerchantIdList([$merchantId]);
+        $entity = array_shift($entityList);
+        if ($entity instanceof MerchantEntity) {
+            return $entity;
+        } else {
+            /** @var MerchantEntity */
+            return MerchantEntity::newInstance();
+        }
+    }
 
+    /**
+     * @param array $idList
+     * @return MerchantEntity[]
+     */
+    public function getMerchantEntityListByMerchantIdList(array $idList): array
+    {
+        return $this->dao->getMerchantEntityListByMerchantIdList($idList);
+    }
 
 }

app/common/repositories/user/UserAddressRepository.php

@@ -10,6 +10,7 @@ namespace app\common\repositories\user;
 use app\common\repositories\BaseRepository;
 use app\common\dao\user\UserAddressDao as dao;
 use app\common\repositories\store\shipping\CityRepository;
+use app\entity\data\user\UserAddressEntity;
 
 /**
  * Class UserAddressRepository
@@ -122,4 +123,17 @@ class UserAddressRepository extends BaseRepository
         }
         return $address;
     }
+
+    /**
+     * 根据 地址ID 获取地址实体
+     *
+     * @param $addressId
+     * @return UserAddressEntity
+     */
+    public function getAddressEntityByAddressId($addressId): UserAddressEntity
+    {
+        /** @var UserAddressEntity $addressEntity */
+        $addressEntity = $this->dao->getAddressEntityByAddressId($addressId);
+        return $addressEntity;
+    }
 }

app/common/repositories/user/UserBillRepository.php

@@ -5,7 +5,7 @@
  * @author xaboy
  * @day 2020-05-07
  *
- * 
+ *
  */
 
 namespace app\common\repositories\user;
@@ -13,14 +13,20 @@ namespace app\common\repositories\user;
 
 use app\common\dao\BaseDao;
 use app\common\dao\user\UserBillDao;
-use app\common\model\store\order\StoreOrder;
+use app\common\enum\user\UserBillEnum;
+use app\common\enum\user\UserCertificationEnum;
 use app\common\model\user\UserBill;
 use app\common\repositories\BaseRepository;
-use crmeb\jobs\SendTemplateMessageJob;
+use app\common\repositories\gzc\GzcLogRepository;
+use app\common\repositories\store\order\StoreOrderRepository;
+use app\entity\data\user\UserBillEntity;
+use app\entity\data\user\UserCertificationEntity;
+use app\entity\data\user\UserEntity;
+use app\utils\ArrayUtil;
+use think\db\exception\DbException;
+use think\exception\ValidateException;
 use think\facade\Cache;
-use function Symfony\Component\String\s;
 use think\facade\Db;
-use think\facade\Queue;
 use think\Model;
 
 /**
@@ -376,4 +382,268 @@ class UserBillRepository extends BaseRepository
     {
         return $this->bill($uid, $category, $type, 0, $data);
     }
+
+    /**
+     * 添加 bill 数据
+     * @param int $uid
+     * @param int $commissionType
+     * @param int $pm
+     * @param float $number
+     * @param string $category
+     * @param string $type
+     * @param string $source
+     * @param int $orderType
+     * @param int $typeShop
+     * @param int $orderId
+     * @param string $mark
+     * @param string $title
+     * @return UserBillEntity
+     */
+    public function addUserBill(int $uid, int $commissionType, int $pm, float $number, string $category, string $type, string $source, int $orderType, int $typeShop = 0, int $orderId = 0, string $mark = '', string $title = ''): UserBillEntity
+    {
+
+        $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();
+        }
+
+        /** @var UserBillEntity $userBillEntity */
+        $userBillEntity = UserBillEntity::newInstance();
+        $userBillEntity->setUid($uid)
+            ->setLinkId($orderId)
+            //UserBillEnum::PM['INCOME']['code']
+            ->setPm($pm)
+            ->setTitle($title ?: ArrayUtil::getEnumNameByCode($commissionType, UserBillEnum::COMMISSION_TYPE))
+            ->setCategory($category)
+            ->setType($type)
+            ->setNumber($number)
+            ->setMark($mark)
+            ->setStatus(UserBillEnum::STATUS['PENDING']['code'])
+            ->setCommissionType($commissionType)
+            ->setOrderSn($orderSn)
+            ->setTypeShop($typeShop)
+            ->setMerId($merId)
+            // UserBillEnum::SOURCE['ONLINE']['code']
+            ->setSource($source)
+            ->setOrderType($orderType)
+            ->setIsRedBrokerage(UserBillEnum::IS_RED_BROKERAGE['NORMAL']['code'])
+            ->setGzc(UserBillEnum::GZC_STATUS['NOT_ENTERED']['code'])
+            ->setIsGzc(UserBillEnum::IS_GZC['NOT_STARTED']['code']);
+
+        return $this->createByEntity($userBillEntity);
+    }
+
+    /**
+     * 写入 数据
+     * @param UserBillEntity $userBillEntity
+     * @return UserBillEntity
+     */
+    public function createByEntity(UserBillEntity $userBillEntity): UserBillEntity
+    {
+        $result = $this->dao->create($userBillEntity->toUnderlineArray())->toArray();
+        /** @var UserBillEntity $entity */
+        $entity = UserBillEntity::newInstance($result);
+        return $entity;
+    }
+
+    /**
+     * @param int $billId
+     * @return UserBillEntity
+     */
+    public function getUserBillEntityByBillId(int $billId): UserBillEntity
+    {
+        $entityList = $this->getUserBillEntityListByBillIdList([$billId]);
+        $entity = array_shift($entityList);
+        if ($entity instanceof UserBillEntity) {
+            return $entity;
+        } else {
+            /** @var UserBillEntity */
+            return UserBillEntity::newInstance();
+        }
+    }
+
+    /**
+     * 获取Bill实体集合 根据 Id集合
+     * @param array $billIdList
+     * @return UserBillEntity[]
+     */
+    public function getUserBillEntityListByBillIdList(array $billIdList): array
+    {
+        return $this->dao->getUserBillEntityListByBillIdList($billIdList);
+    }
+
+    /**
+     * 获取Bill实体集合 根据 订单类型 订单Id集合 待结算状态
+     * @param string $typeShop
+     * @param array $orderIdList
+     * @return UserBillEntity[]
+     */
+    public function getUserBillEntityListByOrderIdListAndPending(string $typeShop, array $orderIdList): array
+    {
+        return $this->dao->getUserBillEntityListByOrderIdListAndPending($typeShop, $orderIdList);
+    }
+
+    /**
+     * @param $dataList
+     * @return array
+     */
+    public function batchUpdateUserBillDataByDataList($dataList): array
+    {
+        return $this->dao->saveAll($dataList);
+    }
+
+    /**
+     * 将 账单 记录设置为生效状态 并对用户的 对应 字段进行增减
+     * @param array $idList
+     * @return array
+     */
+    public function executeByIdList(array $idList): array
+    {
+        $userBillEntityList = $this->getUserBillEntityListByBillIdList($idList);
+        // 忽略 已经生效的 记录
+        $userBillEntityList = array_filter($userBillEntityList, function($entity) {
+            return $entity->getStatus() != UserBillEnum::STATUS['VALID']['code'];
+        });
+
+        if (!empty($userBillEntityList)) {
+            $pensionUidList = [];
+            // 获取所有记录的 归属人
+            $userIdList = array_map(function ($userBillEntity) use (&$pensionUidList) {
+                // 获取 养老金记录
+                if ($userBillEntity->getCommissionType() == UserBillEnum::COMMISSION_TYPE['PENSION']['code']) {
+                    $pensionUidList[] = $userBillEntity->getUid();
+                }
+                return $userBillEntity->getUid();
+            }, $userBillEntityList);
+
+            // 获取用户 映射信息
+            /** @var UserRepository $userRepository */
+            $userRepository = app()->make(UserRepository::class);
+            /** @var UserEntity[] $userEntityMapByUid */
+            $userEntityMapByUid = [];
+            if (!empty($userIdList)) {
+                $userEntityMapByUid = $userRepository->getUserEntityMapByUidList($userIdList);
+            }
+            // 获取实名认证 映射信息 (养老金记录 结算时 需要确定 所属人是否已经实名认证 如果实名认证了 需要推到养老金公证处明细表里 并修改养老金记录的推送状态)
+            /** @var UserCertificationEntity[] $userCertificationEntityMapByUid */
+            $userCertificationEntityMapByUid = [];
+            if (!empty($pensionUidList)) {
+                /** @var UserCertificationRepository $userCertificationRepository */
+                $userCertificationRepository = app()->make(UserCertificationRepository::class);
+                $userCertificationEntityMapByUid = $userCertificationRepository->getUserCertificationEntityMapByUidListApproved($pensionUidList);
+            }
+            /** @var GzcLogRepository $gzcLogRepository */
+            $gzcLogRepository = app()->make(GzcLogRepository::class);
+
+            $updateUserEntityList = [];
+            $updateUserBillEntityList = [];
+            foreach ($userBillEntityList as $userBillEntity) {
+                if (empty($userBillEntity->getBillId()) || empty($userBillEntity->getUid())) {
+                    // throw new ValidateException('无效的账单记录');
+                    continue;
+                }
+                if (!empty($userBillEntity->getTakeTime())) {
+                    throw new ValidateException("该账单记录已更新，请勿重复操作({$userBillEntity->getBillId()})");
+                }
+
+                $userEntity = $userEntityMapByUid[$userBillEntity->getUid()];
+                if (empty($userEntity) || empty($userEntity->getUid())) {
+                    throw new ValidateException("未查询到用户信息({$userBillEntity->getBillId()})");
+                }
+
+                // 更新 用户信息
+                /** @var UserEntity $updateUserEntity */
+                $updateUserEntity = $updateUserEntityList[$userEntity->getUid()] ?? UserEntity::newInstance();
+                $updateUserEntity->setUid($userEntity->getUid());
+                // 更新 账单 记录
+                /** @var UserBillEntity $updateUserBillEntity */
+                $updateUserBillEntity = $updateUserBillEntityList[$userBillEntity->getBillId()] ?? UserBillEntity::newInstance();
+                // 更新 账单记录 状态
+                $updateUserBillEntity
+                    ->setBillId($userBillEntity->getBillId())
+                    ->setStatus(UserBillEnum::STATUS['VALID']['code'])
+                    ->setTakeTime(time());
+
+                if ($userBillEntity->getCommissionType() == UserBillEnum::COMMISSION_TYPE['DIRECT_REFERRAL']['code']) {
+                    // 直推奖
+                    if (is_null($updateUserEntity->getBrokeragePrice())) {
+                        $updateUserEntity->setBrokeragePrice($userEntity->getBrokeragePrice());
+                    }
+                    // 更新用户 佣金 信息
+                    if ($userBillEntity->getPm() == UserBillEnum::PM['EXPEND']['code']) {
+                        if ($updateUserEntity->getBrokeragePrice() < $userBillEntity->getNumber()) {
+                            throw new ValidateException('用户佣金不足');
+                        }
+                        $updateUserEntity->setBrokeragePrice(bcsub($updateUserEntity->getBrokeragePrice(), $userBillEntity->getNumber(), 2));
+                    } else {
+                        $updateUserEntity->setBrokeragePrice(bcadd($updateUserEntity->getBrokeragePrice(), $userBillEntity->getNumber(), 2));
+                    }
+
+                } else if ($userBillEntity->getCommissionType() == UserBillEnum::COMMISSION_TYPE['PENSION']['code']) {
+
+                    if ($userBillEntity->getGzc() == UserBillEnum::GZC_STATUS['NOT_ENTERED']['code']) {
+                        if (!empty($userCertificationEntityMapByUid[$userBillEntity->getUid()])) {
+                            $userCertificationEntity = $userCertificationEntityMapByUid[$userBillEntity->getUid()];
+                            // 创建公证处记录
+                            $gzcLogRepository->addGzcLog(
+                                $userCertificationEntity->getUid(),
+                                $userCertificationEntity->getUserName(),
+                                $userCertificationEntity->getMobile(),
+                                $userCertificationEntity->getUserCard(),
+                                $userBillEntity->getTypeShop(),
+                                $userBillEntity->getLinkId(),
+                                $userBillEntity->getNumber()
+                            );
+
+                            // 养老金
+                            if (is_null($updateUserEntity->getAnnuity())) {
+                                $updateUserEntity->setAnnuity($userEntity->getAnnuity());
+                            }
+                            $updateUserEntity->setAnnuity(bcadd($updateUserEntity->getAnnuity(), $userBillEntity->getNumber(), 2));
+
+                            // 几笔养老金
+                            if (is_null($updateUserEntity->getAnnuityNum())) {
+                                $updateUserEntity->setAnnuityNum($userEntity->getAnnuityNum());
+                            }
+                            $updateUserEntity->setAnnuityNum(bcadd($updateUserEntity->getAnnuityNum(), 1));
+
+                            // 更新佣金记录
+                            $updateUserBillEntity
+                                ->setGzc(UserBillEnum::GZC_STATUS['ENTERED']['code'])
+                                ->setIsGzc(UserBillEnum::IS_GZC['NOT_STARTED']['code']);
+                        }
+                    }
+                }
+
+                $updateUserEntityList[$userEntity->getUid()] = $updateUserEntity;
+                $updateUserBillEntityList[$userBillEntity->getBillId()] = $updateUserBillEntity;
+            }
+            if (!empty($updateUserEntityList)) {
+                $userRepository->batchUpdateUserDataByDataList(
+                    array_map(function (UserEntity $updateUserEntity) {
+                        return $updateUserEntity->toUnderlineArray();
+                    }, $updateUserEntityList)
+                );
+            }
+
+            if (!empty($updateUserBillEntityList)) {
+                $this->batchUpdateUserBillDataByDataList(
+                    array_map(function (UserBillEntity $updateUserBillEntity) {
+                        return $updateUserBillEntity->toUnderlineArray();
+                    }, $updateUserBillEntityList)
+                );
+            }
+        }
+
+        return $idList;
+    }
 }

app/common/repositories/user/UserCertificationRepository.php

@@ -0,0 +1,86 @@
+<?php
+
+namespace app\common\repositories\user;
+
+use app\common\dao\user\UserCertificationDao;
+use app\common\enum\user\UserCertificationEnum;
+use app\common\repositories\BaseRepository;
+use app\entity\data\user\UserCertificationEntity;
+
+class UserCertificationRepository extends BaseRepository
+{
+    public function __construct(UserCertificationDao $dao)
+    {
+        $this->dao = $dao;
+    }
+
+    /**
+     * @param int $id
+     * @return UserCertificationEntity
+     */
+    public function getUserCertificationEntityById(int $id): UserCertificationEntity
+    {
+        $entityList = $this->getUserCertificationEntityListByIdList([$id]);
+        $entity = array_shift($entityList);
+        if ($entity instanceof UserCertificationEntity) {
+            return $entity;
+        } else {
+            /** @var UserCertificationEntity */
+            return UserCertificationEntity::newInstance();
+        }
+    }
+
+    /**
+     * @param array $idList
+     * @return UserCertificationEntity[]
+     */
+    public function getUserCertificationEntityListByIdList(array $idList): array
+    {
+        return $this->dao->getUserCertificationEntityListByIdList($idList);
+    }
+
+    /**
+     * @param array $uidList
+     * @return UserCertificationEntity[]
+     */
+    public function getUserCertificationEntityListByUidList(array $uidList): array
+    {
+        return $this->dao->getUserCertificationEntityListByUidList($uidList);
+    }
+
+    /**
+     * 获取 已通过的 用户实名认证实体 映射 根据用户ID
+     * @param array $uidList
+     * @return UserCertificationEntity[]
+     */
+    public function getUserCertificationEntityMapByUidListApproved(array $uidList): array
+    {
+        /** @var UserCertificationEntity[] $userCertificationEntityMapByUid */
+        $userCertificationEntityMapByUid = [];
+        $userCertificationEntityList = $this->getUserCertificationEntityListByUidList($uidList);
+        foreach ($userCertificationEntityList as $userCertificationEntity) {
+            if ($userCertificationEntity->getStatus() == UserCertificationEnum::STATUS['Approved']['code'] && !empty($userCertificationEntity->getUserCard())) {
+                $userCertificationEntityMapByUid[$userCertificationEntity->getUid()] = $userCertificationEntity;
+            }
+        }
+        return $userCertificationEntityMapByUid;
+    }
+
+    public function create($data)
+    {
+        return $this->dao->create($data);
+    }
+
+    /**
+     * 写入实名认证记录
+     * @param UserCertificationEntity $UserCertificationEntity
+     * @return UserCertificationEntity
+     */
+    public function createByEntity(UserCertificationEntity $UserCertificationEntity): UserCertificationEntity
+    {
+        $result = $this->dao->create($UserCertificationEntity->toUnderlineArray())->toArray();
+        /** @var UserCertificationEntity $entity */
+        $entity = UserCertificationEntity::newInstance($result);
+        return $entity;
+    }
+}

app/common/repositories/user/UserPvLogRepository.php

@@ -0,0 +1,208 @@
+<?php
+
+namespace app\common\repositories\user;
+
+use app\common\dao\user\UserPvLogDao;
+use app\common\enum\user\UserPvLogEnum;
+use app\common\repositories\BaseRepository;
+use app\common\repositories\store\order\StoreOrderRepository;
+use app\entity\data\user\UserEntity;
+use app\entity\data\user\UserPvLogEntity;
+use think\db\exception\DbException;
+use think\exception\ValidateException;
+
+class UserPvLogRepository extends BaseRepository
+{
+    public function __construct(UserPvLogDao $dao)
+    {
+        $this->dao = $dao;
+    }
+
+    /**
+     * @param int $id
+     * @return UserPvLogEntity
+     */
+    public function getUserPvLogEntityById(int $id): UserPvLogEntity
+    {
+        $entityList = $this->getUserPvLogEntityListByIdList([$id]);
+        $entity = array_shift($entityList);
+        if ($entity instanceof UserPvLogEntity) {
+            return $entity;
+        } else {
+            /** @var UserPvLogEntity */
+            return UserPvLogEntity::newInstance();
+        }
+    }
+
+    /**
+     * @param array $idList
+     * @return UserPvLogEntity[]
+     */
+    public function getUserPvLogEntityListByIdList(array $idList): array
+    {
+        return $this->dao->getUserPvLogEntityListByIdList($idList);
+    }
+
+    /**
+     * @param string $orderType
+     * @param array $orderIdList
+     * @return UserPvLogEntity[]
+     */
+    public function getUserPvLogEntityListByOrderIdListAndPending(string $orderType, array $orderIdList): array
+    {
+        return $this->dao->getUserPvLogEntityListByOrderIdListAndPending($orderType, $orderIdList);
+    }
+
+    public function create($data)
+    {
+        return $this->dao->create($data);
+    }
+
+    /**
+     * 写入 PV记录
+     * @param UserPvLogEntity $userPvLogEntity
+     * @return UserPvLogEntity
+     */
+    public function createByEntity(UserPvLogEntity $userPvLogEntity): UserPvLogEntity
+    {
+        $result = $this->dao->create($userPvLogEntity->toUnderlineArray())->toArray();
+        /** @var UserPvLogEntity $entity */
+        $entity = UserPvLogEntity::newInstance($result);
+        return $entity;
+    }
+
+    /**
+     * 添加Pv 记录
+     * @param int $uid
+     * @param float $pv
+     * @param string $mark
+     * @param string $orderType
+     * @param string $orderId
+     * @return UserPvLogEntity
+     */
+    public function addUserPvLog(int $uid, float $pv, string $mark = '', string $orderType = '', string $orderId = ''): UserPvLogEntity
+    {
+        if (!empty($orderType)) {
+            if (!empty($orderId)) {
+                if ($orderType == UserPvLogEnum::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 UserPvLogEntity $userPvLogEntity */
+        $userPvLogEntity = UserPvLogEntity::newInstance();
+        $userPvLogEntity->setUid($uid)
+            ->setPv($pv)
+            ->setMark($mark)
+            ->setOrderType($orderType)
+            ->setOrderId($orderId)
+            ->setAddtime(time())
+            ->setStatus(UserPvLogEnum::STATUS['PendingConfirmation']['code']);
+
+        return $this->createByEntity($userPvLogEntity);
+    }
+
+    /**
+     * 将 贡献值 直推贡献值 记录设置为生效状态 并对用户的 贡献值 直推贡献值 字段进行增减
+     * @param array $idList
+     * @return array
+     */
+    public function executeByIdList(array $idList): array
+    {
+        $userPvLogEntityList = $this->getUserPvLogEntityListByIdList($idList);
+        $userIdList = [];
+
+        // 忽略 已经生效的 记录
+        $userPvLogEntityList = array_filter($userPvLogEntityList, function ($entity) use (&$userIdList) {
+            // 积分数据不为空 用户不为空 状态属于待结算 并且结算字段为空
+            if ((!empty($entity->getId()) && !empty($entity->getUid()) && ($entity->getStatus() == UserPvLogEnum::STATUS['PendingConfirmation']['code']) && empty($entity->getSettlementTime()))) {
+                $userIdList[] = $entity->getUid();
+                return true;
+            }
+            return false;
+        });
+
+        if (!empty($userPvLogEntityList)) {
+            // 获取用户 映射信息
+            /** @var UserRepository $userRepository */
+            $userRepository = app()->make(UserRepository::class);
+            /** @var UserEntity[] $userEntityMapByUid */
+            $userEntityMapByUid = [];
+            if (!empty($userIdList)) {
+                $userEntityMapByUid = $userRepository->getUserEntityMapByUidList($userIdList);
+            }
+
+            /** @var UserEntity[] $updateUserEntityList */
+            $updateUserEntityList = [];
+            /** @var UserPvLogEntity[] $updateUserPvLogEntityList */
+            $updateUserPvLogEntityList = [];
+            foreach ($userPvLogEntityList as $userPvLogEntity) {
+
+                $userEntity = $userEntityMapByUid[$userPvLogEntity->getUid()];
+                if (empty($userEntity) || empty($userEntity->getUid())) {
+                    throw new ValidateException("未查询到用户信息(PvLogId:{$userPvLogEntity->getId()})");
+                }
+
+                // 组建 更新 用户信息
+                if (isset($updateUserEntityList[$userEntity->getUid()])) {
+                    $updateUserEntity = $updateUserEntityList[$userEntity->getUid()];
+                } else {
+                    /** @var UserEntity $updateUserEntity */
+                    $updateUserEntity = UserEntity::newInstance();
+                    $updateUserEntity
+                        ->setUid($userEntity->getUid())
+                        ->setPv($userEntity->getPv());
+                }
+                // 组建 账单 记录
+                if (isset($updateUserPvLogEntityList[$userPvLogEntity->getId()])) {
+                    $updateUserPvLogEntity = $updateUserPvLogEntityList[$userPvLogEntity->getId()];
+                } else {
+                    /** @var UserPvLogEntity $updateUserPvLogEntity */
+                    $updateUserPvLogEntity = UserPvLogEntity::newInstance();
+                    // 更新 账单记录 状态
+                    $updateUserPvLogEntity
+                        ->setId($userPvLogEntity->getId())
+                        ->setStatus(UserPvLogEnum::STATUS['Valid']['code'])
+                        ->setSettlementTime(date('Y-m-d H:i:s'));
+                }
+                // 写入Pv
+                $updateUserEntity->setPv(bcadd($updateUserEntity->getPv(), $userPvLogEntity->getPv(), 2));
+
+                $updateUserEntityList[$userPvLogEntity->getUid()] = $updateUserEntity;
+                $updateUserPvLogEntityList[$userPvLogEntity->getId()] = $updateUserPvLogEntity;
+            }
+
+            if (!empty($updateUserEntityList)) {
+                $userRepository->batchUpdateUserDataByDataList(
+                    array_map(function (UserEntity $updateUserEntity) {
+                        return $updateUserEntity->toUnderlineArray();
+                    }, $updateUserEntityList)
+                );
+            }
+
+            if (!empty($updateUserPvLogEntityList)) {
+                $this->batchUpdateUserPvLogDataByDataList(
+                    array_map(function (UserPvLogEntity $updateUserPvLogEntity) {
+                        return $updateUserPvLogEntity->toUnderlineArray();
+                    }, $updateUserPvLogEntityList)
+                );
+            }
+        }
+        return $idList;
+    }
+
+    /**
+     * @param $dataList
+     * @return array
+     */
+    public function batchUpdateUserPvLogDataByDataList($dataList): array
+    {
+        return $this->dao->saveAll($dataList);
+    }
+}

app/common/repositories/user/UserRepository.php

@@ -15,6 +15,11 @@ use alipay\aop\AlipayConfig;
 use alipay\aop\AopCertClient;
 use app\common\dao\BaseDao;
 use app\common\dao\user\UserDao;
+use app\common\enum\user\UserBillEnum;
+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;
@@ -26,6 +31,11 @@ use app\common\repositories\wechat\RoutineQrcodeRepository;
 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;
@@ -842,7 +852,8 @@ class UserRepository extends BaseRepository
         }
         return Elm::createForm(Route::buildUrl('systemUserChangePro', compact('id'))->build(), [
             Elm::input('spread_account_old', '原推荐人')->value($spread_message['account'].'('.$spread_message['nickname'].')')->disabled(true),
-            Elm::input('spread_account', '推荐人')->required()->placeholder("请填写推荐人手机号")
+            Elm::input('spread_account', '推荐人')->required()->placeholder("请填写推荐人手机号"),
+            Elm::textarea('mark', '备注', '')->placeholder('填写备注信息')
         ])->setTitle('修改用户推荐人');
     }
 
@@ -862,8 +873,9 @@ class UserRepository extends BaseRepository
             $level_message = ['account' => '无节点人', 'nickname' => '无节点人'];
         }
         return Elm::createForm(Route::buildUrl('systemUserChangeLevelPro', compact('id'))->build(), [
-            Elm::input('spread_account_old', '原节点人')->value($level_message['account'].'('.$level_message['nickname'].')')->disabled(true),
-            Elm::input('level_account', '节点人（上级）')->required()->placeholder("请填写节点人（上级）手机号")
+            Elm::input('level_account_old', '原节点人')->value($level_message['account'].'('.$level_message['nickname'].')')->disabled(true),
+            Elm::input('level_account', '节点人（上级）')->required()->placeholder("请填写节点人（上级）手机号"),
+            Elm::textarea('mark', '备注', '')->placeholder('填写备注信息')
         ])->setTitle('修改用户节点人（上级）');
     }
 
@@ -881,7 +893,7 @@ class UserRepository extends BaseRepository
         return Elm::createForm(Route::buildUrl('systemUserChangeGroupPro', compact('id'))->build(), [
             Elm::select('old_identity_id', '当前用户身份')->options([$oldIdentity])->value($oldIdentity['value'])->disabled(true),
             Elm::select('new_identity_id', '新的用户身份')->options($identityList),
-            Elm::textarea('mark', '备注', '')->required()->placeholder('请填写备注信息')
+            Elm::textarea('mark', '备注', '')->placeholder('填写备注信息')
         ])->setTitle('修改用户身份');
     }
 
@@ -3124,22 +3136,26 @@ class UserRepository extends BaseRepository
    *@author cabbage
    *@date 2020-10-31
    * */
-    public function update_spread($uid,$spread_account){
-        //推荐人信息
-        $spread = Db::name("user")->where('account',$spread_account)->field("uid")->find();
+    public function update_spread($uid,$spread_account,$mark,$olld_id,$adminId,$spread){
         //被推荐人信息
         $identity=Db::name("user")->where('uid',$uid)->field("identity,spread_uid")->find();
-        $user_identity_log=Db::name("user_identity_log")->where(["link_id"=>$uid])->find();
+//        $user_identity_log=Db::name("user_identity_log")->where(["link_id"=>$uid])->find();
         if($spread){
             try{
-
                 $data= Db::name("user")->where(["uid"=>$uid])->update(['spread_uid'=>$spread['uid']]);
                 Db::name("merchant")->where(["uid"=>$uid])->update(['recommender'=>$spread['uid']]);
-                if ($user_identity_log){
-                    Db::name("user_identity_log")->where(["id"=>$user_identity_log["id"]])->update(['uid'=>$spread['uid']]);
-                }else{
-                    Db::name("user_identity_log")->insert(['uid'=>$spread['uid'],"identity"=>$identity["identity"],"create_time"=>date("Y-m-d H:i:s"),"link_id"=>$uid]);
-                }
+ //               if ($user_identity_log){
+ //                   Db::name("user_identity_log")->where(["id"=>$user_identity_log["id"]])->update(['uid'=>$spread['uid']]);
+ //               }else{
+ //                   Db::name("user_identity_log")->insert(['uid'=>$spread['uid'],"identity"=>$identity["identity"],"create_time"=>date("Y-m-d H:i:s"),"link_id"=>$uid]);
+ //               }
+                Db::name("user_spread_change_records")->insert([
+                    'operation_id' => $adminId,
+                    'uid' => $uid,
+                    'old_spread_id' => $olld_id,
+                    'new_spread_id' => $spread['uid'],
+                    'mark' => $mark
+                ]);
                 Db::name("user")->where('account',$spread_account)->inc("spread_count",1)->update();
                 if ($identity["spread_uid"]){
                     Db::name("user")->where('uid',$identity["spread_uid"])->dec("spread_count")->update();
@@ -3154,10 +3170,15 @@ class UserRepository extends BaseRepository
 
     }
 
-    public function update_level_uid($uid, $level_account){
-        $level = Db::name("user")->where('account',$level_account)->field("uid")->find();
+    public function update_level_uid($uid, $olld_id, $level_account, $mark,$adminId,$level){
         if($level){
             try{
+                Db::name("user_level_change_records")->insert([
+                    'operation_id' => $adminId,
+                    'uid' => $uid,
+                    'old_level_id' => $olld_id,
+                    'new_level_id' => $level['uid'],
+                    'mark' => $mark ]);
                 return Db::name("user")->where(["uid"=>$uid])->update(['level_id'=>$level['uid']]);
             }catch (\Exception $e) {
                 return false;
@@ -3165,14 +3186,13 @@ class UserRepository extends BaseRepository
         }else{
             return false;
         }
-
     }
 
-    public function update_user_group($id, $old_identity_id, $new_identity_id, $adminid, $mark)
+    public function update_user_group($id, $old_identity_id, $new_identity_id, $adminId, $mark)
     {
         try {
             Db::name("user_identity_change_records")->insert([
-                'operation_id' => $adminid,
+                'operation_id' => $adminId,
                 'uid' => $id,
                 'old_identity_id' => $old_identity_id,
                 'new_identity_id' => $new_identity_id,
@@ -4609,4 +4629,292 @@ class UserRepository extends BaseRepository
         ]);
     }
 
+
+    /**
+     * @param int $uid
+     * @return UserEntity
+     */
+    public function getUserEntityByUid(int $uid): UserEntity
+    {
+        $entityList = $this->getUserEntityListByUidList([$uid]);
+        $entity = array_shift($entityList);
+        if ($entity instanceof UserEntity) {
+            return $entity;
+        } else {
+            /** @var UserEntity */
+            return UserEntity::newInstance();
+        }
+    }
+
+    /**
+     * 获取用户实体集合 根据 uid集合
+     * @param array $uidList
+     * @return UserEntity[]
+     */
+    public function getUserEntityListByUidList(array $uidList): array
+    {
+        return $this->dao->getUserEntityListByUidList($uidList);
+    }
+
+    /**
+     * 获取用户实体集合 根据 uid集合
+     * @param array $uidList
+     * @return UserEntity[]
+     */
+    public function getUserEntityMapByUidList(array $uidList): array
+    {
+        $userEntityList = $this->getUserEntityListByUidList($uidList);
+        /** @var UserEntity[] $userEntityMapByUid */
+        $userEntityMapByUid = array_column($userEntityList, null, 'uid');
+        return $userEntityMapByUid;
+    }
+
+    /**
+     * 更新用户积分 并 写入积分变动记录
+     * @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)
+                ->setRewardSocre($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;
+    }
+
+    /**
+     * 更新用户复购金 并 写入 复购金变动记录
+     * @param int $uid
+     * @param int $recordId
+     * @return float
+     */
+    public function updateUserBrokeragePriceByRecordId(int $uid, int $recordId): float
+    {
+        $userEntity = $this->getUserEntityByUid($uid);
+        if (empty($userEntity->getUid())) {
+            throw new ValidateException('未查询到用户信息');
+        }
+
+        /** @var UserBillRepository $userBillRepository */
+        $userBillRepository = app()->make(UserBillRepository::class);
+        $userBillEntity = $userBillRepository->getUserBillEntityByBillId($recordId);
+        if (empty($userBillEntity->getBillId())) {
+            throw new ValidateException('未查询到佣金记录信息');
+        }
+        if ($userBillEntity->getCommissionType() != UserBillEnum::COMMISSION_TYPE['DIRECT_REFERRAL']['code'] && $userBillEntity->getCommissionType() != UserBillEnum::COMMISSION_TYPE['SHARE_EARNINGS']['code']) {
+            throw new ValidateException('该记录信息非佣金记录');
+        }
+        if ($userBillEntity->getStatus() != UserBillEnum::STATUS['PENDING']['code']) {
+            throw new ValidateException('该记录信息非待分配状态');
+        }
+
+        if ($userBillEntity->getPm() == UserBillEnum::PM['EXPEND']['code']) {
+            $surplus = bcsub($userEntity->getBrokeragePrice(), $userBillEntity->getNumber(), 2);
+            if ($surplus < 0.00) {
+                throw new ValidateException('用户佣金不足');
+            }
+        } else {
+            $surplus = bcadd($userEntity->getBrokeragePrice(), $userBillEntity->getNumber(), 2);
+        }
+        try {
+            $this->dao->update($uid, ['brokerage_price' => $surplus]);
+
+            // 注意 单一
+            // $userBillRepository->updateStatusByBillId($userBillEntity->getBillId(), UserBillEnum::STATUS['VALID']['code']);
+        } catch (DbException $e) {
+            throw new ValidateException('更新京豆失败');
+        }
+        return (float)$surplus;
+    }
+
+    /**
+     * 批量更新
+     * @param $dataList
+     * @return array
+     */
+    public function batchUpdateUserDataByDataList($dataList): array
+    {
+        return $this->dao->saveAll($dataList);
+    }
 }

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/UserSignFugouRepository.php

@@ -0,0 +1,236 @@
+<?php
+
+namespace app\common\repositories\user;
+
+use app\common\dao\user\UserSignFugouDao;
+use app\common\enum\user\UserSignFugouEnum;
+use app\common\repositories\BaseRepository;
+use app\common\repositories\store\order\StoreOrderRepository;
+use app\entity\data\user\UserEntity;
+use app\entity\data\user\UserSignFugouEntity;
+use think\db\exception\DbException;
+use think\exception\ValidateException;
+
+class UserSignFugouRepository extends BaseRepository
+{
+    public function __construct(UserSignFugouDao $dao)
+    {
+        $this->dao = $dao;
+    }
+
+    /**
+     * @param int $id
+     * @return UserSignFugouEntity
+     */
+    public function getUserSignFugouEntityById(int $id): UserSignFugouEntity
+    {
+        $entityList = $this->getUserSignFugouEntityListByIdList([$id]);
+        $entity = array_shift($entityList);
+        if ($entity instanceof UserSignFugouEntity) {
+            return $entity;
+        } else {
+            /** @var UserSignFugouEntity */
+            return UserSignFugouEntity::newInstance();
+        }
+    }
+
+    /**
+     * @param array $idList
+     * @return UserSignFugouEntity[]
+     */
+    public function getUserSignFugouEntityListByIdList(array $idList): array
+    {
+        return $this->dao->getUserSignFugouEntityListByIdList($idList);
+    }
+
+    /**
+     * @param string $orderType
+     * @param array $orderIdList
+     * @return UserSignFugouEntity[]
+     */
+    public function getUserSignFugouEntityListByOrderIdListAndPending(string $orderType, array $orderIdList): array
+    {
+        return $this->dao->getUserSignFugouEntityListByOrderIdListAndPending($orderType, $orderIdList);
+    }
+
+    public function create($data)
+    {
+        return $this->dao->create($data);
+    }
+
+    /**
+     * 写入 复购金 记录
+     * @param UserSignFugouEntity $userSignFugouEntity
+     * @return UserSignFugouEntity
+     */
+    public function createByEntity(UserSignFugouEntity $userSignFugouEntity): UserSignFugouEntity
+    {
+        $result = $this->dao->create($userSignFugouEntity->toUnderlineArray())->toArray();
+        /** @var UserSignFugouEntity $entity */
+        $entity = UserSignFugouEntity::newInstance($result);
+        return $entity;
+    }
+
+    /**
+     * 添加 复购金记录
+     * @param int $uid
+     * @param int $type
+     * @param float $number
+     * @param int $commissionType
+     * @param string $mark
+     * @param string $orderType
+     * @param string $orderId
+     * @return UserSignFugouEntity
+     */
+    public function addUserSingFugou(int $uid, int $type, float $number, int $commissionType, string $mark = '', string $orderType = '', string $orderId = ''): UserSignFugouEntity
+    {
+        if (!empty($orderType)) {
+            if (!empty($orderId)) {
+                if ($orderType == UserSignFugouEnum::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 UserSignFugouEntity $userSignFugouEntity */
+        $userSignFugouEntity = UserSignFugouEntity::newInstance();
+        $userSignFugouEntity->setUid($uid)
+            ->setType($type)
+            ->setNumber($number)
+            ->setCommissionType($commissionType)
+            ->setMark($mark)
+            ->setOrderType($orderType)
+            ->setOrderId($orderId)
+            ->setAddtime(time())
+            ->setStatus(UserSignFugouEnum::STATUS['Pending']['code']);
+
+        return $this->createByEntity($userSignFugouEntity);
+    }
+
+    /**
+     * 将 复购 记录设置为生效状态 并对用户的 复购 字段进行增减
+     * @param int $id
+     * @return int
+     */
+    public function execute(int $id): int
+    {
+        $result = $this->executeByIdList([$id]);
+        return array_shift($result);
+    }
+
+    /**
+     * 将 复购 记录设置为生效状态 并对用户的 复购 字段进行增减
+     * @param array $idList
+     * @return array
+     */
+    public function executeByIdList(array $idList): array
+    {
+        $userSignFugouEntityList = $this->getUserSignFugouEntityListByIdList($idList);
+        $userIdList = [];
+
+        // 忽略 已经生效的 记录
+        $userSignFugouEntityList = array_filter($userSignFugouEntityList, function ($entity) use (&$userIdList) {
+            // 积分数据不为空 用户不为空 状态属于待结算 并且结算字段为空
+            if ((!empty($entity->getId()) && !empty($entity->getUid()) && ($entity->getStatus() == UserSignFugouEnum::STATUS['Pending']['code']) && empty($entity->getSettlementTime()))) {
+                $userIdList[] = $entity->getUid();
+                return true;
+            }
+            return false;
+        });
+
+        if (!empty($userSignFugouEntityList)) {
+            // 获取用户 映射信息
+            /** @var UserRepository $userRepository */
+            $userRepository = app()->make(UserRepository::class);
+            /** @var UserEntity[] $userEntityMapByUid */
+            $userEntityMapByUid = [];
+            if (!empty($userIdList)) {
+                $userEntityMapByUid = $userRepository->getUserEntityMapByUidList($userIdList);
+            }
+
+            /** @var UserEntity[] $updateUserEntityList */
+            $updateUserEntityList = [];
+            /** @var UserSignFugouEntity[] $updateUserFugouEntityList */
+            $updateUserFugouEntityList = [];
+            foreach ($userSignFugouEntityList as $userSignFugouEntity) {
+
+                $userEntity = $userEntityMapByUid[$userSignFugouEntity->getUid()];
+                if (empty($userEntity) || empty($userEntity->getUid())) {
+                    throw new ValidateException("未查询到用户信息(FugouId:{$userSignFugouEntity->getId()})");
+                }
+
+                // 组建 更新 用户信息
+                if (isset($updateUserEntityList[$userEntity->getUid()])) {
+                    $updateUserEntity = $updateUserEntityList[$userEntity->getUid()];
+                } else {
+                    /** @var UserEntity $updateUserEntity */
+                    $updateUserEntity = UserEntity::newInstance();
+                    $updateUserEntity
+                        ->setUid($userEntity->getUid())
+                        ->setFugou($userEntity->getFugou());
+
+                }
+                // 组建 账单 记录
+                if (isset($updateUserFugouEntityList[$userSignFugouEntity->getId()])) {
+                    $updateUserSignFugouEntity = $updateUserFugouEntityList[$userSignFugouEntity->getId()];
+                } else {
+                    /** @var UserSignFugouEntity $updateUserSignFugouEntity */
+                    $updateUserSignFugouEntity = UserSignFugouEntity::newInstance();
+                    // 更新 账单记录 状态
+                    $updateUserSignFugouEntity
+                        ->setId($userSignFugouEntity->getId())
+                        ->setStatus(UserSignFugouEnum::STATUS['Valid']['code'])
+                        ->setSettlementTime(date('Y-m-d H:i:s'));
+                }
+
+                if ($userSignFugouEntity->getType() == UserSignFugouEnum::TYPE['Consume']['code']) {
+                    // 支出
+                    $updateUserEntity->setFugou(bcsub($updateUserEntity->getFugou(), $userSignFugouEntity->getNumber(), 2));
+                    if ($updateUserEntity->getFugou() < 0.00) {
+                        throw new ValidateException('用户复购金不足');
+                    }
+                } else {
+                    $updateUserEntity->setFugou(bcadd($updateUserEntity->getFugou(), $userSignFugouEntity->getNumber(), 2));
+                }
+                $updateUserSignFugouEntity->setSurplus($updateUserEntity->getFugou());
+
+                $updateUserEntityList[$userSignFugouEntity->getUid()] = $updateUserEntity;
+                $updateUserFugouEntityList[$userSignFugouEntity->getId()] = $updateUserSignFugouEntity;
+            }
+            try {
+                if (!empty($updateUserEntityList)) {
+                    $userRepository->batchUpdateUserDataByDataList(
+                        array_map(function (UserEntity $updateUserEntity) {
+                            return $updateUserEntity->toUnderlineArray();
+                        }, $updateUserEntityList)
+                    );
+                }
+
+                if (!empty($updateUserFugouEntityList)) {
+                    $this->batchUpdateUserSignFugouDataByDataList(
+                        array_map(function (UserSignFugouEntity $updateUserSignFugouEntity) {
+                            return $updateUserSignFugouEntity->toUnderlineArray();
+                        }, $updateUserFugouEntityList)
+                    );
+                }
+            } catch (\Exception $e) {
+                throw new ValidateException('用户复购金结算失败');
+            }
+        }
+        return $idList;
+    }
+
+    /**
+     * @param $dataList
+     * @return array
+     */
+    public function batchUpdateUserSignFugouDataByDataList($dataList): array
+    {
+        return $this->dao->saveAll($dataList);
+    }
+}

app/common/repositories/user/UserSignGongxianRepository.php

@@ -0,0 +1,236 @@
+<?php
+
+namespace app\common\repositories\user;
+
+use app\common\dao\user\UserSignGongxianDao;
+use app\common\enum\user\UserSignGongxianEnum;
+use app\common\repositories\BaseRepository;
+use app\common\repositories\store\order\StoreOrderRepository;
+use app\entity\data\user\UserEntity;
+use app\entity\data\user\UserSignGongxianEntity;
+use think\db\exception\DbException;
+use think\exception\ValidateException;
+
+class UserSignGongxianRepository extends BaseRepository
+{
+    public function __construct(UserSignGongxianDao $dao)
+    {
+        $this->dao = $dao;
+    }
+
+    /**
+     * @param int $id
+     * @return UserSignGongxianEntity
+     */
+    public function getUserSignGongxianEntityById(int $id): UserSignGongxianEntity
+    {
+        $entityList = $this->getUserSignGongxianEntityListByIdList([$id]);
+        $entity = array_shift($entityList);
+        if ($entity instanceof UserSignGongxianEntity) {
+            return $entity;
+        } else {
+            /** @var UserSignGongxianEntity */
+            return UserSignGongxianEntity::newInstance();
+        }
+    }
+
+    /**
+     * @param array $idList
+     * @return UserSignGongxianEntity[]
+     */
+    public function getUserSignGongxianEntityListByIdList(array $idList): array
+    {
+        return $this->dao->getUserSignGongxianEntityListByIdList($idList);
+    }
+
+    /**
+     * @param string $orderType
+     * @param array $orderIdList
+     * @return UserSignGongxianEntity[]
+     */
+    public function getUserSignGongxianEntityListByOrderIdListAndPending(string $orderType, array $orderIdList): array
+    {
+        return $this->dao->getUserSignGongxianEntityListByOrderIdListAndPending($orderType, $orderIdList);
+    }
+
+    public function create($data)
+    {
+        return $this->dao->create($data);
+    }
+
+    /**
+     * 写入贡献值记录
+     * @param UserSignGongxianEntity $userSignGongxianEntity
+     * @return UserSignGongxianEntity
+     */
+    public function createByEntity(UserSignGongxianEntity $userSignGongxianEntity): UserSignGongxianEntity
+    {
+        $result = $this->dao->create($userSignGongxianEntity->toUnderlineArray())->toArray();
+        /** @var UserSignGongxianEntity $entity */
+        $entity = UserSignGongxianEntity::newInstance($result);
+        return $entity;
+    }
+
+    /**
+     * 添加贡献值记录
+     * @param int $uid
+     * @param int $type
+     * @param float $number
+     * @param string $mark
+     * @param string $orderType
+     * @param string $orderId
+     * @return UserSignGongxianEntity
+     */
+    public function addUserSingGongxian(int $uid, int $type, float $number, string $mark = '', string $orderType = '', string $orderId = ''): UserSignGongxianEntity
+    {
+        $merId = 0;
+        if (!empty($orderType)) {
+            if (!empty($orderId)) {
+                if ($orderType == UserSignGongxianEnum::ORDER_TYPE['Platform']['code']) {
+                    /** @var StoreOrderRepository $storeOrderRepository */
+                    $storeOrderRepository = app()->make(StoreOrderRepository::class);
+                    $storeOrderEntity = $storeOrderRepository->getStoreOrderEntityByOrderId((int)$orderId);
+                    if (empty($storeOrderEntity->getOrderId())) {
+                        throw new ValidateException('未查询到订单信息');
+                    }
+                    $merId = $storeOrderEntity->getMerId();
+                }
+            }
+        }
+
+        /** @var UserSignGongxianEntity $userSignGongxianEntity */
+        $userSignGongxianEntity = UserSignGongxianEntity::newInstance();
+        $userSignGongxianEntity->setUid($uid)
+            ->setType($type)
+            ->setNumber($number)
+            ->setMark($mark)
+            ->setOrderType($orderType)
+            ->setOrderId($orderId)
+            ->setMerId($merId)
+            ->setAddtime(time())
+            ->setStatus(UserSignGongxianEnum::STATUS['PendingConfirmation']['code']);
+
+        return $this->createByEntity($userSignGongxianEntity);
+    }
+
+    /**
+     * 将 贡献值 直推贡献值 记录设置为生效状态 并对用户的 贡献值 直推贡献值 字段进行增减
+     * @param array $idList
+     * @return array
+     */
+    public function executeByIdList(array $idList): array
+    {
+        $userSignGongxianEntityList = $this->getUserSignGongxianEntityListByIdList($idList);
+        $userIdList = [];
+
+        // 忽略 已经生效的 记录
+        $userSignGongxianEntityList = array_filter($userSignGongxianEntityList, function ($entity) use (&$userIdList) {
+            // 积分数据不为空 用户不为空 状态属于待结算 并且结算字段为空
+            if ((!empty($entity->getId()) && !empty($entity->getUid()) && ($entity->getStatus() == UserSignGongxianEnum::STATUS['PendingConfirmation']['code']) && empty($entity->getSettlementTime()))) {
+                $userIdList[] = $entity->getUid();
+                return true;
+            }
+            return false;
+        });
+
+        if (!empty($userSignGongxianEntityList)) {
+            // 获取用户 映射信息
+            /** @var UserRepository $userRepository */
+            $userRepository = app()->make(UserRepository::class);
+            /** @var UserEntity[] $userEntityMapByUid */
+            $userEntityMapByUid = [];
+            if (!empty($userIdList)) {
+                $userEntityMapByUid = $userRepository->getUserEntityMapByUidList($userIdList);
+            }
+
+            /** @var UserEntity[] $updateUserEntityList */
+            $updateUserEntityList = [];
+            /** @var UserSignGongxianEntity[] $updateUserScoreEntityList */
+            $updateUserScoreEntityList = [];
+            foreach ($userSignGongxianEntityList as $userSignGongxianEntity) {
+
+                $userEntity = $userEntityMapByUid[$userSignGongxianEntity->getUid()];
+                if (empty($userEntity) || empty($userEntity->getUid())) {
+                    throw new ValidateException("未查询到用户信息(GongxianId:{$userSignGongxianEntity->getId()})");
+                }
+
+                // 组建 更新 用户信息
+                if (isset($updateUserEntityList[$userEntity->getUid()])) {
+                    $updateUserEntity = $updateUserEntityList[$userEntity->getUid()];
+                } else {
+                    /** @var UserEntity $updateUserEntity */
+                    $updateUserEntity = UserEntity::newInstance();
+                    $updateUserEntity
+                        ->setUid($userEntity->getUid())
+                        ->setContribute($userEntity->getContribute())
+                        ->setPerContribute($userEntity->getPerContribute());
+                }
+                // 组建 账单 记录
+                if (isset($updateUserScoreEntityList[$userSignGongxianEntity->getId()])) {
+                    $updateUserSignGongxianEntity = $updateUserScoreEntityList[$userSignGongxianEntity->getId()];
+                } else {
+                    /** @var UserSignGongxianEntity $updateUserSignGongxianEntity */
+                    $updateUserSignGongxianEntity = UserSignGongxianEntity::newInstance();
+                    // 更新 账单记录 状态
+                    $updateUserSignGongxianEntity
+                        ->setId($userSignGongxianEntity->getId())
+                        ->setStatus(UserSignGongxianEnum::STATUS['Valid']['code'])
+                        ->setSettlementTime(date('Y-m-d H:i:s'));
+                }
+
+                if ($userSignGongxianEntity->getType() == UserSignGongxianEnum::TYPE['Consume']['code']) {
+                    // 消耗
+                    if (strpos($userSignGongxianEntity->getMark(), '购买') !== false) {
+                        $updateUserEntity->setContribute(bcsub($updateUserEntity->getContribute(), $userSignGongxianEntity->getNumber(), 2));
+                        if ($updateUserEntity->getContribute() < 0.00) {
+                            throw new ValidateException('用户贡献值不足');
+                        }
+                        $updateUserSignGongxianEntity->setSurplus($updateUserEntity->getContribute());
+                    } else if (strpos($userSignGongxianEntity->getMark(), '推广') !== false) {
+                        $updateUserEntity->setPerContribute(bcsub($updateUserEntity->getPerContribute(), $userSignGongxianEntity->getNumber(), 2));
+                        if ($updateUserEntity->getPerContribute() < 0.00) {
+                            throw new ValidateException('用户推广贡献值不足');
+                        }
+                        $updateUserSignGongxianEntity->setSurplus($updateUserEntity->getPerContribute());
+                    }
+                } else {
+                    if (strpos($userSignGongxianEntity->getMark(), '购买') !== false) {
+                        $updateUserEntity->setContribute(bcadd($updateUserEntity->getContribute(), $userSignGongxianEntity->getNumber(), 2));
+                        $updateUserSignGongxianEntity->setSurplus($updateUserEntity->getContribute());
+                    } else if (strpos($userSignGongxianEntity->getMark(), '推广') !== false) {
+                        $updateUserEntity->setPerContribute(bcadd($updateUserEntity->getPerContribute(), $userSignGongxianEntity->getNumber(), 2));
+                        $updateUserSignGongxianEntity->setSurplus($updateUserEntity->getPerContribute());
+                    }
+                }
+
+                $updateUserEntityList[$userSignGongxianEntity->getUid()] = $updateUserEntity;
+                $updateUserScoreEntityList[$userSignGongxianEntity->getId()] = $updateUserSignGongxianEntity;
+            }
+            if (!empty($updateUserEntityList)) {
+                $userRepository->batchUpdateUserDataByDataList(
+                    array_map(function (UserEntity $updateUserEntity) {
+                        return $updateUserEntity->toUnderlineArray();
+                    }, $updateUserEntityList)
+                );
+            }
+
+            if (!empty($updateUserScoreEntityList)) {
+                $this->batchUpdateUserSignGongxianDataByDataList(
+                    array_map(function (UserSignGongxianEntity $updateUserSignGongxianEntity) {
+                        return $updateUserSignGongxianEntity->toUnderlineArray();
+                    }, $updateUserScoreEntityList)
+                );
+            }
+        }
+        return $idList;
+    }
+
+    /**
+     * @param $dataList
+     * @return array
+     */
+    public function batchUpdateUserSignGongxianDataByDataList($dataList): array
+    {
+        return $this->dao->saveAll($dataList);
+    }
+}

app/common/repositories/user/UserSignHongbaoRepository.php

@@ -0,0 +1,218 @@
+<?php
+
+namespace app\common\repositories\user;
+
+use app\common\dao\user\UserSignHongbaoDao;
+use app\common\enum\user\UserSignHongbaoEnum;
+use app\common\repositories\BaseRepository;
+use app\common\repositories\store\order\StoreOrderRepository;
+use app\entity\data\user\UserEntity;
+use app\entity\data\user\UserSignHongbaoEntity;
+use think\db\exception\DbException;
+use think\exception\ValidateException;
+
+class UserSignHongbaoRepository extends BaseRepository
+{
+    public function __construct(UserSignHongbaoDao $dao)
+    {
+        $this->dao = $dao;
+    }
+
+    /**
+     * @param int $id
+     * @return UserSignHongbaoEntity
+     */
+    public function getUserSignHongbaoEntityById(int $id): UserSignHongbaoEntity
+    {
+        $entityList = $this->getUserSignHongbaoEntityListByIdList([$id]);
+        $entity = array_shift($entityList);
+        if ($entity instanceof UserSignHongbaoEntity) {
+            return $entity;
+        } else {
+            /** @var UserSignHongbaoEntity */
+            return UserSignHongbaoEntity::newInstance();
+        }
+    }
+
+    /**
+     * @param array $idList
+     * @return UserSignHongbaoEntity[]
+     */
+    public function getUserSignHongbaoEntityListByIdList(array $idList): array
+    {
+        return $this->dao->getUserSignHongbaoEntityListByIdList($idList);
+    }
+
+    /**
+     * @param string $orderType
+     * @param array $orderIdList
+     * @return UserSignHongbaoEntity[]
+     */
+    public function getUserSignHongbaoEntityListByOrderIdListAndPending(string $orderType, array $orderIdList): array
+    {
+        return $this->dao->getUserSignHongbaoEntityListByOrderIdListAndPending($orderType, $orderIdList);
+    }
+
+    public function create($data)
+    {
+        return $this->dao->create($data);
+    }
+
+    /**
+     * 写入红包记录
+     * @param UserSignHongbaoEntity $userSignHongbaoEntity
+     * @return UserSignHongbaoEntity
+     */
+    public function createByEntity(UserSignHongbaoEntity $userSignHongbaoEntity): UserSignHongbaoEntity
+    {
+        $result = $this->dao->create($userSignHongbaoEntity->toUnderlineArray())->toArray();
+        /** @var UserSignHongbaoEntity $entity */
+        $entity = UserSignHongbaoEntity::newInstance($result);
+        return $entity;
+    }
+
+    /**
+     * 添加红包记录
+     * @param int $uid
+     * @param int $type
+     * @param float $number
+     * @param string $mark
+     * @param string $orderType
+     * @param string $orderId
+     * @return UserSignHongbaoEntity
+     */
+    public function addUserSingHongbao(int $uid, int $type, float $number, string $mark = '', string $orderType = '', string $orderId = ''): UserSignHongbaoEntity
+    {
+        if (!empty($orderType)) {
+            if (!empty($orderId)) {
+                if ($orderType == UserSignHongbaoEnum::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 UserSignHongbaoEntity $userSignHongbaoEntity */
+        $userSignHongbaoEntity = UserSignHongbaoEntity::newInstance();
+        $userSignHongbaoEntity->setUid($uid)
+            ->setType($type)
+            ->setNumber($number)
+            ->setMark($mark)
+            ->setOrderType($orderType)
+            ->setOrderId($orderId)
+            ->setAddtime(time())
+            ->setStatus(UserSignHongbaoEnum::STATUS['PendingConfirmation']['code']);
+
+        return $this->createByEntity($userSignHongbaoEntity);
+    }
+
+    /**
+     * 将 贡献值 直推贡献值 记录设置为生效状态 并对用户的 贡献值 直推贡献值 字段进行增减
+     * @param array $idList
+     * @return array
+     */
+    public function executeByIdList(array $idList): array
+    {
+        $userSignHongbaoEntityList = $this->getUserSignHongbaoEntityListByIdList($idList);
+        $userIdList = [];
+
+        // 忽略 已经生效的 记录
+        $userSignHongbaoEntityList = array_filter($userSignHongbaoEntityList, function ($entity) use (&$userIdList) {
+            // 积分数据不为空 用户不为空 状态属于待结算 并且结算字段为空
+            if ((!empty($entity->getId()) && !empty($entity->getUid()) && ($entity->getStatus() == UserSignHongbaoEnum::STATUS['PendingConfirmation']['code']) && empty($entity->getSettlementTime()))) {
+                $userIdList[] = $entity->getUid();
+                return true;
+            }
+            return false;
+        });
+
+        if (!empty($userSignHongbaoEntityList)) {
+            // 获取用户 映射信息
+            /** @var UserRepository $userRepository */
+            $userRepository = app()->make(UserRepository::class);
+            /** @var UserEntity[] $userEntityMapByUid */
+            $userEntityMapByUid = [];
+            if (!empty($userIdList)) {
+                $userEntityMapByUid = $userRepository->getUserEntityMapByUidList($userIdList);
+            }
+
+            /** @var UserEntity[] $updateUserEntityList */
+            $updateUserEntityList = [];
+            /** @var UserSignHongbaoEntity[] $updateUserSignHongbaoEntityList */
+            $updateUserSignHongbaoEntityList = [];
+            foreach ($userSignHongbaoEntityList as $userSignHongbaoEntity) {
+
+                $userEntity = $userEntityMapByUid[$userSignHongbaoEntity->getUid()];
+                if (empty($userEntity) || empty($userEntity->getUid())) {
+                    throw new ValidateException("未查询到用户信息(HongbaoId:{$userSignHongbaoEntity->getId()})");
+                }
+
+                // 组建 更新 用户信息
+                if (isset($updateUserEntityList[$userEntity->getUid()])) {
+                    $updateUserEntity = $updateUserEntityList[$userEntity->getUid()];
+                } else {
+                    /** @var UserEntity $updateUserEntity */
+                    $updateUserEntity = UserEntity::newInstance();
+                    $updateUserEntity
+                        ->setUid($userEntity->getUid())
+                        ->setHongbao($userEntity->getHongbao());
+                }
+                // 组建 账单 记录
+                if (isset($updateUserSignHongbaoEntityList[$userSignHongbaoEntity->getId()])) {
+                    $updateUserSignHongbaoEntity = $updateUserSignHongbaoEntityList[$userSignHongbaoEntity->getId()];
+                } else {
+                    /** @var UserSignHongbaoEntity $updateUserSignHongbaoEntity */
+                    $updateUserSignHongbaoEntity = UserSignHongbaoEntity::newInstance();
+                    // 更新 账单记录 状态
+                    $updateUserSignHongbaoEntity
+                        ->setId($userSignHongbaoEntity->getId())
+                        ->setStatus(UserSignHongbaoEnum::STATUS['Valid']['code'])
+                        ->setSettlementTime(date('Y-m-d H:i:s'));
+                }
+
+                if ($userSignHongbaoEntity->getType() == UserSignHongbaoEnum::TYPE['Consumption']['code']) {
+                    // 消耗
+                    $updateUserEntity->setHongbao(bcsub($updateUserEntity->getHongbao(), $userSignHongbaoEntity->getNumber(), 2));
+                    if ($updateUserEntity->getHongbao() < 0.00) {
+                        throw new ValidateException('用户红包不足');
+                    }
+                } else {
+                    $updateUserEntity->setHongbao(bcadd($updateUserEntity->getHongbao(), $userSignHongbaoEntity->getNumber(), 2));
+                }
+                $updateUserSignHongbaoEntity->setSurplus($updateUserEntity->getHongbao());
+
+                $updateUserEntityList[$userSignHongbaoEntity->getUid()] = $updateUserEntity;
+                $updateUserSignHongbaoEntityList[$userSignHongbaoEntity->getId()] = $updateUserSignHongbaoEntity;
+            }
+            if (!empty($updateUserEntityList)) {
+                $userRepository->batchUpdateUserDataByDataList(
+                    array_map(function (UserEntity $updateUserEntity) {
+                        return $updateUserEntity->toUnderlineArray();
+                    }, $updateUserEntityList)
+                );
+            }
+
+            if (!empty($updateUserBillEntityList)) {
+                $this->batchUpdateUserSignHongbaoDataByDataList(
+                    array_map(function (UserSignHongbaoEntity $updateUserSignHongbaoEntity) {
+                        return $updateUserSignHongbaoEntity->toUnderlineArray();
+                    }, $updateUserSignHongbaoEntityList)
+                );
+            }
+        }
+        return $idList;
+    }
+
+    /**
+     * @param $dataList
+     * @return array
+     */
+    public function batchUpdateUserSignHongbaoDataByDataList($dataList): array
+    {
+        return $this->dao->saveAll($dataList);
+    }
+}