修复内容

application/api/controller/Calendar.php

@@ -17,20 +17,23 @@ class Calendar extends ApiBase
         if (!preg_match('/^\d{4}-\d{2}$/', $month)) {
             return $this->_error("月份格式错误，请使用格式：2026-01");
         }
-        
         // 计算该月的开始和结束日期
         $startDate = $month . '-01';
         $endDate = date('Y-m-t', strtotime($startDate)); // 获取该月最后一天
+
+        $uid = $this->user_id;
         
-        // 查询该月份的所有服务数据，关联商品表和员工表
+        // 查询该月份的所有服务数据，关联总订单表、商品表和员工表
         $service = Db::name('order_exe')
             ->alias('oe')
+            ->join('order o', 'oe.order_sn = o.order_sn', 'INNER')
             ->join('goods g', 'oe.goods_id = g.id', 'LEFT')
             ->join('staff s', 'oe.staff_id = s.id', 'LEFT')
+            ->where('o.user_id', $uid)
             ->where('oe.date', '>=', $startDate)
             ->where('oe.date', '<=', $endDate)
             ->where('oe.abnormal', 0)
-            ->field('oe.staff_status,oe.date,oe.addtime,oe.start_time,oe.timeout,oe.xq,oe.staff_id,s.name as staff_name,s.onwork,s.leave,g.name as goods_name')
+            ->field('oe.staff_status,oe.date,oe.addtime,oe.start_time,oe.timeout,oe.xq,oe.staff_id,oe.order_sn,s.name as staff_name,s.onwork,s.leave,g.name as goods_name')
             ->order('oe.date asc, oe.addtime asc')
             ->select();
         
@@ -38,9 +41,10 @@ class Calendar extends ApiBase
         if ($service) {
             foreach ($service as $v) {
                 // 如果有绑定员工，但员工状态不符合要求，则跳过
-                if (!empty($v['staff_id']) && ($v['onwork'] != 1 || $v['leave'] != 1)) {
-                    continue;
-                }
+                // 注释掉员工状态过滤，先看看是否能查询出来
+                // if (!empty($v['staff_id']) && ($v['onwork'] != 1 || $v['leave'] != 1)) {
+                //     continue;
+                // }
                 
                 // 处理服务时间
                 $timeRange = '';

application/api/controller/Payment.php

@@ -75,7 +75,9 @@ class Payment extends ApiBase
         if ($order['pay_status'] == Pay::ISPAID || $order['order_amount'] == 0) {
             $this->_success('支付成功', ['order_id' => $order['id']], 10001);
         }
-
+        if ($post['order_source'] == null){
+            $post['order_source'] = 1;
+        }
         $result = PaymentLogic::pay($post['from'], $order, $post['order_source']);
         if (false === $result) {
             $this->_error(PaymentLogic::getError(), ['order_id' => $order['id']], PaymentLogic::getReturnCode());
@@ -86,7 +88,6 @@ class Payment extends ApiBase
              * 支付成功
              * 添加对应商品积分
              */
-
             $this->_success('', $result, PaymentLogic::getReturnCode());
         }
 

application/api/controller/UserAddress.php

@@ -75,11 +75,11 @@ class UserAddress extends ApiBase
         $result = $this->validate($post, 'app\api\validate\UserAddress.add');
         if ($result === true) {
             $user_id = $this->user_id;
-             $adder=Db::name('user_address')->whereLike('telephone',$post['telephone'])->find();    //判断电话号码存在
-            if($adder){
-                $adderss=Db::name('user_address')->whereLike('telephone',$post['telephone'])->update(['user_id'=>$user_id]);
-                $this->_success('添加成功',  $adderss);
-            }
+//             $adder=Db::name('user_address')->whereLike('telephone',$post['telephone'])->find();    //判断电话号码存在
+//            if($adder){
+//                $adderss=Db::name('user_address')->whereLike('telephone',$post['telephone'])->update(['user_id'=>$user_id]);
+//                $this->_success('添加成功',  $adderss);
+//            }
             $result = UserAddressLogic::addUserAddress($user_id, $post);
             if ($result) {
                 $this->_success('添加成功', $result);