Merge branch 'master' of http://git.huaml.com/zhh/huahuibao

common/services/xhPayToolService.php

@@ -263,7 +263,7 @@ class xhPayToolService
             //支付方式要转到商家资产变更里去
             $order['payWay'] = $payWay;
             $order['payTime'] = $now;
-            xhMerchantAssetService::incomeChangeAsset($merchant, $mAsset, $shopId, $mUpdateData, $order, $capitalType);//商家资产改变
+            //xhMerchantAssetService::incomeChangeAsset($merchant, $mAsset, $shopId, $mUpdateData, $order, $capitalType);//商家资产改变
 
             $userName = isset($user['userName']) ? $user['userName'] : '游客';
             $mCapitalEvent = '';
@@ -305,31 +305,31 @@ class xhPayToolService
                 'addTime' => $now,
                 'capitalType' => $capitalType,
             ];
-            $merchantCapital = xhSjCapitalService::add($capitalData);//商家资金流水记录增加
-            $merchantCapitalId = $merchantCapital['id'];
-            $updateData['capitalId'] = $merchantCapitalId;
-            $updateData['payStatus'] = 1;//支付成功
-            $updateData['status'] = 1;//支付成功待配送
-            $updateData['couponId'] = $couponId;
-            $updateData['payWay'] = $payWay;
-            $updateData['payTime'] = $now;
-            //确认h5还是小程序支付
-            $updateData['wxPayType'] = $wxPayType;
-            switch ($capitalType) {
-                case $capitalTypeList['xhOrder']['id']:
-                    OrderClass::payAfter($order, $updateData);
-                    break;
-                case $capitalTypeList['xhActiveOrder']['id']://活动报名
-                    xhActiveOrderService::updateById($orderId, $updateData);
-                    break;
-                case $capitalTypeList['xhApplyOrder']['id']://申请服务
-                    $updateData['inviteCodeStatus'] = 1;
-                    xhApplyOrderService::updateById($orderId, $updateData);
-                    break;
-                default:
-                    Yii::warning('更新订单失败，回调的capitalType不符合要求，capitalType:' . $capitalType . ' orderSn:' . $orderSn);
-                    util::fail('订单流水类型不明确');
-            }
+//            $merchantCapital = xhSjCapitalService::add($capitalData);//商家资金流水记录增加
+//            $merchantCapitalId = $merchantCapital['id'];
+//            $updateData['capitalId'] = $merchantCapitalId;
+//            $updateData['payStatus'] = 1;//支付成功
+//            $updateData['status'] = 1;//支付成功待配送
+//            $updateData['couponId'] = $couponId;
+//            $updateData['payWay'] = $payWay;
+//            $updateData['payTime'] = $now;
+//            //确认h5还是小程序支付
+//            $updateData['wxPayType'] = $wxPayType;
+//            switch ($capitalType) {
+//                case $capitalTypeList['xhOrder']['id']:
+//                    OrderClass::payAfter($order, $updateData);
+//                    break;
+//                case $capitalTypeList['xhActiveOrder']['id']://活动报名
+//                    xhActiveOrderService::updateById($orderId, $updateData);
+//                    break;
+//                case $capitalTypeList['xhApplyOrder']['id']://申请服务
+//                    $updateData['inviteCodeStatus'] = 1;
+//                    xhApplyOrderService::updateById($orderId, $updateData);
+//                    break;
+//                default:
+//                    Yii::warning('更新订单失败，回调的capitalType不符合要求，capitalType:' . $capitalType . ' orderSn:' . $orderSn);
+//                    util::fail('订单流水类型不明确');
+//            }
 
             //累计消费
             //$userTotalExpend = stringUtil::calcAdd($userAsset['totalExpend'], $totalFee);
@@ -361,7 +361,7 @@ class xhPayToolService
                 'gainType' => 1,
                 'addTime' => $now,
             ];
-            xhUserGrowthService::add($growData);//用户兑换型积分流水增加
+            //xhUserGrowthService::add($growData);//用户兑换型积分流水增加
 
             $userCapitalData = [
                 'relateId' => $orderId,
@@ -381,7 +381,7 @@ class xhPayToolService
                 'addTime' => $now,
                 'capitalType' => $capitalType,
             ];
-            xhUserCapitalService::add($userCapitalData);//用户资金流水增加
+            //xhUserCapitalService::add($userCapitalData);//用户资金流水增加
 
             $transaction->commit();