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

app/common/dao/user/UserBillDao.php

@@ -240,4 +240,18 @@ class UserBillDao extends BaseDao
         }
         return $entityList;
     }
+
+    /**
+     * 批量更新
+     * @param $dataList
+     * @return array
+     */
+    public function saveAll($dataList): array
+    {
+        try {
+            return $this->getModel()->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,89 @@
+<?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;
+    }
+
+
+}

app/common/dao/user/UserDao.php

@@ -432,4 +432,18 @@ class UserDao extends BaseDao
         }
         return $entityList;
     }
+
+    /**
+     * 批量更新
+     * @param $dataList
+     * @return array
+     */
+    public function saveAll($dataList): array
+    {
+        try {
+            return $this->getModel()->saveAll($dataList)->toArray();
+        } catch (\Exception $e) {
+            return [];
+        }
+    }
 }

app/common/repositories/gzc/GzcLogRepository.php

@@ -45,7 +45,7 @@ class GzcLogRepository extends BaseRepository
      * @param int $payType
      * @return GzcLogEntity
      */
-    public function addGzcLog(int $uid, string $userName, string $mobile, string $userCard, int $orderType, string $orderId, float $pension, int $payType): GzcLogEntity
+    public function addGzcLog(int $uid, string $userName, string $mobile, string $userCard, int $orderType, string $orderId, float $pension, int $payType = 0): GzcLogEntity
     {
         $orderSn = '';
         $payTime = '';

app/common/repositories/user/UserBillRepository.php

@@ -14,10 +14,13 @@ namespace app\common\repositories\user;
 use app\common\dao\BaseDao;
 use app\common\dao\user\UserBillDao;
 use app\common\enum\user\UserBillEnum;
+use app\common\enum\user\UserCertificationEnum;
 use app\common\model\user\UserBill;
 use app\common\repositories\BaseRepository;
+use app\common\repositories\gzc\GzcLogRepository;
 use app\common\repositories\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;
@@ -489,33 +492,55 @@ class UserBillRepository extends BaseRepository
         return $this->dao->getUserBillEntityListByOrderIdListAndPending($typeShop, $orderIdList);
     }
 
+    /**
+     * @param $dataList
+     * @return array
+     */
+    public function batchUpdateUserBillDataByDataList($dataList): array
+    {
+        return $this->dao->saveAll($dataList);
+    }
 
     /**
      * 将 账单 记录设置为生效状态 并对用户的 对应 字段进行增减
      * @param array $idList
-     * @return UserBillEntity
+     * @return array
      */
-    public function executeByIdList(array $idList): UserBillEntity
+    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)) {
-            $userIdList = array_map(function ($userBillEntity) {
+            $pensionUidList = [];
+            $userIdList = array_map(function ($userBillEntity) use (&$pensionUidList) {
+                if ($userBillEntity->getType() == UserBillEnum::COMMISSION_TYPE['PENSION']['code']) {
+                    $pensionUidList[] = $userBillEntity->getUid();
+                }
                 return $userBillEntity->getUid();
             }, $userBillEntityList);
-            /** @var UserEntity[] $userEntityList */
-            $userEntityList = [];
+
+            // 获取用户 映射信息
+            /** @var UserRepository $userRepository */
+            $userRepository = app()->make(UserRepository::class);
             /** @var UserEntity[] $userEntityMapByUid */
             $userEntityMapByUid = [];
-
             if (!empty($userIdList)) {
-                /** @var UserRepository $userRepository */
-                $userRepository = app()->make(UserRepository::class);
-                $userEntityList = $userRepository->getUserEntityListByUidList($userIdList);
-                /** @var UserEntity[] $userEntityMapByUid */
-                $userEntityMapByUid = array_column($userEntityList, null, 'uid');
-
-
+                $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);
 
             $updateUserDataList = [];
             $updateUserBillDataList = [];
@@ -547,30 +572,51 @@ class UserBillRepository extends BaseRepository
                         $updateUserDataList[$userBillEntity->getUid()]['brokerage_price'] += $userBillEntity->getNumber();
                     }
                     // 更新佣金记录
-                    $updateUserBillDataList[$userBillEntity->getBillId()] = ['status' => UserBillEnum::STATUS['VALID']['code']];
+                    $updateUserBillDataList[$userBillEntity->getBillId()] = [
+                        'status' => UserBillEnum::STATUS['VALID']['code']
+                    ];
                 } else if ($userBillEntity->getType() == UserBillEnum::COMMISSION_TYPE['PENSION']['code']) {
+                    $updateUserBillDataList[$userBillEntity->getBillId()] = [
+                        'status' => UserBillEnum::STATUS['VALID']['code']
+                    ];
+                    if ($userBillEntity->getGzc() == UserBillEnum::GZC_STATUS['']) {
 
-                }
-
+                    }
+                    if (isset($userCertificationEntityMapByUid[$userBillEntity->getUid()])) {
+                        $userCertificationEntity = $userCertificationEntityMapByUid[$userBillEntity->getUid()];
+
+                        // 创建公证处记录
+                        $gzcLogRepository->addGzcLog(
+                            $userCertificationEntity->getUid(),
+                            $userCertificationEntity->getUserName(),
+                            $userCertificationEntity->getMobile(),
+                            $userCertificationEntity->getUserCard(),
+                            $userBillEntity->getTypeShop(),
+                            $userBillEntity->getOrderSn(),
+                            $userBillEntity->getNumber()
+                        );
+                        // 更新佣金记录
 
-                try {
-                    $userBillEntity
-                        ->setSurplus($surplus)
-                        ->setSettlementTime(date('Y-m-d H:i:s'));
-                    $userRepository->update($userEntity->getUid(), ['vr' => $surplus]);
-                    $this->dao->update($userBillEntity->getId(), [
-                        'surplus' => $userBillEntity->getSurplus(),
-                        'settlement_time' => $userBillEntity->getSettlementTime()
-                    ]);
-                } catch (DbException $e) {
+                    }
+                }
+                if (!empty($updateUserDataList)) {
+                    $updateList = [];
+                    foreach ($updateUserDataList as $uid => $fields) {
+                        $updateList[] = array_merge(['uid' => $uid], $fields);
+                    }
+                    $userRepository->batchUpdateUserDataByDataList($updateList);
+                }
 
+                if (!empty($updateUserBillDataList)) {
+                    $updateList = [];
+                    foreach ($updateUserBillDataList as $billId => $fields) {
+                        $updateList[] = array_merge(['bill_id' => $billId], $fields);
+                    }
+                    $this->batchUpdateUserBillDataByDataList($updateList);
                 }
             }
         }
 
-
-
-
-        return $userBillEntity;
+        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/UserRepository.php

@@ -4488,6 +4488,19 @@ class UserRepository extends BaseRepository
     }
 
     /**
+     * 获取用户实体集合 根据 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
@@ -4684,11 +4697,7 @@ class UserRepository extends BaseRepository
     /**
      * 更新用户复购金 并 写入 复购金变动记录
      * @param int $uid
-     * @param int $type
-     * @param float $fugou
-     * @param string $mark
-     * @param string $orderType
-     * @param string $orderId
+     * @param int $recordId
      * @return float
      */
     public function updateUserBrokeragePriceByRecordId(int $uid, int $recordId): float
@@ -4729,4 +4738,14 @@ class UserRepository extends BaseRepository
         }
         return (float)$surplus;
     }
+
+    /**
+     * 批量更新
+     * @param $dataList
+     * @return array
+     */
+    public function batchUpdateUserDataByDataList($dataList): array
+    {
+        return $this->dao->saveAll($dataList);
+    }
 }

app/entity/data/user/UserBillEntity.php

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