From 5e364b201cb0a971fa30478878aa63a8bd4cba63 Mon Sep 17 00:00:00 2001 From: luofei <604446095@qq.com> Date: Fri, 1 Mar 2024 14:26:08 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=82=80=E8=AF=B7?= =?UTF-8?q?=E7=A0=81=E7=94=9F=E6=88=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controller/api/Common.php | 2 +- app/controller/api/store/order/ScanPay.php | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/app/controller/api/Common.php b/app/controller/api/Common.php index cbd5aa15..74e4f26b 100755 --- a/app/controller/api/Common.php +++ b/app/controller/api/Common.php @@ -644,7 +644,7 @@ class Common extends BaseController public function Qrcode($data) { $siteUrl = systemConfig('site_url'); - $name = 'orcode'.$data['id'] .md5(date('Ymd')) . '.png'; + $name = 'orcode'.$data['id'] .md5(date('code') . date('Ymd')) . '.png'; $attachmentRepository = app()->make(AttachmentRepository::class); $imageInfo = $attachmentRepository->getWhere(['attachment_name' => $name]); diff --git a/app/controller/api/store/order/ScanPay.php b/app/controller/api/store/order/ScanPay.php index 58000de6..3950e85b 100644 --- a/app/controller/api/store/order/ScanPay.php +++ b/app/controller/api/store/order/ScanPay.php @@ -36,6 +36,7 @@ class ScanPay extends BaseController public function qrcode() { $merId = $this->request->get('mer_id'); + /** @var Common $common */ $common = app()->make(Common::class); $siteUrl = systemConfig('site_url'); $user = $this->request->userInfo(); From 37bd5326b6c7c6060ca82808ee1a71b4fdebba0f Mon Sep 17 00:00:00 2001 From: luofei <604446095@qq.com> Date: Fri, 1 Mar 2024 14:42:23 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=95=86=E6=88=B7?= =?UTF-8?q?=E5=88=97=E8=A1=A8=E6=95=B0=E6=8D=AE=E8=BF=94=E5=9B=9E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/common/repositories/system/merchant/MerchantRepository.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/common/repositories/system/merchant/MerchantRepository.php b/app/common/repositories/system/merchant/MerchantRepository.php index 3953ea26..7dce5736 100755 --- a/app/common/repositories/system/merchant/MerchantRepository.php +++ b/app/common/repositories/system/merchant/MerchantRepository.php @@ -110,7 +110,7 @@ class MerchantRepository extends BaseRepository 'merchantType' ]) ->order('mer_id','desc') - ->field('sort, mer_id, mer_name, real_name, mer_phone, mer_address, mark, status, create_time,is_best,is_trader,type_id,category_id,copy_product_num,export_dump_num,is_margin,margin,mer_avatar')->select(); + ->field('sort, mer_id, mer_name, real_name, mer_phone, mer_address, mark, status, create_time,is_best,is_trader,type_id,category_id,copy_product_num,export_dump_num,is_margin,margin,mer_avatar,sale_amount,purchase_amount')->select(); return compact('count', 'list'); } From 738cca59bc79da5ce203cd51ef24f6f9fbda9f32 Mon Sep 17 00:00:00 2001 From: mkm <727897186@qq.com> Date: Fri, 1 Mar 2024 15:06:04 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../parameter/ParameterValueRepository.php | 3 +- app/controller/admin/store/StoreProduct.php | 38 +++++++++---------- public/index.html | 2 +- public/static/js/index.0bfdbb83.js | 1 + public/static/js/index.c19c6f8b.js | 1 - ...use-small_classification-index.2cdfedb1.js | 1 - ...use-small_classification-index.acf837c8.js | 1 + ...es-trading_hall-adddi~105e47dc.2f69226a.js | 1 + ...es-trading_hall-adddi~105e47dc.6cf65515.js | 1 - .../js/pages-goods_details-index.790c107a.js | 1 - .../js/pages-goods_details-index.e51e9103.js | 1 + .../pages-goods_details-index_v.6a15bfe7.js | 1 + .../pages-goods_details-index_v.b0480cf3.js | 1 - .../static/js/pages-index-index.04dff1d5.js | 1 + .../static/js/pages-index-index.2cba09d4.js | 1 - ...-users-order_list-in~de58159c.b483e7de.js} | 2 +- ... => pages-order_details-index.bdf3d377.js} | 2 +- .../js/pages-payment-get_payment.61922bdc.js | 1 + .../js/pages-payment-get_payment.707f0025.js | 1 - .../js/pages-payment-settlement.7f7884fd.js | 1 - .../js/pages-payment-settlement.90b15d32.js | 1 + ...ages-users-order_confirm-index.7f1e567b.js | 1 - ...es-supply_chains-supply_chains.85bf15b1.js | 1 + ...es-supply_chains-supply_chains.869f63fb.js | 1 - ...ages-users-order_confirm-index.4a808f60.js | 1 - ...ages-users-order_confirm-index.da5bbfe7.js | 1 + 26 files changed, 34 insertions(+), 34 deletions(-) create mode 100644 public/static/js/index.0bfdbb83.js delete mode 100644 public/static/js/index.c19c6f8b.js delete mode 100644 public/static/js/pages-cloud_warehouse-small_classification-index.2cdfedb1.js create mode 100644 public/static/js/pages-cloud_warehouse-small_classification-index.acf837c8.js create mode 100644 public/static/js/pages-gather-gather~pages-moreProject-moreProject~pages-plant_release-index~pages-trading_hall-adddi~105e47dc.2f69226a.js delete mode 100644 public/static/js/pages-gather-gather~pages-moreProject-moreProject~pages-plant_release-index~pages-trading_hall-adddi~105e47dc.6cf65515.js delete mode 100644 public/static/js/pages-goods_details-index.790c107a.js create mode 100644 public/static/js/pages-goods_details-index.e51e9103.js create mode 100644 public/static/js/pages-goods_details-index_v.6a15bfe7.js delete mode 100644 public/static/js/pages-goods_details-index_v.b0480cf3.js create mode 100644 public/static/js/pages-index-index.04dff1d5.js delete mode 100644 public/static/js/pages-index-index.2cba09d4.js rename public/static/js/{pages-nongKe-supply_chain-purchase_control~pages-payment-settlement~pages-users-order_confirm-index~~2c6b68f2.a111bd74.js => pages-nongKe-supply_chain-purchase_control~pages-users-order_confirm-index~pages-users-order_list-in~de58159c.b483e7de.js} (99%) rename public/static/js/{pages-order_details-index.5c980249.js => pages-order_details-index.bdf3d377.js} (99%) create mode 100644 public/static/js/pages-payment-get_payment.61922bdc.js delete mode 100644 public/static/js/pages-payment-get_payment.707f0025.js delete mode 100644 public/static/js/pages-payment-settlement.7f7884fd.js create mode 100644 public/static/js/pages-payment-settlement.90b15d32.js delete mode 100644 public/static/js/pages-payment-settlement~pages-users-order_confirm-index.7f1e567b.js create mode 100644 public/static/js/pages-supply_chains-supply_chains.85bf15b1.js delete mode 100644 public/static/js/pages-supply_chains-supply_chains.869f63fb.js delete mode 100644 public/static/js/pages-users-order_confirm-index.4a808f60.js create mode 100644 public/static/js/pages-users-order_confirm-index.da5bbfe7.js diff --git a/app/common/repositories/store/parameter/ParameterValueRepository.php b/app/common/repositories/store/parameter/ParameterValueRepository.php index f472a0bb..47aeebc3 100755 --- a/app/common/repositories/store/parameter/ParameterValueRepository.php +++ b/app/common/repositories/store/parameter/ParameterValueRepository.php @@ -35,6 +35,7 @@ class ParameterValueRepository extends BaseRepository public function create($id, $data,$merId) { if (empty($data)) return ; + $create=[]; foreach ($data as $datum) { if ($datum['name'] && $datum['value']) { $create[] = [ @@ -48,7 +49,7 @@ class ParameterValueRepository extends BaseRepository ]; } } - if ($create) $this->dao->insertAll($create); + if (count($create)>0) $this->dao->insertAll($create); } diff --git a/app/controller/admin/store/StoreProduct.php b/app/controller/admin/store/StoreProduct.php index 34ee3776..c56e7adf 100755 --- a/app/controller/admin/store/StoreProduct.php +++ b/app/controller/admin/store/StoreProduct.php @@ -306,30 +306,30 @@ class StoreProduct extends BaseController public function copy($product_id = 0, $mer_id = 0, $street_code = 0, $type_id = 0, $category_id = 0) { if ($product_id == 0) return app('json')->fail('参数错误'); - $find= Db::name('merchant')->where('mer_id',$mer_id)->find(); + // $find= Db::name('merchant')->where('mer_id',$mer_id)->find(); $products = $this->repository->getAdminOneProduct($product_id, 0); $product = $products->toArray(); $product['mer_id'] = $mer_id; $product['old_product_id'] = $product['product_id']; $productId = $this->repository->create($product, 0, 1); - $data = [ - 'product_id' => $productId, - 'mer_id' => $mer_id, - 'source_mer_id' => $products['mer_id'], - 'street_code' => $street_code, - 'weight' => 1, - 'status' => 1, - 'create_time' => date('Y-m-d H:i:s'), - 'type_id' => $type_id, - 'category_id' => $category_id, - 'cate_id' => 2244, - 'long' => $find['long'], - 'lat' => $find['lat'], - 'lat' => $find['lat'], - 'store_name' => $products['store_name'], - 'activity_id' =>2, - ]; - Db::name('cloud_product')->insert($data); + // $data = [ + // 'product_id' => $productId, + // 'mer_id' => $mer_id, + // 'source_mer_id' => $products['mer_id'], + // 'street_code' => $street_code, + // 'weight' => 1, + // 'status' => 1, + // 'create_time' => date('Y-m-d H:i:s'), + // 'type_id' => $type_id, + // 'category_id' => $category_id, + // 'cate_id' => 2244, + // 'long' => $find['long'], + // 'lat' => $find['lat'], + // 'lat' => $find['lat'], + // 'store_name' => $products['store_name'], + // 'activity_id' =>2, + // ]; + // Db::name('cloud_product')->insert($data); return $productId; } } diff --git a/public/index.html b/public/index.html index 08ec4025..c2e7abf8 100644 --- a/public/index.html +++ b/public/index.html @@ -2,4 +2,4 @@ document.write('') if(window.location.protocol == 'https:'){ document.write('') - }