Merge branch 'master' of http://39.98.194.76:3000/txct/wanyue_app

app/admin/controller/member/BenefitController.php

@@ -71,6 +71,7 @@ class BenefitController extends Curd
         ])
             ->where('join_benefit_member_id', $id)
             ->where('join_benefit_package_id', '<>', '')
+            ->orderBy('member_benefit_addtimes','DESC')
             ->get()
             ->toArray();
         foreach ($benefit as &$item){
@@ -248,6 +249,7 @@ class BenefitController extends Curd
         ])->where('join_appointment_member_id', $memberId)
             ->where('join_appointment_member_benefit_id', $benefitId)
             ->where('appointment_status', 'DONE')
+            ->orderBy('appointment_done_datetime','DESC')
             ->get();
 
         foreach ($quotas as &$quota) {
@@ -282,6 +284,7 @@ class BenefitController extends Curd
         ])
             ->where('join_benefit_member_id', $memberId)
             ->where('join_benefit_package_id', '')
+            ->orderBy('member_benefit_addtimes','DESC')
             ->get()
             ->toArray();
         foreach ($benefit as &$item){

app/admin/controller/member/QuotaController.php

@@ -91,16 +91,22 @@ class QuotaController extends Curd
                 ->where('join_member_rule_added_component_id', $row['join_member_rule_added_component_id'])
                 ->first()
                 ->toArray();
-            $quotaTotal = MemberQuota::where('join_quota_member_id', $row['join_quota_member_id'])
-                ->where('join_member_rule_added_component_id', $row['join_member_rule_added_component_id'])
-                ->count();
             $quotaUsed = MemberQuota::where('join_quota_member_id', $row['join_quota_member_id'])
+            ->where('join_member_rule_added_component_id', $row['join_member_rule_added_component_id'])
+            ->where('member_quota_status', 'USED')
+            ->count();
+            $quota['used'] = $quotaUsed;
+            if ($quota['member_quota_nbr'] == '-99.00'){
+                $quota['total'] = '不限次';
+                $quota['unused'] = '不限次';
+            }else{
+                $quotaTotal = MemberQuota::where('join_quota_member_id', $row['join_quota_member_id'])
                 ->where('join_member_rule_added_component_id', $row['join_member_rule_added_component_id'])
-                ->where('member_quota_status', 'USED')
                 ->count();
-            $quota['total'] = $quotaTotal;
-            $quota['used'] = $quotaUsed;
-            $quota['unused'] = $quotaTotal - $quotaUsed;
+                $quota['total'] = $quotaTotal;
+                $quota['unused'] = $quotaTotal - $quotaUsed;
+            }
+            
 
             $addedId = RuleAddedComponent::where('rule_added_component_id', $row['join_member_rule_added_component_id'])->value('join_component_rule_added_id');
             $addedName = RuleAdded::where('rule_added_id', $addedId)->value('rule_added_name');
@@ -258,18 +264,18 @@ class QuotaController extends Curd
             ->limit($nbr)
             ->get()
             ->toArray();
-        if (count($quotas) < intval($nbr)) {
+        if ($quotas[0]['member_quota_nbr'] != '-99.00' && count($quotas) < intval($nbr)) {
             return json_fail("可核销数量不足");
         }
 
-        $member = Member::find(current($memberId));
-        $mobile = $member->member_mobile;
-        $key = "SMS:CODE:QUOTA:" . $mobile;
-        $redisCode = Redis::get($key);
-        if ($redisCode != $code) {
-            return json_fail("验证码错误，请重新输入");
-        }
-        Redis::del($key);
+        // $member = Member::find(current($memberId));
+        // $mobile = $member->member_mobile;
+        // $key = "SMS:CODE:QUOTA:" . $mobile;
+        // $redisCode = Redis::get($key);
+        // if ($redisCode != $code) {
+        //     return json_fail("验证码错误，请重新输入");
+        // }
+        // Redis::del($key);
 
         if (!$times) {
             $params['times'] = date('Y-m-d H:i:s');
@@ -280,16 +286,30 @@ class QuotaController extends Curd
         try {
             // 生成核销数据
             $writeOffData = AddedService::generateWriteOffData($params);
-            foreach ($quotas as $quota) {
-                $writeOffData['member_quota_id'] = $quota['member_quota_id'];
-
-                MemberQuota::where('member_quota_id', $quota['member_quota_id'])->update([
-                    'member_quota_status' => 'USED',
-                    'member_quota_used_json' => json_encode($writeOffData)
-                ]);
+            if($quotas[0]['member_quota_nbr'] != '-99.00'){
+                foreach ($quotas as $quota) {
+                    $writeOffData['member_quota_id'] = $quota['member_quota_id'];
+    
+                    MemberQuota::where('member_quota_id', $quota['member_quota_id'])->update([
+                        'member_quota_status' => 'USED',
+                        'member_quota_used_json' => json_encode($writeOffData)
+                    ]);
+                }
+            }else{
+                $quota = $quotas[0];
+                for($i=0;$i<$nbr;$i++){
+                    $quota['member_quota_id'] = 'MQ'.date('YmdHis').random_string(6,'up');
+                    $quota['member_quota_status'] = 'USED';
+                    $quota['member_quota_used_json'] = json_encode($writeOffData);
+                    $quota['member_quota_addtimes'] = time();
+                    $quota['member_quota_nbr'] = 1;
+                    MemberQuota::insert($quota);
+                }
             }
+            
 
         } catch (\Exception $e) {
+            dump($e->getMessage());
             return json_fail("核销失败");
         }
 

app/admin/service/notify/RechargeService.php

@@ -102,7 +102,6 @@ class RechargeService
         $diff = $added->rule_added_goods_diff;
 
         $components = RuleAddedComponent::where('join_component_rule_added_id', $addedId)->get()->toArray();
-        dump($diff,$components);
         switch ($diff) {
             case "SUM":
                 self::diffSum($memberId, $components);
@@ -192,7 +191,7 @@ class RechargeService
                 self::doSaveMemberQuota($memberId, $component, 1);
             }
         } elseif ($component['rule_added_component_classify'] == 'YEAR') {
-            if ($component['rule_added_component_goods_nbr'] == -99) {
+            if ($component['rule_added_component_goods_nbr'] == "-99.00") {
                 self::doSaveMemberQuota($memberId, $component, -99);
             } else {
                 for ($i = 0; $i < intval($component['rule_added_component_goods_nbr']); $i++) {
@@ -200,7 +199,7 @@ class RechargeService
                 }
             }
         } else {
-            if ($component['rule_added_component_goods_nbr'] == -99) {
+            if ($component['rule_added_component_goods_nbr'] == "-99.00") {
                 self::doSaveMemberQuota($memberId, $component, -99);
             } else {
                 for ($i = 0; $i < intval($component['rule_added_component_goods_nbr']); $i++) {