ソースを参照

待结款 开始

shish 5 年 前
コミット
28811b791b

+ 2 - 2
app/shop/controllers/PurchaseController.php

@@ -92,8 +92,8 @@ class PurchaseController extends BaseController
         util::success($info);
     }
 
-    //待确认支付 shish 2021.1.25
-    public function actionConfirmToPay()
+    //可用的支付方式 shish 2021.1.25
+    public function actionPayWay()
     {
         $button = [
             ['type' => 'wxPay', 'show' => 1, 'disable' => 1],

+ 2 - 0
biz-ghs/merchant/services/SupplierService.php

@@ -16,6 +16,8 @@ class SupplierService extends BaseService
     {
         $data = SupplierClass::getList('*', $where, 'addTime DESC');
         $data['list'] = SupplierClass::groupBaseInfo($data['list']);
+        $data['debtAmount'] = 110000;
+        $data['debtNum'] = 12;
         return $data;
     }
 

+ 3 - 1
sql.sql

@@ -923,4 +923,6 @@ ALTER TABLE `xhPurchase` ADD `updateTime` TIMESTAMP NOT NULL DEFAULT CURRENT_TIM
 ALTER TABLE `xhPurchase` ADD bigNum SMALLINT NOT NULL DEFAULT 0 COMMENT '大单位数量' AFTER `sendCost`;
 ALTER TABLE `xhPurchase` ADD smallNum SMALLINT NOT NULL DEFAULT 0 COMMENT '小单位数量' AFTER `bigNum`;
 ALTER TABLE `xhPurchase` ADD adminId INT NOT NULL DEFAULT 0 COMMENT '采购员' AFTER `smallNum`;
-ALTER TABLE xhPurchase ADD kindNum SMALLINT NOT NULL DEFAULT 0 COMMENT '多少种' AFTER `sendCost`;
+ALTER TABLE xhPurchase ADD kindNum SMALLINT NOT NULL DEFAULT 0 COMMENT '多少种' AFTER `sendCost`;
+ALTER TABLE xhSupplier ADD debt TINYINT NOT NULL DEFAULT 1 COMMENT '1没有欠款 2有欠款' AFTER `upShopId`;
+ALTER TABLE `xhSupplier` ADD debtNum SMALLINT NOT NULL DEFAULT 0 COMMENT '欠款订单数,欠款笔数' AFTER `debt`;