|
@@ -104,10 +104,8 @@ class Order extends Base
|
|
|
/** 产品基础数据 **/
|
|
|
$spec = input('spec', '');
|
|
|
|
|
|
- $productData = [];
|
|
|
- for($i=1;$i<=$number;$i++){
|
|
|
- $productData[] = $product->getDataOnCreateOrder($spec);
|
|
|
- }
|
|
|
+ $productData[0] = $product->getDataOnCreateOrder($spec,$number);
|
|
|
+
|
|
|
} else {
|
|
|
// 多个商品
|
|
|
$cart = input('cart');
|
|
@@ -214,6 +212,12 @@ class Order extends Base
|
|
|
{
|
|
|
$data = input();
|
|
|
$data['city_id'] = 2;
|
|
|
+
|
|
|
+ $pay_type = input('pay_type','alipay');
|
|
|
+ if(!in_array($pay_type,['wechat','alipay','wallet'])){
|
|
|
+ $this->error();
|
|
|
+ }
|
|
|
+
|
|
|
try {
|
|
|
$validate = Loader::validate('\\addons\\unishop\\validate\\Order');
|
|
|
if (!$validate->check($data, [], 'submit')) {
|