This commit is contained in:
wucongxing 2023-04-13 18:40:32 +08:00
parent 66dd47c3b3
commit 727b548be4
2 changed files with 16 additions and 14 deletions

View File

@ -70,7 +70,7 @@ class ReportPreProductOrderCommand extends HyperfCommand
$redis_value = $redis->get($redis_key); $redis_value = $redis->get($redis_key);
$redis->incr($redis_key); $redis->incr($redis_key);
if(!empty($redis_value)){ if(!empty($redis_value)){
if ($redis_value >= 100){ if ($redis_value >= 2){
// 存储上报失败 // 存储上报失败
$this->savaReportFail($item['order_product_id'],"超出最大上报次数"); $this->savaReportFail($item['order_product_id'],"超出最大上报次数");

View File

@ -1099,18 +1099,6 @@ class PatientOrderService extends BaseService
return fail(); return fail();
} }
// 获取物流数据
$params = array();
$params['order_product_id'] = $order_product_id;
$order_product_logistics = OrderProductLogistic::getOne($params);
if (empty($order_product_logistics)){
return success(null);
}
$order_product_logistics = $order_product_logistics->toArray();
$order_product_logistics['logistics_content'] = json_decode($order_product_logistics['logistics_content'],true);
// 地址数据 // 地址数据
$address = array(); $address = array();
$address['province_id'] = $order_product['province_id']; $address['province_id'] = $order_product['province_id'];
@ -1127,11 +1115,25 @@ class PatientOrderService extends BaseService
$address['consignee_tel_mask'] = $order_product['consignee_tel_mask']; $address['consignee_tel_mask'] = $order_product['consignee_tel_mask'];
$result = array(); $result = array();
$result['logistics'] = $order_product_logistics; $result['logistics'] = null;
$result['address'] = $address; $result['address'] = $address;
// 获取物流数据
$params = array();
$params['order_product_id'] = $order_product_id;
$order_product_logistics = OrderProductLogistic::getOne($params);
if (empty($order_product_logistics)){
return success($result);
}
$order_product_logistics = $order_product_logistics->toArray();
$order_product_logistics['logistics_content'] = json_decode($order_product_logistics['logistics_content'],true);
$result['logistics'] = $order_product_logistics;
return success($result); return success($result);
} }
/** /**
* 获取处方订单列表 * 获取处方订单列表
* @return array * @return array