From 252206d64d2b99e9cec667cd5d54acf7d83ec132 Mon Sep 17 00:00:00 2001
From: Terry <2358269014@qq.com>
Date: Wed, 28 Jun 2017 14:01:26 +0800
Subject: [PATCH] =?UTF-8?q?mysql=20order=20=E9=87=91=E9=A2=9D=E5=AD=97?=
 =?UTF-8?q?=E6=AE=B5=E5=B0=8F=E6=95=B0=EF=BC=8C=E7=94=B14=E4=BD=8D?=
 =?UTF-8?q?=E6=94=B9=E6=88=902=E4=BD=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mysqldb/m170628_052812_fecshop_tables.php | 46 +++++++++++++++++++
 services/payment/Paypal.php                   |  1 +
 2 files changed, 47 insertions(+)
 create mode 100644 migrations/mysqldb/m170628_052812_fecshop_tables.php

diff --git a/migrations/mysqldb/m170628_052812_fecshop_tables.php b/migrations/mysqldb/m170628_052812_fecshop_tables.php
new file mode 100644
index 00000000..463dad01
--- /dev/null
+++ b/migrations/mysqldb/m170628_052812_fecshop_tables.php
@@ -0,0 +1,46 @@
+<?php
+
+use yii\db\Migration;
+
+class m170628_052812_fecshop_tables extends Migration
+{
+    public function safeUp()
+    {
+        $arr = [
+            "
+            ALTER TABLE `sales_flat_order` CHANGE `total_weight` `total_weight` DECIMAL(12,2) NULL DEFAULT '0.0000' COMMENT '总重量', 
+            CHANGE `grand_total` `grand_total` DECIMAL(12,2) NULL DEFAULT NULL COMMENT '当前订单的总额', 
+            CHANGE `base_grand_total` `base_grand_total` DECIMAL(12,2) NULL DEFAULT NULL COMMENT '当前订单的默认货币总额', 
+            CHANGE `subtotal` `subtotal` DECIMAL(12,2) NULL DEFAULT NULL COMMENT '当前订单的产品总额', 
+            CHANGE `base_subtotal` `base_subtotal` DECIMAL(12,2) NULL DEFAULT NULL COMMENT '当前订单的产品默认货币总额', 
+            CHANGE `subtotal_with_discount` `subtotal_with_discount` DECIMAL(12,2) NULL DEFAULT NULL COMMENT '当前订单的去掉的总额', 
+            CHANGE `base_subtotal_with_discount` `base_subtotal_with_discount` DECIMAL(12,2) NULL DEFAULT NULL COMMENT '当前订单的去掉的默认货币总额', 
+            CHANGE `shipping_total` `shipping_total` DECIMAL(12,2) NULL DEFAULT NULL COMMENT '运费总额', 
+            CHANGE `base_shipping_total` `base_shipping_total` DECIMAL(12,2) NULL DEFAULT NULL COMMENT '默认货币运费总额', 
+            CHANGE `payment_fee` `payment_fee` DECIMAL(12,2) NULL DEFAULT NULL COMMENT '交易服务费',
+            CHANGE `base_payment_fee` `base_payment_fee` DECIMAL(12,2) NULL DEFAULT NULL COMMENT '交易费用，基础货币值，通过货币进行的转换'
+            "
+            ,
+            "
+            ALTER TABLE `sales_flat_order_item` CHANGE `weight` `weight` DECIMAL( 12, 2 ) NULL DEFAULT NULL COMMENT '重量',
+            CHANGE `row_weight` `row_weight` DECIMAL( 12, 2 ) NULL DEFAULT NULL COMMENT '一个产品重量*个数',
+            CHANGE `price` `price` DECIMAL( 12, 2 ) NULL DEFAULT NULL COMMENT '产品价格',
+            CHANGE `base_price` `base_price` DECIMAL( 12, 2 ) NULL DEFAULT NULL COMMENT '默认货币价格',
+            CHANGE `row_total` `row_total` DECIMAL( 12, 2 ) NULL DEFAULT NULL COMMENT '一个产品价格*个数',
+            CHANGE `base_row_total` `base_row_total` DECIMAL( 12, 2 ) NULL DEFAULT NULL COMMENT '一个产品默认货币价格*个数'
+            "
+
+        ];
+    
+        foreach ($arr as $sql) {
+            $this->execute($sql);
+        }
+    }
+
+    public function safeDown()
+    {
+        echo "m170619_014655_fecshop_tables cannot be reverted.\n";
+
+        return false;
+    }
+}
diff --git a/services/payment/Paypal.php b/services/payment/Paypal.php
index ee6bfa9a..49646abb 100644
--- a/services/payment/Paypal.php
+++ b/services/payment/Paypal.php
@@ -598,6 +598,7 @@ class Paypal extends Service
         $nvp_array['L_PAYMENTREQUEST_0_AMT'.$i] = '-'.$discount_amount;
         
         //var_dump($nvp_array);
+	//exit;
         return $this->getRequestUrlStrByArray($nvp_array);
     }
 
-- 
GitLab