@bee-hole/server 1.84.1 → 1.85.0

package/resource/public/html/h5pay.html

@@ -113,45 +113,46 @@
       text-align: right;
       margin-bottom: 10px;
     }
+
     .notification {
-            position: fixed;
-            top: -100px;
-            left: 0;
-            right: 0;
-            background-color: #4CAF50;
-            color: white;
-            text-align: center;
-            padding: 16px;
-            transition: top 0.5s ease;
-            z-index: 1000;
-        }
+      position: fixed;
+      top: -100px;
+      left: 0;
+      right: 0;
+      background-color: #4CAF50;
+      color: white;
+      text-align: center;
+      padding: 16px;
+      transition: top 0.5s ease;
+      z-index: 1000;
+    }
 
-        .notification.show {
-            top: 0;
-        }
+    .notification.show {
+      top: 0;
+    }
 
-        .notification.error {
-            background-color: #f44336;
-        }
+    .notification.error {
+      background-color: #f44336;
+    }
 
-        .notification.warning {
-            background-color: #ff9800;
-        }
+    .notification.warning {
+      background-color: #ff9800;
+    }
 
-        .close-btn {
-            margin-left: 15px;
-            color: white;
-            font-weight: bold;
-            float: right;
-            font-size: 22px;
-            line-height: 20px;
-            cursor: pointer;
-            transition: 0.3s;
-        }
+    .close-btn {
+      margin-left: 15px;
+      color: white;
+      font-weight: bold;
+      float: right;
+      font-size: 22px;
+      line-height: 20px;
+      cursor: pointer;
+      transition: 0.3s;
+    }
 
-        .close-btn:hover {
-            color: black;
-        }
+    .close-btn:hover {
+      color: black;
+    }
   </style>
 </head>
 
@@ -182,7 +183,7 @@
 
   <script>
     var debug = false;
-    const httpurl = 'http://beehole.tlyoupin.com';
+    const httpurl = 'http://192.168.3.50:8299';
     const translations = {
       'zh-CN': {
         paymentDetails: '支付详情',
@@ -226,6 +227,7 @@
 
     let currentLanguage = 'zh-CN';
     let payRes = null;
+    let yueAmount = 0;
     function translate(key, params = {}) {
       let text = translations[currentLanguage][key] || key;
       for (const [param, value] of Object.entries(params)) {
@@ -278,8 +280,8 @@
       });
       document.title = translate('paymentDetails');
     }
-    function getRouterParams(){
-       let url = decodeURI(window.location.href);
+    function getRouterParams() {
+      let url = decodeURI(window.location.href);
       // 获取地址栏参数
       let params = url.split('?')[1];
       // 获取参数数组
@@ -305,59 +307,60 @@
         if (debug) {
           api = httpurl + api;
         }
-          fetch(api, {
-            method: 'POST',
-            headers: {
-              'Content-Type': 'application/json' // 如果需要 token 认证
-            },
-            body: JSON.stringify({
-              // 参数
-              credential_id: credential_id
-            })
-          }).then(response => response.json())
-            .then(result => {
-              if (result && result.data) {
-                // this.paymentList = result.data.list
-                // this.initPaymenthods();
-
-                if(result.data && result.data.balance){
-                  if(!result.data.list){
-                    // 向第一个追加余额支付
-                    result.data.list = [];
-                  }
-                  result.data.list.unshift({
-                    "pay_way_id": 0,
-                    "description": translate('balance'),
-                    "logo": "",
-                    "balance": result.data.balance_currency + result.data.balance
-                  });
+        fetch(api, {
+          method: 'POST',
+          headers: {
+            'Content-Type': 'application/json' // 如果需要 token 认证
+          },
+          body: JSON.stringify({
+            // 参数
+            credential_id: credential_id
+          })
+        }).then(response => response.json())
+          .then(result => {
+            if (result && result.data) {
+              // this.paymentList = result.data.list
+              // this.initPaymenthods();
+
+              if (result.data && result.data.balance) {
+                if (!result.data.list) {
+                  // 向第一个追加余额支付
+                  result.data.list = [];
                 }
+                result.data.list.unshift({
+                  "pay_way_id": 0,
+                  "description": translate('balance'),
+                  "logo": "",
+                  "balance": result.data.balance_currency + result.data.balance
+                });
+                yueAmount = result.data.balance_currency + '' + result.data.amount;
+              }
 
-                if (!result.data.list || result.data.list.length == 0) {
-                  showNotification(translate('noPayMethod'), 'error');
-                  return;
-                }
-                resolve(result.data.list);
-              } else {
-                if (result && result.code != 0) {
-                  // this.ErrMsg = result.message;
-                  // showErrText(result.message);
-                  showNotification(result.message, 'error');
-                }
+              if (!result.data.list || result.data.list.length == 0) {
+                showNotification(translate('noPayMethod'), 'error');
+                return;
               }
-            })
-            .catch(error => {
-              console.error('Error:', error);
-              // showErrText(error);
-              showNotification(error, 'error');
-            });
+              resolve(result.data.list);
+            } else {
+              if (result && result.code != 0) {
+                // this.ErrMsg = result.message;
+                // showErrText(result.message);
+                showNotification(result.message, 'error');
+              }
+            }
+          })
+          .catch(error => {
+            console.error('Error:', error);
+            // showErrText(error);
+            showNotification(error, 'error');
+          });
       });
     }
 
     function renderPaymentMethods(methods) {
       const container = document.getElementById('payment-methods');
-      container.innerHTML = methods.map(method =>{
-        return  `
+      container.innerHTML = methods.map(method => {
+        return `
                 <div class="payment-method" data-id="${method.pay_way_id}">
                     ${method.logo ? `<img src="${method.logo}" alt="${translate(method.description)}">` : `<div style="height: 22px;"></div>`}
                     <h3 data-i18n="${method.description}" data-id="${method.pay_way_id}">${translate(method.description)}</h3>
@@ -374,7 +377,7 @@
       });
 
       container.querySelectorAll('.currency-select').forEach(select => {
-        select.addEventListener('change', (event)=>{
+        select.addEventListener('change', (event) => {
           selectPaymentMethodAndCurrency(event);
         });
       });
@@ -396,7 +399,7 @@
       updatePayButton();
     }
     async function selectPaymentMethodAndCurrency(event) {
-      if(event){
+      if (event) {
         event.stopPropagation(); // 阻止事件冒泡
       }
 
@@ -421,24 +424,31 @@
       const payWayId = selectedMethod?.getAttribute('data-id')
       const selectedCurrency = selectedMethod ? selectedMethod.querySelector('.currency-select')?.value : '';
       const payButton = document.getElementById('pay-button');
-      if (payWayId+'' === '0') {
+      if (payWayId + '' === '0') {
         // payButton.textContent = '余额支付';
         payButton.disabled = false
-      }else{
+      } else {
         payButton.disabled = !selectedMethod || !selectedCurrency;
       }
       const methodName = selectedMethod.querySelector('[data-i18n]').getAttribute('data-i18n');
-      if (!payButton.disabled && payWayId+'' !== '0') {
+      console.log('methodName-------', methodName)
+      if (!payButton.disabled && payWayId + '' !== '0') {
         // alert(translate('paymentProcessing', { method: translate(methodName), currency: selectedCurrency }));
         payRes = await Pay(selectedCurrency, payWayId, methodName);
       }
+      if(payWayId + '' === '0'){
+        setPayAmount(yueAmount);
+      }
     }
 
     function setPayAmount(amount, payAmount) {
-      const payAmountText = ', ' + translate('translatePrice') + ': ' + payAmount;
+      let payAmountText ='';
+      if (payAmount) {
+        payAmountText = ', ' + translate('translatePrice') + ': ' + payAmount;
+      }
       document.querySelector('.payment-amount').textContent = amount + payAmountText;
     }
-    function backUrl ()  {
+    function backUrl() {
       return window.location.href;
     };
     function Pay(currency, payWayId, name) {
@@ -453,8 +463,8 @@
           pay_way_id: payWayId
         }
         var api = '/admin/payment'
-        if(debug){
-          api = httpurl+api;
+        if (debug) {
+          api = httpurl + api;
         }
         fetch(api, {
           method: 'POST',
@@ -469,7 +479,7 @@
             if (res) {
               // that.prepayAmountCurrency = (res.currency)
               // that.prepayAmount = res.amount;
-              setPayAmount((res.price_currency)+''+ res.price_amount, res.trade_currency + '' + res.trade_amount);
+              setPayAmount((res.price_currency) + '' + res.price_amount, res.trade_currency + '' + res.trade_amount);
               const url64 = res?.jsapi?.auth_link;
               const h5Url = res?.h5?.h5_url;
               const authLink = res?.jsapi?.auth_link;
@@ -479,7 +489,7 @@
                 // 对url进行base64解码
                 const url = Buffer.from(url64, 'base64').toString('binary');
                 // that.payUrl = url;
-                resolve({url, type: 'url'});
+                resolve({ url, type: 'url' });
               }
               if (h5Url) {
                 // that.payUrl = h5Url;
@@ -494,7 +504,7 @@
                 resolve({ url: qrCode, type: 'qrCode' });
                 // this.lunxunOrder();
               }
-              if (payWayId === '' && result.code === 0){
+              if (payWayId === '' && result.code === 0) {
                 resolve(result);
               }
             } else {
@@ -514,8 +524,8 @@
           });
       });
     }
-    
-    let payTime =null;
+
+    let payTime = null;
     function getOrderStatus() {
       return new Promise((resolve) => {
         var api = '/admin/payment/query'
@@ -541,8 +551,8 @@
               }, 1000);
             } else if (res.status === 'PAID') {
               window.close();
-            }else{
-              if(res && res.code != 0){
+            } else {
+              if (res && res.code != 0) {
                 // showErrText(res.message);
                 showNotification(result.message, 'error');
               }
@@ -553,10 +563,10 @@
             // showErrText(error);
             showNotification(error, 'error');
           });
-        });
-      }
-    
-    function initPay (){
+      });
+    }
+
+    function initPay() {
       // // 默认选中第一个支付方式
       // const payMentd = document.querySelector('.payment-method')
       // payMentd.click();
@@ -597,12 +607,12 @@
       // 获取所有
       let isInit = false;
       document.querySelectorAll('.payment-method').forEach((method) => {
-        if(!isInit){
+        if (!isInit) {
           method.click();
           isInit = true;
         }
         const currencySelect = method.querySelector('.currency-select');
-        if(currencySelect){
+        if (currencySelect) {
           for (let i = 1; i < currencySelect.options.length; i++) {
             if (currencySelect.options[i].value) {
               currencySelect.selectedIndex = i;
@@ -617,15 +627,15 @@
           selectPaymentMethodAndCurrency(mockEvent);
         }
       });
-      
+
     }
-    
+
     async function initPage() {
       try {
         const params = getRouterParams();
-        if(params.debug === 'true'){
+        if (params.debug === 'true') {
           debug = true;
-          if(params.httpurl){
+          if (params.httpurl) {
             httpurl = params.httpurl;
           }
         }
@@ -646,7 +656,7 @@
 
     window.addEventListener('load', initPage);
 
-    document.getElementById('pay-button').addEventListener('click',async () => {
+    document.getElementById('pay-button').addEventListener('click', async () => {
       const selectedMethod = document.querySelector('.payment-method[style*="border-color: rgb(49, 130, 206)"]');
       const selectedCurrency = selectedMethod ? selectedMethod.querySelector('.currency-select')?.value : '';
       // 我想通过selectedCurrency获取他标签上的data-id
@@ -664,14 +674,14 @@
             document.getElementById('payCode').innerHTML = `<img src="data:image/jpeg;base64, ${payRes.url}" alt="支付二维码">`;
             showNotification(translate('sanbarcodePay'), 'success');
           }
-        }else{
+        } else {
           // showErrText('支付失败');
         }
-        
-      }else{
+
+      } else {
         const selectedMethod = document.querySelector('.payment-method[style*="border-color: rgb(49, 130, 206)"]');
         const payWayId = selectedMethod?.getAttribute('data-id')
-        if(payWayId+'' === '0'){
+        if (payWayId + '' === '0') {
           // 余额支付
           const res = await Pay(selectedCurrency, '', '余额');
           if (res.code === 0) {
@@ -679,7 +689,7 @@
             setTimeout(() => {
               window.close();
             }, 2000);
-          }else{
+          } else {
             // showErrText('支付失败');
           }
         }

package/storage/init/init.sql

@@ -13144,6 +13144,57 @@ CREATE TABLE `admin_gigab2b_order_items` (
 
 -- --------------------------------------------------------
 
+--
+-- 表的结构 `admin_giga_products`
+--
+
+CREATE TABLE `admin_giga_products` (
+  `id` bigint(20) NOT NULL COMMENT '主键',
+  `sku` char(150) DEFAULT NULL COMMENT '大健商品Sku',
+  `mpn` char(100) DEFAULT NULL COMMENT '商品mpn',
+  `weight_unit` char(20) DEFAULT NULL COMMENT '重量单位',
+  `length_unit` char(20) DEFAULT NULL COMMENT '长度单位',
+  `weight` double(10,2) DEFAULT NULL COMMENT '重量',
+  `length` double(10,2) DEFAULT NULL COMMENT '长度',
+  `width` double(10,2) DEFAULT NULL COMMENT '宽度',
+  `height` double(10,2) DEFAULT NULL COMMENT '高度',
+  `weight_kg` double(10,2) DEFAULT NULL COMMENT '千克重',
+  `length_cm` double(10,2) DEFAULT NULL COMMENT '厘米长',
+  `width_cm` double(10,2) DEFAULT NULL COMMENT '厘米宽',
+  `height_cm` double(10,2) DEFAULT NULL COMMENT '厘米高',
+  `name` varchar(255) DEFAULT NULL COMMENT '商品名字',
+  `description` longtext COMMENT '商品描述',
+  `image_urls` longtext COMMENT '主图数组',
+  `category_code` int(11) DEFAULT NULL COMMENT '分类code',
+  `category` char(200) DEFAULT NULL COMMENT '分类名',
+  `combo_flag` tinyint(1) DEFAULT NULL COMMENT '组合标识',
+  `over_size_flag` tinyint(1) DEFAULT NULL COMMENT '特大商品标识',
+  `part_flag` tinyint(1) DEFAULT NULL COMMENT '零件标识',
+  `customized` char(20) DEFAULT NULL COMMENT '支持定制？ yes  no',
+  `place_of_origin` char(100) DEFAULT NULL COMMENT '产地',
+  `associate_product_list` longtext COMMENT '关联产品列表',
+  `certification_list` longtext COMMENT '认证列表',
+  `file_urls` longtext COMMENT '文件列表',
+  `video_urls` longtext COMMENT '视频列表',
+  `attributes` varchar(255) DEFAULT NULL COMMENT '售卖属性{"Main Color":"Antique Black","Scene":"outside","Main Material":"Acrylic"}',
+  `first_available_date` datetime DEFAULT NULL COMMENT '首次可用日期',
+  `seller_info` varchar(255) DEFAULT NULL COMMENT '卖家信息',
+  `to_be_published` tinyint(1) DEFAULT NULL COMMENT '产品是否已发布 true  false',
+  `currency` char(10) DEFAULT NULL COMMENT '币种 US USD, UK GBP, Germany EUR, Japan JPY',
+  `price` decimal(10,2) DEFAULT NULL COMMENT '价格',
+  `shipping_fee` decimal(10,2) DEFAULT NULL COMMENT '运费',
+  `exclusive_price` decimal(10,2) DEFAULT NULL COMMENT '卖家设定的SKU独家价格',
+  `discounted_price` decimal(10,2) DEFAULT NULL COMMENT '如果有持续的促销活动，折扣价',
+  `map_price` decimal(10,2) DEFAULT NULL COMMENT '最低广告价格（MAP）是零售商可以为销售产品做广告的最低价格。',
+  `future_map_price` decimal(10,2) DEFAULT NULL COMMENT '未来地图价格',
+  `sku_available` tinyint(1) DEFAULT NULL COMMENT '显示此卖家的SKU是否可供用户使用。如果为false，则产品价格为空。',
+  `quantity` int(11) DEFAULT NULL COMMENT '商品数量',
+  `buyer_qty` int(11) DEFAULT NULL COMMENT '买方数量',
+  `seller_qty` int(11) DEFAULT NULL COMMENT '卖方数量'
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
+
+-- --------------------------------------------------------
+
 --
 -- 表的结构 `admin_goods_public`
 --
@@ -39999,6 +40050,14 @@ ALTER TABLE `admin_gigab2b_order_items`
   ADD PRIMARY KEY (`id`),
   ADD KEY `order_id` (`order_id`,`shop_id`);
 
+--
+-- 表的索引 `admin_giga_products`
+--
+ALTER TABLE `admin_giga_products`
+  ADD PRIMARY KEY (`id`),
+  ADD UNIQUE KEY `uniq` (`sku`,`mpn`) USING BTREE,
+  ADD KEY `search` (`sku`,`name`(191),`category_code`,`category`(191));
+
 --
 -- 表的索引 `admin_goods_public`
 --
@@ -40874,7 +40933,7 @@ ALTER TABLE `mall_push_order_logs`
 --
 ALTER TABLE `mall_review`
   ADD PRIMARY KEY (`review_id`),
-  ADD UNIQUE KEY `order_id` (`order_id`,`sku_id`);
+  ADD KEY `order_id` (`order_id`,`sku_id`) USING BTREE;
 
 --
 -- 表的索引 `mall_sales_order_status`
@@ -41417,6 +41476,12 @@ ALTER TABLE `admin_gigab2b_order`
 ALTER TABLE `admin_gigab2b_order_items`
   MODIFY `id` bigint(20) NOT NULL AUTO_INCREMENT, AUTO_INCREMENT=2;
 
+--
+-- 使用表AUTO_INCREMENT `admin_giga_products`
+--
+ALTER TABLE `admin_giga_products`
+  MODIFY `id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT '主键';
+
 --
 -- 使用表AUTO_INCREMENT `admin_goods_public`
 --

package/storage/patch/patch.sql

@@ -1,3 +1,50 @@
-ALTER TABLE `mall_members` CHANGE `member_id` `member_id` BIGINT(20) UNSIGNED NOT NULL COMMENT '用户ID';
-UPDATE `admin_configs` SET `value`='[\"/login/captcha\",\"/login/sign\",\"/login/logout\",\"/login/sub/sign\",\"/login/sub/auth\",\"/login/sub/shop\",\"/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');
-ALTER TABLE `admin_beehole_order` ADD COLUMN `syn_mark`  varchar(255) NULL COMMENT '平台标识' AFTER `config_id`;
+DROP TABLE IF EXISTS `admin_giga_products`;
+CREATE TABLE IF NOT EXISTS `admin_giga_products` (
+    `id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT '主键',
+    `sku` char(150) DEFAULT NULL COMMENT '大健商品Sku',
+    `mpn` char(100) DEFAULT NULL COMMENT '商品mpn',
+    `weight_unit` char(20) DEFAULT NULL COMMENT '重量单位',
+    `length_unit` char(20) DEFAULT NULL COMMENT '长度单位',
+    `weight` double(10,2) DEFAULT NULL COMMENT '重量',
+    `length` double(10,2) DEFAULT NULL COMMENT '长度',
+    `width` double(10,2) DEFAULT NULL COMMENT '宽度',
+    `height` double(10,2) DEFAULT NULL COMMENT '高度',
+    `weight_kg` double(10,2) DEFAULT NULL COMMENT '千克重',
+    `length_cm` double(10,2) DEFAULT NULL COMMENT '厘米长',
+    `width_cm` double(10,2) DEFAULT NULL COMMENT '厘米宽',
+    `height_cm` double(10,2) DEFAULT NULL COMMENT '厘米高',
+    `name` varchar(255) DEFAULT NULL COMMENT '商品名字',
+    `description` longtext COMMENT '商品描述',
+    `image_urls` longtext COMMENT '主图数组',
+    `category_code` int(11) DEFAULT NULL COMMENT '分类code',
+    `category` char(200) DEFAULT NULL COMMENT '分类名',
+    `combo_flag` tinyint(1) DEFAULT NULL COMMENT '组合标识',
+    `over_size_flag` tinyint(1) DEFAULT NULL COMMENT '特大商品标识',
+    `part_flag` tinyint(1) DEFAULT NULL COMMENT '零件标识',
+    `customized` char(20) DEFAULT NULL COMMENT '支持定制？ yes  no',
+    `place_of_origin` char(100) DEFAULT NULL COMMENT '产地',
+    `associate_product_list` longtext COMMENT '关联产品列表',
+    `certification_list` longtext COMMENT '认证列表',
+    `file_urls` longtext COMMENT '文件列表',
+    `video_urls` longtext COMMENT '视频列表',
+    `attributes` varchar(255) DEFAULT NULL COMMENT '售卖属性{"Main Color":"Antique Black","Scene":"outside","Main Material":"Acrylic"}',
+    `first_available_date` datetime DEFAULT NULL COMMENT '首次可用日期',
+    `seller_info` varchar(255) DEFAULT NULL COMMENT '卖家信息',
+    `to_be_published` tinyint(1) DEFAULT NULL COMMENT '产品是否已发布 true  false',
+    `currency` char(10) DEFAULT NULL COMMENT '币种 US USD, UK GBP, Germany EUR, Japan JPY',
+    `price` decimal(10,2) DEFAULT NULL COMMENT '价格',
+    `shipping_fee` decimal(10,2) DEFAULT NULL COMMENT '运费',
+    `exclusive_price` decimal(10,2) DEFAULT NULL COMMENT '卖家设定的SKU独家价格',
+    `discounted_price` decimal(10,2) DEFAULT NULL COMMENT '如果有持续的促销活动，折扣价',
+    `map_price` decimal(10,2) DEFAULT NULL COMMENT '最低广告价格（MAP）是零售商可以为销售产品做广告的最低价格。',
+    `future_map_price` decimal(10,2) DEFAULT NULL COMMENT '未来地图价格',
+    `sku_available` tinyint(1) DEFAULT NULL COMMENT '显示此卖家的SKU是否可供用户使用。如果为false，则产品价格为空。',
+    `quantity` int(11) DEFAULT NULL COMMENT '商品数量',
+    `buyer_qty` int(11) DEFAULT NULL COMMENT '买方数量',
+    `seller_qty` int(11) DEFAULT NULL COMMENT '卖方数量',
+    PRIMARY KEY (`id`),
+    UNIQUE KEY `uniq` (`sku`,`mpn`) USING BTREE,
+    KEY `search` (`sku`,`name`(191),`category_code`,`category`(191))
+) ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT CHARSET=utf8mb4;
+
+ALTER TABLE `mall_review` DROP INDEX `order_id`, ADD INDEX `order_id` (`order_id`, `sku_id`) USING BTREE;

package/version

@@ -1 +1 @@
-v1.84.1
+v1.85.0