短信修改

application/admin/view/cannelorder/edit.html

@@ -32,18 +32,7 @@
             <span class="form-control" disabled="disabled">{$row.buser.username|htmlentities}</span>
         </div>
     </div>
-<!--    <div class="form-group">-->
-<!--        <label class="control-label col-xs-12 col-sm-2">{:__('Name')}:</label>-->
-<!--        <div class="col-xs-12 col-sm-8">-->
-<!--            <input id="c-name"  class="form-control" name="row[name]" type="text" value="{$row.name|htmlentities}">-->
-<!--        </div>-->
-<!--    </div>-->
-<!--    <div class="form-group">-->
-<!--        <label class="control-label col-xs-12 col-sm-2">{:__('Number')}:</label>-->
-<!--        <div class="col-xs-12 col-sm-8">-->
-<!--            <input id="c-number" class="form-control" name="row[number]" type="number" value="{$row.number|htmlentities}">-->
-<!--        </div>-->
-<!--    </div>-->
+
     <div class="form-group">
         <label class="control-label col-xs-12 col-sm-2">{:__('Image')}:</label>
 

application/api/controller/Chuyutimedtask.php

@@ -24,8 +24,7 @@ class Chuyutimedtask extends Api
 {
     // 如果$noNeedLogin为空表示所有接口都需要登录才能请求 无需登录的接口,*表示全部
     /* *可以通过@ApiInternal忽略请求的方法
- * @ApiInternal
-
+     * @ApiInternal
      * */
 
     protected $noNeedLogin = ['*'];
@@ -146,103 +145,104 @@ class Chuyutimedtask extends Api
     }
 
     /**
-     * 账单未支付提醒 -- 发给配送员和回收员
+     * 账单未支付提醒 -- 发给配送员和回收员---需求更改已删除
+     * @ApiInternal
      */
-    public function OrderUnpaid()
-    {
-        // 读取超时时限
-        $order_recovery_overtime = !empty(config('site.bill_unpaid_overtime')) ? config('site.bill_unpaid_overtime') : 360;
-        $overtime = time() - $order_recovery_overtime * 3600;
-
-        // 回收月结账单
-        $recovery_bill_model = new RecoveryBill();
-        $recovery_bill = $recovery_bill_model->alias('b')
-            ->join('user u', 'b.c_user_id = u.id')
-            ->field('b.id,b.c_user_id,u.mobile,b.order_no')
-            ->where('b.status', '=', 1)
-            ->where('b.pay_timeout', '=', 0)
-            ->where('b.createtime', '<=', $overtime)
-            ->select();
-        //var_dump($recovery_bill);exit();
-        if (count($recovery_bill) != 0) {
-            $ids = [];
-//            $mobiles = [];
+//    public function OrderUnpaid()
+//    {
+//        // 读取超时时限
+//        $order_recovery_overtime = !empty(config('site.bill_unpaid_overtime')) ? config('site.bill_unpaid_overtime') : 360;
+//        $overtime = time() - $order_recovery_overtime * 3600;
+//
+//        // 回收月结账单
+//        $recovery_bill_model = new RecoveryBill();
+//        $recovery_bill = $recovery_bill_model->alias('b')
+//            ->join('user u', 'b.c_user_id = u.id')
+//            ->field('b.id,b.c_user_id,u.mobile,b.order_no')
+//            ->where('b.status', '=', 1)
+//            ->where('b.pay_timeout', '=', 0)
+//            ->where('b.createtime', '<=', $overtime)
+//            ->select();
+//        //var_dump($recovery_bill);exit();
+//        if (count($recovery_bill) != 0) {
+//            $ids = [];
+////            $mobiles = [];
+////            foreach ($recovery_bill as $k => $row) {
+////                $mobiles[] = $row['mobile'];
+////                $ids[] = $row['id'];
+////            }
+//
+//            //SMS_262525727、亲爱的“餐厨宝”会员，您的${name}账单已发送至您的微信小程序支付界面，请您尽快前往确认并支付，感谢您的支持！
+//            $TemplateCode = "SMS_262525727";
 //            foreach ($recovery_bill as $k => $row) {
-//                $mobiles[] = $row['mobile'];
-//                $ids[] = $row['id'];
+//                $phoneNumber = $row['mobile'];
+//                $TemplateParam = json_encode(['name' => $row['order_no']]);
+//                $is_success = $this->SmsTemplate($TemplateCode, $phoneNumber, $TemplateParam);
+//
+//                if ($is_success) {
+//                    $ids[] = $row['id'];
+//                }
+//                // todo add else log
 //            }
-
-            //SMS_262525727、亲爱的“餐厨宝”会员，您的${name}账单已发送至您的微信小程序支付界面，请您尽快前往确认并支付，感谢您的支持！
-            $TemplateCode = "SMS_262525727";
-            foreach ($recovery_bill as $k => $row) {
-                $phoneNumber = $row['mobile'];
-                $TemplateParam = json_encode(['name' => $row['order_no']]);
-                $is_success = $this->SmsTemplate($TemplateCode, $phoneNumber, $TemplateParam);
-
-                if ($is_success) {
-                    $ids[] = $row['id'];
-                }
-                // todo add else log
-            }
-
-//            var_dump($ids);
-
-            if (count($ids) > 0) {
-                $data = [
-                    'pay_timeout' => 1,
-                ];
-                $where['id'] = ['in', $ids];
-                $recovery_bill_model->isUpdate(true, $where)->save($data);
-
-                echo(__('发送成功'));
-            }
-        }
-
-        //餐具月结账单
-        $tableware_bill_model = new TablewareBill();
-        $tableware_bill = $tableware_bill_model->alias('b')
-            ->join('user u', 'b.c_user_id = u.id')
-            ->field('b.id,b.c_user_id,u.mobile,b.order_no')
-            ->where('b.status', '=', 1)
-            ->where('b.pay_timeout', '=', 0)
-            ->where('b.createtime', '<=', $overtime)
-            ->select();
-
-        if (count($tableware_bill) != 0) {
-            $ids = [];
-//            $mobiles = [];
+//
+////            var_dump($ids);
+//
+//            if (count($ids) > 0) {
+//                $data = [
+//                    'pay_timeout' => 1,
+//                ];
+//                $where['id'] = ['in', $ids];
+//                $recovery_bill_model->isUpdate(true, $where)->save($data);
+//
+//                echo(__('发送成功'));
+//            }
+//        }
+//
+//        //餐具月结账单
+//        $tableware_bill_model = new TablewareBill();
+//        $tableware_bill = $tableware_bill_model->alias('b')
+//            ->join('user u', 'b.c_user_id = u.id')
+//            ->field('b.id,b.c_user_id,u.mobile,b.order_no')
+//            ->where('b.status', '=', 1)
+//            ->where('b.pay_timeout', '=', 0)
+//            ->where('b.createtime', '<=', $overtime)
+//            ->select();
+//
+//        if (count($tableware_bill) != 0) {
+//            $ids = [];
+////            $mobiles = [];
+////            foreach ($tableware_bill as $k => $row) {
+////                $mobiles[] = $row['mobile'];
+////                $ids[] = $row['id'];
+////            }
+//
+////            $msg = "有餐具月结账单未支付，请及时催收";
+////            $template = 1;
+////            $ret = Smslib::notice($mobiles, $msg, $template);
+//
+//            $TemplateCode = "SMS_262525727";
 //            foreach ($tableware_bill as $k => $row) {
-//                $mobiles[] = $row['mobile'];
-//                $ids[] = $row['id'];
+//                $phoneNumber = $row['mobile'];
+//                $TemplateParam = json_encode(['name' => $row['order_no']]);
+//                $is_success = $this->SmsTemplate($TemplateCode, $phoneNumber, $TemplateParam);
+//
+//                if ($is_success) {
+//                    $ids[] = $row['id'];
+//                }
+//                // todo add else log
 //            }
-
-//            $msg = "有餐具月结账单未支付，请及时催收";
-//            $template = 1;
-//            $ret = Smslib::notice($mobiles, $msg, $template);
-
-            $TemplateCode = "SMS_262525727";
-            foreach ($tableware_bill as $k => $row) {
-                $phoneNumber = $row['mobile'];
-                $TemplateParam = json_encode(['name' => $row['order_no']]);
-                $is_success = $this->SmsTemplate($TemplateCode, $phoneNumber, $TemplateParam);
-
-                if ($is_success) {
-                    $ids[] = $row['id'];
-                }
-                // todo add else log
-            }
-
-            if (count($ids) > 0) {
-                $data_tableware_bill = [
-                    'pay_timeout' => 1,
-                ];
-                $where_tableware_bill['id'] = ['in', $ids];
-                $tableware_bill_model->isUpdate(true, $where_tableware_bill)->save($data_tableware_bill);
-
-                echo(__('发送成功'));
-            }
-        }
-    }
+//
+//            if (count($ids) > 0) {
+//                $data_tableware_bill = [
+//                    'pay_timeout' => 1,
+//                ];
+//                $where_tableware_bill['id'] = ['in', $ids];
+//                $tableware_bill_model->isUpdate(true, $where_tableware_bill)->save($data_tableware_bill);
+//
+//                echo(__('发送成功'));
+//            }
+//        }
+//    }
 
 
     /**

application/api/controller/Delivery.php

@@ -483,7 +483,7 @@ class Delivery extends Api
         }
 
         $user_model = new User();
-        $c_user_info = $user_model->field('id,nickname')->where(['id' => $c_user_id, 'level' => 1, 'type' => 1])->find();
+        $c_user_info = $user_model->field('id,mobile,nickname')->where(['id' => $c_user_id, 'level' => 1, 'type' => 1])->find();
         if (empty($c_user_info)) {
             $this->error('商家信息错误');
             return;
@@ -532,9 +532,18 @@ class Delivery extends Api
             $tableware_bill_model->save($insert_data);
 
             Db::commit();
+
+            //SMS_262525727、亲爱的“餐厨宝”会员，您的${name}账单已发送至您的微信小程序支付界面，请您尽快前往确认并支付，感谢您的支持！
+            $TemplateCode = "SMS_262525727";
+            $phoneNumber = $c_user_info['mobile'];
+            $TemplateParam = json_encode(['name' => $order_no]);
+            $sms_model = new Chuyutimedtask();
+            $sms_model->SmsTemplate($TemplateCode, $phoneNumber, $TemplateParam);
+
             $this->success('已发送');
             return;
-        } catch (Exception $e) {
+        } catch
+        (Exception $e) {
             Db::rollback();
             $this->error('发送失败，请重试');
             return;

application/api/controller/Recoveryorder.php

@@ -328,7 +328,7 @@ class Recoveryorder extends Api
         }
 
         $user_model = new User();
-        $c_user_info = $user_model->field('id,nickname')->where('id', $c_user_id)->where(['level' => 1, 'type' => 1])->find();
+        $c_user_info = $user_model->field('id,mobile,nickname')->where('id', $c_user_id)->where(['level' => 1, 'type' => 1])->find();
         if (empty($c_user_info)) {
             $this->error('商家信息错误');
             return;
@@ -374,6 +374,13 @@ class Recoveryorder extends Api
             $recovery_bill_model->save($insert_data);
 
             Db::commit();
+            //SMS_262525727、亲爱的“餐厨宝”会员，您的${name}账单已发送至您的微信小程序支付界面，请您尽快前往确认并支付，感谢您的支持！
+            $TemplateCode = "SMS_262525727";
+            $phoneNumber = $c_user_info['mobile'];
+            $TemplateParam = json_encode(['name' => $order_no]);
+            $sms_model = new Chuyutimedtask();
+            $sms_model->SmsTemplate($TemplateCode, $phoneNumber, $TemplateParam);
+
             $this->success('已发送');
             return;
         } catch (Exception $e) {