shish hace 10 meses
padre
commit
9680eaeba6

+ 3 - 0
app-ghs/controllers/IntraCityController.php

@@ -558,6 +558,9 @@ class IntraCityController extends BaseController
             ];
             ];
             //确认发货,花店会增加路上库存
             //确认发货,花店会增加路上库存
             OrderClass::orderSend($order, $params);
             OrderClass::orderSend($order, $params);
+            $totalFee = $result['fee'] ?? 0;
+            $ghsName = $cgInfo->ghsName ?? '';
+            noticeUtil::push("批发订单,发跑跑腿,获取运费:{$totalFee} 重量:{$weight} 距离:{$sendDistance} 订单号:{$orderId} 供货商:{$ghsName} 客户:{$customName} 客户手机:{$customMobile}", '15280215347');
 
 
             util::success(['fee' => $data['fee']], '订单创建成功');
             util::success(['fee' => $data['fee']], '订单创建成功');
         } else {
         } else {

+ 2 - 2
app-mall/controllers/OrderController.php

@@ -367,7 +367,7 @@ class OrderController extends BaseController
                 $sendCost = bcdiv($fee, 100, 2);
                 $sendCost = bcdiv($fee, 100, 2);
                 $post['sendCost'] = $sendCost;
                 $post['sendCost'] = $sendCost;
                 $post['sendDistance'] = $distance;
                 $post['sendDistance'] = $distance;
-                noticeUtil::push("散客下单,获取运费:{$sendCost} 重量:{$totalWeight} 距离:{$distance} 姓名:{$customName} 手机号 {$customMobile} 经纬 {$originalLng} {$originalLat} 金额:{$modifyPrice} 数量:{$totalNum}", '15280215347');
+                noticeUtil::push("零售订单,获取运费:{$sendCost} 重量:{$totalWeight} 距离:{$distance} 姓名:{$customName} 手机号 {$customMobile} 经纬 {$originalLng} {$originalLat} 金额:{$modifyPrice} 数量:{$totalNum}", '15280215347');
                 $modifyPrice = bcadd($modifyPrice, $sendCost, 2);
                 $modifyPrice = bcadd($modifyPrice, $sendCost, 2);
             }
             }
 
 
@@ -565,7 +565,7 @@ class OrderController extends BaseController
                 if ($goodsInfo->freightType == 1) {
                 if ($goodsInfo->freightType == 1) {
                     $sendCost = 0;
                     $sendCost = 0;
                 }
                 }
-                noticeUtil::push("散客下单!获取运费:{$sendCost} 重量:{$totalWeight} 距离:{$sendDistance} 姓名:{$customName} 手机号 {$customMobile} 经纬 {$originalLng} {$originalLat} 金额:{$goodsPrice} 数量:{$goodsNum}", '15280215347');
+                noticeUtil::push("零售订单!获取运费:{$sendCost} 重量:{$totalWeight} 距离:{$sendDistance} 姓名:{$customName} 手机号 {$customMobile} 经纬 {$originalLng} {$originalLat} 金额:{$goodsPrice} 数量:{$goodsNum}", '15280215347');
             }
             }
             $post['sendDistance'] = $sendDistance;
             $post['sendDistance'] = $sendDistance;
             $post['sendCost'] = $sendCost;
             $post['sendCost'] = $sendCost;

+ 1 - 1
biz-hd/purchase/classes/PurchaseClass.php

@@ -478,7 +478,7 @@ class PurchaseClass extends BaseClass
         $fee = $result['est_fee'] ?? 0;
         $fee = $result['est_fee'] ?? 0;
         $totalFee = sprintf("%.1f", ($fee / 100));
         $totalFee = sprintf("%.1f", ($fee / 100));
 
 
-        noticeUtil::push("花店下单,获取运费:{$totalFee} 重量:{$weight} 距离:{$showDistance} 客户名:{$customMobile} 手机号 {$customMobile} 经纬 {$shopLong} {$shopLat} 金额:{$price} 数量:{$packageNum}", '15280215347');
+        noticeUtil::push("批发订单,获取运费:{$totalFee} 重量:{$weight} 距离:{$showDistance} 客户名:{$customMobile} 手机号 {$customMobile} 经纬 {$shopLong} {$shopLat} 金额:{$price} 数量:{$packageNum}", '15280215347');
 
 
         return ['distance' => $distance, 'showDistance' => $showDistance, 'fee' => $totalFee];
         return ['distance' => $distance, 'showDistance' => $showDistance, 'fee' => $totalFee];
     }
     }