From 62f9a637576f11d9e710eb08105f5cf024b77490 Mon Sep 17 00:00:00 2001
From: Jerry Yan <792602257@qq.com>
Date: Wed, 2 Dec 2020 17:55:10 +0800
Subject: [PATCH] =?UTF-8?q?zhugou=E5=90=89=E6=97=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 hyhproject/common/model/Orders.php | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/hyhproject/common/model/Orders.php b/hyhproject/common/model/Orders.php
index 5911f0a..566926f 100755
--- a/hyhproject/common/model/Orders.php
+++ b/hyhproject/common/model/Orders.php
@@ -1559,23 +1559,23 @@ class Orders extends Base{
                                 "helpGetCount2"=>$calBaseNum*((float)dataConf('helpSaleCouponsCalBase')/100),
                             ]);
                         }
+                        // 9.26添加
+                        //四级功能相关字：购户吉日获得“已获优惠券”为 00时 00分 15秒 ？ 年2020？ 月10？ 日01
+                        //四级功能相关字：购户吉日获得“已获优惠券”的留言？祝您及家人幸福安康
+                        //四级功能相关字：购户吉日获得“已获优惠券”为“助购值”的？% 50
+                        $sysConf = (new SCM())->getSysConfigs();
+                        if (isset($sysConf['jiri_jiyan']) && isset($sysConf['jiri_get_percent']) && !empty(floatval($sysConf['jiri_get_percent'])) && isset($sysConf['jiri']) ) {
+                            if (date('Y/m/d') == date('Y-m-d', strtotime($sysConf['jiri']))) {
+                                $zhugou_value = $calBaseNum*((float)dataConf('helpSaleCouponsCalBase')/100);
+                                $jiri_get_percent = floatval($sysConf['jiri_get_percent']);
+                                $jiri_jiyan = $sysConf['jiri_jiyan'];
+                                $vm->insertAlreadyVouchersNotice($userId, $orderId, 0, round($zhugou_value*$jiri_get_percent*100, 5), $jiri_jiyan);
+                            }
+                        }
                         // 购户获得已获优惠券是在助购吧购的物的优惠款的? %
                         $vm->insertAlreadyVouchersNotice($order['helpUserId'], $orderId, 0, $calBaseNum*((float)dataConf('helpSaleAlreadyCouponGet')/100),
                             '订单【'.($order['orderNo']?:'--').'】预获优惠券助购转换所得',1);
                     }
-                    // 9.26添加
-                    //四级功能相关字：购户吉日获得“已获优惠券”为 00时 00分 15秒 ？ 年2020？ 月10？ 日01
-                    //四级功能相关字：购户吉日获得“已获优惠券”的留言？祝您及家人幸福安康
-                    //四级功能相关字：购户吉日获得“已获优惠券”为“助购值”的？% 50
-                    $sysConf = (new SCM())->getSysConfigs();
-                    if (isset($sysConf['jiri_jiyan']) && isset($sysConf['jiri_get_percent']) && !empty(floatval($sysConf['jiri_get_percent'])) && isset($sysConf['jiri']) ) {
-                        if (date('Y/m/d') == date('Y-m-d', strtotime($sysConf['jiri']))) {
-                            $zhugou_value = $calBaseNum*((float)dataConf('helpSaleCouponsCalBase')/100);
-                            $jiri_get_percent = floatval($sysConf['jiri_get_percent']);
-                            $jiri_jiyan = $sysConf['jiri_jiyan'];
-                            $vm->insertAlreadyVouchersNotice($userId, $orderId, 0, round($zhugou_value*$jiri_get_percent*100, 5), $jiri_jiyan);
-                        }
-                    }
 
                     //新增订单日志
                     $logOrder = [];