Merge branch 'master' of https://github.com/alipay/global-open-sdk-php

Author: lifelong-creator

example/UserPresentedCodePaymentTest.php

@@ -7,6 +7,7 @@
 require_once 'model/Merchant.php';
 require_once 'model/Store.php';
 require_once 'model/Amount.php';
+require_once 'model/Env.php';
 require_once 'DefaultAlipayClient.php';
 
 
@@ -35,6 +36,12 @@
 
 $order->setMerchant($merchant);
 
+$env = new Env();
+$env->setStoreTerminalRequestTime(date(DATE_ISO8601));
+$env->setStoreTerminalId('Some_Term_Id');
+
+$order->setEnv($env);
+
 $paymentAmount = new Amount();
 $paymentAmount->setCurrency("USD");
 $paymentAmount->setValue("100");

model/Env.php

@@ -96,6 +96,34 @@ public function setCookieId($cookieId){
         $this->cookieId = $cookieId;
     }
 
+    /**
+     * @return String
+     */
+    public function getStoreTerminalId(){
+        return $this->storeTerminalId;
+    }
+
+    /**
+     * @param String $storeTerminalId
+     */
+    public function setStoreTerminalId($storeTerminalId){
+        $this->storeTerminalId = $storeTerminalId;
+    }
+
+    /**
+     * @return String
+     */
+    public function getStoreTerminalRequestTime(){
+        return $this->storeTerminalRequestTime;
+    }
+
+    /**
+     * @param String $storeTerminalRequestTime
+     */
+    public function setStoreTerminalRequestTime($storeTerminalRequestTime){
+        $this->storeTerminalRequestTime = $storeTerminalRequestTime;
+    }
+
     /**
      * @return String
      */

request/pay/UserPresentedCodePaymentRequest.php

@@ -54,6 +54,9 @@ function validate() {
         $this->assertTrue(isset($this->order->merchant->store->referenceStoreId), "order.merchant.store.referenceStoreId required.");
         $this->assertTrue(isset($this->order->merchant->store->storeName), "order.merchant.store.storeName required.");
         $this->assertTrue(isset($this->order->merchant->store->storeMCC), "order.merchant.store.storeMcc required.");
+        $this->assertTrue(isset($this->order->env), "order.env required.");
+        $this->assertTrue(isset($this->order->env->storeTerminalId), "order.env.storeTerminalId required.");
+        $this->assertTrue(isset($this->order->env->storeTerminalRequestTime), "order.env.storeTerminalRequestTime required.");
     }
 
     function assertTrue($exp, $msg) {