diff --git a/hyhproject/common/model/Orders.php b/hyhproject/common/model/Orders.php index a3ce5fe..fb3481a 100755 --- a/hyhproject/common/model/Orders.php +++ b/hyhproject/common/model/Orders.php @@ -1534,14 +1534,16 @@ class Orders extends Base{ if($helpSaleInfo===null){$userHelpGet=0;} else{$userHelpGet = (float)$helpSaleInfo['helpSaleNum'];} while ($userHelpGet < $zgSwipeUnless) { - $isZgSwipe = true; $parentData = Db::name('user_trees')->where(array('uid'=>$curZgSwipeTo))->find(); // 无上级,不滑动 if (empty($parentData)) break; - $curZgSwipeTo = $parentData['pid']; // 用户ID是1或者0,不滑动了 - if ($curZgSwipeTo != 1 && $curZgSwipeTo != 0) break; + if ($parentData['pid'] != 1 && $parentData['pid'] != 0) break; + // 只有进行了滑动,才进行赋值 + $isZgSwipe = true; + $curZgSwipeTo = $parentData['pid']; $zgSwipeToLevel ++; + // 继续判断 $helpSaleInfo = Db::name("user_vouchers_summary")->where(['userId'=>$curZgSwipeTo])->find(); if($helpSaleInfo===null){$userHelpGet=0;} else{$userHelpGet = (float)$helpSaleInfo['helpSaleNum'];} @@ -1550,8 +1552,8 @@ class Orders extends Base{ } if ($zgSwipeUseReal) { $order['helpUserLevel'] = $zgSwipeToLevel; - $order['helpUserId'] = $curZgSwipeTo; } + $order['helpUserId'] = $curZgSwipeTo; // 20201203预获产品券 * 层数*基数 @@ -1585,13 +1587,23 @@ class Orders extends Base{ //现在 计算被助购户获得【已获产品券】的算式为u×n%×(1-50%-20%), // 根据设置新添的【购户获得已获优惠券是在助购吧购的物的优惠款的?20%】, // 同时计算该助购户自己获得【已获优惠券】的算式为u×n%×20%, - $sm->addSysSummary($yhcpq_zh,0,2,'订单【'.($order['orderNo']?:'--').'】预获产品券被助购转换所扣'); - $vm->insertHelpSaleNotice($order["helpUserId"], $orderId, $yhyhq_zh, - '预获助购被助购转换所扣', 0); - $vm->insertVouchersNotice($order['helpUserId'], $orderId, $yhcpq_zh, 0, - '预获产品券被助购转换所扣',0); - $vm->insertAlreadyVouchersNotice($order['helpUserId'], $orderId, $yhcpq_zh, 0, - '订单【'.($order['orderNo']?:'--').'】预获产品券被助购转换所得',1); + if ($isZgSwipe) { + $sm->addSysSummary($yhcpq_zh,0,2,'订单【'.($order['orderNo']?:'--').'】预获产品券被助购上滑转换所扣'); + $vm->insertHelpSaleNotice($order["helpUserId"], $orderId, $yhyhq_zh, + '预获助购被助购上滑转换所扣', 0); + $vm->insertVouchersNotice($order['helpUserId'], $orderId, $yhcpq_zh, 0, + '预获产品券被助购上滑转换所扣',0); + $vm->insertAlreadyVouchersNotice($order['helpUserId'], $orderId, $yhcpq_zh, 0, + '订单【'.($order['orderNo']?:'--').'】预获产品券被助购上滑转换所得',1); + } else { + $sm->addSysSummary($yhcpq_zh,0,2,'订单【'.($order['orderNo']?:'--').'】预获产品券被助购转换所扣'); + $vm->insertHelpSaleNotice($order["helpUserId"], $orderId, $yhyhq_zh, + '预获助购被助购转换所扣', 0); + $vm->insertVouchersNotice($order['helpUserId'], $orderId, $yhcpq_zh, 0, + '预获产品券被助购转换所扣',0); + $vm->insertAlreadyVouchersNotice($order['helpUserId'], $orderId, $yhcpq_zh, 0, + '订单【'.($order['orderNo']?:'--').'】预获产品券被助购转换所得',1); + } // 同时计算该助购户自己获得【已获优惠券】的算式为u×n%×20% $sm->addSysSummary($yhyhq_zh,0,2,'订单【'.($order['orderNo']?:'--').'】预获优惠券助购转换所扣'); $vm->insertHelpSaleNotice($userId, $orderId, $yhyhq_zh,