From b334c4fb4cb91d66a70ded68465b0d965faaceb5 Mon Sep 17 00:00:00 2001 From: weigang Date: Mon, 14 Sep 2020 20:07:47 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E8=A7=92=E6=A0=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/Service/v3/Implementations/BadgeService.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/Service/v3/Implementations/BadgeService.php b/app/Service/v3/Implementations/BadgeService.php index f586115..020101f 100644 --- a/app/Service/v3/Implementations/BadgeService.php +++ b/app/Service/v3/Implementations/BadgeService.php @@ -96,7 +96,7 @@ class BadgeService implements BadgeServiceInterface return [ 'paid' => count($redis->sMembers('badge_paid_store_'.$storeId)), 'delivery' => count($redis->sMembers('badge_delivery_store_'.$storeId)), - 'finish' => count($redis->sMembers('badge_canceled_store_'.$storeId)), + 'finish' => count($redis->sMembers('badge_finish_store_'.$storeId)), 'refund' => count($redis->sMembers('badge_refund_store_'.$storeId)), 'canceled' => count($redis->sMembers('badge_canceled_store_'.$storeId)), 'rejection' => count($redis->sMembers('badge_rejection_store_'.$storeId)), @@ -155,7 +155,7 @@ class BadgeService implements BadgeServiceInterface * @inheritDoc */ public function clearStoreOrder($storeId, $badge = 'all') - { + {var_dump('badge_'.$badge.'_store_'.$storeId); $redis = ApplicationContext::getContainer()->get(Redis::class); if ($badge == 'all') { $redis->del('badge_paid_store_'.$storeId); # 移除商户待付款 From fce4ee397420cb6d38ea85c1c7f25a1d5a36588e Mon Sep 17 00:00:00 2001 From: weigang Date: Mon, 14 Sep 2020 20:29:47 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E6=8E=A8=E8=8D=90=E5=95=86=E5=93=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/Controller/v3/GoodsRecommendController.php | 2 ++ 1 file changed, 2 insertions(+) diff --git a/app/Controller/v3/GoodsRecommendController.php b/app/Controller/v3/GoodsRecommendController.php index f9ec2c6..40efde5 100644 --- a/app/Controller/v3/GoodsRecommendController.php +++ b/app/Controller/v3/GoodsRecommendController.php @@ -100,6 +100,8 @@ class GoodsRecommendController extends BaseController $goodsTable = ApplicationContext::getContainer()->get(Goods::class)->getTable(); $goods = Goods::query() + ->select(''.$goodsTable.'.*') + ->addSelect(''.$goodsTable.'.sales as total_sales') ->join($storeTable,''.$storeTable.'.id', '=', ''.$goodsTable.'.store_id') ->where([ ''.$storeTable.'.is_open' => StoreConstants::IS_OPEN_YES, From 14ad2f20ad51e9f08ff252cec3e9835f8825a355 Mon Sep 17 00:00:00 2001 From: weigang Date: Mon, 14 Sep 2020 20:34:44 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E5=BD=93=E9=9D=A2=E4=BB=98=E8=AE=A2?= =?UTF-8?q?=E5=8D=95=E6=97=B6=E9=97=B4=E7=AD=9B=E9=80=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/Service/v3/Implementations/OrderListService.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/Service/v3/Implementations/OrderListService.php b/app/Service/v3/Implementations/OrderListService.php index 279c073..a65e6eb 100644 --- a/app/Service/v3/Implementations/OrderListService.php +++ b/app/Service/v3/Implementations/OrderListService.php @@ -149,7 +149,7 @@ class OrderListService implements OrderListServiceInterface ->with('user'); if(!empty($start_time) && !empty($end_time)){ - $builder->whereBetween('lanzu_order_main.created_at',[strtotime($start_time.' 23:59:59'),strtotime($end_time.' 23:59:59')]); + $builder->whereBetween('lanzu_order_main.created_at',[strtotime($start_time.' 00:00:00'),strtotime($end_time.' 23:59:59')]); } $paginate = $builder->orderBy('lanzu_order_main.created_at', 'desc')->paginate($pagesize); From 2985a2abca57f74cb87b62f9476f0411afb58489 Mon Sep 17 00:00:00 2001 From: weigang Date: Mon, 14 Sep 2020 21:01:45 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E5=95=86=E5=93=81=E6=8B=BC=E5=8D=95?= =?UTF-8?q?=E4=BD=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/Model/v3/Goods.php | 5 +++++ app/Model/v3/GoodsActivity.php | 5 +++++ 2 files changed, 10 insertions(+) diff --git a/app/Model/v3/Goods.php b/app/Model/v3/Goods.php index d6a31bc..d7feb67 100644 --- a/app/Model/v3/Goods.php +++ b/app/Model/v3/Goods.php @@ -125,6 +125,11 @@ class Goods extends Model }); } + public function getNameAttribute($value) + { + return $value . ' ' . $this->attributes['goods_unit']; + } + public function store() { return $this->belongsTo(Store::class, 'store_id', 'id'); diff --git a/app/Model/v3/GoodsActivity.php b/app/Model/v3/GoodsActivity.php index 3257026..1243de2 100644 --- a/app/Model/v3/GoodsActivity.php +++ b/app/Model/v3/GoodsActivity.php @@ -94,6 +94,11 @@ class GoodsActivity extends Model return $this->attachmentService->switchImgToAliOss($value, OssThumbnail::THUMBNAIL_600_Q90); } + public function getNameAttribute($value) + { + return $value . ' ' . $this->attributes['goods_unit']; + } + public function store() { return $this->belongsTo(Store::class, 'store_id', 'id');