@@ -30,8 +30,8 @@ public function __construct( array $config)
3030 WxPayConfig::$ sslCertPath = $ sslPath . trim ($ config ['sslName ' ]) . '_cert.pem ' ;
3131 WxPayConfig::$ sslKeyPath = $ sslPath . trim ($ config ['sslName ' ]) . '_key.pem ' ;
3232
33- $ config ['sub_appid ' ] && WxPayConfig::$ sub_appId = trim ($ config ['sub_appid ' ]);
34- $ config ['sub_mch_id ' ] && WxPayConfig::$ sub_mch_id = trim ($ config ['sub_mch_id ' ]);
33+ ! empty ( $ config ['sub_appid ' ]) && WxPayConfig::$ sub_appId = trim ($ config ['sub_appid ' ]);
34+ ! empty ( $ config ['sub_mch_id ' ]) && WxPayConfig::$ sub_mch_id = trim ($ config ['sub_mch_id ' ]);
3535 }
3636
3737 /**微信--生成订单
@@ -53,17 +53,18 @@ public function createOrder( array $orderInfo, $time = 600){
5353 $ order ->SetBody ($ orderInfo [PaymentProperty::$ body ]);
5454 $ order ->SetOut_trade_no ($ orderInfo [PaymentProperty::$ orderId ]);
5555 $ order ->SetTotal_fee ( (int ) $ orderInfo [PaymentProperty::$ total ]);
56+ $ order ->SetTrade_type ($ orderInfo [PaymentProperty::$ tradeType ]);
5657 //有效时间
5758 $ order ->SetTime_start (date ("YmdHis " ));
5859 $ order ->SetTime_expire (date ("YmdHis " , time () + $ time ));
5960 //非必填项
6061 !empty ($ orderInfo [PaymentProperty::$ openId ]) && $ order ->SetOpenid ($ orderInfo [PaymentProperty::$ openId ]);
61- !empty ($ orderInfo [PaymentProperty::$ tradeType ]) && $ order ->SetTrade_type ($ orderInfo [PaymentProperty::$ tradeType ]);
6262 !empty ($ orderInfo [PaymentProperty::$ deviceInfo ]) && $ order ->SetDevice_info ($ orderInfo [PaymentProperty::$ deviceInfo ]);
6363 !empty ($ orderInfo [PaymentProperty::$ detail ]) && $ order ->SetDetail ($ orderInfo [PaymentProperty::$ detail ]);
6464 !empty ($ orderInfo [PaymentProperty::$ attach ]) && $ order ->SetAttach ($ orderInfo [PaymentProperty::$ attach ]);
6565 !empty ($ orderInfo [PaymentProperty::$ feeType ]) && $ order ->SetFee_type ($ orderInfo [PaymentProperty::$ feeType ]);
6666 !empty ($ orderInfo [PaymentProperty::$ tag ]) && $ order ->SetGoods_tag ($ orderInfo [PaymentProperty::$ tag ]);
67+ !empty ($ orderInfo [PaymentProperty::$ productId ] ) && $ order ->SetProduct_id ($ orderInfo [ PaymentProperty::$ productId ]);
6768 //服务商
6869 !empty ($ orderInfo [PaymentProperty::$ sub_openid ]) && $ order ->SetSub_openid ($ orderInfo [PaymentProperty::$ sub_openid ]);
6970 return WxPayApi::unifiedOrder ($ order );
0 commit comments