|
|
@@ -17,13 +17,13 @@ class HdDeliveryOrderClass extends BaseClass
|
|
|
|
|
|
public static function payAfter($order)
|
|
|
{
|
|
|
- if(empty($order)){
|
|
|
+ if (empty($order)) {
|
|
|
return false;
|
|
|
}
|
|
|
- if($order->sendType != 2){
|
|
|
+ if ($order->sendType != 2) {
|
|
|
return false;
|
|
|
}
|
|
|
- if($order->payStatus != 1){
|
|
|
+ if ($order->payStatus != 1) {
|
|
|
return false;
|
|
|
}
|
|
|
$orderId = $order->id;
|
|
|
@@ -74,18 +74,18 @@ class HdDeliveryOrderClass extends BaseClass
|
|
|
try {
|
|
|
//跑腿订单生产者创建订单
|
|
|
$orderId = $order->id ?? 0;
|
|
|
- $callErrand = $post['callErrand']; // 是否立即发跑腿 1:是 0:否
|
|
|
+ $callErrand = $post['callErrand'] ?? 0; // 是否立即发跑腿 1:是 0:否
|
|
|
|
|
|
if ($callErrand == 1) {
|
|
|
$hasPay = $post['hasPay'] ?? dict::getDict('hasPay', 'unPay'); //收款方式 0:扫码付 1:线下(已付款) 2:赊账(欠款)3:现金 4:余额
|
|
|
if ($hasPay == dict::getDict('hasPay', 'unPay')) { // 0:扫码付
|
|
|
$deliveryPlatform = $post['deliveryPlatform'];
|
|
|
$expireTime = 0;
|
|
|
- if($deliveryPlatform == 'shansong'){
|
|
|
+ if ($deliveryPlatform == 'shansong') {
|
|
|
$expireTime = 1800 - 60;
|
|
|
- }elseif($deliveryPlatform == 'didi'){
|
|
|
+ } elseif ($deliveryPlatform == 'didi') {
|
|
|
$expireTime = 7200;
|
|
|
- }else{
|
|
|
+ } else {
|
|
|
$expireTime = 7200; // 默认缓存时长2小时
|
|
|
}
|
|
|
$cacheKey = 'hd_pt_cacheData:' . $orderId;
|
|
|
@@ -261,7 +261,7 @@ class HdDeliveryOrderClass extends BaseClass
|
|
|
$shopId = $data['shopId'];
|
|
|
// 发 App 通知
|
|
|
self::sendAppNotice($shopId, $orderId, "订单号:{$orderId},原因:" . $e->getMessage());
|
|
|
-
|
|
|
+
|
|
|
return ConsumerInterface::MSG_REJECT;
|
|
|
}
|
|
|
}
|