订单线下支付

app/admin/controller/member/MemberController.php

@@ -4,6 +4,7 @@ namespace app\admin\controller\member;
 
 use app\admin\service\member\MemberService;
 use app\admin\validate\member\MemberValidate;
+use app\model\CouponDetail;
 use app\model\Family;
 use app\model\FamilyMember;
 use app\model\Member;
@@ -27,9 +28,9 @@ class MemberController
         $res = Db::table('member')
             ->leftjoin('member_cert', 'member.member_id', '=', 'member_cert.join_cert_member_id')
             ->leftjoin('member_info', 'member.member_id', '=', 'member_info.join_info_member_id')
-            ->select('member.member_id', 'member.member_mobile', 'member_cert.member_cert_name','member_info.member_info_nickname')
+            ->select('member.member_id', 'member.member_mobile', 'member_cert.member_cert_name', 'member_info.member_info_nickname')
             ->where('member.member_is_owner', $isOwner)
-            ->where('member_status','ACTIVED')
+            ->where('member_status', 'ACTIVED')
             // ->where('member_mobile','<>','0000')
             ->where(function ($query) use ($keywords) {
                 $query->where('member.member_mobile', 'like', '%' . $keywords . '%')
@@ -41,19 +42,19 @@ class MemberController
         foreach ($res as $item) {
             // $item->member_mobile = substr($item->member_mobile,0,3).'****'.substr($item->member_mobile,7);
             $name = '';
-            if(!empty($item->member_cert_name)){
+            if (!empty($item->member_cert_name)) {
                 $name = $item->member_cert_name;
-            }else if(!empty($item->member_info_nickname)){
+            } else if (!empty($item->member_info_nickname)) {
                 $name = $item->member_info_nickname;
             }
-            $value = !empty($name) ? $name.'-' : '';
-            if ($item->member_mobile != '0000'){
+            $value = !empty($name) ? $name . '-' : '';
+            if ($item->member_mobile != '0000') {
                 $value .= $item->member_mobile;
             }
-            if (empty($value)){
+            if (empty($value)) {
                 $value = $item->member_mobile;
             }
-            $value = rtrim($value,'-');
+            $value = rtrim($value, '-');
             $data[] = [
                 'key' => $item->member_id,
                 'value' => $value,
@@ -63,7 +64,8 @@ class MemberController
         return json_success('', $data);
     }
 
-    public function exportMember(Request $request){
+    public function exportMember(Request $request)
+    {
 
         return MemberService::exportMember($request);
     }
@@ -121,9 +123,9 @@ class MemberController
 
     public function selectMemberAllQuota(Request $request)
     {
-        $memberId = $request->get('member_id','');
+        $memberId = $request->get('member_id', '');
         $orderId = $request->get('order_id', '');
-        $goodsId = $request->get('goods_id','');
+        $goodsId = $request->get('goods_id', '');
         $person = $request->get('person', '');
         $selectType = $request->get('select_type', 'ALL');
 
@@ -197,9 +199,9 @@ class MemberController
      */
     public function selectMemberAllQuotaByAppointment(Request $request)
     {
-        $memberId = $request->get('member_id','');
+        $memberId = $request->get('member_id', '');
         $orderId = $request->get('order_id', '');
-        $goodsId = $request->get('goods_id','');
+        $goodsId = $request->get('goods_id', '');
         $person = $request->get('person', '');
         $selectType = $request->get('select_type', 'ALL');
 
@@ -237,7 +239,7 @@ class MemberController
             ->groupBy('join_quota_member_id', 'join_member_rule_added_component_id')
             ->get()
             ->toArray();
-            
+
         $data['quota'] = [];
         foreach ($quotas as $quota) {
             $usedNum = MemberQuota::where('join_quota_member_id', $quota['join_quota_member_id'])
@@ -454,4 +456,18 @@ class MemberController
     {
         return MemberService::deleteDevice($request);
     }
+
+    public function coupon(Request $request)
+    {
+        $memberId = $request->get('member_id','');
+        $active = $request->get('active','');
+
+        $coupons = CouponDetail::where('join_coupon_detail_member_id',$memberId)
+            ->leftJoin('coupon','coupon.coupon_id','=','coupon_detail.join_detail_coupon_id')
+            ->groupBy('join_detail_coupon_id')
+            ->get()
+            ->toArray();
+
+        dump($coupons);
+    }
 }

app/admin/controller/order/WholeController.php

@@ -718,7 +718,7 @@ class WholeController extends Curd
         // 验证线下付款密码
         if ($params['pay_constitute'] == 'N' && in_array($params['pay_category'],['OFFLINE'])){
             $password = $params['offline_password'];
-            if ($password != '123456') {
+            if ($password != '666888') {
                 return json_fail("密码错误，请重新输入");
             }
         }
@@ -1178,7 +1178,7 @@ class WholeController extends Curd
         // 验证线下付款密码
         if (!empty($params['pay_category_constitute']) && in_array('OFFLINE',$params['pay_category_constitute'])){
             $password = $params['offline_password'];
-            if ($password != '123456') {
+            if ($password != '666888') {
                 return json_fail("密码错误，请重新输入");
             }
         }
@@ -1612,7 +1612,7 @@ class WholeController extends Curd
             // 验证线下付款密码
             if ($params['settlement_now'] == 'Y' && $params['pay_constitute'] == 'N' && in_array($params['pay_category'],['OFFLINE'])){
                 $password = $params['offline_password'];
-                if ($password != '123456') {
+                if ($password != '666888') {
                     return json_fail("密码错误，请重新输入");
                 }
             }
@@ -2145,7 +2145,7 @@ class WholeController extends Curd
             // 验证线下付款密码
             if (!empty($params['pay_category_constitute']) && in_array('OFFLINE',$params['pay_category_constitute'])){
                 $password = $params['offline_password'];
-                if ($password != '123456') {
+                if ($password != '666888') {
                     return json_fail("密码错误，请重新输入");
                 }
             }

route/admin.php

@@ -646,6 +646,7 @@ Route::group('/admin', function () {
             Route::get('/selectMemberAllQuotaByAppointment', [\app\admin\controller\member\MemberController::class, 'selectMemberAllQuotaByAppointment']);
             Route::get('/welfareInfo', [\app\admin\controller\member\MemberController::class, 'welfareInfo']);
             Route::get('/vipInfo', [\app\admin\controller\member\MemberController::class, 'vipInfo']);
+            Route::get('/coupon', [\app\admin\controller\member\MemberController::class, 'coupon']);
             Route::get('/balanceInfo', [\app\admin\controller\member\MemberController::class, 'balanceInfo']);
             Route::get('/pointInfo', [\app\admin\controller\member\MemberController::class, 'pointInfo']);
             Route::get('/list', [\app\admin\controller\member\MemberController::class, 'list']);