优化推送

application/common/service/ZopOrderService.php

@@ -164,10 +164,13 @@ class ZopOrderService extends ZopBaseService
         $orderTotalFee = bcmul($amount, 1000, 0);
         $pageUrl = $produce->link ?? '';
         // 判断产品是否使用用户收货地址区号
+        $numProvinceCode = $postProvinceCode;
+        $numCityCode = $postCityCode;
+
         $homeLocationType = $produce->home_location_type ?? 'address';
         if ($homeLocationType == 'assign') {
-            $postProvinceCode = $produce->home_location_province ?? 0;
-            $postCityCode = $produce->home_location_city ?? 0;
+            $numProvinceCode = $produce->home_location_province ?? 0;
+            $numCityCode = $produce->home_location_city ?? 0;
         }
 
         $no = $order['no'];
@@ -179,6 +182,8 @@ class ZopOrderService extends ZopBaseService
                 'certName' => $certName,
                 'certNo' => $certNum,
                 'contactNum' => $contactNum,
+                'numProvinceCode' => $numProvinceCode,
+                'numCityCode' => $numCityCode,
                 'postProvinceCode' => $postProvinceCode,
                 'postCityCode' => $postCityCode,
                 'postDistrictCode' => $postDistrictCode,
@@ -238,17 +243,10 @@ class ZopOrderService extends ZopBaseService
             $phoneNum = $order->no ?? '';
             $isOpenCF = 0;
     
-            // 判断产品是否使用用户收货地址区号
-            $homeLocationType = $produce->home_location_type ?? 'address';
-            if ($homeLocationType == 'assign') {
-                $provinceNumCode = $produce->home_location_province ?? 0;
-                $cityNumCode = $produce->home_location_city ?? 0;
-            }
-    
             $orderParams = [
                 'goodsId' => $goodsId,
-                'provinceCode' => $provinceNumCode,
-                'cityCode' => $cityNumCode,
+                'provinceCode' => $numProvinceCode,
+                'cityCode' => $numCityCode,
                 'phoneNum' => $phoneNum,
                 'token' => $token,
                 'createTime' => $createTime,
@@ -265,6 +263,7 @@ class ZopOrderService extends ZopBaseService
             }
         }
 
+        $order->failure_reason = '操作成功';
         $order->is_push_zop = 1;
         $order->save();
 
@@ -660,6 +659,8 @@ class ZopOrderService extends ZopBaseService
             'certName',
             'certNo',
             'contactNum',
+            'numProvinceCode',
+            'numCityCode',
             'postProvinceCode',
             'postCityCode',
             'postDistrictCode',