|
|
@@ -2241,7 +2241,7 @@ class StoreOrderRepository extends BaseRepository
|
|
2241
|
2241
|
|
|
2242
|
2242
|
|
|
2243
|
2243
|
//throw new ValidateException($user_datas['vr']);
|
|
2244
|
|
- if ($uid == 7 || $uid == 669 || $uid == 670 || $uid == 783 || $uid == 873 || $uid == 766 || $uid == 17 || $uid == 26) {
|
|
|
2244
|
+ // if ($uid == 7 || $uid == 669 || $uid == 670 || $uid == 783 || $uid == 873 || $uid == 766 || $uid == 17 || $uid == 26) {
|
|
2245
|
2245
|
//如果选择组合支付,查询当前用户名下的VR
|
|
2246
|
2246
|
$user_datas = Db::name('user')->where('uid', $uid)->find();
|
|
2247
|
2247
|
|
|
|
@@ -2273,14 +2273,14 @@ class StoreOrderRepository extends BaseRepository
|
|
2273
|
2273
|
}
|
|
2274
|
2274
|
|
|
2275
|
2275
|
|
|
2276
|
|
- } else {
|
|
2277
|
|
- $cartInfo['list'][$_k]['fzone_paytype'] = [
|
|
|
2276
|
+ // } else {
|
|
|
2277
|
+ // $cartInfo['list'][$_k]['fzone_paytype'] = [
|
|
2278
|
2278
|
|
|
2279
|
|
- ['type' => 'a1', 'price' => $orderpri, 'other' => 0, 'note' => "VR"],//VR支付
|
|
2280
|
|
- ['type' => 'a2', 'price' => $orderpri, 'other' => 0, 'note' => "现金"],//现金支付
|
|
2281
|
|
- // ['type'=>'a3','price'=>$orderpri,'other'=>0,'note'=>"现金+VR"],//现金支付
|
|
2282
|
|
- ];
|
|
2283
|
|
- }
|
|
|
2279
|
+ // ['type' => 'a1', 'price' => $orderpri, 'other' => 0, 'note' => "VR"],//VR支付
|
|
|
2280
|
+ // ['type' => 'a2', 'price' => $orderpri, 'other' => 0, 'note' => "现金"],//现金支付
|
|
|
2281
|
+ // // ['type'=>'a3','price'=>$orderpri,'other'=>0,'note'=>"现金+VR"],//现金支付
|
|
|
2282
|
+ // ];
|
|
|
2283
|
+ // }
|
|
2284
|
2284
|
|
|
2285
|
2285
|
|
|
2286
|
2286
|
} else if ($store_product_datas['mer_id'] == 439) {
|