去除了ca打印,修改了上报处方订单的数组格式。
This commit is contained in:
@@ -332,7 +332,7 @@ class OrderPrescriptionService extends BaseService
|
||||
$params['coupon_id'] = $user_coupon['coupon_id'];
|
||||
$coupon = Coupon::getOne($params);
|
||||
if (!empty($coupon)){
|
||||
$product_coupons = array_push($product_coupons,$coupon->toArray());
|
||||
$product_coupons[] = $coupon->toArray();
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -467,7 +467,7 @@ class OrderPrescriptionService extends BaseService
|
||||
$arg['presList'][0]['orderDrugList'][$key]['price'] = $product['product_price']; // 药品单价
|
||||
$arg['presList'][0]['orderDrugList'][$key]['drugCount'] = $item['amount']; // 药品数量
|
||||
$arg['presList'][0]['orderDrugList'][$key]['packingUnit'] = $product['packaging_unit']; // 药品单位
|
||||
$arg['presList'][0]['orderDrugList'][$key]['actualSellingPrice'] = $product['actual_product_price']; // 药品实际销售单价
|
||||
$arg['presList'][0]['orderDrugList'][$key]['actualSellingPrice'] = $item['actual_product_price']; // 药品实际销售单价
|
||||
}
|
||||
|
||||
// 处理上报处方平台药品优惠券相关数据
|
||||
@@ -526,11 +526,11 @@ class OrderPrescriptionService extends BaseService
|
||||
/**
|
||||
* 处理上报处方平台药品优惠券相关数据
|
||||
* @param array $product_coupons 药品订单优惠券,为coupon数据
|
||||
* @param array $order_product_item 药品订单明细
|
||||
* @param array|object $order_product_item 药品订单明细
|
||||
* @param string $orderNo 药品订单编号
|
||||
* @return array
|
||||
*/
|
||||
public function handleReportPrescriptionProductCouponData(array $product_coupons,array $order_product_item,string $orderNo): array
|
||||
public function handleReportPrescriptionProductCouponData(array $product_coupons,array|object $order_product_item,string $orderNo): array
|
||||
{
|
||||
$promotion = array();
|
||||
|
||||
@@ -547,7 +547,7 @@ class OrderPrescriptionService extends BaseService
|
||||
$result["amount"] = $product_coupon["coupon_price"]; // 优惠金额
|
||||
$result["count"] = 1;
|
||||
|
||||
$promotion = array_push($promotion,$result);
|
||||
$promotion[] = $result;
|
||||
}
|
||||
|
||||
if ($product_coupon["application_scope"] == 5){
|
||||
|
||||
Reference in New Issue
Block a user