|
|
@@ -3,7 +3,6 @@
|
|
|
namespace common\services;
|
|
|
|
|
|
use biz\order\services\OrderService;
|
|
|
-use biz\tool\services\CouponService;
|
|
|
use biz\user\services\UserAssetService;
|
|
|
use biz\user\services\UserService;
|
|
|
use common\components\stringUtil;
|
|
|
@@ -221,9 +220,9 @@ class xhPayToolService
|
|
|
Yii::warning('更新订单失败，回调传过来的 capitalType 不符合要求,即订单流水类型不明确,capitalType:' . $capitalType . ' orderId:' . $orderId);
|
|
|
return ['code' => 'A0002', 'msg' => '订单流水类型不明确'];
|
|
|
}
|
|
|
-
|
|
|
+
|
|
|
//抵销优惠券并分成
|
|
|
- CouponService::destroyToGetReward(['id' => $couponId]);
|
|
|
+ //CouponService::destroyToGetReward(['id' => $couponId]);
|
|
|
|
|
|
if (isset($order['inviteCode']) && !empty($order['inviteCode'])) {
|
|
|
$invitedMerchantId = isset($order['invitedMerchantId']) ? $order['invitedMerchantId'] : 0;
|
shish