|
@@ -10,6 +10,7 @@ use biz\stat\classes\StatOrderCountClass;
|
|
|
use bizGhs\stat\classes\StatYjClass;
|
|
use bizGhs\stat\classes\StatYjClass;
|
|
|
use bizGhs\ws\services\WsService;
|
|
use bizGhs\ws\services\WsService;
|
|
|
use bizHd\user\classes\UserClass;
|
|
use bizHd\user\classes\UserClass;
|
|
|
|
|
+use common\components\dict;
|
|
|
use common\components\miniUtil;
|
|
use common\components\miniUtil;
|
|
|
use common\components\orderSn;
|
|
use common\components\orderSn;
|
|
|
use common\components\util;
|
|
use common\components\util;
|
|
@@ -159,10 +160,12 @@ class OrderClass extends BaseClass
|
|
|
}
|
|
}
|
|
|
$date = date("Y-m-d H:i:s");
|
|
$date = date("Y-m-d H:i:s");
|
|
|
$order->payTime = $date;
|
|
$order->payTime = $date;
|
|
|
- $shopAdminIds = \bizGhs\shop\classes\ShopAdminClass::getRemindAdminIdsByShopId($order->shopId);
|
|
|
|
|
- if($shopAdminIds){
|
|
|
|
|
- foreach ($shopAdminIds as $v){
|
|
|
|
|
- WsService::arrivalNotice($v,$order->actPrice);
|
|
|
|
|
|
|
+ if($order->fromtType == dict::getDict("fromType","shop")){
|
|
|
|
|
+ $shopAdminIds = \bizGhs\shop\classes\ShopAdminClass::getRemindAdminIdsByShopId($order->shopId);
|
|
|
|
|
+ if($shopAdminIds){
|
|
|
|
|
+ foreach ($shopAdminIds as $v){
|
|
|
|
|
+ WsService::arrivalNotice($v,$order->actPrice);
|
|
|
|
|
+ }
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|
|
|
self::complete($order, $payWay);
|
|
self::complete($order, $payWay);
|
|
@@ -231,6 +234,16 @@ class OrderClass extends BaseClass
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|
|
|
};
|
|
};
|
|
|
|
|
+
|
|
|
|
|
+ //下单通知,来自mall linqh 2021.5.19
|
|
|
|
|
+ if($order->fromtType == dict::getDict("fromType","mall")){
|
|
|
|
|
+ $shopIdAdminIds = \bizGhs\shop\classes\ShopAdminClass::getRemindAdminIdsByShopId($shopId);
|
|
|
|
|
+ if($shopIdAdminIds){
|
|
|
|
|
+ foreach ($shopIdAdminIds as $v){
|
|
|
|
|
+ WsService::newOrderNotice($v);
|
|
|
|
|
+ }
|
|
|
|
|
+ }
|
|
|
|
|
+ }
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
//转化出送到时间 ssh 2020.3.15
|
|
//转化出送到时间 ssh 2020.3.15
|