优惠价

biz/coupon/classes/CouponAssetClass.php

@@ -58,7 +58,7 @@ class CouponAssetClass extends BaseClass
 							"template_id" => $tempId,
 							"url" => Yii::$app->params['mallDomain'] . '/#/pages/coupon/list?account=' . $merchantId,
 							"data" => [
-								"first" => ["value" => "获得一张优惠劵。", "color" => "#173177"],
+								"first" => ["value" => "恭喜，您获得一张优惠劵。", "color" => "#173177"],
 								"keyword1" => ["value" => $amount . '元', "color" => "#173177"],
 								"keyword2" => ["value" => '优惠劵', "color" => "#173177"],
 								"keyword3" => ["value" => date("Y-m-d H:i"), "color" => "#173177"],

biz/order/services/OrderService.php

@@ -161,7 +161,7 @@ class OrderService extends BaseService
 		$data['deliver'] = 1;
 		OrderClass::updateById($id, $data);
 	}
-
+	
 	//订单详情 shish 2020.1.2
 	public static function getOrderById($id)
 	{
@@ -200,7 +200,6 @@ class OrderService extends BaseService
 			$discountAmount = stringUtil::calcSub($price, $newPrice);
 			$discountPrice = $newPrice;
 		}
-		
 		//使用随机优惠 shish 2019.9.12
 		if ($sourceType == 3) {
 			$discountAmount = OrderClass::getRandDiscount($price);
@@ -213,7 +212,8 @@ class OrderService extends BaseService
 			$discountType = 3;
 		}
 		$discountType = $discountAmount <= 0 ? 0 : $discountType;
+		$discountPrice = $discountPrice <= 0 ? 0.01 : $discountPrice;
 		return ['price' => $discountPrice, 'discountType' => $discountType, 'discountAmount' => $discountAmount];
 	}
-	
+
 }