Merge branch 'minus' into dev

biz-hd/cg/classes/CgRefundClass.php

@@ -278,7 +278,7 @@ class CgRefundClass extends BaseClass
                     'thirdNo' => $transaction_id,
                 ];
                 $response = $laResource->refund($aliParams);
-                if (isset($response['code']) == false || $response['code'] != 'BBS00000') {
+                if (!isset($response['code']) || $response['code'] != 'BBS00000') {
                     $errMsg = $response['msg'] ?? '';
                     //$lklSjNo = $ghsShop->lklSjNo ?? '';
                     //noticeUtil::push('商户号：' . $lklSjNo . '的退款失败了哦，请注意：' . $errMsg . ' 金额：' . $refundFee, '15280215347');

biz-hd/refund/services/HdRefundService.php

@@ -66,7 +66,8 @@ class HdRefundService extends BaseService
         $sjId = $post['sjId'] ?? 0;
         $shopId = $post['shopId'] ?? 0;
         $mainId = $post['mainId'] ?? 0;
-        $xsOrderSn = $order->orderSn ?? '';
+        $myOrderSn = $order->orderSn ?? '';
+        $thirdNo = $order->thirdNo ?? '';
         $data['sjId'] = $sjId;
         $data['shopId'] = $shopId;
         $data['mainId'] = $mainId;
@@ -103,7 +104,7 @@ class HdRefundService extends BaseService
         if (!empty($itemInfoList)) {
             $ids = array_column($itemInfoList, 'productId');
             $productInfo = ProductClass::getByids($ids, null, 'id');
-            $orderItemData = OrderItemClass::getAllByCondition(['orderSn' => $xsOrderSn], null, '*', 'itemId', true);
+            $orderItemData = OrderItemClass::getAllByCondition(['orderSn' => $myOrderSn], null, '*', 'itemId', true);
             if (empty($orderItemData)) {
                 util::fail('没有找到商品');
             }
@@ -157,7 +158,7 @@ class HdRefundService extends BaseService
         if (!empty($goodsInfoList)) {
             $ids = array_column($goodsInfoList, 'productId');
             $goodsData = GoodsClass::getByIds($ids, null, 'id');
-            $orderGoodsData = OrderGoodsClass::getAllByCondition(['orderSn' => $xsOrderSn], null, '*', 'goodsId', true);
+            $orderGoodsData = OrderGoodsClass::getAllByCondition(['orderSn' => $myOrderSn], null, '*', 'goodsId', true);
             foreach ($goodsInfoList as $currentGoods) {
                 $goodsId = $currentGoods['productId'] ?? 0;
                 $unitPrice = $currentGoods['unitPrice'] ?? 0;
@@ -261,16 +262,17 @@ class HdRefundService extends BaseService
                 ];
                 $laResource = new Lakala($params);
                 $refundReason = '';
-                $aliParams = [
+                $refundParams = [
                     'refundSn' => $refundSn,
-                    'orderSn' => $xsOrderSn,
+                    'orderSn' => $myOrderSn,
                     'refundAmount' => $refundFee,
                     'refundReason' => $refundReason,
+                    'thirdNo' => $thirdNo,
                 ];
-                $response = $laResource->refund($aliParams);
+                $response = $laResource->refund($refundParams);
                 if (!isset($response['code']) || $response['code'] != 'BBS00000') {
                     $errMsg = $response['msg'] ?? '';
-                    noticeUtil::push('散客订单，支付宝，退款失败，原因：' . $errMsg . ' refundSn:' . $refundSn . ' orderSn:' . $xsOrderSn, '15280215347');
+                    noticeUtil::push('散客订单，支付宝，退款失败，原因：' . $errMsg . ' refundSn:' . $refundSn . ' orderSn:' . $myOrderSn, '15280215347');
                     util::fail('退款失败');
                 }
                 $wxRefundId = isset($response['resp_data']['trade_no']) ? $response['resp_data']['trade_no'] : '';