|
|
@@ -35,14 +35,14 @@ class PurchaseClearController extends BaseController
|
|
|
}
|
|
|
$id = $order['id'];
|
|
|
|
|
|
- $name = $order['orderName'] ?? '购买商品';
|
|
|
+ $name = '1123';
|
|
|
$totalFee = $order['actPrice'];
|
|
|
|
|
|
//强制使用小程序的miniOpenId
|
|
|
$openId = $this->admin['miniOpenId'];
|
|
|
|
|
|
$typeList = dict::getConfig('capitalType');
|
|
|
- $capitalType = $typeList['xhGhsOrder']['id'];
|
|
|
+ $capitalType = $typeList['xhPurchase']['id'];
|
|
|
//流水类型、优惠卷、微信支付（h5还是小程序支付）类型 带到回调
|
|
|
$wxPayType = 0;
|
|
|
if (httpUtil::isMiniProgram()) {
|
|
|
@@ -68,6 +68,7 @@ class PurchaseClearController extends BaseController
|
|
|
|
|
|
//花卉宝代为申请的微信支付
|
|
|
$merchantExtend = WxOpenClass::getWxInfo();
|
|
|
+
|
|
|
if (isset($merchantExtend['wxPayApply']) && $merchantExtend['wxPayApply'] == 1) {
|
|
|
$input->SetSub_openid($openId);
|
|
|
} else {
|
shish