Merge branch 'stabble' of qk:wangdu/wangdu_public_api into stabble

app/Console/Commands/PaymentQueryTask.php

@@ -68,9 +68,9 @@ class PaymentQueryTask extends Command
                 'order_no'  => $pay->trade_no,
                 'pay_time' => $pay->pay_time,
             ], $pay->is_company == 0);
-            if ($result['result'] == 'success') {
+            if ($result['result'] == 'success' && $result['content']->respCode == '0000' && $result['content']->resultFlag == 0) {
                 print_r(($pay->id) . '---执行---start---' . "\n");
-                $sand_serial = $result['content']->sandSerial;
+                $sand_serial = property_exists($result['content'],'sandSerial') ? $result['content']->sandSerial : '0000';
                 $payment_service->updateBatchPaymentStatus($pay, AdvancedPaymentService::auto_success, 0, $result, $sand_serial);
                 print_r(($pay->id) . '---执行---end---' . "\n");
             } else if ($result['result'] == 'failure') {

app/Modules/Channel/Services/ReportToChannelUserAndOrderService.php

@@ -27,11 +27,19 @@ class ReportToChannelUserAndOrderService
         if($distribution_channel_id == 10543){
             return 'http://yx1.hncwzx88.cn/api/app/home/wdy';
         }
+
+        if($distribution_channel_id == 10545){
+            return 'http://yx1.hncwzx88.cn/api/app/home/wdy';
+        }
 		
 		if($distribution_channel_id == 10588){
             return 'https://xdd.guozhen6.com/ysh/wdapi/';
         }
 		
+        if($distribution_channel_id == 10590){
+            return 'https://xdd.guozhen6.com/ysh/wdapi/';
+        }
+        
         return '';
     }