From 11dff348e7181b4257982cfe32d047d6504f4a7d Mon Sep 17 00:00:00 2001 From: shengchanzhe <179998674@qq.com> Date: Fri, 27 Oct 2023 19:04:56 +0800 Subject: [PATCH 01/15] =?UTF-8?q?=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../community/CommunityRepository.php | 56 ++++++++++--------- 1 file changed, 30 insertions(+), 26 deletions(-) diff --git a/app/common/repositories/community/CommunityRepository.php b/app/common/repositories/community/CommunityRepository.php index 29e139e5..18ea9a83 100644 --- a/app/common/repositories/community/CommunityRepository.php +++ b/app/common/repositories/community/CommunityRepository.php @@ -682,35 +682,39 @@ class CommunityRepository extends BaseRepository $entrustInfo->update($value); continue; } - $purchaseRecord = PurchaseRecord::where('unique', $value['product_attr_unique'])->find(); - $totalNumber = PurchaseRecord::where('unique', $value['product_attr_unique'])->sum('number'); - $totalSalesVolume = PurchaseRecord::where('unique', $value['product_attr_unique'])->sum('sales_volume'); - if (empty($purchaseRecord) || ($totalNumber - $totalSalesVolume) <= 0) { - throw new ValidateException('进货记录不存在或已售罄'); - } - if (($totalNumber - $totalSalesVolume) < $value['number']) { - throw new ValidateException('库存不足'); - } + + // $purchaseRecord = PurchaseRecord::where('unique', $value['product_attr_unique'])->find(); + // $totalNumber = PurchaseRecord::where('unique', $value['product_attr_unique'])->sum('number'); + // $totalSalesVolume = PurchaseRecord::where('unique', $value['product_attr_unique'])->sum('sales_volume'); + // if (empty($purchaseRecord) || ($totalNumber - $totalSalesVolume) <= 0) { + // throw new ValidateException('进货记录不存在或已售罄'); + // } + // if (($totalNumber - $totalSalesVolume) < $value['number']) { + // throw new ValidateException('库存不足'); + // } if ($value) { - $insert[] = [ - 'community_id' => $id, - 'purchase_record_id' => $purchaseRecord['id'], - 'product_id' => $purchaseRecord['product_id'], - 'product_attr_unique' => $purchaseRecord['unique'], - 'mer_id' => $purchaseRecord['mer_id'], - 'entrust_mer_id' => $entrustMerId, - 'entrust_day' => $entrustDay, - 'number' => $value['number'], - 'price' => $value['price'], - 'update_time' => date('Y-m-d H:i:s'), - ]; + $attrValue = ProductAttrValue::where('unique', $value['product_attr_unique'])->find(); + if($attrValue){ + $insert[] = [ + 'community_id' => $id, + 'purchase_record_id' => 0,//$purchaseRecord['id'], + 'product_id' => $attrValue['product_id'], + 'product_attr_unique' => $attrValue['unique'], + 'mer_id' => $attrValue['mer_id'], + 'entrust_mer_id' => $entrustMerId, + 'entrust_day' => $entrustDay, + 'number' => $value['number'], + 'price' => $value['price'], + 'update_time' => date('Y-m-d H:i:s'), + ]; + $attrValue->stock -= $value['number']; + $attrValue->save(); + } } - $purchaseRecord->product->stock -= $value['number']; - $purchaseRecord->product->save(); - $attrValue = ProductAttrValue::where('product_id', $purchaseRecord['product_id'])->where('unique', $purchaseRecord['unique'])->find(); - $attrValue->stock -= $value['number']; - $attrValue->save(); + // $purchaseRecord->product->stock -= $value['number']; + // $purchaseRecord->product->save(); + } if ($insert) { Entrust::getInstance()->insertAll($insert); From dac2051f3d239316283e83cfbc665bafaa4913c4 Mon Sep 17 00:00:00 2001 From: shengchanzhe <179998674@qq.com> Date: Fri, 27 Oct 2023 19:26:10 +0800 Subject: [PATCH 02/15] =?UTF-8?q?=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controller/api/store/merchant/MerchantIntention.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/controller/api/store/merchant/MerchantIntention.php b/app/controller/api/store/merchant/MerchantIntention.php index cb89c21e..8d7a202d 100644 --- a/app/controller/api/store/merchant/MerchantIntention.php +++ b/app/controller/api/store/merchant/MerchantIntention.php @@ -195,7 +195,7 @@ class MerchantIntention extends BaseController 'city' => $areaInfo['city_code'] ?? '', 'area' => $merInfo['area_id'] ?? '', 'street' => $merInfo['street_id'] ?? '', - 'address' => $merInfo['address'] ?? '', + 'address' => $intenInfo['address'] ?? '', 'bank_username' => $data['bank_username'] ?? '', 'bank_opening' => $data['bank_opening'] ?? '', 'bank_front' => $data['bank_front'] ?? '', From 79109e7f04fb6eefe1c5dd5c63d10ece62097244 Mon Sep 17 00:00:00 2001 From: shengchanzhe <179998674@qq.com> Date: Fri, 27 Oct 2023 20:14:24 +0800 Subject: [PATCH 03/15] =?UTF-8?q?=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/common/repositories/store/product/ProductRepository.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/common/repositories/store/product/ProductRepository.php b/app/common/repositories/store/product/ProductRepository.php index 4889122b..503115ae 100644 --- a/app/common/repositories/store/product/ProductRepository.php +++ b/app/common/repositories/store/product/ProductRepository.php @@ -2370,8 +2370,8 @@ class ProductRepository extends BaseRepository if ($stockIn <= 0) { throw new ValidateException('入库数量不能小于等于0'); } - $attrValue->stock = $attrValue->stock + $stockIn; - $attrValue->save(); + ProductAttrValue::where('mer_id', $merId)->where('product_id', $product['product_id'])->where('sku', $sku)->update(['stock'=>$attrValue->stock + $stockIn]); + $product->stock = $stockIn + $product->stock; if (!$product->save()) { throw new \Exception('商品库存保存失败', 500); From bcd574a3e24a25945a0e8ef15d7857182e8188e7 Mon Sep 17 00:00:00 2001 From: shengchanzhe <179998674@qq.com> Date: Fri, 27 Oct 2023 20:31:21 +0800 Subject: [PATCH 04/15] =?UTF-8?q?=E5=86=8D=E6=AC=A1=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/common/repositories/store/product/ProductRepository.php | 1 + 1 file changed, 1 insertion(+) diff --git a/app/common/repositories/store/product/ProductRepository.php b/app/common/repositories/store/product/ProductRepository.php index 503115ae..e7364bc1 100644 --- a/app/common/repositories/store/product/ProductRepository.php +++ b/app/common/repositories/store/product/ProductRepository.php @@ -2370,6 +2370,7 @@ class ProductRepository extends BaseRepository if ($stockIn <= 0) { throw new ValidateException('入库数量不能小于等于0'); } + //111 ProductAttrValue::where('mer_id', $merId)->where('product_id', $product['product_id'])->where('sku', $sku)->update(['stock'=>$attrValue->stock + $stockIn]); $product->stock = $stockIn + $product->stock; From 6d7edcd628118aec4d9ab9c664aea72372f8aa27 Mon Sep 17 00:00:00 2001 From: shengchanzhe <179998674@qq.com> Date: Fri, 27 Oct 2023 20:41:32 +0800 Subject: [PATCH 05/15] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=85=A5=E5=BA=93?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../store/product/ProductRepository.php | 31 +++++++++++++++---- 1 file changed, 25 insertions(+), 6 deletions(-) diff --git a/app/common/repositories/store/product/ProductRepository.php b/app/common/repositories/store/product/ProductRepository.php index e7364bc1..1e0966d7 100644 --- a/app/common/repositories/store/product/ProductRepository.php +++ b/app/common/repositories/store/product/ProductRepository.php @@ -2352,12 +2352,33 @@ class ProductRepository extends BaseRepository } $stockIn = $params['number'] ?? 0; $price = $params['price'] ?? 0; + $model = new PurchaseRecord(); if (!empty($params['order_id'])) { //采购、委托订单导入 $orderMerId = StoreOrder::where('order_id', $params['order_id'])->value('mer_id'); $orderProduct = StoreOrderProduct::where('order_id', $params['order_id'])->where('product_id', $params['order_product_id'])->where('product_sku', $params['order_unique'])->find(); - if (empty($orderProduct) || $orderProduct->is_imported == 1) { - throw new ValidateException('订单商品不存在或已入库'); + if (empty($orderProduct)) { + throw new ValidateException('订单商品不存在'); + } + if( $orderProduct->is_imported == 1){ + ProductAttrValue::where('mer_id', $merId) + ->where('product_id', $params['product_id'])->where('unique', $params['unique']) + ->update(['stock'=>$attrValue->stock + $stockIn]); + $data = [ + 'order_id' => $params['order_id'] ?? 0, + 'order_product_id' => $params['order_product_id'] ?? 0, + 'product_id' => $product->product_id, + 'number' => $stockIn, + 'order_unique' => $params['order_unique'] ?? '', + 'unique' => $attrValue['unique'], + 'price' => $price, + 'mer_id' => $product->mer_id, + 'supplier_mer_id' => $supplierMerId, + ]; + if (!$model->save($data)) { + throw new \Exception('入库失败', 500); + } + return true; } $stockIn = $orderProduct['product_num'] ?? 0; $price = $orderProduct['product_price'] ?? 0; @@ -2370,14 +2391,12 @@ class ProductRepository extends BaseRepository if ($stockIn <= 0) { throw new ValidateException('入库数量不能小于等于0'); } - //111 - ProductAttrValue::where('mer_id', $merId)->where('product_id', $product['product_id'])->where('sku', $sku)->update(['stock'=>$attrValue->stock + $stockIn]); - + $attrValue->stock = $attrValue->stock + $stockIn; + $attrValue->save(); $product->stock = $stockIn + $product->stock; if (!$product->save()) { throw new \Exception('商品库存保存失败', 500); } - $model = new PurchaseRecord(); $data = [ 'order_id' => $params['order_id'] ?? 0, 'order_product_id' => $params['order_product_id'] ?? 0, From 41b2df4a81632165edb4a15f2bca8cd71198a099 Mon Sep 17 00:00:00 2001 From: shengchanzhe <179998674@qq.com> Date: Fri, 27 Oct 2023 20:49:08 +0800 Subject: [PATCH 06/15] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E9=BB=98=E8=AE=A4?= =?UTF-8?q?=E5=80=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/common/repositories/store/product/ProductRepository.php | 3 +++ 1 file changed, 3 insertions(+) diff --git a/app/common/repositories/store/product/ProductRepository.php b/app/common/repositories/store/product/ProductRepository.php index 1e0966d7..289e4f31 100644 --- a/app/common/repositories/store/product/ProductRepository.php +++ b/app/common/repositories/store/product/ProductRepository.php @@ -2361,6 +2361,9 @@ class ProductRepository extends BaseRepository throw new ValidateException('订单商品不存在'); } if( $orderProduct->is_imported == 1){ + if($stockIn==0){ + $stockIn=1; + } ProductAttrValue::where('mer_id', $merId) ->where('product_id', $params['product_id'])->where('unique', $params['unique']) ->update(['stock'=>$attrValue->stock + $stockIn]); From 79d4d3adb97cdddcfd8062122dbc4af6ff0dd46d Mon Sep 17 00:00:00 2001 From: shengchanzhe <179998674@qq.com> Date: Fri, 27 Oct 2023 21:11:25 +0800 Subject: [PATCH 07/15] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E9=87=87=E8=B4=AD?= =?UTF-8?q?=E5=85=A5=E5=BA=93?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../store/product/ProductRepository.php | 91 +++++++++---------- 1 file changed, 45 insertions(+), 46 deletions(-) diff --git a/app/common/repositories/store/product/ProductRepository.php b/app/common/repositories/store/product/ProductRepository.php index 289e4f31..7d7a6145 100644 --- a/app/common/repositories/store/product/ProductRepository.php +++ b/app/common/repositories/store/product/ProductRepository.php @@ -2328,20 +2328,60 @@ class ProductRepository extends BaseRepository Db::startTrans(); try { $supplierMerId = 0; + $model = new PurchaseRecord(); if (empty($params['product_id']) && !empty($params['order_product_id'])) { //有商品无规格或者无商品无规格,导入商品和规格 $product = $this->getWhere(['source_product_id' => $params['order_product_id'], 'mer_id' => $merId]); + $sku = ProductAttrValue::where('product_id', $params['order_product_id'])->where('unique', $params['order_unique'])->value('sku'); + $attrValue = ProductAttrValue::where('mer_id', $merId)->where('product_id', $product['product_id'])->where('sku', $sku)->find(); if (!empty($product)) { - $unique = $this->importAttrValue($params['order_product_id'], $product->toArray(), $params['order_unique']); - if (!$unique) { - throw new \Exception('商品规格导入出错', 500); + $stockIn = $params['number'] ?? 0; + $price = $params['price'] ?? 0; + if (!empty($params['order_id'])) { + //采购、委托订单导入 + $orderMerId = StoreOrder::where('order_id', $params['order_id'])->value('mer_id'); + $orderProduct = StoreOrderProduct::where('order_id', $params['order_id'])->where('product_id', $params['order_product_id'])->where('product_sku', $params['order_unique'])->find(); + if (empty($orderProduct)) { + $unique = $this->importAttrValue($params['order_product_id'], $product->toArray(), $params['order_unique']); + if (!$unique) { + throw new \Exception('商品规格导入出错', 500); + } + } + if( $orderProduct->is_imported == 1){ + if($stockIn==0){ + $stockIn=1; + } + ProductAttrValue::where('mer_id', $merId) + ->where('product_id', $params['product_id'])->where('unique', $params['unique']) + ->update(['stock'=>$attrValue->stock + $stockIn]); + $data = [ + 'order_id' => $params['order_id'] ?? 0, + 'order_product_id' => $params['order_product_id'] ?? 0, + 'product_id' => $product->product_id, + 'number' => $stockIn, + 'order_unique' => $params['order_unique'] ?? '', + 'unique' => $attrValue['unique'], + 'price' => $price, + 'mer_id' => $product->mer_id, + 'supplier_mer_id' => $supplierMerId, + ]; + if (!$model->save($data)) { + throw new \Exception('入库失败', 500); + } + return true; + } + $stockIn = $orderProduct['product_num'] ?? 0; + $price = $orderProduct['product_price'] ?? 0; + $supplierMerId = $orderMerId ?? 0; + // 如果是委托商品入库后就成为供应链商家的采购类型商品 + if ($orderProduct['product_type'] == 99) { + $product->product_type = 98; + } } } else { $productId = $this->import($params['order_product_id'], request()->userInfo()); $product = $this->get($productId); } - $sku = ProductAttrValue::where('product_id', $params['order_product_id'])->where('unique', $params['order_unique'])->value('sku'); - $attrValue = ProductAttrValue::where('mer_id', $merId)->where('product_id', $product['product_id'])->where('sku', $sku)->find(); } else { //有商品有规格 $product = $this->get($params['product_id']); @@ -2350,47 +2390,6 @@ class ProductRepository extends BaseRepository if (!$product || !$attrValue) { throw new DataNotFoundException('商品或规格不存在'); } - $stockIn = $params['number'] ?? 0; - $price = $params['price'] ?? 0; - $model = new PurchaseRecord(); - if (!empty($params['order_id'])) { - //采购、委托订单导入 - $orderMerId = StoreOrder::where('order_id', $params['order_id'])->value('mer_id'); - $orderProduct = StoreOrderProduct::where('order_id', $params['order_id'])->where('product_id', $params['order_product_id'])->where('product_sku', $params['order_unique'])->find(); - if (empty($orderProduct)) { - throw new ValidateException('订单商品不存在'); - } - if( $orderProduct->is_imported == 1){ - if($stockIn==0){ - $stockIn=1; - } - ProductAttrValue::where('mer_id', $merId) - ->where('product_id', $params['product_id'])->where('unique', $params['unique']) - ->update(['stock'=>$attrValue->stock + $stockIn]); - $data = [ - 'order_id' => $params['order_id'] ?? 0, - 'order_product_id' => $params['order_product_id'] ?? 0, - 'product_id' => $product->product_id, - 'number' => $stockIn, - 'order_unique' => $params['order_unique'] ?? '', - 'unique' => $attrValue['unique'], - 'price' => $price, - 'mer_id' => $product->mer_id, - 'supplier_mer_id' => $supplierMerId, - ]; - if (!$model->save($data)) { - throw new \Exception('入库失败', 500); - } - return true; - } - $stockIn = $orderProduct['product_num'] ?? 0; - $price = $orderProduct['product_price'] ?? 0; - $supplierMerId = $orderMerId ?? 0; - // 如果是委托商品入库后就成为供应链商家的采购类型商品 - if ($orderProduct['product_type'] == 99) { - $product->product_type = 98; - } - } if ($stockIn <= 0) { throw new ValidateException('入库数量不能小于等于0'); } From 31b4169b4598f15c8e8000fccf71cc537f10c5f4 Mon Sep 17 00:00:00 2001 From: shengchanzhe <179998674@qq.com> Date: Fri, 27 Oct 2023 21:26:53 +0800 Subject: [PATCH 08/15] =?UTF-8?q?=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/common/repositories/store/product/ProductRepository.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/common/repositories/store/product/ProductRepository.php b/app/common/repositories/store/product/ProductRepository.php index 7d7a6145..f61fda95 100644 --- a/app/common/repositories/store/product/ProductRepository.php +++ b/app/common/repositories/store/product/ProductRepository.php @@ -2352,7 +2352,7 @@ class ProductRepository extends BaseRepository $stockIn=1; } ProductAttrValue::where('mer_id', $merId) - ->where('product_id', $params['product_id'])->where('unique', $params['unique']) + ->where('product_id', $params['product_id']) ->update(['stock'=>$attrValue->stock + $stockIn]); $data = [ 'order_id' => $params['order_id'] ?? 0, @@ -2363,7 +2363,7 @@ class ProductRepository extends BaseRepository 'unique' => $attrValue['unique'], 'price' => $price, 'mer_id' => $product->mer_id, - 'supplier_mer_id' => $supplierMerId, + 'supplier_mer_id' => $orderMerId??0, ]; if (!$model->save($data)) { throw new \Exception('入库失败', 500); From 64ed1355bc389b219c01443205860c0063401f65 Mon Sep 17 00:00:00 2001 From: shengchanzhe <179998674@qq.com> Date: Fri, 27 Oct 2023 21:33:17 +0800 Subject: [PATCH 09/15] =?UTF-8?q?=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/common/repositories/store/product/ProductRepository.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/common/repositories/store/product/ProductRepository.php b/app/common/repositories/store/product/ProductRepository.php index f61fda95..26f0d172 100644 --- a/app/common/repositories/store/product/ProductRepository.php +++ b/app/common/repositories/store/product/ProductRepository.php @@ -2352,7 +2352,7 @@ class ProductRepository extends BaseRepository $stockIn=1; } ProductAttrValue::where('mer_id', $merId) - ->where('product_id', $params['product_id']) + ->where('product_id', $product['product_id']) ->update(['stock'=>$attrValue->stock + $stockIn]); $data = [ 'order_id' => $params['order_id'] ?? 0, From 251a7bb1c3ac2324f6d5ee1f6910d8bf9ee48351 Mon Sep 17 00:00:00 2001 From: shengchanzhe <179998674@qq.com> Date: Fri, 27 Oct 2023 21:38:02 +0800 Subject: [PATCH 10/15] =?UTF-8?q?=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/common/repositories/store/product/ProductRepository.php | 1 + 1 file changed, 1 insertion(+) diff --git a/app/common/repositories/store/product/ProductRepository.php b/app/common/repositories/store/product/ProductRepository.php index 26f0d172..bd76734e 100644 --- a/app/common/repositories/store/product/ProductRepository.php +++ b/app/common/repositories/store/product/ProductRepository.php @@ -2368,6 +2368,7 @@ class ProductRepository extends BaseRepository if (!$model->save($data)) { throw new \Exception('入库失败', 500); } + Db::commit(); return true; } $stockIn = $orderProduct['product_num'] ?? 0; From e1c15d7eeab62232f55733827c987dae385c5159 Mon Sep 17 00:00:00 2001 From: shengchanzhe <179998674@qq.com> Date: Fri, 27 Oct 2023 21:43:46 +0800 Subject: [PATCH 11/15] =?UTF-8?q?=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/common/repositories/store/product/ProductRepository.php | 1 + 1 file changed, 1 insertion(+) diff --git a/app/common/repositories/store/product/ProductRepository.php b/app/common/repositories/store/product/ProductRepository.php index bd76734e..3c5303a6 100644 --- a/app/common/repositories/store/product/ProductRepository.php +++ b/app/common/repositories/store/product/ProductRepository.php @@ -2325,6 +2325,7 @@ class ProductRepository extends BaseRepository */ public function stockIn($merId, $params) { + /**感觉有问题 最好在优化一下结构 */ Db::startTrans(); try { $supplierMerId = 0; From 713f8c70f8b65bb64e84395f0609352c967cb251 Mon Sep 17 00:00:00 2001 From: yaooo <272523191@qq.com> Date: Sat, 28 Oct 2023 09:38:06 +0800 Subject: [PATCH 12/15] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E7=9B=B4=E6=92=AD?= =?UTF-8?q?=E9=80=81=E7=A4=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/common/dao/user/UserBillDao.php | 6 +++--- app/controller/api/user/Zhibo.php | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/app/common/dao/user/UserBillDao.php b/app/common/dao/user/UserBillDao.php index 088cd0fe..edbd691e 100644 --- a/app/common/dao/user/UserBillDao.php +++ b/app/common/dao/user/UserBillDao.php @@ -192,11 +192,11 @@ class UserBillDao extends BaseDao return UserBill::getDB() ->when(isset($where['now_money']) && in_array($where['now_money'], [0, 1, 2]), function ($query) use ($where) { if ($where['now_money'] == 0) - $query->where('category', 'now_money')->whereIn('type', ['pay_product', 'recharge', 'sys_inc_money', 'sys_dec_money', 'brokerage', 'presell', 'refund']); + $query->where('category', 'now_money')->whereIn('type', ['pay_product', 'recharge', 'sys_inc_money', 'sys_dec_money', 'brokerage', 'presell', 'refund', 'zhibo_reward_inc', 'zhibo_reward_dec']); else if ($where['now_money'] == 1) - $query->where('category', 'now_money')->whereIn('type', ['pay_product', 'sys_dec_money', 'presell']); + $query->where('category', 'now_money')->whereIn('type', ['pay_product', 'sys_dec_money', 'presell', 'zhibo_reward_inc']); else if ($where['now_money'] == 2) - $query->where('category', 'now_money')->whereIn('type', ['recharge', 'sys_inc_money', 'brokerage', 'refund']); + $query->where('category', 'now_money')->whereIn('type', ['recharge', 'sys_inc_money', 'brokerage', 'refund', 'zhibo_reward_dec']); }) ->when(isset($where['uid']) && $where['uid'] !== '', function ($query) use ($where) { $query->where('uid', $where['uid'])->where('mer_id', 0); diff --git a/app/controller/api/user/Zhibo.php b/app/controller/api/user/Zhibo.php index 338cc7e5..82b7e8a7 100644 --- a/app/controller/api/user/Zhibo.php +++ b/app/controller/api/user/Zhibo.php @@ -64,7 +64,7 @@ class Zhibo extends BaseController $user->save(); $userBillRepository = app()->make(UserBillRepository::class); //打赏人账单 - $userBillRepository->decBill($user['uid'], 'now_money', 'zhibo_reward', [ + $userBillRepository->decBill($user['uid'], 'now_money', 'zhibo_reward_dec', [ 'link_id' => $orderId, 'status' => 1, 'title' => '直播送礼支出', @@ -76,7 +76,7 @@ class Zhibo extends BaseController Db::name('user')->where('uid', $params['master_id'])->inc('now_money', $params['amount'])->update(); $master = Db::name('user')->where('uid', $params['master_id'])->find(); //主播账单 - $userBillRepository->incBill($master['uid'], 'now_money', 'zhibo_reward', [ + $userBillRepository->incBill($master['uid'], 'now_money', 'zhibo_reward_inc', [ 'link_id' => $orderId, 'status' => 1, 'title' => '直播送礼收入', From 1d2a72e4db9a80af282b0f0c1622f94bb92b59f3 Mon Sep 17 00:00:00 2001 From: yaooo <272523191@qq.com> Date: Sat, 28 Oct 2023 09:42:01 +0800 Subject: [PATCH 13/15] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E7=9B=B4=E6=92=AD?= =?UTF-8?q?=E9=80=81=E7=A4=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/common/dao/user/UserBillDao.php | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/app/common/dao/user/UserBillDao.php b/app/common/dao/user/UserBillDao.php index edbd691e..18327388 100644 --- a/app/common/dao/user/UserBillDao.php +++ b/app/common/dao/user/UserBillDao.php @@ -189,14 +189,15 @@ class UserBillDao extends BaseDao */ public function search(array $where) { + halt($where); return UserBill::getDB() ->when(isset($where['now_money']) && in_array($where['now_money'], [0, 1, 2]), function ($query) use ($where) { if ($where['now_money'] == 0) $query->where('category', 'now_money')->whereIn('type', ['pay_product', 'recharge', 'sys_inc_money', 'sys_dec_money', 'brokerage', 'presell', 'refund', 'zhibo_reward_inc', 'zhibo_reward_dec']); else if ($where['now_money'] == 1) - $query->where('category', 'now_money')->whereIn('type', ['pay_product', 'sys_dec_money', 'presell', 'zhibo_reward_inc']); + $query->where('category', 'now_money')->whereIn('type', ['pay_product', 'sys_dec_money', 'presell', 'zhibo_reward_dec']); else if ($where['now_money'] == 2) - $query->where('category', 'now_money')->whereIn('type', ['recharge', 'sys_inc_money', 'brokerage', 'refund', 'zhibo_reward_dec']); + $query->where('category', 'now_money')->whereIn('type', ['recharge', 'sys_inc_money', 'brokerage', 'refund', 'zhibo_reward_inc']); }) ->when(isset($where['uid']) && $where['uid'] !== '', function ($query) use ($where) { $query->where('uid', $where['uid'])->where('mer_id', 0); From 9ed5034de747611b23df5cd79d0ab0d3c89f1230 Mon Sep 17 00:00:00 2001 From: yaooo <272523191@qq.com> Date: Sat, 28 Oct 2023 09:42:32 +0800 Subject: [PATCH 14/15] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E7=9B=B4=E6=92=AD?= =?UTF-8?q?=E9=80=81=E7=A4=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/common/dao/user/UserBillDao.php | 1 - 1 file changed, 1 deletion(-) diff --git a/app/common/dao/user/UserBillDao.php b/app/common/dao/user/UserBillDao.php index 18327388..8e5e2153 100644 --- a/app/common/dao/user/UserBillDao.php +++ b/app/common/dao/user/UserBillDao.php @@ -189,7 +189,6 @@ class UserBillDao extends BaseDao */ public function search(array $where) { - halt($where); return UserBill::getDB() ->when(isset($where['now_money']) && in_array($where['now_money'], [0, 1, 2]), function ($query) use ($where) { if ($where['now_money'] == 0) From fdf697e1f4c39aba5a54406a02ea0fa61578b968 Mon Sep 17 00:00:00 2001 From: mkm <727897186@qq.com> Date: Sat, 28 Oct 2023 15:55:30 +0800 Subject: [PATCH 15/15] =?UTF-8?q?=E5=90=8E=E5=8F=B0pc=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/mer.html | 2 +- ...5568af.css => chunk-43056c0c.68b66d07.css} | 0 ...6cf18c.css => chunk-d08ae18a.32ccfe6c.css} | 2 +- .../js/{app.fe0f742e.js => app.25f28002.js} | 2 +- ...fdcd9251.js => chunk-00584afe.624c1175.js} | 0 ...8f59ef6b.js => chunk-02ea1cc8.819ab222.js} | 0 ...042ab901.js => chunk-031de214.9543f216.js} | 0 ...86d07fc8.js => chunk-03944393.8bfab3b6.js} | 0 ...8cbd6aa0.js => chunk-03cdbf88.4487520b.js} | 0 ...2aff42ac.js => chunk-048e53ee.d62f6d74.js} | 0 ...aa21e7a0.js => chunk-0493956f.be78afa1.js} | 0 ...2ad37d1b.js => chunk-09296115.1e8c40a4.js} | 0 ...ca5bb21e.js => chunk-0b1f3772.0ba08aec.js} | 0 ...e0773add.js => chunk-0d2c1415.c4774000.js} | 0 ...a26c8980.js => chunk-0fa0e81e.80278ae1.js} | 0 ...769caa52.js => chunk-1306dfb6.6d5bf91a.js} | 0 ...7290c316.js => chunk-154b4748.0d789442.js} | 0 ...db6cbc65.js => chunk-18fda1e0.5b862cc7.js} | 0 ...1931a746.js => chunk-1df22872.bcf73eca.js} | 0 public/mer/js/chunk-21d73fce.5539a9b3.js | 1 - ...4b7cef41.js => chunk-2d0ab2c5.ccb7cbfa.js} | 0 ...18d61df1.js => chunk-2d0aba79.87953f9e.js} | 0 ...aa9a030a.js => chunk-2d0aed35.631ff8f9.js} | 0 ...30aba183.js => chunk-2d0b1e40.13688b61.js} | 0 ...0d379f8a.js => chunk-2d0ba554.7951b196.js} | 0 ...f73feb79.js => chunk-2d0c212a.b09722f2.js} | 0 ...c5e53609.js => chunk-2d0c481a.89a1b8f5.js} | 0 ...52446984.js => chunk-2d0c8a44.9cbed354.js} | 0 ...a2ede260.js => chunk-2d0d095b.71131484.js} | 0 ...02714f46.js => chunk-2d0d3300.9bf19520.js} | 0 ...52b19eb9.js => chunk-2d0e276e.23d3b1fc.js} | 0 ...a3b258af.js => chunk-2d0e5b8e.e1c10376.js} | 0 ...78663302.js => chunk-2d0e6675.4e70c6e8.js} | 0 ...cd499ae2.js => chunk-2d207706.d9c4bd71.js} | 0 ...7c26e238.js => chunk-2d209391.6745fc84.js} | 0 ...9d1daa11.js => chunk-2d213182.8506b72f.js} | 0 ...a8a920dc.js => chunk-2d213ed3.8b17b6aa.js} | 0 ...c3b530f5.js => chunk-2d21d8a3.ac5c243f.js} | 0 ...148070d8.js => chunk-2d229240.36fecbb3.js} | 0 ...e293f269.js => chunk-2d230c26.580182ee.js} | 0 ...d5a662c3.js => chunk-2f105f7b.91bb2a68.js} | 0 ...de565e36.js => chunk-32c5a54a.79b30984.js} | 0 ...8ae9799c.js => chunk-344a4872.9f13361e.js} | 0 ...06457928.js => chunk-35013ff2.21c964fc.js} | 0 ...555c036a.js => chunk-39a0bfcb.c18ef5ad.js} | 0 ...39783fd1.js => chunk-3e2c114c.d3d7810e.js} | 0 ...fdce1d90.js => chunk-3ec8e821.ea1c61fb.js} | 0 ...fa909bf4.js => chunk-406e1b8e.dd83a8e7.js} | 0 ...24abaab8.js => chunk-40dcbfe7.680a3af8.js} | 0 ...1f2c5aca.js => chunk-412170ef.760231be.js} | 0 ...50036902.js => chunk-412d33f7.6be40bb0.js} | 0 ...ea6e4fc8.js => chunk-418fea3c.3d90e1f1.js} | 0 ...e59a6118.js => chunk-43056c0c.0d9277c1.js} | 0 ...e3ddc594.js => chunk-4a9f6d94.11ae2226.js} | 0 ...cde49d77.js => chunk-4bf3fbdc.4e23f1a8.js} | 0 ...fc6490f6.js => chunk-4f7a44e8.4954143d.js} | 0 ...64844fe9.js => chunk-5310352e.72571813.js} | 0 ...c98063ac.js => chunk-546dc2ee.15d321b6.js} | 0 ...a073636b.js => chunk-59e52b70.748518b3.js} | 0 ...2d301d4f.js => chunk-5bb47ee8.44a56b61.js} | 0 ...b9e36fe7.js => chunk-5d8cc0ba.7350d926.js} | 0 ...b803e001.js => chunk-5ed4f497.d60a336c.js} | 0 ...58ddaa43.js => chunk-6231f720.f43febc0.js} | 0 ...2f0b8987.js => chunk-634734f0.98f9792e.js} | 0 ...388a52b3.js => chunk-648f00b5.db9bfa05.js} | 0 ...e8bd0321.js => chunk-67e1db22.abd27fd8.js} | 0 ...f0ca8d97.js => chunk-6a905886.f0de56de.js} | 0 ...52472e5f.js => chunk-6c88f67a.49ca2cb5.js} | 0 ...5756f677.js => chunk-7288b5a6.d553c60c.js} | 0 ...ba9efa07.js => chunk-738c6ac1.17f05c02.js} | 0 ...076d6e65.js => chunk-7788e6ba.14f30dca.js} | 0 ...7c752e4a.js => chunk-78c4a0d7.d8acd954.js} | 0 ...0aef87f6.js => chunk-7c1a0002.5e412e55.js} | 0 ...257efbe1.js => chunk-7c43671d.00c29d08.js} | 0 ...a7b44025.js => chunk-7f2544fe.ffee7d4d.js} | 0 ...b2d33e41.js => chunk-80a8cf62.35b9a0b4.js} | 0 ...8358745d.js => chunk-82bee4a8.eefcb150.js} | 0 ...27debe08.js => chunk-90657762.e50cb7b5.js} | 0 ...44d85c7b.js => chunk-961c0de4.d2693796.js} | 0 ...5aacfc38.js => chunk-9afa8a36.2cbda66b.js} | 0 ...646073ee.js => chunk-9d6d22b0.e54eef26.js} | 0 ...b4c46718.js => chunk-a0fbc2e4.228eb9f0.js} | 0 ...b6cd9810.js => chunk-a97676f4.47892021.js} | 0 ...b4cb614d.js => chunk-ab3d6574.37409ec9.js} | 0 ...846bcf99.js => chunk-ae0b147e.6d857c9b.js} | 0 ...ba3acbcc.js => chunk-afbd5864.8cb5ad78.js} | 0 ...4b421028.js => chunk-b28bec38.9413f9c5.js} | 0 ...9593a4c9.js => chunk-cd8d615e.c270674c.js} | 0 ...73afe2a9.js => chunk-cf155762.efba42ff.js} | 0 ....cc2ce7aa.js => chunk-commons.50cf883d.js} | 0 public/mer/js/chunk-d08ae18a.f45890ac.js | 1 + ...9b315160.js => chunk-edb267f4.0d92693c.js} | 0 ...9297575c.js => chunk-ef8562be.c5e8299a.js} | 0 ...d19a690.js => chunk-elementUI.d0585cc2.js} | 2 +- ...4d86ded5.js => chunk-f0a8813a.bc9fae18.js} | 0 ...f21bd127.js => chunk-f1874498.cea83324.js} | 0 ...0b03926c.js => chunk-fa99d034.c4ebd973.js} | 0 ...e1c39184.js => chunk-fe6fa87e.9918d2a6.js} | 0 ...ibs.898070c3.js => chunk-libs.f60897d8.js} | 124 ++++++++---------- 99 files changed, 63 insertions(+), 71 deletions(-) rename public/mer/css/{chunk-43056c0c.275568af.css => chunk-43056c0c.68b66d07.css} (100%) rename public/mer/css/{chunk-21d73fce.ff6cf18c.css => chunk-d08ae18a.32ccfe6c.css} (53%) rename public/mer/js/{app.fe0f742e.js => app.25f28002.js} (99%) rename public/mer/js/{chunk-00584afe.fdcd9251.js => chunk-00584afe.624c1175.js} (100%) rename public/mer/js/{chunk-02ea1cc8.8f59ef6b.js => chunk-02ea1cc8.819ab222.js} (100%) rename public/mer/js/{chunk-031de214.042ab901.js => chunk-031de214.9543f216.js} (100%) rename public/mer/js/{chunk-03944393.86d07fc8.js => chunk-03944393.8bfab3b6.js} (100%) rename public/mer/js/{chunk-03cdbf88.8cbd6aa0.js => chunk-03cdbf88.4487520b.js} (100%) rename public/mer/js/{chunk-048e53ee.2aff42ac.js => chunk-048e53ee.d62f6d74.js} (100%) rename public/mer/js/{chunk-0493956f.aa21e7a0.js => chunk-0493956f.be78afa1.js} (100%) rename public/mer/js/{chunk-09296115.2ad37d1b.js => chunk-09296115.1e8c40a4.js} (100%) rename public/mer/js/{chunk-0b1f3772.ca5bb21e.js => chunk-0b1f3772.0ba08aec.js} (100%) rename public/mer/js/{chunk-0d2c1415.e0773add.js => chunk-0d2c1415.c4774000.js} (100%) rename public/mer/js/{chunk-0fa0e81e.a26c8980.js => chunk-0fa0e81e.80278ae1.js} (100%) rename public/mer/js/{chunk-1306dfb6.769caa52.js => chunk-1306dfb6.6d5bf91a.js} (100%) rename public/mer/js/{chunk-154b4748.7290c316.js => chunk-154b4748.0d789442.js} (100%) rename public/mer/js/{chunk-18fda1e0.db6cbc65.js => chunk-18fda1e0.5b862cc7.js} (100%) rename public/mer/js/{chunk-1df22872.1931a746.js => chunk-1df22872.bcf73eca.js} (100%) delete mode 100644 public/mer/js/chunk-21d73fce.5539a9b3.js rename public/mer/js/{chunk-2d0ab2c5.4b7cef41.js => chunk-2d0ab2c5.ccb7cbfa.js} (100%) rename public/mer/js/{chunk-2d0aba79.18d61df1.js => chunk-2d0aba79.87953f9e.js} (100%) rename public/mer/js/{chunk-2d0aed35.aa9a030a.js => chunk-2d0aed35.631ff8f9.js} (100%) rename public/mer/js/{chunk-2d0b1e40.30aba183.js => chunk-2d0b1e40.13688b61.js} (100%) rename public/mer/js/{chunk-2d0ba554.0d379f8a.js => chunk-2d0ba554.7951b196.js} (100%) rename public/mer/js/{chunk-2d0c212a.f73feb79.js => chunk-2d0c212a.b09722f2.js} (100%) rename public/mer/js/{chunk-2d0c481a.c5e53609.js => chunk-2d0c481a.89a1b8f5.js} (100%) rename public/mer/js/{chunk-2d0c8a44.52446984.js => chunk-2d0c8a44.9cbed354.js} (100%) rename public/mer/js/{chunk-2d0d095b.a2ede260.js => chunk-2d0d095b.71131484.js} (100%) rename public/mer/js/{chunk-2d0d3300.02714f46.js => chunk-2d0d3300.9bf19520.js} (100%) rename public/mer/js/{chunk-2d0e276e.52b19eb9.js => chunk-2d0e276e.23d3b1fc.js} (100%) rename public/mer/js/{chunk-2d0e5b8e.a3b258af.js => chunk-2d0e5b8e.e1c10376.js} (100%) rename public/mer/js/{chunk-2d0e6675.78663302.js => chunk-2d0e6675.4e70c6e8.js} (100%) rename public/mer/js/{chunk-2d207706.cd499ae2.js => chunk-2d207706.d9c4bd71.js} (100%) rename public/mer/js/{chunk-2d209391.7c26e238.js => chunk-2d209391.6745fc84.js} (100%) rename public/mer/js/{chunk-2d213182.9d1daa11.js => chunk-2d213182.8506b72f.js} (100%) rename public/mer/js/{chunk-2d213ed3.a8a920dc.js => chunk-2d213ed3.8b17b6aa.js} (100%) rename public/mer/js/{chunk-2d21d8a3.c3b530f5.js => chunk-2d21d8a3.ac5c243f.js} (100%) rename public/mer/js/{chunk-2d229240.148070d8.js => chunk-2d229240.36fecbb3.js} (100%) rename public/mer/js/{chunk-2d230c26.e293f269.js => chunk-2d230c26.580182ee.js} (100%) rename public/mer/js/{chunk-2f105f7b.d5a662c3.js => chunk-2f105f7b.91bb2a68.js} (100%) rename public/mer/js/{chunk-32c5a54a.de565e36.js => chunk-32c5a54a.79b30984.js} (100%) rename public/mer/js/{chunk-344a4872.8ae9799c.js => chunk-344a4872.9f13361e.js} (100%) rename public/mer/js/{chunk-35013ff2.06457928.js => chunk-35013ff2.21c964fc.js} (100%) rename public/mer/js/{chunk-39a0bfcb.555c036a.js => chunk-39a0bfcb.c18ef5ad.js} (100%) rename public/mer/js/{chunk-3e2c114c.39783fd1.js => chunk-3e2c114c.d3d7810e.js} (100%) rename public/mer/js/{chunk-3ec8e821.fdce1d90.js => chunk-3ec8e821.ea1c61fb.js} (100%) rename public/mer/js/{chunk-406e1b8e.fa909bf4.js => chunk-406e1b8e.dd83a8e7.js} (100%) rename public/mer/js/{chunk-40dcbfe7.24abaab8.js => chunk-40dcbfe7.680a3af8.js} (100%) rename public/mer/js/{chunk-412170ef.1f2c5aca.js => chunk-412170ef.760231be.js} (100%) rename public/mer/js/{chunk-412d33f7.50036902.js => chunk-412d33f7.6be40bb0.js} (100%) rename public/mer/js/{chunk-418fea3c.ea6e4fc8.js => chunk-418fea3c.3d90e1f1.js} (100%) rename public/mer/js/{chunk-43056c0c.e59a6118.js => chunk-43056c0c.0d9277c1.js} (100%) rename public/mer/js/{chunk-4a9f6d94.e3ddc594.js => chunk-4a9f6d94.11ae2226.js} (100%) rename public/mer/js/{chunk-4bf3fbdc.cde49d77.js => chunk-4bf3fbdc.4e23f1a8.js} (100%) rename public/mer/js/{chunk-4f7a44e8.fc6490f6.js => chunk-4f7a44e8.4954143d.js} (100%) rename public/mer/js/{chunk-5310352e.64844fe9.js => chunk-5310352e.72571813.js} (100%) rename public/mer/js/{chunk-546dc2ee.c98063ac.js => chunk-546dc2ee.15d321b6.js} (100%) rename public/mer/js/{chunk-59e52b70.a073636b.js => chunk-59e52b70.748518b3.js} (100%) rename public/mer/js/{chunk-5bb47ee8.2d301d4f.js => chunk-5bb47ee8.44a56b61.js} (100%) rename public/mer/js/{chunk-5d8cc0ba.b9e36fe7.js => chunk-5d8cc0ba.7350d926.js} (100%) rename public/mer/js/{chunk-5ed4f497.b803e001.js => chunk-5ed4f497.d60a336c.js} (100%) rename public/mer/js/{chunk-6231f720.58ddaa43.js => chunk-6231f720.f43febc0.js} (100%) rename public/mer/js/{chunk-634734f0.2f0b8987.js => chunk-634734f0.98f9792e.js} (100%) rename public/mer/js/{chunk-648f00b5.388a52b3.js => chunk-648f00b5.db9bfa05.js} (100%) rename public/mer/js/{chunk-67e1db22.e8bd0321.js => chunk-67e1db22.abd27fd8.js} (100%) rename public/mer/js/{chunk-6a905886.f0ca8d97.js => chunk-6a905886.f0de56de.js} (100%) rename public/mer/js/{chunk-6c88f67a.52472e5f.js => chunk-6c88f67a.49ca2cb5.js} (100%) rename public/mer/js/{chunk-7288b5a6.5756f677.js => chunk-7288b5a6.d553c60c.js} (100%) rename public/mer/js/{chunk-738c6ac1.ba9efa07.js => chunk-738c6ac1.17f05c02.js} (100%) rename public/mer/js/{chunk-7788e6ba.076d6e65.js => chunk-7788e6ba.14f30dca.js} (100%) rename public/mer/js/{chunk-78c4a0d7.7c752e4a.js => chunk-78c4a0d7.d8acd954.js} (100%) rename public/mer/js/{chunk-7c1a0002.0aef87f6.js => chunk-7c1a0002.5e412e55.js} (100%) rename public/mer/js/{chunk-7c43671d.257efbe1.js => chunk-7c43671d.00c29d08.js} (100%) rename public/mer/js/{chunk-7f2544fe.a7b44025.js => chunk-7f2544fe.ffee7d4d.js} (100%) rename public/mer/js/{chunk-80a8cf62.b2d33e41.js => chunk-80a8cf62.35b9a0b4.js} (100%) rename public/mer/js/{chunk-82bee4a8.8358745d.js => chunk-82bee4a8.eefcb150.js} (100%) rename public/mer/js/{chunk-90657762.27debe08.js => chunk-90657762.e50cb7b5.js} (100%) rename public/mer/js/{chunk-961c0de4.44d85c7b.js => chunk-961c0de4.d2693796.js} (100%) rename public/mer/js/{chunk-9afa8a36.5aacfc38.js => chunk-9afa8a36.2cbda66b.js} (100%) rename public/mer/js/{chunk-9d6d22b0.646073ee.js => chunk-9d6d22b0.e54eef26.js} (100%) rename public/mer/js/{chunk-a0fbc2e4.b4c46718.js => chunk-a0fbc2e4.228eb9f0.js} (100%) rename public/mer/js/{chunk-a97676f4.b6cd9810.js => chunk-a97676f4.47892021.js} (100%) rename public/mer/js/{chunk-ab3d6574.b4cb614d.js => chunk-ab3d6574.37409ec9.js} (100%) rename public/mer/js/{chunk-ae0b147e.846bcf99.js => chunk-ae0b147e.6d857c9b.js} (100%) rename public/mer/js/{chunk-afbd5864.ba3acbcc.js => chunk-afbd5864.8cb5ad78.js} (100%) rename public/mer/js/{chunk-b28bec38.4b421028.js => chunk-b28bec38.9413f9c5.js} (100%) rename public/mer/js/{chunk-cd8d615e.9593a4c9.js => chunk-cd8d615e.c270674c.js} (100%) rename public/mer/js/{chunk-cf155762.73afe2a9.js => chunk-cf155762.efba42ff.js} (100%) rename public/mer/js/{chunk-commons.cc2ce7aa.js => chunk-commons.50cf883d.js} (100%) create mode 100644 public/mer/js/chunk-d08ae18a.f45890ac.js rename public/mer/js/{chunk-edb267f4.9b315160.js => chunk-edb267f4.0d92693c.js} (100%) rename public/mer/js/{chunk-ef8562be.9297575c.js => chunk-ef8562be.c5e8299a.js} (100%) rename public/mer/js/{chunk-elementUI.6d19a690.js => chunk-elementUI.d0585cc2.js} (99%) rename public/mer/js/{chunk-f0a8813a.4d86ded5.js => chunk-f0a8813a.bc9fae18.js} (100%) rename public/mer/js/{chunk-f1874498.f21bd127.js => chunk-f1874498.cea83324.js} (100%) rename public/mer/js/{chunk-fa99d034.0b03926c.js => chunk-fa99d034.c4ebd973.js} (100%) rename public/mer/js/{chunk-fe6fa87e.e1c39184.js => chunk-fe6fa87e.9918d2a6.js} (100%) rename public/mer/js/{chunk-libs.898070c3.js => chunk-libs.f60897d8.js} (88%) diff --git a/public/mer.html b/public/mer.html index 9f6e88da..32e51e6f 100644 --- a/public/mer.html +++ b/public/mer.html @@ -1 +1 @@ -