|
|
@@ -425,6 +425,7 @@ class OrderService extends BaseService
|
|
|
}
|
|
|
|
|
|
$order = $this->model->with(['user','orderGoods'])->find($id);
|
|
|
+ $orderRemark = isset($order['remark'])?$order['remark'] : '';
|
|
|
$orderGoods = isset($order['orderGoods'])?$order['orderGoods'] : [];
|
|
|
$goodsName = isset($orderGoods[0]['goods_name'])?$orderGoods[0]['goods_name']:'订单商品';
|
|
|
$goodsNum = isset($orderGoods[0]['num']) && $orderGoods[0]['num']?$orderGoods[0]['num']: 1;
|
|
|
@@ -480,7 +481,7 @@ class OrderService extends BaseService
|
|
|
|
|
|
// 调用小程序发货信息同步接口
|
|
|
$msg = '发货成功';
|
|
|
- if($deliveryType == 1 && $openid){
|
|
|
+ if($deliveryType == 1 && $openid && $orderRemark != '人工审核支付'){
|
|
|
$sendData = [
|
|
|
'order_key' => [
|
|
|
"order_number_type" => 2,
|