wang jun 2 years ago
parent
commit
7d42efd9ff

+ 4 - 1
application/app/logic/appointmentlogic.php

@@ -94,7 +94,7 @@ class appointmentlogic extends baselogic
             return backarr(0, "测试类型错误");
         }
         $where = ['id' => $aid];
-        $field = ['name', 'sfzid', 'telno', 'signurl', 'oprdate', 'ispay', 'isuse', 'payorderno', 'openid', 'code', 'id'];
+        $field = ['name', 'sfzid', 'telno', 'signurl', 'oprdate', 'ispay', 'isuse', 'payorderno', 'openid', 'code', 'id', 'age', 'gender', 'birthday'];
         $ainfo = $m_a->getInfo($where, $field);
         if (empty($ainfo)) {
             return backarr(0, "无申请数据");
@@ -123,6 +123,9 @@ class appointmentlogic extends baselogic
                 'appointment_id' => $ainfo['id'],
                 'test_type' => $testtype,
                 'wid' => $winfo['id'],
+                'age' => $ainfo['age'],
+                'gender' => $ainfo['gender'],
+                'birthday' => $ainfo['birthday'],
             ];
             $tid = $m_t->insertData($tinsertData);
             if (empty($tid)) {

+ 1 - 1
application/index/controller/Fileoper.php

@@ -132,7 +132,7 @@ class Fileoper extends Controller
         if (!in_array($ext, $allowtype)) {
             return backjson2(0, "格式错误");
         }
-        $dir = "workercard/" . date('Ymd') . "/";
+        $dir = "signimg/" . date('Ymd') . "/";
         $filename = uniqid() . '.' . $ext;
         //use ntyu-1313172967
         //$bucket = "backup-1306866048";

+ 4 - 0
application/index/logic/appointmentlogic.php

@@ -77,6 +77,7 @@ class appointmentlogic extends baselogic
         }
         $data = $result['data'];
         $m_a = new appointmentmodel();
+        //$sfzid = authcode($data['sfzid'], 'encode');
         $insertData = [
             'openid' => $data['openid'],
             'name' => $data['name'],
@@ -84,6 +85,9 @@ class appointmentlogic extends baselogic
             'telno' => $data['telno'],
             'oprdate' => date('Y-m-d H:i:s'),
             'signurl' => $data['signurl'],
+            'age' => $data['age'],
+            'gender' => $data['gender'],
+            'birthday' => $data['birthday'],
         ];
         $id = $m_a->insertData($insertData);
         if (empty($id)) {

+ 6 - 0
application/index/logic/paylogic.php

@@ -63,6 +63,12 @@ class paylogic extends baselogic
         if (empty($ainfo)) {
             return backarr(0, "无申请数据");
         }
+        if (1 == $ainfo['ispay']) {
+            return backarr(0, "申请单已支付");
+        }
+        if (1 == $ainfo['isuse']) {
+            return backarr(0, "申请单已使用");
+        }
         $body = "核酸检测费用";
         $out_trade_no = createOrderNo();
         $notify_url = getselfurl('dev') . "index/appointment/pay_call_back";

+ 2 - 2
config/app.php

@@ -146,10 +146,10 @@ return [
     //'env' => 'pro',
     'selfurl' => [
         'dev' => [
-            'default' => 'https://app.tjzhxx.cn:41443/index.php/',
+            'default' => 'https://app.tjzhxx.cn:43443/index.php/',
         ],
         'pro' => [
-            'default' => 'https://app.tjzhxx.cn:43443/index.php/',
+            'default' => 'https://www.tjtgntyy.cn/index.php/',
         ],
     ],