zxhxx 3 yıl önce
ebeveyn
işleme
8245e226a9
100 değiştirilmiş dosya ile 489 ekleme ve 489 silme
  1. 3 3
      app/Request.php
  2. 3 3
      app/command/ClearCacheAttachment.php
  3. 3 3
      app/command/FormatMenuPath.php
  4. 7 7
      app/common.php
  5. 14 14
      app/common/dao/BaseDao.php
  6. 9 9
      app/common/dao/article/ArticleCategoryDao.php
  7. 1 1
      app/common/dao/article/ArticleContentDao.php
  8. 2 2
      app/common/dao/article/ArticleDao.php
  9. 7 7
      app/common/dao/store/StoreAttrTemplateDao.php
  10. 1 1
      app/common/dao/store/StoreBrandCategoryDao.php
  11. 6 6
      app/common/dao/store/broadcast/BroadcastGoodsDao.php
  12. 7 7
      app/common/dao/store/broadcast/BroadcastRoomDao.php
  13. 14 14
      app/common/dao/store/coupon/StoreCouponDao.php
  14. 3 3
      app/common/dao/store/coupon/StoreCouponIssueUserDao.php
  15. 5 5
      app/common/dao/store/coupon/StoreCouponProductDao.php
  16. 2 2
      app/common/dao/store/coupon/StoreCouponUserDao.php
  17. 1 1
      app/common/dao/store/order/PresellOrderDao.php
  18. 2 2
      app/common/dao/store/order/StoreCartDao.php
  19. 5 5
      app/common/dao/store/order/StoreGroupOrderDao.php
  20. 8 8
      app/common/dao/store/order/StoreOrderDao.php
  21. 5 5
      app/common/dao/store/order/StoreOrderProductDao.php
  22. 3 3
      app/common/dao/store/order/StoreOrderStatusDao.php
  23. 2 2
      app/common/dao/store/order/StoreRefundOrderDao.php
  24. 10 10
      app/common/dao/store/product/ProductAttrValueDao.php
  25. 4 4
      app/common/dao/store/product/ProductDao.php
  26. 7 7
      app/common/dao/store/product/ProductReplyDao.php
  27. 10 10
      app/common/dao/store/service/StoreServiceDao.php
  28. 12 12
      app/common/dao/store/service/StoreServiceLogDao.php
  29. 4 4
      app/common/dao/system/CacheDao.php
  30. 5 5
      app/common/dao/system/admin/AdminDao.php
  31. 3 3
      app/common/dao/system/admin/LogDao.php
  32. 9 9
      app/common/dao/system/attachment/AttachmentCategoryDao.php
  33. 7 7
      app/common/dao/system/attachment/AttachmentDao.php
  34. 12 12
      app/common/dao/system/config/SystemConfigClassifyDao.php
  35. 7 7
      app/common/dao/system/config/SystemConfigDao.php
  36. 7 7
      app/common/dao/system/config/SystemConfigValueDao.php
  37. 8 8
      app/common/dao/system/groupData/GroupDao.php
  38. 10 10
      app/common/dao/system/groupData/GroupDataDao.php
  39. 20 20
      app/common/dao/system/menu/MenuDao.php
  40. 6 6
      app/common/dao/system/menu/RoleDao.php
  41. 1 1
      app/common/dao/system/merchant/FinancialRecordDao.php
  42. 13 13
      app/common/dao/system/merchant/MerchantAdminDao.php
  43. 4 4
      app/common/dao/system/merchant/MerchantCategoryDao.php
  44. 5 5
      app/common/dao/system/merchant/MerchantDao.php
  45. 4 4
      app/common/dao/system/notice/SystemNoticeLogDao.php
  46. 6 6
      app/common/dao/system/sms/SmsRecordDao.php
  47. 4 4
      app/common/dao/user/FeedbackDao.php
  48. 8 8
      app/common/dao/user/UserBillDao.php
  49. 16 16
      app/common/dao/user/UserDao.php
  50. 4 4
      app/common/dao/user/UserGroupDao.php
  51. 6 6
      app/common/dao/user/UserLabelDao.php
  52. 5 5
      app/common/dao/user/UserMerchantDao.php
  53. 3 3
      app/common/dao/user/UserRechargeDao.php
  54. 3 3
      app/common/dao/user/UserRelationDao.php
  55. 9 9
      app/common/dao/user/UserVisitDao.php
  56. 5 5
      app/common/dao/wechat/WechatQrcodeDao.php
  57. 6 6
      app/common/dao/wechat/WechatReplyDao.php
  58. 12 12
      app/common/dao/wechat/WechatUserDao.php
  59. 1 1
      app/common/middleware/AdminTokenMiddleware.php
  60. 1 1
      app/common/middleware/BaseMiddleware.php
  61. 1 1
      app/common/middleware/MerchantTokenMiddleware.php
  62. 1 1
      app/common/middleware/UserTokenMiddleware.php
  63. 4 4
      app/common/model/BaseModel.php
  64. 2 2
      app/common/model/article/Article.php
  65. 2 2
      app/common/model/article/ArticleCategory.php
  66. 2 2
      app/common/model/article/ArticleContent.php
  67. 5 5
      app/common/model/store/StoreAttrTemplate.php
  68. 2 2
      app/common/model/store/StoreBrand.php
  69. 2 2
      app/common/model/store/StoreBrandCategory.php
  70. 2 2
      app/common/model/store/StoreCategory.php
  71. 3 3
      app/common/model/store/broadcast/BroadcastGoods.php
  72. 3 3
      app/common/model/store/broadcast/BroadcastRoom.php
  73. 2 2
      app/common/model/store/coupon/StoreCoupon.php
  74. 2 2
      app/common/model/store/coupon/StoreCouponProduct.php
  75. 3 3
      app/common/model/store/coupon/StoreCouponUser.php
  76. 3 3
      app/common/model/store/order/StoreOrderStatus.php
  77. 1 1
      app/common/model/store/product/ProductReply.php
  78. 2 2
      app/common/model/store/shipping/ShippingTemplate.php
  79. 5 5
      app/common/model/system/Cache.php
  80. 5 5
      app/common/model/system/admin/Admin.php
  81. 2 2
      app/common/model/system/admin/Log.php
  82. 2 2
      app/common/model/system/attachment/Attachment.php
  83. 2 2
      app/common/model/system/attachment/AttachmentCategory.php
  84. 2 2
      app/common/model/system/auth/Menu.php
  85. 4 4
      app/common/model/system/auth/Role.php
  86. 4 4
      app/common/model/system/config/SystemConfig.php
  87. 6 6
      app/common/model/system/config/SystemConfigClassify.php
  88. 5 5
      app/common/model/system/config/SystemConfigValue.php
  89. 5 5
      app/common/model/system/groupData/SystemGroup.php
  90. 3 3
      app/common/model/system/groupData/SystemGroupData.php
  91. 2 2
      app/common/model/system/merchant/Merchant.php
  92. 5 5
      app/common/model/system/merchant/MerchantAdmin.php
  93. 3 3
      app/common/model/system/merchant/MerchantCategory.php
  94. 2 2
      app/common/model/system/merchant/MerchantIntention.php
  95. 4 4
      app/common/model/system/notice/SystemNoticeLog.php
  96. 2 2
      app/common/model/system/sms/SmsRecord.php
  97. 8 8
      app/common/model/user/User.php
  98. 2 2
      app/common/model/user/UserAddress.php
  99. 2 2
      app/common/model/user/UserBill.php
  100. 2 2
      app/common/model/user/UserGroup.php

+ 3 - 3
app/Request.php

@@ -34,7 +34,7 @@ class Request extends \think\Request
      * @param $db
      * @param $key
      * @return bool
-     * @author xaboy
+     * @author zfy
      * @day 2020/10/22
      */
     public function hasCache($db, $key)
@@ -46,7 +46,7 @@ class Request extends \think\Request
      * @param $db
      * @param $key
      * @return array|mixed|string
-     * @author xaboy
+     * @author zfy
      * @day 2020/10/22
      */
     public function getCache($db, $key)
@@ -65,7 +65,7 @@ class Request extends \think\Request
      * @param $db
      * @param $key
      * @param null $value
-     * @author xaboy
+     * @author zfy
      * @day 2020/10/22
      */
     public function setCache($db, $key, $value = null)

+ 3 - 3
app/command/ClearCacheAttachment.php

@@ -14,13 +14,13 @@ use think\console\Output;
 /**
  * Class FormatMenuPath
  * @package app\command
- * @author xaboy
+ * @author zfy
  * @day 2020/8/26
  */
 class ClearCacheAttachment extends Command
 {
     /**
-     * @author xaboy
+     * @author zfy
      * @day 2020/9/21
      */
     protected function configure()
@@ -35,7 +35,7 @@ class ClearCacheAttachment extends Command
      * @param Input $input
      * @param Output $output
      * @return int|void|null
-     * @author xaboy
+     * @author zfy
      * @day 2020/9/21
      */
     protected function execute(Input $input, Output $output)

+ 3 - 3
app/command/FormatMenuPath.php

@@ -13,13 +13,13 @@ use think\console\Output;
 /**
  * Class FormatMenuPath
  * @package app\command
- * @author xaboy
+ * @author zfy
  * @day 2020/8/26
  */
 class FormatMenuPath extends Command
 {
     /**
-     * @author xaboy
+     * @author zfy
      * @day 2020/8/26
      */
     protected function configure()
@@ -34,7 +34,7 @@ class FormatMenuPath extends Command
      * @param Input $input
      * @param Output $output
      * @return int|void|null
-     * @author xaboy
+     * @author zfy
      * @day 2020/8/26
      */
     protected function execute(Input $input, Output $output)

+ 7 - 7
app/common.php

@@ -210,7 +210,7 @@ if (!function_exists('getModelTime')) {
      * @param string $prefix
      * @param string $field
      * @return mixed
-     * @author xaboy
+     * @author zfy
      * @day 2020-04-29
      */
     function getModelTime(BaseQuery $model, string $section, $prefix = 'create_time', $field = '-')
@@ -269,7 +269,7 @@ if (!function_exists('systemConfig')) {
      *
      * @param string|string[] $key
      * @return mixed
-     * @author xaboy
+     * @author zfy
      * @day 2020-05-08
      */
     function systemConfig($key)
@@ -339,7 +339,7 @@ if (!function_exists('merchantConfig')) {
      * @param int $merId
      * @param string|string[] $key
      * @return mixed
-     * @author xaboy
+     * @author zfy
      * @day 2020-05-08
      */
     function merchantConfig(int $merId, $key)
@@ -380,7 +380,7 @@ if (!function_exists('systemGroupData')) {
      * @param int|null $page
      * @param int|null $limit
      * @return array
-     * @author xaboy
+     * @author zfy
      * @day 2020/5/27
      */
     function systemGroupData(string $key, ?int $page = null, ?int $limit = 10)
@@ -399,7 +399,7 @@ if (!function_exists('merchantGroupData')) {
      * @param int|null $page
      * @param int|null $limit
      * @return array
-     * @author xaboy
+     * @author zfy
      * @day 2020/5/27
      */
     function merchantGroupData(int $merId, string $key, ?int $page = null, ?int $limit = 10)
@@ -737,7 +737,7 @@ if (!function_exists('monday')) {
      *
      * @param null $time
      * @return false|string
-     * @author xaboy
+     * @author zfy
      * @day 2020/6/22
      */
     function monday($time = null)
@@ -750,7 +750,7 @@ if (!function_exists('orderLock')) {
     /**
      * @param string $name
      * @return Lock
-     * @author xaboy
+     * @author zfy
      * @day 2020/8/25
      */
     function makeLock($name = 'default'): Lock

+ 14 - 14
app/common/dao/BaseDao.php

@@ -16,14 +16,14 @@ use think\Model;
 /**
  * Class BaseDao
  * @package app\common\dao
- * @author xaboy
+ * @author zfy
  * @day 2020-03-30
  */
 abstract class BaseDao
 {
     /**
      * @return BaseModel
-     * @author xaboy
+     * @author zfy
      * @day 2020-03-30
      */
     abstract protected function getModel(): string;
@@ -31,7 +31,7 @@ abstract class BaseDao
 
     /**
      * @return string
-     * @author xaboy
+     * @author zfy
      * @day 2020-03-30
      */
     public function getPk()
@@ -42,7 +42,7 @@ abstract class BaseDao
     /**
      * @param int $id
      * @return bool
-     * @author xaboy
+     * @author zfy
      * @day 2020-03-27
      */
     public function exists(int $id)
@@ -56,7 +56,7 @@ abstract class BaseDao
      * @param $value
      * @param int|null $except
      * @return bool
-     * @author xaboy
+     * @author zfy
      * @day 2020-03-30
      */
     public function fieldExists($field, $value, ?int $except = null): bool
@@ -69,7 +69,7 @@ abstract class BaseDao
     /**
      * @param array $data
      * @return self|Model
-     * @author xaboy
+     * @author zfy
      * @day 2020-03-27
      */
     public function create(array $data)
@@ -83,7 +83,7 @@ abstract class BaseDao
      * @param array $data
      * @return int
      * @throws DbException
-     * @author xaboy
+     * @author zfy
      * @day 2020-03-27
      */
     public function update(int $id, array $data)
@@ -96,7 +96,7 @@ abstract class BaseDao
      * @param array $data
      * @return int
      * @throws DbException
-     * @author xaboy
+     * @author zfy
      * @day 2020/6/8
      */
     public function updates(array $ids, array $data)
@@ -109,7 +109,7 @@ abstract class BaseDao
      * @param int $id
      * @return int
      * @throws DbException
-     * @author xaboy
+     * @author zfy
      * @day 2020-03-27
      */
     public function delete(int $id)
@@ -124,7 +124,7 @@ abstract class BaseDao
      * @throws DataNotFoundException
      * @throws DbException
      * @throws ModelNotFoundException
-     * @author xaboy
+     * @author zfy
      * @day 2020-03-27
      */
     public function get($id)
@@ -139,7 +139,7 @@ abstract class BaseDao
      * @throws DataNotFoundException
      * @throws DbException
      * @throws ModelNotFoundException
-     * @author xaboy
+     * @author zfy
      * @day 2020/6/1
      */
     public function getWhere(array $where, string $field = '*', array $with = [])
@@ -156,7 +156,7 @@ abstract class BaseDao
      * @throws DataNotFoundException
      * @throws DbException
      * @throws ModelNotFoundException
-     * @author xaboy
+     * @author zfy
      * @day 2020/6/1
      */
     public function selectWhere(array $where, string $field = '*')
@@ -171,7 +171,7 @@ abstract class BaseDao
      * @throws DataNotFoundException
      * @throws DbException
      * @throws ModelNotFoundException
-     * @author xaboy
+     * @author zfy
      * @day 2020-03-27
      */
     public function getWith(int $id, $with = [])
@@ -183,7 +183,7 @@ abstract class BaseDao
     /**
      * @param array $data
      * @return int
-     * @author xaboy
+     * @author zfy
      * @day 2020/6/8
      */
     public function insertAll(array $data)

+ 9 - 9
app/common/dao/article/ArticleCategoryDao.php

@@ -18,7 +18,7 @@ use think\Model;
 /**
  * Class ArticleCategoryDao
  * @package app\common\dao\article
- * @author xaboy
+ * @author zfy
  * @day 2020-04-20
  */
 class ArticleCategoryDao extends BaseDao
@@ -26,7 +26,7 @@ class ArticleCategoryDao extends BaseDao
 
     /**
      * @return BaseModel
-     * @author xaboy
+     * @author zfy
      * @day 2020-03-30
      */
     protected function getModel(): string
@@ -37,7 +37,7 @@ class ArticleCategoryDao extends BaseDao
     /**
      * @param int $mer_id
      * @return array
-     * @author xaboy
+     * @author zfy
      * @day 2020-04-20
      */
     public function getAllOptions($mer_id = 0)
@@ -51,7 +51,7 @@ class ArticleCategoryDao extends BaseDao
      * @throws DataNotFoundException
      * @throws DbException
      * @throws ModelNotFoundException
-     * @author xaboy
+     * @author zfy
      * @day 2020-04-20
      */
     public function getAll($mer_id = 0,$status = null)
@@ -64,7 +64,7 @@ class ArticleCategoryDao extends BaseDao
     /**
      * @param array $where
      * @return \think\db\BaseQuery
-     * @author xaboy
+     * @author zfy
      * @day 2020/9/18
      */
     public function search(array $where)
@@ -82,7 +82,7 @@ class ArticleCategoryDao extends BaseDao
      * @param $value
      * @param null $except
      * @return bool
-     * @author xaboy
+     * @author zfy
      * @day 2020-04-20
      */
     public function merFieldExists(int $merId, $field, $value, $except = null)
@@ -97,7 +97,7 @@ class ArticleCategoryDao extends BaseDao
      * @param int $id
      * @param null $except
      * @return bool
-     * @author xaboy
+     * @author zfy
      * @day 2020-04-20
      */
     public function merExists(int $merId, int $id, $except = null)
@@ -112,7 +112,7 @@ class ArticleCategoryDao extends BaseDao
      * @throws DataNotFoundException
      * @throws DbException
      * @throws ModelNotFoundException
-     * @author xaboy
+     * @author zfy
      * @day 2020-04-15
      */
     public function get( $id, $merId = 0)
@@ -125,7 +125,7 @@ class ArticleCategoryDao extends BaseDao
      * @param int $merId
      * @return int
      * @throws DbException
-     * @author xaboy
+     * @author zfy
      * @day 2020-04-20
      */
     public function delete(int $id, $merId = 0)

+ 1 - 1
app/common/dao/article/ArticleContentDao.php

@@ -14,7 +14,7 @@ class ArticleContentDao extends BaseDao
 
     /**
      * @return BaseModel
-     * @author xaboy
+     * @author zfy
      * @day 2020-03-30
      */
     protected function getModel(): string

+ 2 - 2
app/common/dao/article/ArticleDao.php

@@ -21,7 +21,7 @@ class ArticleDao extends BaseDao
 
     /**
      * @return BaseModel
-     * @author xaboy
+     * @author zfy
      * @day 2020-03-30
      */
     protected function getModel(): string
@@ -98,7 +98,7 @@ class ArticleDao extends BaseDao
      * @param int $merId
      * @return int
      * @throws DbException
-     * @author xaboy
+     * @author zfy
      * @day 2020-04-20
      */
     public function delete(int $id, int $merId = 0)

+ 7 - 7
app/common/dao/store/StoreAttrTemplateDao.php

@@ -18,7 +18,7 @@ use think\Model;
 /**
  * Class StoreAttrTemplateDao
  * @package app\common\dao\store
- * @author xaboy
+ * @author zfy
  * @day 2020-05-06
  */
 class StoreAttrTemplateDao extends BaseDao
@@ -26,7 +26,7 @@ class StoreAttrTemplateDao extends BaseDao
 
     /**
      * @return BaseModel
-     * @author xaboy
+     * @author zfy
      * @day 2020-03-30
      */
     protected function getModel(): string
@@ -38,7 +38,7 @@ class StoreAttrTemplateDao extends BaseDao
      * @param $merId
      * @param array $where
      * @return BaseQuery
-     * @author xaboy
+     * @author zfy
      * @day 2020-05-06
      */
     public function search($merId, array $where = [])
@@ -51,7 +51,7 @@ class StoreAttrTemplateDao extends BaseDao
      * @param int $id
      * @param null $except
      * @return bool
-     * @author xaboy
+     * @author zfy
      * @day 2020-04-15
      */
     public function merExists(int $merId, int $id, $except = null)
@@ -65,7 +65,7 @@ class StoreAttrTemplateDao extends BaseDao
      * @param $value
      * @param null $except
      * @return bool
-     * @author xaboy
+     * @author zfy
      * @day 2020-04-15
      */
     public function merFieldExists(int $merId, $field, $value, $except = null)
@@ -83,7 +83,7 @@ class StoreAttrTemplateDao extends BaseDao
      * @throws DataNotFoundException
      * @throws DbException
      * @throws ModelNotFoundException
-     * @author xaboy
+     * @author zfy
      * @day 2020-04-15
      */
     public function get( $id, $merId = 0)
@@ -96,7 +96,7 @@ class StoreAttrTemplateDao extends BaseDao
      * @param int $merId
      * @return int
      * @throws DbException
-     * @author xaboy
+     * @author zfy
      * @day 2020-04-15
      */
     public function delete(int $id, $merId = 0)

+ 1 - 1
app/common/dao/store/StoreBrandCategoryDao.php

@@ -49,7 +49,7 @@ class StoreBrandCategoryDao extends BaseDao
 
     /**
      * @return array
-     * @author xaboy
+     * @author zfy
      * @day 2020/7/22
      */
     public function options()

+ 6 - 6
app/common/dao/store/broadcast/BroadcastGoodsDao.php

@@ -15,7 +15,7 @@ use think\db\exception\DbException;
 /**
  * Class BroadcastGoodsDao
  * @package app\common\dao\store\broadcast
- * @author xaboy
+ * @author zfy
  * @day 2020/7/29
  */
 class BroadcastGoodsDao extends BaseDao
@@ -23,7 +23,7 @@ class BroadcastGoodsDao extends BaseDao
 
     /**
      * @return string
-     * @author xaboy
+     * @author zfy
      * @day 2020/7/29
      */
     protected function getModel(): string
@@ -35,7 +35,7 @@ class BroadcastGoodsDao extends BaseDao
      * @param int $id
      * @return int
      * @throws DbException
-     * @author xaboy
+     * @author zfy
      * @day 2020/7/30
      */
     public function delete(int $id)
@@ -46,7 +46,7 @@ class BroadcastGoodsDao extends BaseDao
     /**
      * @param int $id
      * @return bool
-     * @author xaboy
+     * @author zfy
      * @day 2020/7/30
      */
     public function exists(int $id)
@@ -58,7 +58,7 @@ class BroadcastGoodsDao extends BaseDao
      * @param int $id
      * @param int $merId
      * @return bool
-     * @author xaboy
+     * @author zfy
      * @day 2020/7/30
      */
     public function merExists(int $id, int $merId)
@@ -69,7 +69,7 @@ class BroadcastGoodsDao extends BaseDao
     /**
      * @param array $where
      * @return BaseQuery
-     * @author xaboy
+     * @author zfy
      * @day 2020/7/30
      */
     public function search(array $where)

+ 7 - 7
app/common/dao/store/broadcast/BroadcastRoomDao.php

@@ -18,7 +18,7 @@ use think\Model;
 /**
  * Class BroadcastRoomDao
  * @package app\common\dao\store\broadcast
- * @author xaboy
+ * @author zfy
  * @day 2020/7/29
  */
 class BroadcastRoomDao extends BaseDao
@@ -26,7 +26,7 @@ class BroadcastRoomDao extends BaseDao
 
     /**
      * @return string
-     * @author xaboy
+     * @author zfy
      * @day 2020/7/29
      */
     protected function getModel(): string
@@ -38,7 +38,7 @@ class BroadcastRoomDao extends BaseDao
      * @param int $id
      * @return int
      * @throws DbException
-     * @author xaboy
+     * @author zfy
      * @day 2020/7/30
      */
     public function delete(int $id)
@@ -49,7 +49,7 @@ class BroadcastRoomDao extends BaseDao
     /**
      * @param int $id
      * @return bool
-     * @author xaboy
+     * @author zfy
      * @day 2020/7/30
      */
     public function exists(int $id)
@@ -61,7 +61,7 @@ class BroadcastRoomDao extends BaseDao
      * @param int $id
      * @param int $merId
      * @return bool
-     * @author xaboy
+     * @author zfy
      * @day 2020/7/30
      */
     public function merExists(int $id, int $merId)
@@ -77,7 +77,7 @@ class BroadcastRoomDao extends BaseDao
     /**
      * @param array $where
      * @return BaseQuery
-     * @author xaboy
+     * @author zfy
      * @day 2020/7/30
      */
     public function search(array $where)
@@ -133,7 +133,7 @@ class BroadcastRoomDao extends BaseDao
      * @throws DataNotFoundException
      * @throws DbException
      * @throws ModelNotFoundException
-     * @author xaboy
+     * @author zfy
      * @day 2020/7/31
      */
     public function validRoom($roomId, $merId)

+ 14 - 14
app/common/dao/store/coupon/StoreCouponDao.php

@@ -20,7 +20,7 @@ use think\Model;
 /**
  * Class StoreCouponIssueDao
  * @package app\common\dao\store\coupon
- * @author xaboy
+ * @author zfy
  * @day 2020-05-14
  */
 class StoreCouponDao extends BaseDao
@@ -28,7 +28,7 @@ class StoreCouponDao extends BaseDao
 
     /**
      * @return BaseModel
-     * @author xaboy
+     * @author zfy
      * @day 2020-03-30
      */
     protected function getModel(): string
@@ -40,7 +40,7 @@ class StoreCouponDao extends BaseDao
      * @param int $merId
      * @param array $where
      * @return BaseQuery
-     * @author xaboy
+     * @author zfy
      * @day 2020-05-14
      */
     public function search(?int $merId, array $where)
@@ -70,7 +70,7 @@ class StoreCouponDao extends BaseDao
      * @param int|null $type
      * @param int $send_type
      * @return BaseQuery
-     * @author xaboy
+     * @author zfy
      * @day 2020/6/18
      */
     public function validCouponQuery(int $type = null, $send_type = 0)
@@ -102,7 +102,7 @@ class StoreCouponDao extends BaseDao
      * @throws DataNotFoundException
      * @throws DbException
      * @throws ModelNotFoundException
-     * @author xaboy
+     * @author zfy
      * @day 2020/6/19
      */
     public function validCoupon($id, $uid)
@@ -121,7 +121,7 @@ class StoreCouponDao extends BaseDao
      * @throws DbException
      * @throws DataNotFoundException
      * @throws ModelNotFoundException
-     * @author xaboy
+     * @author zfy
      * @day 2020/6/1
      */
     public function validMerCoupon($merId, $uid = null, $type = 0)
@@ -137,7 +137,7 @@ class StoreCouponDao extends BaseDao
      * @param $merId
      * @param null $uid
      * @return int
-     * @author xaboy
+     * @author zfy
      * @day 2020/6/19
      */
     public function validMerCouponExists($merId, $uid = null)
@@ -156,7 +156,7 @@ class StoreCouponDao extends BaseDao
      * @throws DbException
      * @throws DataNotFoundException
      * @throws ModelNotFoundException
-     * @author xaboy
+     * @author zfy
      * @day 2020/6/1
      */
     public function validProductCoupon(array $couponIds, $uid = null)
@@ -187,7 +187,7 @@ class StoreCouponDao extends BaseDao
      * @param int $id
      * @return int
      * @throws DbException
-     * @author xaboy
+     * @author zfy
      * @day 2020-05-13
      */
     public function delete(int $id)
@@ -198,7 +198,7 @@ class StoreCouponDao extends BaseDao
     /**
      * @param int $id
      * @return bool
-     * @author xaboy
+     * @author zfy
      * @day 2020-05-13
      */
     public function exists(int $id)
@@ -211,7 +211,7 @@ class StoreCouponDao extends BaseDao
      * @param int $id
      * @return int
      * @throws DbException
-     * @author xaboy
+     * @author zfy
      * @day 2020-05-13
      */
     public function merDelete(int $merId, int $id)
@@ -223,7 +223,7 @@ class StoreCouponDao extends BaseDao
      * @param int $merId
      * @param int $id
      * @return bool
-     * @author xaboy
+     * @author zfy
      * @day 2020-05-13
      */
     public function merExists(int $merId, int $id)
@@ -236,7 +236,7 @@ class StoreCouponDao extends BaseDao
      * @throws DataNotFoundException
      * @throws DbException
      * @throws ModelNotFoundException
-     * @author xaboy
+     * @author zfy
      * @day 2020/6/18
      */
     public function newPeopleCoupon()
@@ -250,7 +250,7 @@ class StoreCouponDao extends BaseDao
      * @throws DataNotFoundException
      * @throws DbException
      * @throws ModelNotFoundException
-     * @author xaboy
+     * @author zfy
      * @day 2020/6/19
      */
     public function getGiveCoupon(array $ids = null)

+ 3 - 3
app/common/dao/store/coupon/StoreCouponIssueUserDao.php

@@ -14,7 +14,7 @@ use think\db\BaseQuery;
 /**
  * Class StoreCouponIssueUserDao
  * @package app\common\dao\store\coupon
- * @author xaboy
+ * @author zfy
  * @day 2020/6/2
  */
 class StoreCouponIssueUserDao extends BaseDao
@@ -22,7 +22,7 @@ class StoreCouponIssueUserDao extends BaseDao
 
     /**
      * @return string
-     * @author xaboy
+     * @author zfy
      * @day 2020/6/2
      */
     protected function getModel(): string
@@ -33,7 +33,7 @@ class StoreCouponIssueUserDao extends BaseDao
     /**
      * @param array $where
      * @return BaseQuery
-     * @author xaboy
+     * @author zfy
      * @day 2020/6/2
      */
     public function search(array $where)

+ 5 - 5
app/common/dao/store/coupon/StoreCouponProductDao.php

@@ -17,7 +17,7 @@ use think\db\exception\ModelNotFoundException;
 /**
  * Class StoreCouponProductDao
  * @package app\common\dao\store\coupon
- * @author xaboy
+ * @author zfy
  * @day 2020-05-13
  */
 class StoreCouponProductDao extends BaseDao
@@ -25,7 +25,7 @@ class StoreCouponProductDao extends BaseDao
 
     /**
      * @return BaseModel
-     * @author xaboy
+     * @author zfy
      * @day 2020-03-30
      */
     protected function getModel(): string
@@ -36,7 +36,7 @@ class StoreCouponProductDao extends BaseDao
     /**
      * @param array $data
      * @return int
-     * @author xaboy
+     * @author zfy
      * @day 2020-05-13
      */
     public function insertAll(array $data)
@@ -48,7 +48,7 @@ class StoreCouponProductDao extends BaseDao
      * @param $couponId
      * @return int
      * @throws DbException
-     * @author xaboy
+     * @author zfy
      * @day 2020-05-13
      */
     public function clear($couponId)
@@ -59,7 +59,7 @@ class StoreCouponProductDao extends BaseDao
     /**
      * @param $productId
      * @return array
-     * @author xaboy
+     * @author zfy
      * @day 2020/6/1
      */
     public function productByCouponId($productId)

+ 2 - 2
app/common/dao/store/coupon/StoreCouponUserDao.php

@@ -13,7 +13,7 @@ use app\common\model\store\coupon\StoreCouponUser;
 /**
  * Class StoreCouponUserDao
  * @package app\common\dao\store\coupon
- * @author xaboy
+ * @author zfy
  * @day 2020-05-14
  */
 class StoreCouponUserDao extends BaseDao
@@ -21,7 +21,7 @@ class StoreCouponUserDao extends BaseDao
 
     /**
      * @return BaseModel
-     * @author xaboy
+     * @author zfy
      * @day 2020-03-30
      */
     protected function getModel(): string

+ 1 - 1
app/common/dao/store/order/PresellOrderDao.php

@@ -39,7 +39,7 @@ class PresellOrderDao extends BaseDao
     /**
      * @param $time
      * @return array
-     * @author xaboy
+     * @author zfy
      * @day 2020/11/3
      */
     public function getTimeOutIds($time)

+ 2 - 2
app/common/dao/store/order/StoreCartDao.php

@@ -36,7 +36,7 @@ class StoreCartDao extends BaseDao
      * @param $uid
      * @param int|null $merId
      * @return array
-     * @author xaboy
+     * @author zfy
      * @day 2020/6/5
      */
     public function validIntersection(array $ids, $uid, int $merId = null): array
@@ -131,7 +131,7 @@ class StoreCartDao extends BaseDao
     /**
      * @param $source
      * @param array|null $ids
-     * @author xaboy
+     * @author zfy
      * @day 2020/8/31
      */
     public function getSourcePayInfo($source, ?array $ids = null)

+ 5 - 5
app/common/dao/store/order/StoreGroupOrderDao.php

@@ -12,7 +12,7 @@ use app\common\model\store\order\StoreGroupOrder;
 /**
  * Class StoreGroupOrderDao
  * @package app\common\dao\store\order
- * @author xaboy
+ * @author zfy
  * @day 2020/6/9
  */
 class StoreGroupOrderDao extends BaseDao
@@ -20,7 +20,7 @@ class StoreGroupOrderDao extends BaseDao
 
     /**
      * @return string
-     * @author xaboy
+     * @author zfy
      * @day 2020/6/9
      */
     protected function getModel(): string
@@ -31,7 +31,7 @@ class StoreGroupOrderDao extends BaseDao
     /**
      * @param null $uid
      * @return int
-     * @author xaboy
+     * @author zfy
      * @day 2020/6/11
      */
     public function orderNumber($uid = null)
@@ -44,7 +44,7 @@ class StoreGroupOrderDao extends BaseDao
     /**
      * @param array $where
      * @return \think\db\BaseQuery
-     * @author xaboy
+     * @author zfy
      * @day 2020/6/9
      */
     public function search(array $where)
@@ -64,7 +64,7 @@ class StoreGroupOrderDao extends BaseDao
      * @param $time
      * @param bool $is_remind
      * @return array
-     * @author xaboy
+     * @author zfy
      * @day 2020/6/9
      */
     public function getTimeOutIds($time, $is_remind = false)

+ 8 - 8
app/common/dao/store/order/StoreOrderDao.php

@@ -30,7 +30,7 @@ use think\Model;
 /**
  * Class StoreOrderDao
  * @package app\common\dao\store\order
- * @author xaboy
+ * @author zfy
  * @day 2020/6/8
  */
 class StoreOrderDao extends BaseDao
@@ -38,7 +38,7 @@ class StoreOrderDao extends BaseDao
 
     /**
      * @return string
-     * @author xaboy
+     * @author zfy
      * @day 2020/6/8
      */
     protected function getModel(): string
@@ -50,7 +50,7 @@ class StoreOrderDao extends BaseDao
      * @param array $where
      * @param int $sysDel
      * @return BaseQuery
-     * @author xaboyCRMEB
+     * @author zfyCRMEB
      * @day 2020/6/16
      */
     public function search(array $where, $sysDel = 0)
@@ -154,7 +154,7 @@ class StoreOrderDao extends BaseDao
      * @throws DataNotFoundException
      * @throws DbException
      * @throws ModelNotFoundException
-     * @author xaboy
+     * @author zfy
      * @day 2020/6/11
      */
     public function userOrder($id, $uid)
@@ -166,7 +166,7 @@ class StoreOrderDao extends BaseDao
      * @param array $where
      * @param $ids
      * @return BaseQuery
-     * @author xaboy
+     * @author zfy
      * @day 2020/6/26
      */
     public function usersOrderQuery(array $where, $ids, $uid)
@@ -189,7 +189,7 @@ class StoreOrderDao extends BaseDao
      * @param $value
      * @param int|null $except
      * @return bool
-     * @author xaboy
+     * @author zfy
      * @day 2020/6/11
      */
     public function fieldExists($field, $value, ?int $except = null): bool
@@ -202,7 +202,7 @@ class StoreOrderDao extends BaseDao
     /**
      * @param $id
      * @return mixed
-     * @author xaboy
+     * @author zfy
      * @day 2020/6/12
      */
     public function getMerId($id)
@@ -434,7 +434,7 @@ class StoreOrderDao extends BaseDao
     /**
      * @param $end
      * @return mixed
-     * @author xaboy
+     * @author zfy
      * @day 2020/9/16
      */
     public function getFinishTimeoutIds($end)

+ 5 - 5
app/common/dao/store/order/StoreOrderProductDao.php

@@ -15,7 +15,7 @@ use think\model\Relation;
 /**
  * Class StoreOrderProductDao
  * @package app\common\dao\store\order
- * @author xaboy
+ * @author zfy
  * @day 2020/6/10
  */
 class StoreOrderProductDao extends BaseDao
@@ -23,7 +23,7 @@ class StoreOrderProductDao extends BaseDao
 
     /**
      * @return string
-     * @author xaboy
+     * @author zfy
      * @day 2020/6/10
      */
     protected function getModel(): string
@@ -38,7 +38,7 @@ class StoreOrderProductDao extends BaseDao
      * @throws \think\db\exception\DataNotFoundException
      * @throws \think\db\exception\DbException
      * @throws \think\db\exception\ModelNotFoundException
-     * @author xaboy
+     * @author zfy
      * @day 2020/6/10
      */
     public function userOrderProduct($id, $uid)
@@ -51,7 +51,7 @@ class StoreOrderProductDao extends BaseDao
     /**
      * @param $orderId
      * @return int
-     * @author xaboy
+     * @author zfy
      * @day 2020/6/12
      */
     public function noReplyProductCount($orderId)
@@ -68,7 +68,7 @@ class StoreOrderProductDao extends BaseDao
      * @throws \think\db\exception\DataNotFoundException
      * @throws \think\db\exception\DbException
      * @throws \think\db\exception\ModelNotFoundException
-     * @author xaboy
+     * @author zfy
      * @day 2020/6/12
      */
     public function userRefundProducts(array $ids, $uid, $orderId = null)

+ 3 - 3
app/common/dao/store/order/StoreOrderStatusDao.php

@@ -13,7 +13,7 @@ use app\common\model\store\order\StoreOrderStatus;
 /**
  * Class StoreOrderStatusDao
  * @package app\common\dao\store\order
- * @author xaboy
+ * @author zfy
  * @day 2020/6/12
  */
 class StoreOrderStatusDao extends BaseDao
@@ -21,7 +21,7 @@ class StoreOrderStatusDao extends BaseDao
 
     /**
      * @return string
-     * @author xaboy
+     * @author zfy
      * @day 2020/6/12
      */
     protected function getModel(): string
@@ -32,7 +32,7 @@ class StoreOrderStatusDao extends BaseDao
     /**
      * @param $id
      * @return mixed
-     * @author xaboy
+     * @author zfy
      * @day 2020/6/12
      */
     public function search($id)

+ 2 - 2
app/common/dao/store/order/StoreRefundOrderDao.php

@@ -25,7 +25,7 @@ class StoreRefundOrderDao extends BaseDao
     /**
      * @param array $where
      * @return BaseQuery
-     * @author xaboy
+     * @author zfy
      * @day 2020/6/12
      */
     public function search(array $where)
@@ -106,7 +106,7 @@ class StoreRefundOrderDao extends BaseDao
      * @param $id
      * @return int
      * @throws DbException
-     * @author xaboy
+     * @author zfy
      * @day 2020/6/12
      */
     public function userDel($uid, $id)

+ 10 - 10
app/common/dao/store/product/ProductAttrValueDao.php

@@ -13,14 +13,14 @@ use think\facade\Db;
 /**
  * Class ProductAttrValueDao
  * @package app\common\dao\store\product
- * @author xaboy
+ * @author zfy
  * @day 2020/6/9
  */
 class ProductAttrValueDao extends BaseDao
 {
     /**
      * @return string
-     * @author xaboy
+     * @author zfy
      * @day 2020/6/9
      */
     protected function getModel(): string
@@ -103,7 +103,7 @@ class ProductAttrValueDao extends BaseDao
     /**
      * @param $id
      * @return mixed
-     * @author xaboy
+     * @author zfy
      * @day 2020/6/9
      */
     public function getSku($id)
@@ -117,7 +117,7 @@ class ProductAttrValueDao extends BaseDao
      * @param $value
      * @param null $except
      * @return mixed
-     * @author xaboy
+     * @author zfy
      * @day 2020/6/9
      */
     public function getFieldExists(?int $merId, $field, $value, $except = null)
@@ -135,7 +135,7 @@ class ProductAttrValueDao extends BaseDao
      * @param int $desc
      * @return int
      * @throws DbException
-     * @author xaboy
+     * @author zfy
      * @day 2020/6/8
      */
     public function descStock(int $productId, string $unique, int $desc)
@@ -152,7 +152,7 @@ class ProductAttrValueDao extends BaseDao
      * @param int $desc
      * @return int
      * @throws DbException
-     * @author xaboy
+     * @author zfy
      * @day 2020/6/8
      */
     public function descSkuStock(int $productId, string $sku, int $desc)
@@ -168,7 +168,7 @@ class ProductAttrValueDao extends BaseDao
      * @param string $unique
      * @param int $inc
      * @throws DbException
-     * @author xaboy
+     * @author zfy
      * @day 2020/6/8
      */
     public function incStock(int $productId, string $unique, int $inc)
@@ -182,7 +182,7 @@ class ProductAttrValueDao extends BaseDao
      * @param string $sku
      * @param int $inc
      * @throws DbException
-     * @author xaboy
+     * @author zfy
      * @day 2020/6/8
      */
     public function incSkuStock(int $productId, string $sku, int $inc)
@@ -195,7 +195,7 @@ class ProductAttrValueDao extends BaseDao
      * @param int $productId
      * @param string $unique
      * @return bool
-     * @author xaboy
+     * @author zfy
      * @day 2020/6/9
      */
     public function attrExists(int $productId, string $unique): bool
@@ -207,7 +207,7 @@ class ProductAttrValueDao extends BaseDao
      * @param int $productId
      * @param string $sku
      * @return bool
-     * @author xaboy
+     * @author zfy
      * @day 2020/6/9
      */
     public function skuExists(int $productId, string $sku): bool

+ 4 - 4
app/common/dao/store/product/ProductDao.php

@@ -255,7 +255,7 @@ class ProductDao extends BaseDao
      * @param int $merId
      * @param array $productIds
      * @return array
-     * @author xaboy
+     * @author zfy
      * @day 2020/5/26
      */
     public function productIdByImage(int $merId, array $productIds)
@@ -266,7 +266,7 @@ class ProductDao extends BaseDao
     /**
      * @param array $ids
      * @return array
-     * @author xaboy
+     * @author zfy
      * @day 2020/5/30
      */
     public function intersectionKey(array $ids): array
@@ -291,7 +291,7 @@ class ProductDao extends BaseDao
      * @param int $desc
      * @return int
      * @throws DbException
-     * @author xaboy
+     * @author zfy
      * @day 2020/6/8
      */
     public function descStock(int $productId, int $desc)
@@ -307,7 +307,7 @@ class ProductDao extends BaseDao
      * @param int $inc
      * @return int
      * @throws DbException
-     * @author xaboy
+     * @author zfy
      * @day 2020/6/8
      */
     public function incStock(int $productId, int $inc)

+ 7 - 7
app/common/dao/store/product/ProductReplyDao.php

@@ -17,7 +17,7 @@ use think\facade\Queue;
 /**
  * Class ProductReplyDao
  * @package app\common\dao\store\product
- * @author xaboy
+ * @author zfy
  * @day 2020/5/30
  */
 class ProductReplyDao extends BaseDao
@@ -25,7 +25,7 @@ class ProductReplyDao extends BaseDao
 
     /**
      * @return string
-     * @author xaboy
+     * @author zfy
      * @day 2020/5/30
      */
     protected function getModel(): string
@@ -36,7 +36,7 @@ class ProductReplyDao extends BaseDao
     /**
      * @param array $where
      * @return BaseQuery
-     * @author xaboy
+     * @author zfy
      * @day 2020/6/1
      */
     public function search(array $where)
@@ -87,7 +87,7 @@ class ProductReplyDao extends BaseDao
     /**
      * @param array $data
      * @return int
-     * @author xaboy
+     * @author zfy
      * @day 2020/5/30
      */
     public function insertAll(array $data)
@@ -98,7 +98,7 @@ class ProductReplyDao extends BaseDao
     /**
      * @param int $id
      * @return bool
-     * @author xaboy
+     * @author zfy
      * @day 2020/5/30
      */
     public function exists(int $id)
@@ -110,7 +110,7 @@ class ProductReplyDao extends BaseDao
      * @param $merId
      * @param int $id
      * @return bool
-     * @author xaboy
+     * @author zfy
      * @day 2020/6/28
      */
     public function merExists($merId, int $id)
@@ -122,7 +122,7 @@ class ProductReplyDao extends BaseDao
      * @param int $id
      * @return int
      * @throws DbException
-     * @author xaboy
+     * @author zfy
      * @day 2020/5/30
      */
     public function delete(int $id)

+ 10 - 10
app/common/dao/store/service/StoreServiceDao.php

@@ -17,7 +17,7 @@ use think\Model;
 /**
  * Class StoreServiceDao
  * @package app\common\dao\store\service
- * @author xaboy
+ * @author zfy
  * @day 2020/5/29
  */
 class StoreServiceDao extends BaseDao
@@ -25,7 +25,7 @@ class StoreServiceDao extends BaseDao
 
     /**
      * @return string
-     * @author xaboy
+     * @author zfy
      * @day 2020/5/29
      */
     protected function getModel(): string
@@ -36,7 +36,7 @@ class StoreServiceDao extends BaseDao
     /**
      * @param array $where
      * @return BaseQuery
-     * @author xaboy
+     * @author zfy
      * @day 2020/5/29
      */
     public function search(array $where)
@@ -67,7 +67,7 @@ class StoreServiceDao extends BaseDao
      * @param int $merId
      * @param int $id
      * @return bool
-     * @author xaboy
+     * @author zfy
      * @day 2020-05-13
      */
     public function merExists(int $merId, int $id)
@@ -80,7 +80,7 @@ class StoreServiceDao extends BaseDao
      * @param $uid
      * @param int|null $except
      * @return bool
-     * @author xaboy
+     * @author zfy
      * @day 2020/5/29
      */
     public function issetService($merId, $uid, ?int $except = null)
@@ -94,7 +94,7 @@ class StoreServiceDao extends BaseDao
      * @param $uid
      * @param int|null $except
      * @return bool
-     * @author xaboy
+     * @author zfy
      * @day 2020/5/29
      */
     public function isBindService($uid, ?int $except = null)
@@ -108,7 +108,7 @@ class StoreServiceDao extends BaseDao
      * @param int $id
      * @return int
      * @throws DbException
-     * @author xaboy
+     * @author zfy
      * @day 2020/5/29
      */
     public function delete(int $id)
@@ -122,7 +122,7 @@ class StoreServiceDao extends BaseDao
      * @throws DbException
      * @throws DataNotFoundException
      * @throws ModelNotFoundException
-     * @author xaboy
+     * @author zfy
      * @day 2020/5/29
      */
     public function getChatService($merId)
@@ -146,7 +146,7 @@ class StoreServiceDao extends BaseDao
      * @throws DataNotFoundException
      * @throws DbException
      * @throws ModelNotFoundException
-     * @author xaboy
+     * @author zfy
      * @day 2020/5/29
      */
     public function getValidServiceInfo($id)
@@ -157,7 +157,7 @@ class StoreServiceDao extends BaseDao
     /**
      * @param $merId
      * @return array
-     * @author xaboy
+     * @author zfy
      * @day 2020/7/1
      */
     public function getNoticeServiceInfo($merId)

+ 12 - 12
app/common/dao/store/service/StoreServiceLogDao.php

@@ -14,7 +14,7 @@ use think\db\BaseQuery;
 /**
  * Class StoreServiceLogDao
  * @package app\common\dao\store\service
- * @author xaboy
+ * @author zfy
  * @day 2020/5/29
  */
 class StoreServiceLogDao extends BaseDao
@@ -22,7 +22,7 @@ class StoreServiceLogDao extends BaseDao
 
     /**
      * @return string
-     * @author xaboy
+     * @author zfy
      * @day 2020/5/29
      */
     protected function getModel(): string
@@ -35,7 +35,7 @@ class StoreServiceLogDao extends BaseDao
      * @param $uid
      * @return int
      * @throws \think\db\exception\DbException
-     * @author xaboy
+     * @author zfy
      * @day 2020/6/16
      */
     public function userRead($merId, $uid)
@@ -47,7 +47,7 @@ class StoreServiceLogDao extends BaseDao
      * @param $uid
      * @param $merId
      * @return bool
-     * @author xaboy
+     * @author zfy
      * @day 2020/6/16
      */
     public function issetLog($uid, $merId)
@@ -61,7 +61,7 @@ class StoreServiceLogDao extends BaseDao
      * @param $serviceId
      * @return int
      * @throws \think\db\exception\DbException
-     * @author xaboy
+     * @author zfy
      * @day 2020/10/15
      */
     public function serviceRead($merId, $uid, $serviceId)
@@ -72,7 +72,7 @@ class StoreServiceLogDao extends BaseDao
     /**
      * @param array $where
      * @return \think\db\BaseQuery
-     * @author xaboy
+     * @author zfy
      * @day 2020/6/16
      */
     public function search(array $where)
@@ -90,7 +90,7 @@ class StoreServiceLogDao extends BaseDao
      * @param $merId
      * @param $uid
      * @return mixed
-     * @author xaboy
+     * @author zfy
      * @day 2020/5/29
      */
     public function getLastServiceId($merId, $uid)
@@ -101,7 +101,7 @@ class StoreServiceLogDao extends BaseDao
     /**
      * @param $uid
      * @return BaseQuery
-     * @author xaboy
+     * @author zfy
      * @day 2020/6/16
      */
     public function getMerchantListQuery($uid)
@@ -113,7 +113,7 @@ class StoreServiceLogDao extends BaseDao
      * TODO 客服的所有用户
      * @param $serviceId
      * @return BaseQuery
-     * @author xaboy
+     * @author zfy
      * @day 2020/6/16
      */
     public function getUserListQuery($serviceId)
@@ -140,7 +140,7 @@ class StoreServiceLogDao extends BaseDao
      * @throws \think\db\exception\DataNotFoundException
      * @throws \think\db\exception\DbException
      * @throws \think\db\exception\ModelNotFoundException
-     * @author xaboy
+     * @author zfy
      * @day 2020/6/19
      */
     public function getLastLog($merId, $uid)
@@ -153,7 +153,7 @@ class StoreServiceLogDao extends BaseDao
      * @param $uid
      * @param $sendType
      * @return int
-     * @author xaboy
+     * @author zfy
      * @day 2020/6/19
      */
     public function getUnReadNum($merId, $uid, $sendType)
@@ -164,7 +164,7 @@ class StoreServiceLogDao extends BaseDao
     /**
      * @param $uid
      * @return int
-     * @author xaboy
+     * @author zfy
      * @day 2020/6/19
      */
     public function totalUnReadNum($uid)

+ 4 - 4
app/common/dao/system/CacheDao.php

@@ -14,7 +14,7 @@ use think\db\exception\DbException;
 /**
  * Class CacheDao
  * @package app\common\dao\system
- * @author xaboy
+ * @author zfy
  * @day 2020-04-24
  */
 class CacheDao extends BaseDao
@@ -22,7 +22,7 @@ class CacheDao extends BaseDao
 
     /**
      * @return BaseModel
-     * @author xaboy
+     * @author zfy
      * @day 2020-03-30
      */
     protected function getModel(): string
@@ -33,7 +33,7 @@ class CacheDao extends BaseDao
     /**
      * @param $key
      * @return mixed
-     * @author xaboy
+     * @author zfy
      * @day 2020-04-24
      */
     public function getResult($key)
@@ -46,7 +46,7 @@ class CacheDao extends BaseDao
      * @param string $key
      * @param $data
      * @throws DbException
-     * @author xaboy
+     * @author zfy
      * @day 2020-04-24
      */
     public function keyUpdate(string $key, $data)

+ 5 - 5
app/common/dao/system/admin/AdminDao.php

@@ -20,7 +20,7 @@ class AdminDao extends BaseDao
 
     /**
      * @return BaseModel
-     * @author xaboy
+     * @author zfy
      * @day 2020-03-30
      */
     protected function getModel(): string
@@ -31,7 +31,7 @@ class AdminDao extends BaseDao
     /**
      * @param array $where
      * @return BaseQuery
-     * @author xaboy
+     * @author zfy
      * @day 2020-04-09
      */
     public function search(array $where = [], $is_del = 0,$level = true)
@@ -65,7 +65,7 @@ class AdminDao extends BaseDao
      * @throws DataNotFoundException
      * @throws DbException
      * @throws ModelNotFoundException
-     * @author xaboy
+     * @author zfy
      * @day 2020-04-09
      */
     public function get( $id)
@@ -79,7 +79,7 @@ class AdminDao extends BaseDao
      * @param $value
      * @param int|null $except
      * @return bool
-     * @author xaboy
+     * @author zfy
      * @day 2020-03-30
      */
     public function fieldExists($field, $value, ?int $except = null): bool
@@ -95,7 +95,7 @@ class AdminDao extends BaseDao
      * @throws DataNotFoundException
      * @throws DbException
      * @throws ModelNotFoundException
-     * @author xaboy
+     * @author zfy
      * @day 2020-04-09
      */
     public function accountByAdmin(string $account)

+ 3 - 3
app/common/dao/system/admin/LogDao.php

@@ -14,7 +14,7 @@ use think\db\BaseQuery;
 /**
  * Class LogDao
  * @package app\common\dao\system\admin
- * @author xaboy
+ * @author zfy
  * @day 2020-04-16
  */
 class LogDao extends BaseDao
@@ -22,7 +22,7 @@ class LogDao extends BaseDao
 
     /**
      * @return BaseModel
-     * @author xaboy
+     * @author zfy
      * @day 2020-03-30
      */
     protected function getModel(): string
@@ -34,7 +34,7 @@ class LogDao extends BaseDao
      * @param array $where
      * @param $merId
      * @return BaseQuery
-     * @author xaboy
+     * @author zfy
      * @day 2020-04-16
      */
     public function search(array $where, $merId)

+ 9 - 9
app/common/dao/system/attachment/AttachmentCategoryDao.php

@@ -18,14 +18,14 @@ use think\Model;
 /**
  * Class AttachmentCategoryDao
  * @package app\common\dao\system\attachment
- * @author xaboy
+ * @author zfy
  * @day 2020-04-22
  */
 class AttachmentCategoryDao extends BaseDao
 {
     /**
      * @return BaseModel
-     * @author xaboy
+     * @author zfy
      * @day 2020-03-30
      */
     protected function getModel(): string
@@ -39,7 +39,7 @@ class AttachmentCategoryDao extends BaseDao
      * @throws DataNotFoundException
      * @throws DbException
      * @throws ModelNotFoundException
-     * @author xaboy
+     * @author zfy
      * @day 2020-04-15
      */
     public function getAll($mer_id = 0)
@@ -89,7 +89,7 @@ class AttachmentCategoryDao extends BaseDao
     /**
      * @param int $mer_id
      * @return array
-     * @author xaboy
+     * @author zfy
      * @day 2020-04-20
      */
     public function getAllOptions($mer_id = 0)
@@ -102,7 +102,7 @@ class AttachmentCategoryDao extends BaseDao
      * @param int $id
      * @param null $except
      * @return bool
-     * @author xaboy
+     * @author zfy
      * @day 2020-04-15
      */
     public function merExists(int $merId, int $id, $except = null)
@@ -116,7 +116,7 @@ class AttachmentCategoryDao extends BaseDao
      * @param $value
      * @param null $except
      * @return bool
-     * @author xaboy
+     * @author zfy
      * @day 2020-04-15
      */
     public function merFieldExists(int $merId, $field, $value, $except = null)
@@ -134,7 +134,7 @@ class AttachmentCategoryDao extends BaseDao
      * @throws DataNotFoundException
      * @throws DbException
      * @throws ModelNotFoundException
-     * @author xaboy
+     * @author zfy
      * @day 2020-04-15
      */
     public function get($id, $merId = 0)
@@ -147,7 +147,7 @@ class AttachmentCategoryDao extends BaseDao
      * @param int $merId
      * @return int
      * @throws DbException
-     * @author xaboy
+     * @author zfy
      * @day 2020-04-15
      */
     public function delete(int $id, $merId = 0)
@@ -161,7 +161,7 @@ class AttachmentCategoryDao extends BaseDao
      * @throws DataNotFoundException
      * @throws DbException
      * @throws ModelNotFoundException
-     * @author xaboy
+     * @author zfy
      * @day 2020-04-30
      */
     public function updatePath(string $oldPath, string $path)

+ 7 - 7
app/common/dao/system/attachment/AttachmentDao.php

@@ -15,7 +15,7 @@ use think\db\exception\DbException;
 /**
  * Class AttachmentDao
  * @package app\common\dao\system\attachment
- * @author xaboy
+ * @author zfy
  * @day 2020-04-16
  */
 class AttachmentDao extends BaseDao
@@ -23,7 +23,7 @@ class AttachmentDao extends BaseDao
 
     /**
      * @return BaseModel
-     * @author xaboy
+     * @author zfy
      * @day 2020-03-30
      */
     protected function getModel(): string
@@ -34,7 +34,7 @@ class AttachmentDao extends BaseDao
     /**
      * @param array $where
      * @return BaseQuery
-     * @author xaboy
+     * @author zfy
      * @day 2020-04-15
      */
     public function search(array $where)
@@ -57,7 +57,7 @@ class AttachmentDao extends BaseDao
      * @param int $userType
      * @return int
      * @throws DbException
-     * @author xaboy
+     * @author zfy
      * @day 2020-04-16
      */
     public function delete(int $id, $userType = 0)
@@ -70,7 +70,7 @@ class AttachmentDao extends BaseDao
      * @param int $userType
      * @return int
      * @throws DbException
-     * @author xaboy
+     * @author zfy
      * @day 2020-04-15
      */
     public function batchDelete(array $ids, $userType = 0)
@@ -82,7 +82,7 @@ class AttachmentDao extends BaseDao
      * @param int $id
      * @param int $userType
      * @return bool
-     * @author xaboy
+     * @author zfy
      * @day 2020-04-16
      */
     public function exists(int $id, $userType = 0)
@@ -96,7 +96,7 @@ class AttachmentDao extends BaseDao
      * @param int $user_type
      * @return int
      * @throws DbException
-     * @author xaboy
+     * @author zfy
      * @day 2020-04-16
      */
     public function batchChange(array $ids, array $data, int $user_type = 0)

+ 12 - 12
app/common/dao/system/config/SystemConfigClassifyDao.php

@@ -18,7 +18,7 @@ use think\Model;
 /**
  * Class SystemConfigClassifyDao
  * @package app\common\dao\system\config
- * @author xaboy
+ * @author zfy
  * @day 2020-03-27
  */
 class SystemConfigClassifyDao extends BaseDao
@@ -26,7 +26,7 @@ class SystemConfigClassifyDao extends BaseDao
 
     /**
      * @return BaseModel
-     * @author xaboy
+     * @author zfy
      * @day 2020-03-30
      */
     protected function getModel(): string
@@ -36,7 +36,7 @@ class SystemConfigClassifyDao extends BaseDao
 
     /**
      * @return array
-     * @author xaboy
+     * @author zfy
      * @day 2020-03-27
      */
     public function getOptions()
@@ -46,7 +46,7 @@ class SystemConfigClassifyDao extends BaseDao
 
     /**
      * @return array
-     * @author xaboy
+     * @author zfy
      * @day 2020-04-22
      */
     public function getTopOptions()
@@ -59,7 +59,7 @@ class SystemConfigClassifyDao extends BaseDao
      * @throws DataNotFoundException
      * @throws DbException
      * @throws ModelNotFoundException
-     * @author xaboy
+     * @author zfy
      * @day 2020-03-31
      */
     public function all()
@@ -69,7 +69,7 @@ class SystemConfigClassifyDao extends BaseDao
 
     /**
      * @return int
-     * @author xaboy
+     * @author zfy
      * @day 2020-03-31
      */
     public function count()
@@ -84,7 +84,7 @@ class SystemConfigClassifyDao extends BaseDao
      * @throws DataNotFoundException
      * @throws DbException
      * @throws ModelNotFoundException
-     * @author xaboy
+     * @author zfy
      * @day 2020-03-27
      */
     public function children(int $pid, string $field = 'id,classify_name')
@@ -95,7 +95,7 @@ class SystemConfigClassifyDao extends BaseDao
     /**
      * @param int $id
      * @return bool
-     * @author xaboy
+     * @author zfy
      * @day 2020-03-27
      */
     public function existsChild(int $id): bool
@@ -107,7 +107,7 @@ class SystemConfigClassifyDao extends BaseDao
      * @param $key
      * @param int|null $except
      * @return bool
-     * @author xaboy
+     * @author zfy
      * @day 2020-03-27
      */
     public function keyExists($key, ?int $except = null): bool
@@ -119,7 +119,7 @@ class SystemConfigClassifyDao extends BaseDao
      * @param int $pid
      * @param int|null $except
      * @return bool
-     * @author xaboy
+     * @author zfy
      * @day 2020-03-27
      */
     public function pidExists(int $pid, ?int $except = null): bool
@@ -130,7 +130,7 @@ class SystemConfigClassifyDao extends BaseDao
     /**
      * @param string $key
      * @return mixed
-     * @author xaboy
+     * @author zfy
      * @day 2020-04-22
      */
     public function keyById(string $key)
@@ -144,7 +144,7 @@ class SystemConfigClassifyDao extends BaseDao
      * @throws DataNotFoundException
      * @throws DbException
      * @throws ModelNotFoundException
-     * @author xaboy
+     * @author zfy
      * @day 2020-04-22
      */
     public function keyByData(string $key)

+ 7 - 7
app/common/dao/system/config/SystemConfigDao.php

@@ -18,7 +18,7 @@ use think\db\exception\ModelNotFoundException;
 /**
  * Class SystemConfigDao
  * @package app\common\dao\system\config
- * @author xaboy
+ * @author zfy
  * @day 2020-03-27
  */
 class SystemConfigDao extends BaseDao
@@ -26,7 +26,7 @@ class SystemConfigDao extends BaseDao
 
     /**
      * @return BaseModel
-     * @author xaboy
+     * @author zfy
      * @day 2020-03-30
      */
     protected function getModel(): string
@@ -37,7 +37,7 @@ class SystemConfigDao extends BaseDao
     /**
      * @param int $classify_id
      * @return bool
-     * @author xaboy
+     * @author zfy
      * @day 2020-03-27
      */
     public function classifyIdExists(int $classify_id)
@@ -49,7 +49,7 @@ class SystemConfigDao extends BaseDao
      * @param $key
      * @param int|null $except
      * @return bool
-     * @author xaboy
+     * @author zfy
      * @day 2020-03-27
      */
     public function keyExists($key, ?int $except = null): bool
@@ -60,7 +60,7 @@ class SystemConfigDao extends BaseDao
     /**
      * @param array $where
      * @return BaseQuery
-     * @author xaboy
+     * @author zfy
      * @day 2020-03-31
      */
     public function search(array $where)
@@ -81,7 +81,7 @@ class SystemConfigDao extends BaseDao
      * @throws DataNotFoundException
      * @throws DbException
      * @throws ModelNotFoundException
-     * @author xaboy
+     * @author zfy
      * @day 2020-04-23
      */
     public function cidByConfig(int $cid, int $user_type)
@@ -93,7 +93,7 @@ class SystemConfigDao extends BaseDao
      * @param int $cid
      * @param $keys
      * @return array
-     * @author xaboy
+     * @author zfy
      * @day 2020-04-22
      */
     public function intersectionKey(int $cid, $keys): array

+ 7 - 7
app/common/dao/system/config/SystemConfigValueDao.php

@@ -14,7 +14,7 @@ use think\db\exception\DbException;
 /**
  * Class SystemConfigValueDao
  * @package app\common\dao\system\config
- * @author xaboy
+ * @author zfy
  * @day 2020-03-27
  */
 class SystemConfigValueDao extends BaseDao
@@ -22,7 +22,7 @@ class SystemConfigValueDao extends BaseDao
 
     /**
      * @return BaseModel
-     * @author xaboy
+     * @author zfy
      * @day 2020-03-30
      */
     protected function getModel(): string
@@ -36,7 +36,7 @@ class SystemConfigValueDao extends BaseDao
      * @param array $data
      * @return int
      * @throws DbException
-     * @author xaboy
+     * @author zfy
      * @day 2020-03-27
      */
     public function merUpdate(int $merId, string $key, array $data)
@@ -49,7 +49,7 @@ class SystemConfigValueDao extends BaseDao
      * @param array $keys
      * @param int $merId
      * @return array
-     * @author xaboy
+     * @author zfy
      * @day 2020-04-22
      */
     public function fields(array $keys, int $merId)
@@ -68,7 +68,7 @@ class SystemConfigValueDao extends BaseDao
      * @param int $merId
      * @return int
      * @throws DbException
-     * @author xaboy
+     * @author zfy
      * @day 2020-05-18
      */
     public function clear(array $keys, int $merId)
@@ -81,7 +81,7 @@ class SystemConfigValueDao extends BaseDao
      * @param string $key
      * @param int $merId
      * @return mixed|null
-     * @author xaboy
+     * @author zfy
      * @day 2020-05-08
      */
     public function value(string $key, int $merId)
@@ -95,7 +95,7 @@ class SystemConfigValueDao extends BaseDao
      * @param string $key
      * @param int $merId
      * @return bool
-     * @author xaboy
+     * @author zfy
      * @day 2020-03-27
      */
     public function merExists(string $key, int $merId): bool

+ 8 - 8
app/common/dao/system/groupData/GroupDao.php

@@ -18,7 +18,7 @@ use think\db\exception\ModelNotFoundException;
 /**
  * Class GroupDao
  * @package app\common\dao\system\groupData
- * @author xaboy
+ * @author zfy
  * @day 2020-03-27
  */
 class GroupDao extends BaseDao
@@ -26,7 +26,7 @@ class GroupDao extends BaseDao
 
     /**
      * @return string
-     * @author xaboy
+     * @author zfy
      * @day 2020-03-30
      */
     protected function getModel(): string
@@ -40,7 +40,7 @@ class GroupDao extends BaseDao
      * @throws DataNotFoundException
      * @throws DbException
      * @throws ModelNotFoundException
-     * @author xaboy
+     * @author zfy
      * @day 2020-04-01
      */
     public function all()
@@ -50,7 +50,7 @@ class GroupDao extends BaseDao
 
     /**
      * @return int
-     * @author xaboy
+     * @author zfy
      * @day 2020-04-01
      */
     public function count()
@@ -62,7 +62,7 @@ class GroupDao extends BaseDao
      * @param $page
      * @param $limit
      * @return BaseQuery
-     * @author xaboy
+     * @author zfy
      * @day 2020-04-01
      */
     public function page($page, $limit)
@@ -74,7 +74,7 @@ class GroupDao extends BaseDao
      * @param $key
      * @param int|null $except
      * @return bool
-     * @author xaboy
+     * @author zfy
      * @day 2020-03-27
      */
     public function keyExists($key, ?int $except = null): bool
@@ -85,7 +85,7 @@ class GroupDao extends BaseDao
     /**
      * @param $id
      * @return mixed
-     * @author xaboy
+     * @author zfy
      * @day 2020-04-02
      */
     public function fields($id)
@@ -96,7 +96,7 @@ class GroupDao extends BaseDao
     /**
      * @param string $key
      * @return mixed
-     * @author xaboy
+     * @author zfy
      * @day 2020/5/27
      */
     public function keyById(string $key)

+ 10 - 10
app/common/dao/system/groupData/GroupDataDao.php

@@ -18,7 +18,7 @@ use think\Model;
 /**
  * Class GroupDataDao
  * @package app\common\dao\system\groupData
- * @author xaboy
+ * @author zfy
  * @day 2020-03-27
  */
 class GroupDataDao extends BaseDao
@@ -26,7 +26,7 @@ class GroupDataDao extends BaseDao
 
     /**
      * @return BaseModel
-     * @author xaboy
+     * @author zfy
      * @day 2020-03-30
      */
     protected function getModel(): string
@@ -38,7 +38,7 @@ class GroupDataDao extends BaseDao
      * @param $merId
      * @param $groupId
      * @return BaseQuery
-     * @author xaboy
+     * @author zfy
      * @day 2020-03-30
      */
     public function getGroupDataWhere($merId, $groupId): BaseQuery
@@ -54,7 +54,7 @@ class GroupDataDao extends BaseDao
      * @param int|null $page
      * @param int|null $limit
      * @return array
-     * @author xaboy
+     * @author zfy
      * @day 2020/5/27
      */
     public function getGroupData($merId, $groupId, ?int $page = null, ?int $limit = 10)
@@ -84,7 +84,7 @@ class GroupDataDao extends BaseDao
      * @param int|null $page
      * @param int|null $limit
      * @return array
-     * @author xaboy
+     * @author zfy
      * @day 2020/6/3
      */
     public function getGroupDataId($merId, $groupId, ?int $page = null, ?int $limit = 10)
@@ -104,7 +104,7 @@ class GroupDataDao extends BaseDao
      * @param $data
      * @return int
      * @throws DbException
-     * @author xaboy
+     * @author zfy
      * @day 2020-03-30
      */
     public function merUpdate($merId, $id, $data)
@@ -118,7 +118,7 @@ class GroupDataDao extends BaseDao
      * @param $id
      * @return int
      * @throws DbException
-     * @author xaboy
+     * @author zfy
      * @day 2020-03-30
      */
     public function merDelete($merId, $id)
@@ -130,7 +130,7 @@ class GroupDataDao extends BaseDao
      * @param int $merId
      * @param int $id
      * @return bool
-     * @author xaboy
+     * @author zfy
      * @day 2020-04-02
      */
     public function merExists(int $merId, int $id)
@@ -142,7 +142,7 @@ class GroupDataDao extends BaseDao
      * @param int $groupId
      * @return int
      * @throws DbException
-     * @author xaboy
+     * @author zfy
      * @day 2020-05-16
      */
     public function clearGroup(int $groupId)
@@ -157,7 +157,7 @@ class GroupDataDao extends BaseDao
      * @throws DbException
      * @throws DataNotFoundException
      * @throws ModelNotFoundException
-     * @author xaboy
+     * @author zfy
      * @day 2020/6/2
      */
     public function merGet($id, $merId)

+ 20 - 20
app/common/dao/system/menu/MenuDao.php

@@ -17,14 +17,14 @@ use think\Model;
 /**
  * Class MenuDao
  * @package app\common\dao\system\menu
- * @author xaboy
+ * @author zfy
  * @day 2020-04-08
  */
 class MenuDao extends BaseDao
 {
     /**
      * @return BaseModel
-     * @author xaboy
+     * @author zfy
      * @day 2020-03-30
      */
     protected function getModel(): string
@@ -36,7 +36,7 @@ class MenuDao extends BaseDao
      * @param array $where
      * @param int $is_mer
      * @return BaseQuery
-     * @author xaboy
+     * @author zfy
      * @day 2020-04-08
      */
     public function search(array $where, int $is_mer = 0)
@@ -55,7 +55,7 @@ class MenuDao extends BaseDao
      * @throws DataNotFoundException
      * @throws DbException
      * @throws ModelNotFoundException
-     * @author xaboy
+     * @author zfy
      * @day 2020-04-08
      */
     public function getAllMenu($is_mer = 0)
@@ -69,7 +69,7 @@ class MenuDao extends BaseDao
      * @throws DataNotFoundException
      * @throws DbException
      * @throws ModelNotFoundException
-     * @author xaboy
+     * @author zfy
      * @day 2020-04-08
      */
     public function getAll($is_mer = 0)
@@ -81,7 +81,7 @@ class MenuDao extends BaseDao
      * @param int $id
      * @param int $is_mer
      * @return bool
-     * @author xaboy
+     * @author zfy
      * @day 2020-04-08
      */
     public function menuExists(int $id, $is_mer = 0)
@@ -93,7 +93,7 @@ class MenuDao extends BaseDao
      * @param int $id
      * @param int $is_mer
      * @return bool
-     * @author xaboy
+     * @author zfy
      * @day 2020-04-16
      */
     public function merExists(int $id, $is_mer = 0)
@@ -105,7 +105,7 @@ class MenuDao extends BaseDao
      * @param int $id
      * @param int $is_mer
      * @return bool
-     * @author xaboy
+     * @author zfy
      * @day 2020-04-08
      */
     public function authExists(int $id, $is_mer = 0)
@@ -117,7 +117,7 @@ class MenuDao extends BaseDao
      * @param string $route
      * @param int $is_mer
      * @return bool
-     * @author xaboy
+     * @author zfy
      * @day 2020-04-08
      */
     public function routeExists(string $route, $is_mer = 0)
@@ -128,7 +128,7 @@ class MenuDao extends BaseDao
     /**
      * @param int $is_mer
      * @return array
-     * @author xaboy
+     * @author zfy
      * @day 2020-04-08
      */
     public function getAllMenuOptions($is_mer = 0)
@@ -140,7 +140,7 @@ class MenuDao extends BaseDao
      * @param array $rule
      * @param int $is_mer
      * @return array
-     * @author xaboy
+     * @author zfy
      * @day 2020-04-10
      */
     public function ruleByMenuList(array $rule, $is_mer = 0)
@@ -159,7 +159,7 @@ class MenuDao extends BaseDao
     /**
      * @param int $is_mer
      * @return array
-     * @author xaboy
+     * @author zfy
      * @day 2020-04-10
      */
     public function getValidMenuList($is_mer = 0)
@@ -171,7 +171,7 @@ class MenuDao extends BaseDao
     /**
      * @param int $is_mer
      * @return array
-     * @author xaboy
+     * @author zfy
      * @day 2020-04-08
      */
     public function getAllOptions($is_mer = 0, $all = false)
@@ -187,7 +187,7 @@ class MenuDao extends BaseDao
      * @param $id
      * @param int $is_mer
      * @return mixed
-     * @author xaboy
+     * @author zfy
      * @day 2020-04-09
      */
     public function getPath($id, $is_mer = 0)
@@ -202,7 +202,7 @@ class MenuDao extends BaseDao
      * @throws DataNotFoundException
      * @throws DbException
      * @throws ModelNotFoundException
-     * @author xaboy
+     * @author zfy
      * @day 2020-04-08
      */
     public function getMenu(int $id, $is_mer = 0)
@@ -217,7 +217,7 @@ class MenuDao extends BaseDao
      * @throws DataNotFoundException
      * @throws DbException
      * @throws ModelNotFoundException
-     * @author xaboy
+     * @author zfy
      * @day 2020-04-08
      */
     public function getAuth(int $id, $is_mer = 0)
@@ -230,7 +230,7 @@ class MenuDao extends BaseDao
      * @param int $is_mer
      * @return int
      * @throws DbException
-     * @author xaboy
+     * @author zfy
      * @day 2020-04-08
      */
     public function delete(int $id, $is_mer = 0)
@@ -241,7 +241,7 @@ class MenuDao extends BaseDao
     /**
      * @param int $id
      * @return bool
-     * @author xaboy
+     * @author zfy
      * @day 2020-04-08
      */
     public function pidExists(int $id)
@@ -252,7 +252,7 @@ class MenuDao extends BaseDao
     /**
      * @param array $ids
      * @return array
-     * @author xaboy
+     * @author zfy
      * @day 2020-04-10
      */
     public function idsByRoutes(array $ids)
@@ -266,7 +266,7 @@ class MenuDao extends BaseDao
      * @throws DataNotFoundException
      * @throws DbException
      * @throws ModelNotFoundException
-     * @author xaboy
+     * @author zfy
      * @day 2020-04-30
      */
     public function updatePath(string $oldPath, string $path)

+ 6 - 6
app/common/dao/system/menu/RoleDao.php

@@ -13,7 +13,7 @@ use app\common\model\system\auth\Role;
 /**
  * Class RoleDao
  * @package app\common\dao\system\menu
- * @author xaboy
+ * @author zfy
  * @day 2020-04-18
  */
 class RoleDao extends BaseDao
@@ -21,7 +21,7 @@ class RoleDao extends BaseDao
 
     /**
      * @return BaseModel
-     * @author xaboy
+     * @author zfy
      * @day 2020-03-30
      */
     protected function getModel(): string
@@ -33,7 +33,7 @@ class RoleDao extends BaseDao
      * @param $merId
      * @param array $where
      * @return BaseModel|Role
-     * @author xaboy
+     * @author zfy
      * @day 2020-04-18
      */
     public function search($merId, array $where = [])
@@ -53,7 +53,7 @@ class RoleDao extends BaseDao
     /**
      * @param int $merId
      * @return array
-     * @author xaboy
+     * @author zfy
      * @day 2020-04-18
      */
     public function getAllOptions(int $merId)
@@ -65,7 +65,7 @@ class RoleDao extends BaseDao
      * @param $merId
      * @param array $ids
      * @return array
-     * @author xaboy
+     * @author zfy
      * @day 2020-04-18
      */
     public function idsByRules($merId, array $ids)
@@ -82,7 +82,7 @@ class RoleDao extends BaseDao
      * @param int $merId
      * @param int $id
      * @return bool
-     * @author xaboy
+     * @author zfy
      * @day 2020-04-18
      */
     public function merExists(int $merId, int $id)

+ 1 - 1
app/common/dao/system/merchant/FinancialRecordDao.php

@@ -19,7 +19,7 @@ class FinancialRecordDao extends BaseDao
 
     /**
      * @return string
-     * @author xaboy
+     * @author zfy
      * @day 2020/6/9
      */
     public function getSn()

+ 13 - 13
app/common/dao/system/merchant/MerchantAdminDao.php

@@ -18,7 +18,7 @@ use think\Model;
 /**
  * Class MerchantAdminDao
  * @package app\common\dao\system\merchant
- * @author xaboy
+ * @author zfy
  * @day 2020-04-17
  */
 class MerchantAdminDao extends BaseDao
@@ -26,7 +26,7 @@ class MerchantAdminDao extends BaseDao
 
     /**
      * @return string
-     * @author xaboy
+     * @author zfy
      * @day 2020-04-16
      */
     protected function getModel(): string
@@ -39,7 +39,7 @@ class MerchantAdminDao extends BaseDao
      * @param array $where
      * @param int|null $level
      * @return BaseQuery
-     * @author xaboy
+     * @author zfy
      * @day 2020-04-18
      */
     public function search(int $merId, array $where = [], ?int $level = null)
@@ -65,7 +65,7 @@ class MerchantAdminDao extends BaseDao
     /**
      * @param int $merId
      * @return string
-     * @author xaboy
+     * @author zfy
      * @day 2020-04-16
      */
     public function merIdByAccount(int $merId): string
@@ -79,7 +79,7 @@ class MerchantAdminDao extends BaseDao
      * @throws DataNotFoundException
      * @throws DbException
      * @throws ModelNotFoundException
-     * @author xaboy
+     * @author zfy
      * @day 2020/7/7
      */
     public function merIdByAdmin(int $merId)
@@ -94,7 +94,7 @@ class MerchantAdminDao extends BaseDao
      * @throws DataNotFoundException
      * @throws DbException
      * @throws ModelNotFoundException
-     * @author xaboy
+     * @author zfy
      * @day 2020-04-20
      */
     public function accountByAdmin(string $account, int $merId)
@@ -111,7 +111,7 @@ class MerchantAdminDao extends BaseDao
      * @throws DataNotFoundException
      * @throws DbException
      * @throws ModelNotFoundException
-     * @author xaboy
+     * @author zfy
      * @day 2020-04-20
      */
     public function accountByTopAdmin(string $account)
@@ -125,7 +125,7 @@ class MerchantAdminDao extends BaseDao
     /**
      * @param string $account
      * @return mixed
-     * @author xaboy
+     * @author zfy
      * @day 2020-04-20
      */
     public function accountByMerchantId(string $account)
@@ -140,7 +140,7 @@ class MerchantAdminDao extends BaseDao
      * @throws DataNotFoundException
      * @throws DbException
      * @throws ModelNotFoundException
-     * @author xaboy
+     * @author zfy
      * @day 2020-04-17
      */
     public function get( $id)
@@ -153,7 +153,7 @@ class MerchantAdminDao extends BaseDao
      * @param int $merId
      * @param int|null $level
      * @return bool
-     * @author xaboy
+     * @author zfy
      * @day 2020-04-18
      */
     public function exists(int $id, int $merId = 0, ?int $level = null)
@@ -170,7 +170,7 @@ class MerchantAdminDao extends BaseDao
      * @param $value
      * @param int|null $except
      * @return bool
-     * @author xaboy
+     * @author zfy
      * @day 2020-04-18
      */
     public function merFieldExists(int $merId, $field, $value, ?int $except = null): bool
@@ -183,7 +183,7 @@ class MerchantAdminDao extends BaseDao
     /**
      * @param int $id
      * @return bool
-     * @author xaboy
+     * @author zfy
      * @day 2020-04-18
      */
     public function topExists(int $id)
@@ -195,7 +195,7 @@ class MerchantAdminDao extends BaseDao
     /**
      * @param int $merId
      * @return mixed
-     * @author xaboy
+     * @author zfy
      * @day 2020-04-17
      */
     public function merchantIdByTopAdminId(int $merId)

+ 4 - 4
app/common/dao/system/merchant/MerchantCategoryDao.php

@@ -15,7 +15,7 @@ use think\facade\Db;
 /**
  * Class MerchantCategoryDao
  * @package app\common\dao\system\merchant
- * @author xaboy
+ * @author zfy
  * @day 2020-05-06
  */
 class MerchantCategoryDao extends BaseDao
@@ -23,7 +23,7 @@ class MerchantCategoryDao extends BaseDao
 
     /**
      * @return BaseModel
-     * @author xaboy
+     * @author zfy
      * @day 2020-03-30
      */
     protected function getModel(): string
@@ -35,7 +35,7 @@ class MerchantCategoryDao extends BaseDao
     /**
      * @param array $where
      * @return BaseQuery
-     * @author xaboy
+     * @author zfy
      * @day 2020-05-06
      */
     public function search(array $where = [])
@@ -45,7 +45,7 @@ class MerchantCategoryDao extends BaseDao
 
     /**
      * @return array
-     * @author xaboy
+     * @author zfy
      * @day 2020-05-06
      */
     public function allOptions()

+ 5 - 5
app/common/dao/system/merchant/MerchantDao.php

@@ -21,7 +21,7 @@ class MerchantDao extends BaseDao
 
     /**
      * @return string
-     * @author xaboy
+     * @author zfy
      * @day 2020-04-16
      */
     protected function getModel(): string
@@ -32,7 +32,7 @@ class MerchantDao extends BaseDao
     /**
      * @param array $where
      * @return BaseQuery
-     * @author xaboy
+     * @author zfy
      * @day 2020-04-16
      */
     public function search(array $where, $is_del = 0)
@@ -109,7 +109,7 @@ class MerchantDao extends BaseDao
      * @throws DataNotFoundException
      * @throws DbException
      * @throws ModelNotFoundException
-     * @author xaboy
+     * @author zfy
      * @day 2020-04-17
      */
     public function get($id)
@@ -138,7 +138,7 @@ class MerchantDao extends BaseDao
     /**
      * @param int $merId
      * @param int $inc
-     * @author xaboy
+     * @author zfy
      * @day 2020/9/25
      */
     public function incSales($merId, $inc)
@@ -192,7 +192,7 @@ class MerchantDao extends BaseDao
      * @param $value
      * @param int|null $except
      * @return bool
-     * @author xaboy
+     * @author zfy
      * @day 2020-03-30
      */
     public function fieldExists($field, $value, ?int $except = null): bool

+ 4 - 4
app/common/dao/system/notice/SystemNoticeLogDao.php

@@ -13,7 +13,7 @@ use app\common\model\system\notice\SystemNoticeLog;
 /**
  * Class SystemNoticeLogDao
  * @package app\common\dao\system\notice
- * @author xaboy
+ * @author zfy
  * @day 2020/11/6
  */
 class SystemNoticeLogDao extends BaseDao
@@ -21,7 +21,7 @@ class SystemNoticeLogDao extends BaseDao
 
     /**
      * @return string
-     * @author xaboy
+     * @author zfy
      * @day 2020/11/6
      */
     protected function getModel(): string
@@ -34,7 +34,7 @@ class SystemNoticeLogDao extends BaseDao
      * @param $merId
      * @return int
      * @throws \think\db\exception\DbException
-     * @author xaboy
+     * @author zfy
      * @day 2020/11/6
      */
     public function read($id, $merId)
@@ -52,7 +52,7 @@ class SystemNoticeLogDao extends BaseDao
      * @param $merId
      * @return int
      * @throws \think\db\exception\DbException
-     * @author xaboy
+     * @author zfy
      * @day 2020/11/6
      */
     public function del($id, $merId)

+ 6 - 6
app/common/dao/system/sms/SmsRecordDao.php

@@ -15,7 +15,7 @@ use think\db\exception\DbException;
 /**
  * Class SmsRecordDao
  * @package app\common\dao\system\sms
- * @author xaboy
+ * @author zfy
  * @day 2020-05-18
  */
 class SmsRecordDao extends BaseDao
@@ -23,7 +23,7 @@ class SmsRecordDao extends BaseDao
 
     /**
      * @return BaseModel
-     * @author xaboy
+     * @author zfy
      * @day 2020-03-30
      */
     protected function getModel(): string
@@ -34,7 +34,7 @@ class SmsRecordDao extends BaseDao
     /**
      * @param array $where
      * @return BaseQuery
-     * @author xaboy
+     * @author zfy
      * @day 2020-05-18
      */
     public function search(array $where)
@@ -46,7 +46,7 @@ class SmsRecordDao extends BaseDao
 
     /**
      * @return int
-     * @author xaboy
+     * @author zfy
      * @day 2020-05-18
      */
     public function count()
@@ -59,7 +59,7 @@ class SmsRecordDao extends BaseDao
      * @param $resultcode
      * @return int
      * @throws DbException
-     * @author xaboy
+     * @author zfy
      * @day 2020-05-18
      */
     public function updateRecordStatus($record_id, $resultcode)
@@ -71,7 +71,7 @@ class SmsRecordDao extends BaseDao
     /**
      * @param $time
      * @return array
-     * @author xaboy
+     * @author zfy
      * @day 2020/6/9
      */
     public function getTimeOutIds($time)

+ 4 - 4
app/common/dao/user/FeedbackDao.php

@@ -14,7 +14,7 @@ use think\db\BaseQuery;
 /**
  * Class FeedbackDao
  * @package app\common\dao\user
- * @author xaboy
+ * @author zfy
  * @day 2020/5/28
  */
 class FeedbackDao extends BaseDao
@@ -22,7 +22,7 @@ class FeedbackDao extends BaseDao
 
     /**
      * @return string
-     * @author xaboy
+     * @author zfy
      * @day 2020/5/28
      */
     protected function getModel(): string
@@ -33,7 +33,7 @@ class FeedbackDao extends BaseDao
     /**
      * @param array $where
      * @return BaseQuery
-     * @author xaboy
+     * @author zfy
      * @day 2020/5/28
      */
     public function search(array $where)
@@ -60,7 +60,7 @@ class FeedbackDao extends BaseDao
      * @param $id
      * @param $uid
      * @return bool
-     * @author xaboy
+     * @author zfy
      * @day 2020/5/28
      */
     public function uidExists($id, $uid): bool

+ 8 - 8
app/common/dao/user/UserBillDao.php

@@ -13,7 +13,7 @@ use app\common\model\user\UserBill;
 /**
  * Class UserBillDao
  * @package app\common\dao\user
- * @author xaboy
+ * @author zfy
  * @day 2020/6/22
  */
 class UserBillDao extends BaseDao
@@ -21,7 +21,7 @@ class UserBillDao extends BaseDao
 
     /**
      * @return BaseModel
-     * @author xaboy
+     * @author zfy
      * @day 2020-03-30
      */
     protected function getModel(): string
@@ -34,7 +34,7 @@ class UserBillDao extends BaseDao
      * @param $data
      * @return int
      * @throws \think\db\exception\DbException
-     * @author xaboy
+     * @author zfy
      * @day 2020/6/22
      */
     public function updateBill(array $where, $data)
@@ -48,7 +48,7 @@ class UserBillDao extends BaseDao
      * @throws \think\db\exception\DataNotFoundException
      * @throws \think\db\exception\DbException
      * @throws \think\db\exception\ModelNotFoundException
-     * @author xaboy
+     * @author zfy
      * @day 2020/6/22
      */
     public function getTimeoutBrokerageBill($time)
@@ -94,7 +94,7 @@ class UserBillDao extends BaseDao
     /**
      * @param $uid
      * @return float
-     * @author xaboy
+     * @author zfy
      * @day 2020/6/22
      */
     public function lockBrokerage($uid)
@@ -146,7 +146,7 @@ class UserBillDao extends BaseDao
     /**
      * @param $uid
      * @return float
-     * @author xaboy
+     * @author zfy
      * @day 2020/6/22
      */
     public function totalBrokerage($uid)
@@ -160,7 +160,7 @@ class UserBillDao extends BaseDao
     /**
      * @param $uid
      * @return float
-     * @author xaboy
+     * @author zfy
      * @day 2020/6/22
      */
     public function yesterdayBrokerage($uid)
@@ -172,7 +172,7 @@ class UserBillDao extends BaseDao
     /**
      * @param array $where
      * @return \think\db\BaseQuery
-     * @author xaboy
+     * @author zfy
      * @day 2020/6/22
      */
     public function search(array $where)

+ 16 - 16
app/common/dao/user/UserDao.php

@@ -20,7 +20,7 @@ use think\Model;
 /**
  * Class UserDao
  * @package app\common\dao\user
- * @author xaboy
+ * @author zfy
  * @day 2020-04-28
  */
 class UserDao extends BaseDao
@@ -28,7 +28,7 @@ class UserDao extends BaseDao
 
     /**
      * @return BaseModel
-     * @author xaboy
+     * @author zfy
      * @day 2020-03-30
      */
     protected function getModel(): string
@@ -38,7 +38,7 @@ class UserDao extends BaseDao
 
     /**
      * @return string
-     * @author xaboy
+     * @author zfy
      * @day 2020/6/22
      */
     public function defaultPwd()
@@ -49,7 +49,7 @@ class UserDao extends BaseDao
     /**
      * @param array $where
      * @return BaseQuery
-     * @author xaboy
+     * @author zfy
      * @day 2020-05-07
      */
     public function search(array $where)
@@ -117,7 +117,7 @@ class UserDao extends BaseDao
     /**
      * @param $keyword
      * @return BaseQuery
-     * @author xaboy
+     * @author zfy
      * @day 2020/6/22
      */
     public function searchMerUser($keyword)
@@ -130,7 +130,7 @@ class UserDao extends BaseDao
      * @param int $group_id
      * @return int
      * @throws DbException
-     * @author xaboy
+     * @author zfy
      * @day 2020-05-07
      */
     public function batchChangeGroupId(array $ids, int $group_id)
@@ -143,7 +143,7 @@ class UserDao extends BaseDao
      * @param array $label_id
      * @return int
      * @throws DbException
-     * @author xaboy
+     * @author zfy
      * @day 2020-05-07
      */
     public function batchChangeLabelId(array $ids, array $label_id)
@@ -159,7 +159,7 @@ class UserDao extends BaseDao
      * @throws DataNotFoundException
      * @throws DbException
      * @throws ModelNotFoundException
-     * @author xaboy
+     * @author zfy
      * @day 2020-04-28
      */
     public function wechatUserIdBytUser(int $id)
@@ -170,7 +170,7 @@ class UserDao extends BaseDao
     /**
      * @param $id
      * @return mixed
-     * @author xaboy
+     * @author zfy
      * @day 2020-04-28
      */
     public function wechatUserIdByUid($id)
@@ -181,7 +181,7 @@ class UserDao extends BaseDao
     /**
      * @param $id
      * @return mixed
-     * @author xaboy
+     * @author zfy
      * @day 2020/7/7
      */
     public function uidByWechatUserId($id)
@@ -195,7 +195,7 @@ class UserDao extends BaseDao
      * @throws DataNotFoundException
      * @throws DbException
      * @throws ModelNotFoundException
-     * @author xaboy
+     * @author zfy
      * @day 2020/6/22
      */
     public function accountByUser($account)
@@ -206,7 +206,7 @@ class UserDao extends BaseDao
     /**
      * @param $uid
      * @return array
-     * @author xaboy
+     * @author zfy
      * @day 2020/6/22
      */
     public function getSubIds($uid)
@@ -217,7 +217,7 @@ class UserDao extends BaseDao
     /**
      * @param $uid
      * @return int
-     * @author xaboy
+     * @author zfy
      * @day 2020/6/22
      */
     public function getOneLevelCount($uid)
@@ -228,7 +228,7 @@ class UserDao extends BaseDao
     /**
      * @param $uid
      * @return int
-     * @author xaboy
+     * @author zfy
      * @day 2020/6/22
      */
     public function getTwoLevelCount($uid)
@@ -240,7 +240,7 @@ class UserDao extends BaseDao
     /**
      * @param $ids
      * @return array
-     * @author xaboy
+     * @author zfy
      * @day 2020/6/22
      */
     public function getSubAllIds(array $ids)
@@ -255,7 +255,7 @@ class UserDao extends BaseDao
      * @throws DataNotFoundException
      * @throws DbException
      * @throws ModelNotFoundException
-     * @author xaboy
+     * @author zfy
      * @day 2020/6/22
      */
     public function users(array $ids, $field = '*')

+ 4 - 4
app/common/dao/user/UserGroupDao.php

@@ -14,7 +14,7 @@ use think\db\BaseQuery;
 /**
  * Class UserGroupDao
  * @package app\common\dao\user
- * @author xaboy
+ * @author zfy
  * @day 2020-05-07
  */
 class UserGroupDao extends BaseDao
@@ -22,7 +22,7 @@ class UserGroupDao extends BaseDao
 
     /**
      * @return BaseModel
-     * @author xaboy
+     * @author zfy
      * @day 2020-03-30
      */
     protected function getModel(): string
@@ -34,7 +34,7 @@ class UserGroupDao extends BaseDao
     /**
      * @param array $where
      * @return BaseQuery
-     * @author xaboy
+     * @author zfy
      * @day 2020-05-06
      */
     public function search(array $where = [])
@@ -44,7 +44,7 @@ class UserGroupDao extends BaseDao
 
     /**
      * @return array
-     * @author xaboy
+     * @author zfy
      * @day 2020-05-07
      */
     public function allOptions()

+ 6 - 6
app/common/dao/user/UserLabelDao.php

@@ -14,7 +14,7 @@ use think\db\BaseQuery;
 /**
  * Class UserLabelDao
  * @package app\common\dao\user
- * @author xaboy
+ * @author zfy
  * @day 2020-05-07
  */
 class UserLabelDao extends BaseDao
@@ -22,7 +22,7 @@ class UserLabelDao extends BaseDao
 
     /**
      * @return BaseModel
-     * @author xaboy
+     * @author zfy
      * @day 2020-03-30
      */
     protected function getModel(): string
@@ -34,7 +34,7 @@ class UserLabelDao extends BaseDao
     /**
      * @param array $where
      * @return BaseQuery
-     * @author xaboy
+     * @author zfy
      * @day 2020-05-06
      */
     public function search(array $where = [])
@@ -51,7 +51,7 @@ class UserLabelDao extends BaseDao
     /**
      * @param int $merId
      * @return array
-     * @author xaboy
+     * @author zfy
      * @day 2020/10/20
      */
     public function allOptions($merId = 0)
@@ -63,7 +63,7 @@ class UserLabelDao extends BaseDao
      * @param array $ids
      * @param int $merId
      * @return array
-     * @author xaboy
+     * @author zfy
      * @day 2020/10/20
      */
     public function labels(array $ids, $merId = 0)
@@ -75,7 +75,7 @@ class UserLabelDao extends BaseDao
      * @param int $id
      * @param int $mer_id
      * @return bool
-     * @author xaboy
+     * @author zfy
      * @day 2020/10/20
      */
     public function exists(int $id, $mer_id = 0)

+ 5 - 5
app/common/dao/user/UserMerchantDao.php

@@ -15,7 +15,7 @@ use think\db\BaseQuery;
 /**
  * Class UserMerchantDao
  * @package app\common\dao\user
- * @author xaboy
+ * @author zfy
  * @day 2020/10/20
  */
 class UserMerchantDao extends BaseDao
@@ -23,7 +23,7 @@ class UserMerchantDao extends BaseDao
 
     /**
      * @return string
-     * @author xaboy
+     * @author zfy
      * @day 2020/10/20
      */
     protected function getModel(): string
@@ -35,7 +35,7 @@ class UserMerchantDao extends BaseDao
      * @param $uid
      * @param $mer_id
      * @return bool
-     * @author xaboy
+     * @author zfy
      * @day 2020/10/20
      */
     public function isMerUser($uid, $mer_id)
@@ -48,7 +48,7 @@ class UserMerchantDao extends BaseDao
      * @param $mer_id
      * @return int
      * @throws \think\db\exception\DbException
-     * @author xaboy
+     * @author zfy
      * @day 2020/10/20
      */
     public function updateLastTime($uid, $mer_id)
@@ -61,7 +61,7 @@ class UserMerchantDao extends BaseDao
     /**
      * @param array $where
      * @return mixed
-     * @author xaboy
+     * @author zfy
      * @day 2020/10/20
      */
     public function search(array $where)

+ 3 - 3
app/common/dao/user/UserRechargeDao.php

@@ -13,7 +13,7 @@ use think\db\BaseQuery;
 /**
  * Class UserRechargeDao
  * @package app\common\dao\user
- * @author xaboy
+ * @author zfy
  * @day 2020/6/2
  */
 class UserRechargeDao extends BaseDao
@@ -21,7 +21,7 @@ class UserRechargeDao extends BaseDao
 
     /**
      * @return string
-     * @author xaboy
+     * @author zfy
      * @day 2020/6/2
      */
     protected function getModel(): string
@@ -43,7 +43,7 @@ class UserRechargeDao extends BaseDao
     /**
      * @param array $where
      * @return BaseQuery
-     * @author xaboy
+     * @author zfy
      * @day 2020/6/23
      */
     public function searchJoinQuery(array $where)

+ 3 - 3
app/common/dao/user/UserRelationDao.php

@@ -13,7 +13,7 @@ use app\common\model\user\UserRelation as model;
 /**
  * Class UserVisitDao
  * @package app\common\dao\user
- * @author xaboy
+ * @author zfy
  * @day 2020/5/27
  */
 class UserRelationDao extends BaseDao
@@ -21,7 +21,7 @@ class UserRelationDao extends BaseDao
 
     /**
      * @return string
-     * @author xaboy
+     * @author zfy
      * @day 2020/5/27
      */
     protected function getModel(): string
@@ -98,7 +98,7 @@ class UserRelationDao extends BaseDao
      * @param $uid
      * @param array $ids
      * @return array
-     * @author xaboy
+     * @author zfy
      * @day 2020/10/20
      */
     public function intersectionPayer($uid, array $ids): array

+ 9 - 9
app/common/dao/user/UserVisitDao.php

@@ -14,7 +14,7 @@ use think\Model;
 /**
  * Class UserVisitDao
  * @package app\common\dao\user
- * @author xaboy
+ * @author zfy
  * @day 2020/5/27
  */
 class UserVisitDao extends BaseDao
@@ -22,7 +22,7 @@ class UserVisitDao extends BaseDao
 
     /**
      * @return string
-     * @author xaboy
+     * @author zfy
      * @day 2020/5/27
      */
     protected function getModel(): string
@@ -36,7 +36,7 @@ class UserVisitDao extends BaseDao
      * @param int $type_id
      * @param string|null $content
      * @return BaseDao|Model
-     * @author xaboy
+     * @author zfy
      * @day 2020/5/27
      */
     public function addVisit(int $uid, string $type, int $type_id, ?string $content = '')
@@ -48,7 +48,7 @@ class UserVisitDao extends BaseDao
      * @param int $uid
      * @param int $productId
      * @return BaseDao|Model
-     * @author xaboy
+     * @author zfy
      * @day 2020/5/27
      */
     public function visitProduct(int $uid, int $productId)
@@ -60,7 +60,7 @@ class UserVisitDao extends BaseDao
      * @param int $uid
      * @param string $page
      * @return BaseDao|Model
-     * @author xaboy
+     * @author zfy
      * @day 2020/5/27
      */
     public function visitPage(int $uid, string $page)
@@ -72,7 +72,7 @@ class UserVisitDao extends BaseDao
      * @param int $uid
      * @param string $page
      * @return BaseDao|Model
-     * @author xaboy
+     * @author zfy
      * @day 2020/5/27
      */
     public function visitSmallProgram(int $uid, string $page)
@@ -84,7 +84,7 @@ class UserVisitDao extends BaseDao
      * @param int $uid
      * @param string $keyword
      * @return BaseDao|Model
-     * @author xaboy
+     * @author zfy
      * @day 2020/5/27
      */
     public function searchProduct(int $uid, string $keyword, int $merId = 0)
@@ -96,7 +96,7 @@ class UserVisitDao extends BaseDao
      * @param int $uid
      * @param string $keyword
      * @return BaseDao|Model
-     * @author xaboy
+     * @author zfy
      * @day 2020/5/27
      */
     public function searchMerchant(int $uid, string $keyword)
@@ -107,7 +107,7 @@ class UserVisitDao extends BaseDao
     /**
      * @param $uid
      * @return int
-     * @author xaboy
+     * @author zfy
      * @day 2020/6/19
      */
     public function userTotalVisit($uid)

+ 5 - 5
app/common/dao/wechat/WechatQrcodeDao.php

@@ -17,7 +17,7 @@ use think\Model;
 /**
  * Class WechatQrcodeDao
  * @package app\common\dao\wechat
- * @author xaboy
+ * @author zfy
  * @day 2020-04-28
  */
 class WechatQrcodeDao extends BaseDao
@@ -25,7 +25,7 @@ class WechatQrcodeDao extends BaseDao
 
     /**
      * @return BaseModel
-     * @author xaboy
+     * @author zfy
      * @day 2020-03-30
      */
     protected function getModel(): string
@@ -39,7 +39,7 @@ class WechatQrcodeDao extends BaseDao
      * @throws DataNotFoundException
      * @throws DbException
      * @throws ModelNotFoundException
-     * @author xaboy
+     * @author zfy
      * @day 2020-04-28
      */
     public function ticketByQrcode($ticket)
@@ -54,7 +54,7 @@ class WechatQrcodeDao extends BaseDao
      * @throws DataNotFoundException
      * @throws DbException
      * @throws ModelNotFoundException
-     * @author xaboy
+     * @author zfy
      * @day 2020-04-28
      */
     public function getForeverQrcode($type, $id)
@@ -69,7 +69,7 @@ class WechatQrcodeDao extends BaseDao
      * @throws DataNotFoundException
      * @throws DbException
      * @throws ModelNotFoundException
-     * @author xaboy
+     * @author zfy
      * @day 2020-04-28
      */
     public function getTemporaryQrcode($type, $id)

+ 6 - 6
app/common/dao/wechat/WechatReplyDao.php

@@ -18,7 +18,7 @@ use think\Model;
 /**
  * Class WechatReplyDao
  * @package app\common\dao\wechat
- * @author xaboy
+ * @author zfy
  * @day 2020-04-24
  */
 class WechatReplyDao extends BaseDao
@@ -26,7 +26,7 @@ class WechatReplyDao extends BaseDao
 
     /**
      * @return BaseModel
-     * @author xaboy
+     * @author zfy
      * @day 2020-03-30
      */
     protected function getModel(): string
@@ -40,7 +40,7 @@ class WechatReplyDao extends BaseDao
      * @throws DataNotFoundException
      * @throws DbException
      * @throws ModelNotFoundException
-     * @author xaboy
+     * @author zfy
      * @day 2020-04-24
      */
     public function keyByReply(string $key)
@@ -51,7 +51,7 @@ class WechatReplyDao extends BaseDao
     /**
      * @param array $where
      * @return BaseQuery
-     * @author xaboy
+     * @author zfy
      * @day 2020-04-24
      */
     public function search(array $where)
@@ -67,7 +67,7 @@ class WechatReplyDao extends BaseDao
      * @param int $id
      * @return int
      * @throws DbException
-     * @author xaboy
+     * @author zfy
      * @day 2020-04-24
      */
     public function delete(int $id)
@@ -81,7 +81,7 @@ class WechatReplyDao extends BaseDao
      * @throws DataNotFoundException
      * @throws DbException
      * @throws ModelNotFoundException
-     * @author xaboy
+     * @author zfy
      * @day 2020-04-27
      */
     public function keyByValidData($key)

+ 12 - 12
app/common/dao/wechat/WechatUserDao.php

@@ -18,7 +18,7 @@ use think\Model;
 /**
  * Class WechatUserDao
  * @package app\common\dao\wechat
- * @author xaboy
+ * @author zfy
  * @day 2020-04-28
  */
 class WechatUserDao extends BaseDao
@@ -26,7 +26,7 @@ class WechatUserDao extends BaseDao
 
     /**
      * @return BaseModel
-     * @author xaboy
+     * @author zfy
      * @day 2020-03-30
      */
     protected function getModel(): string
@@ -40,7 +40,7 @@ class WechatUserDao extends BaseDao
      * @throws DataNotFoundException
      * @throws DbException
      * @throws ModelNotFoundException
-     * @author xaboy
+     * @author zfy
      * @day 2020-04-28
      */
     public function openIdByWechatUser(string $openId)
@@ -54,7 +54,7 @@ class WechatUserDao extends BaseDao
      * @throws DataNotFoundException
      * @throws DbException
      * @throws ModelNotFoundException
-     * @author xaboy
+     * @author zfy
      * @day 2020-04-28
      */
     public function unionIdByWechatUser(string $unionId)
@@ -65,7 +65,7 @@ class WechatUserDao extends BaseDao
     /**
      * @param string $openId
      * @return mixed
-     * @author xaboy
+     * @author zfy
      * @day 2020-04-28
      */
     public function openIdById(string $openId)
@@ -79,7 +79,7 @@ class WechatUserDao extends BaseDao
      * @throws DataNotFoundException
      * @throws DbException
      * @throws ModelNotFoundException
-     * @author xaboy
+     * @author zfy
      * @day 2020-04-28
      */
     public function routineIdByWechatUser(string $openId)
@@ -90,7 +90,7 @@ class WechatUserDao extends BaseDao
     /**
      * @param string $unionId
      * @return mixed
-     * @author xaboy
+     * @author zfy
      * @day 2020-04-28
      */
     public function unionIdById(string $unionId)
@@ -101,7 +101,7 @@ class WechatUserDao extends BaseDao
     /**
      * @param $id
      * @return mixed
-     * @author xaboy
+     * @author zfy
      * @day 2020/5/30
      */
     public function idByOpenId(int $id)
@@ -112,7 +112,7 @@ class WechatUserDao extends BaseDao
     /**
      * @param $id
      * @return mixed
-     * @author xaboy
+     * @author zfy
      * @day 2020/5/30
      */
     public function idByRoutineId(int $id)
@@ -124,7 +124,7 @@ class WechatUserDao extends BaseDao
      * @param string $openId
      * @return int
      * @throws DbException
-     * @author xaboy
+     * @author zfy
      * @day 2020-04-28
      */
     public function unsubscribe(string $openId)
@@ -135,7 +135,7 @@ class WechatUserDao extends BaseDao
     /**
      * @param $id
      * @return bool
-     * @author xaboy
+     * @author zfy
      * @day 2020-05-11
      */
     public function isSubscribeWechatUser($id)
@@ -146,7 +146,7 @@ class WechatUserDao extends BaseDao
     /**
      * @param array $where
      * @return BaseQuery
-     * @author xaboy
+     * @author zfy
      * @day 2020-04-29
      */
     public function search(array $where)

+ 1 - 1
app/common/middleware/AdminTokenMiddleware.php

@@ -21,7 +21,7 @@ class AdminTokenMiddleware extends BaseMiddleware
     /**
      * @param Request $request
      * @throws Throwable
-     * @author xaboy
+     * @author zfy
      * @day 2020-04-10
      */
     public function before(Request $request)

+ 1 - 1
app/common/middleware/BaseMiddleware.php

@@ -26,7 +26,7 @@ abstract class BaseMiddleware implements MiddlewareInterface
      * @param int $num
      * @param mixed $default
      * @return mixed
-     * @author xaboy
+     * @author zfy
      * @day 2020-04-10
      */
     public function getArg($num, $default = null)

+ 1 - 1
app/common/middleware/MerchantTokenMiddleware.php

@@ -21,7 +21,7 @@ class MerchantTokenMiddleware extends BaseMiddleware
     /**
      * @param Request $request
      * @throws Throwable
-     * @author xaboy
+     * @author zfy
      * @day 2020-04-10
      */
     public function before(Request $request)

+ 1 - 1
app/common/middleware/UserTokenMiddleware.php

@@ -20,7 +20,7 @@ class UserTokenMiddleware extends BaseMiddleware
     /**
      * @param Request $request
      * @throws Throwable
-     * @author xaboy
+     * @author zfy
      * @day 2020-04-10
      */
     public function before(Request $request)

+ 4 - 4
app/common/model/BaseModel.php

@@ -12,7 +12,7 @@ use think\Model;
 /**
  * Class BaseModel
  * @package app\common\model
- * @author xaboy
+ * @author zfy
  * @day 2020-03-30
  */
 abstract class BaseModel extends Model
@@ -21,14 +21,14 @@ abstract class BaseModel extends Model
 
     /**
      * @return string
-     * @author xaboy
+     * @author zfy
      * @day 2020-03-30
      */
     abstract public static function tablePk():? string;
 
     /**
      * @return string
-     * @author xaboy
+     * @author zfy
      * @day 2020-03-30
      */
     abstract public static function tableName(): string;
@@ -55,7 +55,7 @@ abstract class BaseModel extends Model
     /**
      * @param array $scope
      * @return BaseQuery
-     * @author xaboy
+     * @author zfy
      * @day 2020-03-30
      */
     public static function getDB(array $scope = [])

+ 2 - 2
app/common/model/article/Article.php

@@ -13,7 +13,7 @@ class Article extends BaseModel
 
     /**
      * @return string
-     * @author xaboy
+     * @author zfy
      * @day 2020-03-30
      */
     public static function tablePk(): string
@@ -23,7 +23,7 @@ class Article extends BaseModel
 
     /**
      * @return string
-     * @author xaboy
+     * @author zfy
      * @day 2020-03-30
      */
     public static function tableName(): string

+ 2 - 2
app/common/model/article/ArticleCategory.php

@@ -13,7 +13,7 @@ class ArticleCategory extends BaseModel
 
     /**
      * @return string
-     * @author xaboy
+     * @author zfy
      * @day 2020-03-30
      */
     public static function tablePk(): string
@@ -23,7 +23,7 @@ class ArticleCategory extends BaseModel
 
     /**
      * @return string
-     * @author xaboy
+     * @author zfy
      * @day 2020-03-30
      */
     public static function tableName(): string

+ 2 - 2
app/common/model/article/ArticleContent.php

@@ -13,7 +13,7 @@ class ArticleContent extends BaseModel
 
     /**
      * @return string
-     * @author xaboy
+     * @author zfy
      * @day 2020-03-30
      */
     public static function tablePk(): string
@@ -23,7 +23,7 @@ class ArticleContent extends BaseModel
 
     /**
      * @return string
-     * @author xaboy
+     * @author zfy
      * @day 2020-03-30
      */
     public static function tableName(): string

+ 5 - 5
app/common/model/store/StoreAttrTemplate.php

@@ -11,7 +11,7 @@ use app\common\model\BaseModel;
 /**
  * Class StoreAttrTemplate
  * @package app\common\model\store
- * @author xaboy
+ * @author zfy
  * @day 2020-05-06
  */
 class StoreAttrTemplate extends BaseModel
@@ -19,7 +19,7 @@ class StoreAttrTemplate extends BaseModel
 
     /**
      * @return string
-     * @author xaboy
+     * @author zfy
      * @day 2020-03-30
      */
     public static function tablePk(): string
@@ -29,7 +29,7 @@ class StoreAttrTemplate extends BaseModel
 
     /**
      * @return string
-     * @author xaboy
+     * @author zfy
      * @day 2020-03-30
      */
     public static function tableName(): string
@@ -40,7 +40,7 @@ class StoreAttrTemplate extends BaseModel
     /**
      * @param $val
      * @return mixed
-     * @author xaboy
+     * @author zfy
      * @day 2020-05-06
      */
     public function getTemplateValueAttr($val)
@@ -51,7 +51,7 @@ class StoreAttrTemplate extends BaseModel
     /**
      * @param $val
      * @return false|string
-     * @author xaboy
+     * @author zfy
      * @day 2020-05-06
      */
     public function setTemplateValueAttr($val)

+ 2 - 2
app/common/model/store/StoreBrand.php

@@ -12,7 +12,7 @@ class StoreBrand extends BaseModel
 
     /**
      * @return string
-     * @author xaboy
+     * @author zfy
      * @day 2020-03-30
      */
     public static function tablePk(): string
@@ -22,7 +22,7 @@ class StoreBrand extends BaseModel
 
     /**
      * @return string
-     * @author xaboy
+     * @author zfy
      * @day 2020-03-30
      */
     public static function tableName(): string

+ 2 - 2
app/common/model/store/StoreBrandCategory.php

@@ -12,7 +12,7 @@ class StoreBrandCategory extends BaseModel
 
     /**
      * @return string
-     * @author xaboy
+     * @author zfy
      * @day 2020-03-30
      */
     public static function tablePk(): string
@@ -22,7 +22,7 @@ class StoreBrandCategory extends BaseModel
 
     /**
      * @return string
-     * @author xaboy
+     * @author zfy
      * @day 2020-03-30
      */
     public static function tableName(): string

+ 2 - 2
app/common/model/store/StoreCategory.php

@@ -13,7 +13,7 @@ class StoreCategory extends BaseModel
 
     /**
      * @return string
-     * @author xaboy
+     * @author zfy
      * @day 2020-03-30
      */
     public static function tablePk(): string
@@ -23,7 +23,7 @@ class StoreCategory extends BaseModel
 
     /**
      * @return string
-     * @author xaboy
+     * @author zfy
      * @day 2020-03-30
      */
     public static function tableName(): string

+ 3 - 3
app/common/model/store/broadcast/BroadcastGoods.php

@@ -13,7 +13,7 @@ use app\common\model\system\merchant\Merchant;
 /**
  * Class BroadcastGoods
  * @package app\common\model\store\broadcast
- * @author xaboy
+ * @author zfy
  * @day 2020/7/29
  */
 class BroadcastGoods extends BaseModel
@@ -21,7 +21,7 @@ class BroadcastGoods extends BaseModel
 
     /**
      * @return string|null
-     * @author xaboy
+     * @author zfy
      * @day 2020/7/29
      */
     public static function tablePk(): ?string
@@ -31,7 +31,7 @@ class BroadcastGoods extends BaseModel
 
     /**
      * @return string
-     * @author xaboy
+     * @author zfy
      * @day 2020/7/29
      */
     public static function tableName(): string

+ 3 - 3
app/common/model/store/broadcast/BroadcastRoom.php

@@ -12,7 +12,7 @@ use app\common\model\system\merchant\Merchant;
 /**
  * Class BroadcastRoom
  * @package app\common\model\store\broadcast
- * @author xaboy
+ * @author zfy
  * @day 2020/7/29
  */
 class BroadcastRoom extends BaseModel
@@ -20,7 +20,7 @@ class BroadcastRoom extends BaseModel
 
     /**
      * @return string|null
-     * @author xaboy
+     * @author zfy
      * @day 2020/7/29
      */
     public static function tablePk(): ?string
@@ -30,7 +30,7 @@ class BroadcastRoom extends BaseModel
 
     /**
      * @return string
-     * @author xaboy
+     * @author zfy
      * @day 2020/7/29
      */
     public static function tableName(): string

+ 2 - 2
app/common/model/store/coupon/StoreCoupon.php

@@ -15,7 +15,7 @@ class StoreCoupon extends BaseModel
 
     /**
      * @return string
-     * @author xaboy
+     * @author zfy
      * @day 2020-03-30
      */
     public static function tablePk(): string
@@ -25,7 +25,7 @@ class StoreCoupon extends BaseModel
 
     /**
      * @return string
-     * @author xaboy
+     * @author zfy
      * @day 2020-03-30
      */
     public static function tableName(): string

+ 2 - 2
app/common/model/store/coupon/StoreCouponProduct.php

@@ -14,7 +14,7 @@ class StoreCouponProduct extends BaseModel
 
     /**
      * @return string
-     * @author xaboy
+     * @author zfy
      * @day 2020-03-30
      */
     public static function tablePk():? string
@@ -24,7 +24,7 @@ class StoreCouponProduct extends BaseModel
 
     /**
      * @return string
-     * @author xaboy
+     * @author zfy
      * @day 2020-03-30
      */
     public static function tableName(): string

+ 3 - 3
app/common/model/store/coupon/StoreCouponUser.php

@@ -12,7 +12,7 @@ use app\common\model\user\User;
 /**
  * Class StoreCouponUser
  * @package app\common\model\store\coupon
- * @author xaboy
+ * @author zfy
  * @day 2020-05-14
  */
 class StoreCouponUser extends BaseModel
@@ -20,7 +20,7 @@ class StoreCouponUser extends BaseModel
 
     /**
      * @return string
-     * @author xaboy
+     * @author zfy
      * @day 2020-03-30
      */
     public static function tablePk(): string
@@ -30,7 +30,7 @@ class StoreCouponUser extends BaseModel
 
     /**
      * @return string
-     * @author xaboy
+     * @author zfy
      * @day 2020-03-30
      */
     public static function tableName(): string

+ 3 - 3
app/common/model/store/order/StoreOrderStatus.php

@@ -11,7 +11,7 @@ use app\common\model\BaseModel;
 /**
  * Class StoreOrderStatus
  * @package app\common\model\store\order
- * @author xaboy
+ * @author zfy
  * @day 2020/6/12
  */
 class StoreOrderStatus extends BaseModel
@@ -19,7 +19,7 @@ class StoreOrderStatus extends BaseModel
 
     /**
      * @return string|null
-     * @author xaboy
+     * @author zfy
      * @day 2020/6/12
      */
     public static function tablePk(): ?string
@@ -29,7 +29,7 @@ class StoreOrderStatus extends BaseModel
 
     /**
      * @return string
-     * @author xaboy
+     * @author zfy
      * @day 2020/6/12
      */
     public static function tableName(): string

+ 1 - 1
app/common/model/store/product/ProductReply.php

@@ -12,7 +12,7 @@ use app\common\repositories\store\product\ProductAttrValueRepository;
 /**
  * Class ProductReply
  * @package app\common\model\store\product
- * @author xaboy
+ * @author zfy
  * @day 2020/5/30
  */
 class ProductReply extends BaseModel

+ 2 - 2
app/common/model/store/shipping/ShippingTemplate.php

@@ -58,7 +58,7 @@ class ShippingTemplate extends BaseModel
 
     /**
      * @return \think\model\relation\HasOne
-     * @author xaboy
+     * @author zfy
      * @day 2020/6/4
      */
     public function freeAddress()
@@ -68,7 +68,7 @@ class ShippingTemplate extends BaseModel
 
     /**
      * @return \think\model\relation\HasOne
-     * @author xaboy
+     * @author zfy
      * @day 2020/6/4
      */
     public function regionAddress()

+ 5 - 5
app/common/model/system/Cache.php

@@ -11,7 +11,7 @@ use app\common\model\BaseModel;
 /**
  * Class Cache
  * @package app\common\model\system
- * @author xaboy
+ * @author zfy
  * @day 2020-04-24
  */
 class Cache extends BaseModel
@@ -19,7 +19,7 @@ class Cache extends BaseModel
 
     /**
      * @return string
-     * @author xaboy
+     * @author zfy
      * @day 2020-03-30
      */
     public static function tablePk(): string
@@ -29,7 +29,7 @@ class Cache extends BaseModel
 
     /**
      * @return string
-     * @author xaboy
+     * @author zfy
      * @day 2020-03-30
      */
     public static function tableName(): string
@@ -40,7 +40,7 @@ class Cache extends BaseModel
     /**
      * @param $val
      * @return false|string
-     * @author xaboy
+     * @author zfy
      * @day 2020-04-24
      */
     public function setResultAttr($val)
@@ -51,7 +51,7 @@ class Cache extends BaseModel
     /**
      * @param string $val
      * @return mixed
-     * @author xaboy
+     * @author zfy
      * @day 2020-04-24
      */
     public function getResultAttr($val)

+ 5 - 5
app/common/model/system/admin/Admin.php

@@ -12,7 +12,7 @@ class Admin extends BaseModel
 {
     /**
      * @return string
-     * @author xaboy
+     * @author zfy
      * @day 2020-03-30
      */
     public static function tablePk(): string
@@ -22,7 +22,7 @@ class Admin extends BaseModel
 
     /**
      * @return string
-     * @author xaboy
+     * @author zfy
      * @day 2020-03-30
      */
     public static function tableName(): string
@@ -33,7 +33,7 @@ class Admin extends BaseModel
     /**
      * @param $value
      * @return array
-     * @author xaboy
+     * @author zfy
      * @day 2020-03-30
      */
     public function getRolesAttr($value)
@@ -44,7 +44,7 @@ class Admin extends BaseModel
     /**
      * @param $value
      * @return string
-     * @author xaboy
+     * @author zfy
      * @day 2020-03-30
      */
     public function setRolesAttr($value)
@@ -55,7 +55,7 @@ class Admin extends BaseModel
     /**
      * @param bool $isArray
      * @return array|string
-     * @author xaboy
+     * @author zfy
      * @day 2020-04-09
      */
     public function roleNames($isArray = false)

+ 2 - 2
app/common/model/system/admin/Log.php

@@ -13,7 +13,7 @@ class Log extends BaseModel
 
     /**
      * @return string
-     * @author xaboy
+     * @author zfy
      * @day 2020-03-30
      */
     public static function tablePk(): string
@@ -23,7 +23,7 @@ class Log extends BaseModel
 
     /**
      * @return string
-     * @author xaboy
+     * @author zfy
      * @day 2020-03-30
      */
     public static function tableName(): string

+ 2 - 2
app/common/model/system/attachment/Attachment.php

@@ -11,7 +11,7 @@ class Attachment extends BaseModel
 {
     /**
      * @return string
-     * @author xaboy
+     * @author zfy
      * @day 2020-03-30
      */
     public static function tablePk(): string
@@ -21,7 +21,7 @@ class Attachment extends BaseModel
 
     /**
      * @return string
-     * @author xaboy
+     * @author zfy
      * @day 2020-03-30
      */
     public static function tableName(): string

+ 2 - 2
app/common/model/system/attachment/AttachmentCategory.php

@@ -12,7 +12,7 @@ class AttachmentCategory extends BaseModel
 {
     /**
      * @return string
-     * @author xaboy
+     * @author zfy
      * @day 2020-03-30
      */
     public static function tablePk(): string
@@ -22,7 +22,7 @@ class AttachmentCategory extends BaseModel
 
     /**
      * @return string
-     * @author xaboy
+     * @author zfy
      * @day 2020-03-30
      */
     public static function tableName(): string

+ 2 - 2
app/common/model/system/auth/Menu.php

@@ -12,7 +12,7 @@ class Menu extends BaseModel
 {
     /**
      * @return string
-     * @author xaboy
+     * @author zfy
      * @day 2020-03-30
      */
     public static function tablePk(): string
@@ -22,7 +22,7 @@ class Menu extends BaseModel
 
     /**
      * @return string
-     * @author xaboy
+     * @author zfy
      * @day 2020-03-30
      */
     public static function tableName(): string

+ 4 - 4
app/common/model/system/auth/Role.php

@@ -11,7 +11,7 @@ class Role extends BaseModel
 {
     /**
      * @return string
-     * @author xaboy
+     * @author zfy
      * @day 2020-03-30
      */
     public static function tablePk(): string
@@ -21,7 +21,7 @@ class Role extends BaseModel
 
     /**
      * @return string
-     * @author xaboy
+     * @author zfy
      * @day 2020-03-30
      */
     public static function tableName(): string
@@ -39,7 +39,7 @@ class Role extends BaseModel
     /**
      * @param $value
      * @return array
-     * @author xaboy
+     * @author zfy
      * @day 2020-03-30
      */
     public function getRulesAttr($value)
@@ -50,7 +50,7 @@ class Role extends BaseModel
     /**
      * @param $value
      * @return string
-     * @author xaboy
+     * @author zfy
      * @day 2020-03-30
      */
     public function setRulesAttr($value)

+ 4 - 4
app/common/model/system/config/SystemConfig.php

@@ -12,14 +12,14 @@ use think\model\relation\HasOne;
 /**
  * Class SystemConfig
  * @package app\common\model\system\config
- * @author xaboy
+ * @author zfy
  * @day 2020-03-30
  */
 class SystemConfig extends BaseModel
 {
     /**
      * @return string
-     * @author xaboy
+     * @author zfy
      * @day 2020-03-30
      */
     public static function tablePk(): string
@@ -29,7 +29,7 @@ class SystemConfig extends BaseModel
 
     /**
      * @return string
-     * @author xaboy
+     * @author zfy
      * @day 2020-03-30
      */
     public static function tableName(): string
@@ -39,7 +39,7 @@ class SystemConfig extends BaseModel
 
     /**
      * @return HasOne
-     * @author xaboy
+     * @author zfy
      * @day 2020-03-30
      */
     public function classify()

+ 6 - 6
app/common/model/system/config/SystemConfigClassify.php

@@ -13,14 +13,14 @@ use think\model\relation\HasOne;
 /**
  * Class SystemConfigClassify
  * @package app\common\model\system\config
- * @author xaboy
+ * @author zfy
  * @day 2020-03-30
  */
 class SystemConfigClassify extends BaseModel
 {
     /**
      * @return string
-     * @author xaboy
+     * @author zfy
      * @day 2020-03-30
      */
     public static function tablePk(): string
@@ -30,7 +30,7 @@ class SystemConfigClassify extends BaseModel
 
     /**
      * @return string
-     * @author xaboy
+     * @author zfy
      * @day 2020-03-30
      */
     public static function tableName(): string
@@ -41,7 +41,7 @@ class SystemConfigClassify extends BaseModel
 
     /**
      * @return HasOne
-     * @author xaboy
+     * @author zfy
      * @day 2020-03-30
      */
     public function parent()
@@ -51,7 +51,7 @@ class SystemConfigClassify extends BaseModel
 
     /**
      * @return HasMany
-     * @author xaboy
+     * @author zfy
      * @day 2020-03-30
      */
     public function children()
@@ -61,7 +61,7 @@ class SystemConfigClassify extends BaseModel
 
     /**
      * @return HasMany
-     * @author xaboy
+     * @author zfy
      * @day 2020-03-30
      */
     public function config()

+ 5 - 5
app/common/model/system/config/SystemConfigValue.php

@@ -11,14 +11,14 @@ use app\common\model\BaseModel;
 /**
  * Class SystemConfigValue
  * @package app\common\model\system\config
- * @author xaboy
+ * @author zfy
  * @day 2020-03-30
  */
 class SystemConfigValue extends BaseModel
 {
     /**
      * @return string
-     * @author xaboy
+     * @author zfy
      * @day 2020-03-30
      */
     public static function tablePk(): string
@@ -28,7 +28,7 @@ class SystemConfigValue extends BaseModel
 
     /**
      * @return string
-     * @author xaboy
+     * @author zfy
      * @day 2020-03-30
      */
     public static function tableName(): string
@@ -39,7 +39,7 @@ class SystemConfigValue extends BaseModel
     /**
      * @param $value
      * @return mixed
-     * @author xaboy
+     * @author zfy
      * @day 2020-03-30
      */
     public function getValueAttr($value)
@@ -50,7 +50,7 @@ class SystemConfigValue extends BaseModel
     /**
      * @param $value
      * @return false|string
-     * @author xaboy
+     * @author zfy
      * @day 2020-03-30
      */
     public function setValueAttr($value)

+ 5 - 5
app/common/model/system/groupData/SystemGroup.php

@@ -11,14 +11,14 @@ use app\common\model\BaseModel;
 /**
  * Class SystemGroup
  * @package app\common\model\system\groupData
- * @author xaboy
+ * @author zfy
  * @day 2020-03-30
  */
 class SystemGroup extends BaseModel
 {
     /**
      * @return string
-     * @author xaboy
+     * @author zfy
      * @day 2020-03-30
      */
     public static function tablePk(): string
@@ -28,7 +28,7 @@ class SystemGroup extends BaseModel
 
     /**
      * @return string
-     * @author xaboy
+     * @author zfy
      * @day 2020-03-30
      */
     public static function tableName(): string
@@ -39,7 +39,7 @@ class SystemGroup extends BaseModel
     /**
      * @param $value
      * @return mixed
-     * @author xaboy
+     * @author zfy
      * @day 2020-03-30
      */
     public function getFieldsAttr($value)
@@ -50,7 +50,7 @@ class SystemGroup extends BaseModel
     /**
      * @param $value
      * @return false|string
-     * @author xaboy
+     * @author zfy
      * @day 2020-03-30
      */
     public function setFieldsAttr($value)

+ 3 - 3
app/common/model/system/groupData/SystemGroupData.php

@@ -11,7 +11,7 @@ use app\common\model\BaseModel;
 /**
  * Class SystemGroupData
  * @package app\common\model\system\groupData
- * @author xaboy
+ * @author zfy
  * @day 2020-03-30
  */
 class SystemGroupData extends BaseModel
@@ -19,7 +19,7 @@ class SystemGroupData extends BaseModel
 
     /**
      * @return string
-     * @author xaboy
+     * @author zfy
      * @day 2020-03-30
      */
     public static function tablePk(): string
@@ -29,7 +29,7 @@ class SystemGroupData extends BaseModel
 
     /**
      * @return string
-     * @author xaboy
+     * @author zfy
      * @day 2020-03-30
      */
     public static function tableName(): string

+ 2 - 2
app/common/model/system/merchant/Merchant.php

@@ -17,7 +17,7 @@ class Merchant extends BaseModel
 
     /**
      * @return string
-     * @author xaboy
+     * @author zfy
      * @day 2020-03-30
      */
     public static function tablePk(): string
@@ -27,7 +27,7 @@ class Merchant extends BaseModel
 
     /**
      * @return string
-     * @author xaboy
+     * @author zfy
      * @day 2020-03-30
      */
     public static function tableName(): string

+ 5 - 5
app/common/model/system/merchant/MerchantAdmin.php

@@ -14,7 +14,7 @@ class MerchantAdmin extends BaseModel
 
     /**
      * @return string
-     * @author xaboy
+     * @author zfy
      * @day 2020-03-30
      */
     public static function tablePk(): string
@@ -24,7 +24,7 @@ class MerchantAdmin extends BaseModel
 
     /**
      * @return string
-     * @author xaboy
+     * @author zfy
      * @day 2020-03-30
      */
     public static function tableName(): string
@@ -35,7 +35,7 @@ class MerchantAdmin extends BaseModel
     /**
      * @param $value
      * @return array
-     * @author xaboy
+     * @author zfy
      * @day 2020-03-30
      */
     public function getRolesAttr($value)
@@ -46,7 +46,7 @@ class MerchantAdmin extends BaseModel
     /**
      * @param $value
      * @return string
-     * @author xaboy
+     * @author zfy
      * @day 2020-03-30
      */
     public function setRolesAttr($value)
@@ -57,7 +57,7 @@ class MerchantAdmin extends BaseModel
     /**
      * @param bool $isArray
      * @return array|string
-     * @author xaboy
+     * @author zfy
      * @day 2020-04-18
      */
     public function roleNames($isArray = false)

+ 3 - 3
app/common/model/system/merchant/MerchantCategory.php

@@ -11,7 +11,7 @@ use app\common\model\BaseModel;
 /**
  * Class MerchantCategory
  * @package app\common\model\system\merchant
- * @author xaboy
+ * @author zfy
  * @day 2020-05-06
  */
 class MerchantCategory extends BaseModel
@@ -19,7 +19,7 @@ class MerchantCategory extends BaseModel
 
     /**
      * @return string
-     * @author xaboy
+     * @author zfy
      * @day 2020-03-30
      */
     public static function tablePk(): string
@@ -29,7 +29,7 @@ class MerchantCategory extends BaseModel
 
     /**
      * @return string
-     * @author xaboy
+     * @author zfy
      * @day 2020-03-30
      */
     public static function tableName(): string

+ 2 - 2
app/common/model/system/merchant/MerchantIntention.php

@@ -10,7 +10,7 @@ class MerchantIntention extends BaseModel
 {
     /**
      * @return string
-     * @author xaboy
+     * @author zfy
      * @day 2020-03-30
      */
     public static function tablePk(): string
@@ -20,7 +20,7 @@ class MerchantIntention extends BaseModel
 
     /**
      * @return string
-     * @author xaboy
+     * @author zfy
      * @day 2020-03-30
      */
     public static function tableName(): string

+ 4 - 4
app/common/model/system/notice/SystemNoticeLog.php

@@ -11,7 +11,7 @@ use app\common\model\BaseModel;
 /**
  * Class SystemNoticeLog
  * @package app\common\model\system\notice
- * @author xaboy
+ * @author zfy
  * @day 2020/11/6
  */
 class SystemNoticeLog extends BaseModel
@@ -19,7 +19,7 @@ class SystemNoticeLog extends BaseModel
 
     /**
      * @return string|null
-     * @author xaboy
+     * @author zfy
      * @day 2020/11/6
      */
     public static function tablePk(): ?string
@@ -29,7 +29,7 @@ class SystemNoticeLog extends BaseModel
 
     /**
      * @return string
-     * @author xaboy
+     * @author zfy
      * @day 2020/11/6
      */
     public static function tableName(): string
@@ -39,7 +39,7 @@ class SystemNoticeLog extends BaseModel
 
     /**
      * @return \think\model\relation\HasOne
-     * @author xaboy
+     * @author zfy
      * @day 2020/11/6
      */
     public function notice()

+ 2 - 2
app/common/model/system/sms/SmsRecord.php

@@ -13,7 +13,7 @@ class SmsRecord extends BaseModel
 
     /**
      * @return string
-     * @author xaboy
+     * @author zfy
      * @day 2020-03-30
      */
     public static function tablePk(): string
@@ -23,7 +23,7 @@ class SmsRecord extends BaseModel
 
     /**
      * @return string
-     * @author xaboy
+     * @author zfy
      * @day 2020-03-30
      */
     public static function tableName(): string

+ 8 - 8
app/common/model/user/User.php

@@ -23,7 +23,7 @@ use app\common\repositories\user\UserVisitRepository;
 /**
  * Class User
  * @package app\common\model\user
- * @author xaboy
+ * @author zfy
  * @day 2020-04-28
  */
 class User extends BaseModel
@@ -33,7 +33,7 @@ class User extends BaseModel
 
     /**
      * @return string
-     * @author xaboy
+     * @author zfy
      * @day 2020-03-30
      */
     public static function tablePk(): string
@@ -43,7 +43,7 @@ class User extends BaseModel
 
     /**
      * @return string
-     * @author xaboy
+     * @author zfy
      * @day 2020-03-30
      */
     public static function tableName(): string
@@ -54,7 +54,7 @@ class User extends BaseModel
     /**
      * @param $value
      * @return string
-     * @author xaboy
+     * @author zfy
      * @day 2020-05-09
      */
     public function getBirthdayAttr($value)
@@ -65,7 +65,7 @@ class User extends BaseModel
     /**
      * @param $value
      * @return array
-     * @author xaboy
+     * @author zfy
      * @day 2020-05-09
      */
     public function getLabelIdAttr($value)
@@ -76,7 +76,7 @@ class User extends BaseModel
     /**
      * @param $value
      * @return string
-     * @author xaboy
+     * @author zfy
      * @day 2020-05-09
      */
     public function setLabelIdAttr($value)
@@ -139,7 +139,7 @@ class User extends BaseModel
 
     /**
      * @return \think\model\relation\HasOne
-     * @author xaboy
+     * @author zfy
      * @day 2020-05-09
      */
     public function group()
@@ -160,7 +160,7 @@ class User extends BaseModel
 
     /**
      * @param $spreadUid
-     * @author xaboy
+     * @author zfy
      * @day 2020-04-28
      */
     public function setSpread($spreadUid)

+ 2 - 2
app/common/model/user/UserAddress.php

@@ -14,7 +14,7 @@ class UserAddress extends BaseModel
 
     /**
      * @return string
-     * @author xaboy
+     * @author zfy
      * @day 2020-03-30
      */
     public static function tablePk(): string
@@ -24,7 +24,7 @@ class UserAddress extends BaseModel
 
     /**
      * @return string
-     * @author xaboy
+     * @author zfy
      * @day 2020-03-30
      */
     public static function tableName(): string

+ 2 - 2
app/common/model/user/UserBill.php

@@ -13,7 +13,7 @@ class UserBill extends BaseModel
 
     /**
      * @return string
-     * @author xaboy
+     * @author zfy
      * @day 2020-03-30
      */
     public static function tablePk(): string
@@ -23,7 +23,7 @@ class UserBill extends BaseModel
 
     /**
      * @return string
-     * @author xaboy
+     * @author zfy
      * @day 2020-03-30
      */
     public static function tableName(): string

+ 2 - 2
app/common/model/user/UserGroup.php

@@ -13,7 +13,7 @@ class UserGroup extends BaseModel
 
     /**
      * @return string
-     * @author xaboy
+     * @author zfy
      * @day 2020-03-30
      */
     public static function tablePk(): string
@@ -23,7 +23,7 @@ class UserGroup extends BaseModel
 
     /**
      * @return string
-     * @author xaboy
+     * @author zfy
      * @day 2020-03-30
      */
     public static function tableName(): string

Bu fark içinde çok fazla dosya değişikliği olduğu için bazı dosyalar gösterilmiyor