From 018f73673b965e01eda38120ce3557f25c61d3f1 Mon Sep 17 00:00:00 2001
From: Jerry Yan <792602257@qq.com>
Date: Tue, 29 Sep 2020 15:13:25 +0800
Subject: [PATCH] =?UTF-8?q?=E5=90=89=E6=97=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 hyhproject/admin/model/SysConfigs.php         | 13 +++++-
 hyhproject/admin/view/sysconfigs/edit.html    |  3 +-
 .../admin/view/sysconfigs/jiriConfigs.html    | 44 +++++++++++++++++++
 hyhproject/common/model/Orders.php            | 16 +++++++
 4 files changed, 74 insertions(+), 2 deletions(-)
 create mode 100644 hyhproject/admin/view/sysconfigs/jiriConfigs.html

diff --git a/hyhproject/admin/model/SysConfigs.php b/hyhproject/admin/model/SysConfigs.php
index 958a48e..22dfcaa 100755
--- a/hyhproject/admin/model/SysConfigs.php
+++ b/hyhproject/admin/model/SysConfigs.php
@@ -80,7 +80,18 @@ class SysConfigs extends Base{
 	        	foreach ($data as $k=>$v) {
 	        		$m->updateInfo(['configId'=>$k],['fieldValue'=>$v]);
 	        	}
-				Db::commit(); 
+                if (isset($data['jiri_jiyan'])) {
+                    $this->update(['fieldValue'=>$data['jiri_jiyan']],['fieldCode'=>'jiri_jiyan']);
+                }
+                if (isset($data['jiri_get_percent'])) {
+                    $this->update(['fieldValue'=>floatval($data['jiri_get_percent'])],['fieldCode'=>'jiri_get_percent']);
+                }
+                if (isset($data['jiri'])) {
+                    $time = strtotime($data['jiri']);
+                    if (empty($time)) {return WSTReturn("操作失败；吉日日期格式不对", 1);}
+                    $this->update(['fieldValue'=>date('Y/m/d', $time)],['fieldCode'=>'jiri']);
+                }
+				Db::commit();
 			 	return WSTReturn("操作成功", 1);
 	        }catch (\Exception $e) {
 			    Db::rollback();errLog($e);
diff --git a/hyhproject/admin/view/sysconfigs/edit.html b/hyhproject/admin/view/sysconfigs/edit.html
index 9b710ab..568ecd3 100755
--- a/hyhproject/admin/view/sysconfigs/edit.html
+++ b/hyhproject/admin/view/sysconfigs/edit.html
@@ -34,6 +34,7 @@ td{height:40px; }
 
 	   <ul class="layui-tab-title">
 			<li class="layui-this">数据配置</li>
+			<li>吉日配置</li>
 	      <!-- <li class="layui-this">基础设置</li>
 
 	      <li>服务器设置</li>
@@ -52,7 +53,7 @@ td{height:40px; }
 
 	   <div class="layui-tab-content" style="padding: 10px 0;">
 
-   {include file='sysconfigs/dataConfigs,sysconfigs/config1,sysconfigs/config2,sysconfigs/config3,sysconfigs/config4,sysconfigs/config6,sysconfigs/config5' /}
+   {include file='sysconfigs/dataConfigs,sysconfigs/jiriConfigs,sysconfigs/config2,sysconfigs/config3,sysconfigs/config4,sysconfigs/config6,sysconfigs/config5' /}
 
    </div>
 
diff --git a/hyhproject/admin/view/sysconfigs/jiriConfigs.html b/hyhproject/admin/view/sysconfigs/jiriConfigs.html
new file mode 100644
index 0000000..d9633ac
--- /dev/null
+++ b/hyhproject/admin/view/sysconfigs/jiriConfigs.html
@@ -0,0 +1,44 @@
+
+<div class="layui-tab-item layui-form">
+
+     <table class='wst-form wst-box-top'>
+
+	  <tr>
+
+	     <th width='400'>购户吉日获得“已获优惠券”为：<br>（填写时间,例子：2020/10/01，2021/04/30）</th>
+
+	     <td><input type="text" id='jiri' class='ipt' value="{$object['jiri']}" maxLength='100' placeholder='日期'/></td>
+
+	  </tr>
+
+	  <tr>
+
+	     <th width='400'>购户吉日获得“已获优惠券”的留言？：</th>
+
+	     <td><input type="text" id='jiri_jiyan' class='ipt' value="{$object['jiri_jiyan']}" placeholder='留言'/></td>
+
+	  </tr>
+
+	  <tr>
+
+	     <th>购户吉日获得“已获优惠券”为“助购值”的？%：</th>
+
+		  <td><input type="number" id='jiri_get_percent' class='ipt' value="{$object['jiri_get_percent']}" max='1000' min="0" placeholder='百分比'/></td>
+
+	  </tr>
+
+	  <tr>
+
+	     <td colspan='2' align='center'>
+
+	     	<button type="button" onclick='javascript:edit()' style='margin-right:15px;' class='btn btn-primary btn-mright'><i class="fa fa-check"></i>保存</button>
+
+            <button type="reset"  class='btn'><i class="fa fa-refresh"></i>重置</button>
+
+	     </td>
+
+	  </tr>
+
+	 </table>
+
+</div>
\ No newline at end of file
diff --git a/hyhproject/common/model/Orders.php b/hyhproject/common/model/Orders.php
index 9acf7ef..f4b64d3 100755
--- a/hyhproject/common/model/Orders.php
+++ b/hyhproject/common/model/Orders.php
@@ -3,6 +3,8 @@ namespace wstmart\common\model;
 use think\Db;
 use think\Loader;
 use wstmart\common\model\LogSms;
+use wstmart\admin\model\SysConfigs as SCM;
+
 /**
  * ============================================================================
  * 订单业务处理类
@@ -1539,6 +1541,20 @@ class Orders extends Base{
                                 '预获产品券转换所扣', 0);
                         }
 
+                        // 9.26添加
+                        //四级功能相关字：购户吉日获得“已获优惠券”为 00时 00分 15秒 ？ 年2020？ 月10？ 日01
+                        //四级功能相关字：购户吉日获得“已获优惠券”的留言？祝您及家人幸福安康
+                        //四级功能相关字：购户吉日获得“已获优惠券”为“助购值”的？% 50
+                        $sysConf = (new SCM())->getSysConfigs();
+                        if (isset($sysConf['jiri_jiyan']) && isset($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((new SCM())->getSysConfigs()['jiri_get_percent']);
+                                $jiri_jiyan = (new SCM())->getSysConfigs()['jiri_jiyan'];
+                                $vm->insertAlreadyVouchersNotice($userId, $orderId, 0, round($zhugou_value*$jiri_get_percent*100, 5), $jiri_jiyan);
+                            }
+                        }
+
                         // 10.15添加：助购户的 助购预获 减少的同时 代快付值等额减少
                         Db::name("orders")->where(compact('orderId'))->update([
                             "helpGetCount"=>$order['goodsMoney']*((int)$order["helpUserLevel"])*(float)dataConf("helpSaleCalBase"),