From f9be35da6ddeaddbfced464ce0afcc2e7e10543a Mon Sep 17 00:00:00 2001
From: Jerry Yan <792602257@qq.com>
Date: Fri, 4 Dec 2020 13:27:01 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BE=85=E7=A1=AE=E8=AE=A4Q5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 hyhproject/common/model/Orders.php | 17 +++++++++++++++--
 1 file changed, 15 insertions(+), 2 deletions(-)

diff --git a/hyhproject/common/model/Orders.php b/hyhproject/common/model/Orders.php
index d7605fe..a47bc31 100755
--- a/hyhproject/common/model/Orders.php
+++ b/hyhproject/common/model/Orders.php
@@ -1550,21 +1550,34 @@ class Orders extends Base{
 
                         // step 8 平台送自己的上第N层：扣减“助购预获”、“预获产品券”各10000×0.4×0.5=2000，
                         //                            同时添加10000×0.4×0.5=2000“已获产品券”。
+                        // 被助购户:购户选的第几层对应的用户
                         if((int)$order["helpUserLevel"]>0){
                             $vm->insertHelpSaleNotice($order["helpUserId"], $orderId, $calBaseNum*((float)dataConf('helpSaleCouponsCalBase')/100),
                                 '预获助购转换所扣', 0);
                             $sm->addSysSummary($calBaseNum*((float)dataConf('helpSaleCouponsCalBase')/100),0,2,'订单【'.($order['orderNo']?:'--').'】被助购转换所扣');
                             // 购户获得已获优惠券是在助购吧购的物的优惠款的? %
-                            $yhyhq_zh = $calBaseNum*((float)dataConf('helpSaleAlreadyCouponGet')/100);
+                            $yhyhq_zh = $calBaseNum*(1-(float)dataConf('helpSaleAlreadyCouponGet')/100);
+                            if ($yhyhq_zh < 0) $yhyhq_zh = 0;
                             $vm->insertVouchersNotice($order['helpUserId'], $orderId, 0, $yhyhq_zh,
                                 '预获优惠券被助购转换所扣',0);
                             $vm->insertAlreadyVouchersNotice($order['helpUserId'], $orderId, 0, $yhyhq_zh,
                                 '订单【'.($order['orderNo']?:'--').'】预获优惠券助购转换所得',1);
-                            $yhcpq_zh = $calBaseNum*((float)dataConf('helpSaleCouponsCalBase')/100);
+                            $yhcpq_zh = $calBaseNum*(1-(float)dataConf('helpSaleCouponsCalBase')/100-(float)dataConf('helpSaleAlreadyCouponGet')/100);
+                            $yhcpq_zh2 = $calBaseNum*((float)dataConf('helpSaleAlreadyCouponGet')/100);
+                            if ($yhcpq_zh < 0) $yhcpq_zh = 0;
+                            if ((float)dataConf('helpSaleAlreadyCouponGet')/100 > (1-(float)dataConf('helpSaleCouponsCalBase')/100)) $yhcpq_zh2 = $calBaseNum*(1-(float)dataConf('helpSaleCouponsCalBase')/100);
                             $vm->insertVouchersNotice($order['helpUserId'], $orderId, $yhcpq_zh, 0,
                                 '预获产品券被助购转换所扣',0);
                             $vm->insertAlreadyVouchersNotice($order['helpUserId'], $orderId, $yhcpq_zh, 0,
                                 '订单【'.($order['orderNo']?:'--').'】预获产品券被助购转换所得',1);
+                            $vm->insertVouchersNotice($order['helpUserId'], $orderId, $yhcpq_zh, 0,
+                                '预获产品券被助购转换所扣',0);
+                            $vm->insertAlreadyVouchersNotice($order['helpUserId'], $orderId, $yhcpq_zh, 0,
+                                '订单【'.($order['orderNo']?:'--').'】预获产品券被助购转换所得',1);
+                            $vm->insertVouchersNotice($userId, $orderId, 0, $yhcpq_zh2,
+                                '预获产品券被助购转换所扣',0);
+                            $vm->insertAlreadyVouchersNotice($userId, $orderId, 0, $yhcpq_zh2,
+                                '订单【'.($order['orderNo']?:'--').'】预获产品券被助购转换所得',1);
                         }else{
                             $vm->insertHelpSaleNotice($order["helpUserId"], $orderId, 0,
                                 '预获产品券被助购转换所扣0', 0);