diff --git a/app/controller/api/Coupon.php b/app/controller/api/Coupon.php index 4908b6e..1ae9c78 100644 --- a/app/controller/api/Coupon.php +++ b/app/controller/api/Coupon.php @@ -715,7 +715,7 @@ class Coupon extends Base $agencyRedpackData['pay_time'] = date("Y-m-d H:i:s",$time); }else{ //否则失败 记录失败原因 - Log::info("企业发起付款【分销者红包】失败:" . json_encode($agencyResult,JSON_UNESCAPED_UNICODE)); + Log::info("企业发起付款【渠道商】失败:" . json_encode($agencyResult,JSON_UNESCAPED_UNICODE)); } // 不管成功还是失败 都要写入 Redpack::create($agencyRedpackData); diff --git a/app/controller/manager/Coupon.php b/app/controller/manager/Coupon.php index e2cd44b..9d39078 100644 --- a/app/controller/manager/Coupon.php +++ b/app/controller/manager/Coupon.php @@ -424,7 +424,7 @@ class Coupon extends Base } if($data['commission_dis_distribution'] < $data['commission_dis_distributed']){ //检测【分销者】部分是否最少0.3元 - $distributionMoney = ($data['commission_dis_distribution']/100) * $data['deduction_money']; + $distributionMoney = ($data['commission_dis_distribution']/100) * $couponMain['deduction_money']; if ($distributionMoney != 0 && $distributionMoney < CouponMain::min_redpack_money) { return $this->json(4002, "开启分销:【分销者】红包不足" @@ -436,7 +436,7 @@ class Coupon extends Base } }else{ //检测【被分销者】部分是否最少0.3元 - $distributedMoney = ($data['commission_dis_distributed']/100) * $data['deduction_money']; + $distributedMoney = ($data['commission_dis_distributed']/100) * $couponMain['deduction_money']; if ($distributedMoney != 0 && $distributedMoney < CouponMain::min_redpack_money) { return $this->json(4002, "开启分销:【被分销者】红包不足" @@ -449,9 +449,9 @@ class Coupon extends Base - if($couponMain['commission_consumer'] < $couponMain['commission_agency']){ + if($data['commission_consumer'] < $data['commission_agency']){ //检测 【消费者】部分是否最少0.3元 - $consumerMoney = ($couponMain['commission_consumer']/100) * $couponMain['deduction_money']; + $consumerMoney = ($data['commission_consumer']/100) * $couponMain['deduction_money']; if ($consumerMoney != 0 && $consumerMoney < CouponMain::min_redpack_money) { return $this->json(4002, "关闭分销:【消费者】红包不足" @@ -462,7 +462,7 @@ class Coupon extends Base } }else{ //检测 【渠道商】部分是否最少0.3元 - $agencyMoney = ($couponMain['commission_agency']/100) * $couponMain['deduction_money']; + $agencyMoney = ($data['commission_agency']/100) * $couponMain['deduction_money']; if ($agencyMoney != 0 && $agencyMoney < CouponMain::min_redpack_money) { return $this->json(4002, "关闭分销:【渠道商】红包不足"