@bee-hole/server 1.82.6 → 1.83.0

package/resource/public/html/h5pay.html

@@ -200,6 +200,7 @@
         translatePrice: '换算金额',
         balance: '余额',
         paySuccess: '支付成功',
+        sanbarcodePay: '请扫上面的支付码支付',
       },
       'en-US': {
         paymentDetails: 'Payment Details',
@@ -217,6 +218,7 @@
         translatePrice: 'Translate Price',
         balance: 'Balance',
         paySuccess: 'Payment Success',
+        sanbarcodePay: '请扫上面的支付码支付',
       }
     };
 
@@ -230,7 +232,7 @@
       return text;
     }
 
-    function showNotification(message, type = 'success') {
+    function showNotification(message, type = 'success', ttl = 5000) {
       const notification = document.getElementById('notification');
       const notificationMessage = document.getElementById('notificationMessage');
 
@@ -247,7 +249,7 @@
       // Auto hide after 5 seconds
       setTimeout(() => {
         closeNotification();
-      }, 5000);
+      }, ttl);
     }
 
     function closeNotification() {
@@ -264,6 +266,9 @@
     function hiidenPayCode() {
       document.getElementById('payCode').style.display = 'none';
     }
+    function showPayCode() {
+      document.getElementById('payCode').style.display = 'block';
+    }
     function updatePageLanguage() {
       document.querySelectorAll('[data-i18n]').forEach(element => {
         const key = element.getAttribute('data-i18n');
@@ -369,6 +374,7 @@
 
     function selectPaymentMethod(event) {
       hiddenErrText();
+      hiidenPayCode();
       document.querySelectorAll('.payment-method').forEach(method => {
         method.style.borderColor = '#ddd';
         method.style.backgroundColor = '#fff';
@@ -386,15 +392,15 @@
       const select = event.target;
       const paymentMethod = select.closest('.payment-method');
 
-      // 重置所有支付方式的样式
-      document.querySelectorAll('.payment-method').forEach(method => {
-        method.style.borderColor = '#ddd';
-        method.style.backgroundColor = '#fff';
-      });
+      // // 重置所有支付方式的样式
+      // document.querySelectorAll('.payment-method').forEach(method => {
+      //   method.style.borderColor = '#ddd';
+      //   method.style.backgroundColor = '#fff';
+      // });
 
-      // 设置当前选中的支付方式样式
-      paymentMethod.style.borderColor = '#3182ce';
-      paymentMethod.style.backgroundColor = '#ebf8ff';
+      // // 设置当前选中的支付方式样式
+      // paymentMethod.style.borderColor = '#3182ce';
+      // paymentMethod.style.backgroundColor = '#ebf8ff';
 
       hiddenErrText();
       await updatePayButton();
@@ -556,26 +562,50 @@
       // document.querySelector('.currency-select').value = document.querySelector('.currency-select option').value;
       // 默认点击支付按钮
       // 默认选中第一个支付方式的第一个有效货币
-      const firstPaymentMethod = document.querySelector('.payment-method');
-      const currencySelect = firstPaymentMethod.querySelector('.currency-select');
-
-      // 选中第一个有效的货币选项（跳过空选项）
-      if(currencySelect){
-        for (let i = 1; i < currencySelect.options.length; i++) {
-          if (currencySelect.options[i].value) {
-            currencySelect.selectedIndex = i;
-            break;
+      // console.log('all', document.querySelectorAll('.payment-method'));
+      // const firstPaymentMethod = document.querySelector('.payment-method');
+      // const currencySelect = firstPaymentMethod.querySelector('.currency-select');
+      // console.log('firstPaymentMethod', firstPaymentMethod);
+      // // 选中第一个有效的货币选项（跳过空选项）
+      // if(currencySelect){
+      //   for (let i = 1; i < currencySelect.options.length; i++) {
+      //     if (currencySelect.options[i].value) {
+      //       currencySelect.selectedIndex = i;
+      //       break;
+      //     }
+      //   }
+      //   // 手动触发选择事件
+      //   const mockEvent = {
+      //     target: currencySelect,
+      //     stopPropagation: () => { } // 添加一个空的 stopPropagation 方法
+      //   };
+      //   selectPaymentMethodAndCurrency(mockEvent);
+      // }else{
+      //   firstPaymentMethod.click();
+      // }
+      // 获取所有
+      let isInit = false;
+      document.querySelectorAll('.payment-method').forEach((method) => {
+        if(!isInit){
+          method.click();
+          isInit = true;
+        }
+        const currencySelect = method.querySelector('.currency-select');
+        if(currencySelect){
+          for (let i = 1; i < currencySelect.options.length; i++) {
+            if (currencySelect.options[i].value) {
+              currencySelect.selectedIndex = i;
+              break;
+            }
           }
+          // 手动触发选择事件
+          const mockEvent = {
+            target: currencySelect,
+            stopPropagation: () => { } // 添加一个空的 stopPropagation 方法
+          };
+          selectPaymentMethodAndCurrency(mockEvent);
         }
-        // 手动触发选择事件
-        const mockEvent = {
-          target: currencySelect,
-          stopPropagation: () => { } // 添加一个空的 stopPropagation 方法
-        };
-        selectPaymentMethodAndCurrency(mockEvent);
-      }else{
-        firstPaymentMethod.click();
-      }
+      });
       
     }
     
@@ -619,7 +649,9 @@
           if (payRes.type === 'url') {
             window.location.href = payRes.url;
           } else {
+            showPayCode();
             document.getElementById('payCode').innerHTML = `<img src="data:image/jpeg;base64, ${payRes.url}" alt="支付二维码">`;
+            showNotification(translate('sanbarcodePay'), 'success');
           }
         }else{
           // showErrText('支付失败');

package/storage/init/init.sql

@@ -12747,7 +12747,7 @@ INSERT INTO `admin_configs` (`name`, `value`) VALUES
 ('print', '{\"app_id\":\"33843334df8569b8\",\"app_key\":\"OUyyV06fW2zyLKKdoGn1lOaWO0WpKrpiWc7DwTHYHRw=\",\"printer_id\":\"CP202210100008\",\"print_url\":\"http://test.o2oprint.cn:9100/trmapi/\"}'),
 ('register', '{\"mall_register\":true,\"seller_register\":false}'),
 ('router.admin.exceptAuth', '[\"/member/info\",\"/role/dynamic\"]'),
-('router.admin.exceptLogin', '[\"/login/captcha\",\"/login/sign\",\"/login/logout\",\"/login/sub/sign\",\"/login/sub/auth\",\"/login/sub/syn/auth\",\"/member/register\",\"/member/email/verify\",\"/google/oauth/callback\",\"/member/external/register\",\"/login/auth\",\"/copyright\",\"/payment/methods\",\"/payment\"]'),
+('router.admin.exceptLogin', '[\"/login/captcha\",\"/login/sign\",\"/login/logout\",\"/login/sub/sign\",\"/login/sub/auth\",\"/login/sub/syn/auth\",\"/member/register\",\"/member/email/verify\",\"/google/oauth/callback\",\"/member/external/register\",\"/login/auth\",\"/copyright\",\"/payment/methods\",\"/payment\",\"/login/merchant\",\"/role/get_service_fee_list\",\"/role/get_valid_service_fee\"]'),
 ('router.mall.exceptAuth', '[\"/guest/login\"]'),
 ('router.mall.exceptLogin', '[\"/member/captcha\",\"/member/login\",\"/member/register\",\"/member/logout\",\"/good/list\",\"/good/info\",\"/shop/view\",\"/cat/list\",\"/standard/cat\",\"/config/list\",\"/config/all\",\"/article/list\",\"/article/get\",\"/article/cat/list\",\"/article/new-list\",\"/good/same/cat\",\"/review/list\",\"/order/query\",\"/order/payment\",\"/shop/view\",\"/shop-config/get\",\"/shop-config/all\",\"/sitemap.xml\",\"/member/phone/verify\",\"/member/email/verify\",\"/guest/login\",\"/guest/make/key\",\"/guest/get/token\",\"/product/search\",\"/good/wholesale/get\",\"/good/comment/level\"]');
 
@@ -34968,6 +34968,24 @@ CREATE TABLE `mall_uploads` (
 
 -- --------------------------------------------------------
 
+--
+-- 表的结构 `mall_uploads_attachments`
+--
+
+CREATE TABLE `mall_uploads_attachments` (
+  `id` bigint(20) NOT NULL COMMENT '自增id',
+  `shop_id` bigint(20) NOT NULL COMMENT '门店id',
+  `member_id` bigint(20) NOT NULL COMMENT '用户id',
+  `name` varchar(255) NOT NULL COMMENT '图片名称',
+  `path` varchar(255) NOT NULL COMMENT '图片地址',
+  `content_type` varchar(255) DEFAULT NULL COMMENT '文件类型',
+  `real_name` varchar(255) DEFAULT NULL COMMENT '原文件名称',
+  `oss_type` char(20) DEFAULT 'aliOss' COMMENT '上传方式',
+  `create_time` datetime DEFAULT NULL COMMENT '上传时间'
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
+
+-- --------------------------------------------------------
+
 --
 -- 表的结构 `mall_warehouse`
 --
@@ -41146,6 +41164,13 @@ ALTER TABLE `mall_uploads`
   ADD KEY `shop_id` (`shop_id`),
   ADD KEY `good_id` (`good_id`,`shop_id`);
 
+--
+-- 表的索引 `mall_uploads_attachments`
+--
+ALTER TABLE `mall_uploads_attachments`
+  ADD PRIMARY KEY (`id`) USING BTREE,
+  ADD KEY `uniq` (`shop_id`,`member_id`);
+
 --
 -- 表的索引 `mall_warehouse`
 --
@@ -42201,6 +42226,12 @@ ALTER TABLE `mall_trans_words`
 ALTER TABLE `mall_uploads`
   MODIFY `id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT '自增id';
 
+--
+-- 使用表AUTO_INCREMENT `mall_uploads_attachments`
+--
+ALTER TABLE `mall_uploads_attachments`
+  MODIFY `id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT '自增id';
+
 --
 -- 使用表AUTO_INCREMENT `mall_warehouse_priority_shipping`
 --

package/storage/patch/patch.sql

@@ -1,111 +1,18 @@
-ALTER TABLE `admin_supply_orders`
-    ADD COLUMN `purchase_id` varchar(64) NOT NULL COMMENT '采购单号' AFTER `main_shop_id`,
-    ADD COLUMN `payment`  decimal(10,2) NOT NULL COMMENT '实付金额' AFTER `deduction_status`;
-
-DROP TABLE IF EXISTS `admin_payments`;
-CREATE TABLE IF NOT EXISTS admin_payments
-(
-    `id`               bigint unsigned auto_increment comment '表主键' primary key,
-    `credential_id` varchar(64) not null comment '支付凭据ID',
-    `payment_id`       bigint unsigned not null comment '支付标记',
-    `origin_id` varchar(64) not null comment '发起单据ID,如采购单号',
-    `shop_id`          bigint null comment '所属店铺',
-    `transaction_type` tinyint    not null comment '交易类型:0(供应单支付)1(充值单支付)',
-    `payee_type` int not null comment '收款方类型:0(平台)1(供应商)',
-    `status` varchar(8) not null comment '交易状态:PENDING(待支付)PAID(已支付)REFUNDED(已退款)',
-    `create_time`      datetime   not null comment '数据创建时间',
-    constraint admin_payments_pk_2 unique (payment_id, shop_id)
-);
-
-create unique index admin_payments_credential_id_uindex on admin_payments (credential_id);
-
-DROP TABLE IF EXISTS `admin_payment_entities`;
-CREATE TABLE IF NOT EXISTS admin_payment_entities
-(
-    `id`          bigint unsigned auto_increment comment '表主键' primary key,
-    `payment_id`  bigint unsigned not null comment '支付ID',
-    `order_id`    varchar(64) not null comment '单据号:如供应单ID,充值单ID',
-    `shop_id`     bigint      not null comment '单据所属方shop_id',
-    `create_time` datetime    not null comment '数据创建时间',
-    constraint admin_payment_entities_pk_2 unique (payment_id, shop_id)
-)comment '交易实体信息';
-
-DROP TABLE IF EXISTS `admin_payment_updates`;
-CREATE TABLE IF NOT EXISTS `admin_payment_updates`
-(
-    `id`             bigint unsigned auto_increment comment '表主键' primary key,
-    `payment_id`     bigint unsigned not null comment '支付ID',
-    `shop_id`        bigint          not null comment '单据所属方shop_id(如供应单,所属方为供应商)',
-    `order_id`       varchar(64)     not null comment '单据ID',
-    `price_amount`   decimal(15, 2)  not null comment '标价金额',
-    `price_currency` varchar(3)      not null comment '标价货币',
-    `exchange_rate`  decimal(20, 6)  not null comment '汇率',
-    `trade_currency` varchar(3)      not null comment '交易货币',
-    `trade_amount`   decimal(15, 2)  not null comment '交易金额',
-    `serial_id`      bigint unsigned not null comment '交易流水号',
-    `status`         varchar(8)      not null comment '交易状态:PENDING(待支付)PAID(已支付)REFUNDED(已退款)',
-    `payment_method` varchar(10)     null comment '支付方式: wechat(微信支付)',
-    `transaction_id` varchar(64)     null comment '支付平台交易ID',
-    `paid_time`      datetime        null comment '支付时间',
-    `refunded_time`  datetime        null comment '退款时间',
-    `create_time`    datetime        not null comment '数据创建时间'
-) comment '付款动态';
-
-create index admin_payment_updates_payment_id_index on admin_payment_updates (payment_id);
-create index admin_payment_updates_serial_id_index on admin_payment_updates (serial_id);
-
-alter table mall_after_sales add after_sale_type int not null comment '售后类型:0(订单)1(供应单)' after shop_id;
-
-DROP TABLE IF EXISTS `admin_beehole_order`;
-CREATE TABLE IF NOT EXISTS `admin_beehole_order` (
-    `id` bigint(20) unsigned NOT NULL AUTO_INCREMENT COMMENT '主键',
-    `order_id` varchar(64) NOT NULL COMMENT '订单号',
-    `out_order_id` varchar(64) DEFAULT NULL COMMENT '外部订单号(子店)',
-    `purchase_id` varchar(64) DEFAULT NULL COMMENT '采购单号',
-    `shop_id` bigint(20) NOT NULL COMMENT '店铺ID',
-    `config_id` bigint(20) DEFAULT NULL COMMENT '配置ID',
-    `login_to_shop_id` bigint(20) DEFAULT NULL COMMENT '登录到对方店铺',
-    `login_time` datetime DEFAULT NULL COMMENT '登录时间',
-    `login_sign` varchar(64) DEFAULT NULL COMMENT '登录签名',
-    `main_shop_id` bigint(20) DEFAULT NULL COMMENT '对方主店店铺ID',
-    `sub_shop_id` bigint(20) DEFAULT NULL COMMENT '对方店铺ID',
-    `currency` varchar(3) DEFAULT NULL,
-    `post_fee` decimal(10,2) DEFAULT NULL,
-    `discount` decimal(10,2) DEFAULT NULL,
-    `payment` decimal(10,2) DEFAULT NULL,
-    `status` varchar(16) DEFAULT NULL,
-    `create_time` datetime DEFAULT NULL COMMENT '创建时间',
-    PRIMARY KEY (`id`),
-    UNIQUE KEY `uniq` (`order_id`,`shop_id`,`config_id`,`login_to_shop_id`,`purchase_id`) USING BTREE
-) ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT CHARSET=utf8mb4;
-
-DROP TABLE IF EXISTS `admin_beehole_order_items`;
-CREATE TABLE IF NOT EXISTS `admin_beehole_order_items` (
-    `id` bigint(20) unsigned NOT NULL AUTO_INCREMENT,
-    `order_id` varchar(64) DEFAULT NULL,
-    `out_order_id` varchar(64) DEFAULT NULL,
-    `purchase_id` varchar(64) DEFAULT NULL COMMENT '采购单号',
-    `reference_id` bigint(20) unsigned DEFAULT NULL,
-    `good_id` bigint(20) DEFAULT NULL,
-    `sku_id` bigint(20) DEFAULT NULL,
-    `title` varchar(255) DEFAULT NULL,
-    `sku_prop` text,
-    `img_url` text,
-    `barcode` varchar(64) DEFAULT NULL,
-    `out_id` varchar(64) DEFAULT NULL,
-    `num` int(11) DEFAULT NULL,
-    `price` decimal(10,2) DEFAULT NULL,
-    `discount` decimal(10,2) DEFAULT NULL,
-    `payment` decimal(10,2) DEFAULT NULL,
-    `create_time` datetime DEFAULT NULL,
-    PRIMARY KEY (`id`),
-    KEY `uniq` (`order_id`,`out_order_id`,`reference_id`,`good_id`,`sku_id`)
-) ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT CHARSET=utf8mb4;
-
-ALTER TABLE `mall_purchase` ADD COLUMN `out_platform`  varchar(255) NULL COMMENT '外部采购单来源平台' AFTER `out_order_id`;
-
-UPDATE `admin_configs` SET `value`='[\"/login/captcha\",\"/login/sign\",\"/login/logout\",\"/login/sub/sign\",\"/login/sub/auth\",\"/login/sub/syn/auth\",\"/member/register\",\"/member/email/verify\",\"/google/oauth/callback\",\"/member/external/register\",\"/login/auth\",\"/copyright\",\"/payment/methods\",\"/payment\"]' WHERE (`name`='router.admin.exceptLogin');
-
-ALTER TABLE `mall_review` ADD `video_url` VARCHAR(255) NULL DEFAULT NULL AFTER `review_content`, ADD `image_url1` VARCHAR(255) NULL DEFAULT NULL AFTER `video_url`, ADD `image_url2` VARCHAR(255) NULL DEFAULT NULL AFTER `image_url1`, ADD `image_url3` VARCHAR(255) NULL DEFAULT NULL AFTER `image_url2`, ADD `image_url4` VARCHAR(255) NULL DEFAULT NULL AFTER `image_url3`, ADD `image_url5` VARCHAR(255) NULL DEFAULT NULL AFTER `image_url4`;
-ALTER TABLE `mall_review` ADD `status` TINYINT(1) NOT NULL DEFAULT '1' COMMENT '1=显示2=隐藏' AFTER `image_url5`;
-ALTER TABLE `admin_tiktok_oauth` MODIFY COLUMN `shop_cipher`  longtext CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL AFTER `seller_name`;
+UPDATE `admin_configs` SET `value`='[\"/login/captcha\",\"/login/sign\",\"/login/logout\",\"/login/sub/sign\",\"/login/sub/auth\",\"/login/sub/syn/auth\",\"/member/register\",\"/member/email/verify\",\"/google/oauth/callback\",\"/member/external/register\",\"/login/auth\",\"/copyright\",\"/payment/methods\",\"/payment\",\"/login/merchant\",\"/role/get_service_fee_list\",\"/role/get_valid_service_fee\"]' WHERE (`name`='router.admin.exceptLogin');
+
+DROP TABLE IF EXISTS `mall_uploads_attachments`;
+CREATE TABLE IF NOT EXISTS `mall_uploads_attachments` (
+    `id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT '自增id',
+    `shop_id` bigint(20) NOT NULL COMMENT '门店id',
+    `member_id` bigint(20) NOT NULL COMMENT '用户id',
+    `name` varchar(255) NOT NULL COMMENT '图片名称',
+    `path` varchar(255) NOT NULL COMMENT '图片地址',
+    `content_type` varchar(255) DEFAULT NULL COMMENT '文件类型',
+    `real_name` varchar(255) DEFAULT NULL COMMENT '原文件名称',
+    `oss_type` char(20) DEFAULT 'aliOss' COMMENT '上传方式',
+    `create_time` datetime DEFAULT NULL COMMENT '上传时间',
+    PRIMARY KEY (`id`) USING BTREE,
+    KEY `uniq` (`shop_id`,`member_id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
+
+ALTER TABLE `mall_benefit_code` ADD COLUMN `is_automatic`  int(1) NULL COMMENT '是否自动发放' AFTER `effect_scope_type`;

package/version

@@ -1 +1 @@
-v1.82.6
+v1.83.0