|
|
@@ -339,14 +339,8 @@ class OrderController extends BaseController
|
|
|
$name = '购买商品';
|
|
|
$totalFee = $actPrice;
|
|
|
$admin = AdminClass::getAdminById($this->adminId);
|
|
|
- $openId = isset($admin['openId']) ? $admin['openId'] : 0;
|
|
|
- if (httpUtil::isMiniProgram()) {
|
|
|
- //小程序使用miniOpenId
|
|
|
- $openId = $admin['miniOpenId'];
|
|
|
- } else {
|
|
|
- //util::fail('仅支持小程序支付');
|
|
|
- $openId = $admin['miniOpenId'];
|
|
|
- }
|
|
|
+ //小程序使用miniOpenId
|
|
|
+ $openId = $admin['miniOpenId'];
|
|
|
$typeList = dict::getConfig('capitalType');
|
|
|
$capitalType = $typeList['xhGhsOrder']['id'];
|
|
|
//流水类型、优惠卷、微信支付(h5还是小程序支付)类型 带到回调
|