diff --git a/app/controller/api/Business.php b/app/controller/api/Business.php
index 774a8f2..6a0d99f 100644
--- a/app/controller/api/Business.php
+++ b/app/controller/api/Business.php
@@ -387,7 +387,7 @@ class Business extends Base
$data["usingRule"] = DictionaryRepository::getInstance()->getUsingRuleByCouponMainId($couponMain->id);
$data["punishRule"] = '';//处罚规则 已取消
- $data["content"] = $couponMain->content;
+ $data["content"] = (string)$couponMain->content;
//未登录可以领取 0可领取 1已领取
if (empty($account)) {
diff --git a/app/controller/api/Coupon.php b/app/controller/api/Coupon.php
index f1c236c..b2b12b1 100644
--- a/app/controller/api/Coupon.php
+++ b/app/controller/api/Coupon.php
@@ -600,12 +600,12 @@ class Coupon extends Base
//发起支付
- //$result = $payment->transfer->toBalance($toBalanceData);
+ $result = $payment->transfer->toBalance($toBalanceData);
//var_dump($result);
//付款成功才提交！！！！！伪装成功
- if( true || isset($result['payment_no']) ){
+ if( isset($result['payment_no']) ){
$redpackData['pay_time'] = date("Y-m-d H:i:s",$time);
Db::commit();
@@ -616,7 +616,7 @@ class Coupon extends Base
"redpack" =>$consumerMoney
]);
}
- //Log::info("企业发起付款失败:" . json_encode($result,JSON_UNESCAPED_UNICODE));
+ Log::info("企业发起付款失败:" . json_encode($result,JSON_UNESCAPED_UNICODE));
//默认回滚
diff --git a/app/controller/manager/Business.php b/app/controller/manager/Business.php
index 3b06bdc..f5d5747 100644
--- a/app/controller/manager/Business.php
+++ b/app/controller/manager/Business.php
@@ -230,7 +230,7 @@ class Business extends Base
'intro|介绍' => 'require',
'business_circle_id|商圈' => 'require',
'background|背景图' => 'require',
- 'score|评分' => 'require|in:1,2,3,4,5',
+ //'score|评分' => 'require|in:1,2,3,4,5',
'reason|驳回原因' => 'max:100',
]);
diff --git a/view/manager/business/business_detail.html b/view/manager/business/business_detail.html
index b51e3cf..4b63afa 100644
--- a/view/manager/business/business_detail.html
+++ b/view/manager/business/business_detail.html
@@ -181,16 +181,16 @@
-
+
+
+
+
+
+
+
+
+
+
diff --git a/view/manager/coupon/add.html b/view/manager/coupon/add.html
index 355135b..f8e7ef6 100644
--- a/view/manager/coupon/add.html
+++ b/view/manager/coupon/add.html
@@ -199,16 +199,39 @@
-
-