订单优惠券调整

app/admin/controller/order/GoodsController.php

@@ -514,8 +514,8 @@ class GoodsController extends Curd
                 } else {
                     $account->member_account_surplus = $account->member_account_surplus - $params['order_amount_pay'];
                 }
-                if ($account->member_account_surplus == 0){
-                    MemberService::accountToDone($account->member_account_id,$account->member_account_surplus,$account->member_account_added);
+                if ($account->member_account_surplus == 0) {
+                    MemberService::accountToDone($account->member_account_id, $account->member_account_surplus, $account->member_account_added);
                 }
                 $account->member_account_expend = $account->member_account_expend + $params['order_amount_pay'];
                 $account->member_account_update_user_id = JwtToken::getCurrentId();
@@ -1208,8 +1208,8 @@ class GoodsController extends Curd
                 } else {
                     $account->member_account_surplus = $account->member_account_surplus - $params['order_amount_pay'];
                 }
-                if ($account->member_account_surplus == 0){
-                    MemberService::accountToDone($account->member_account_id,$account->member_account_surplus,$account->member_account_added);
+                if ($account->member_account_surplus == 0) {
+                    MemberService::accountToDone($account->member_account_id, $account->member_account_surplus, $account->member_account_added);
                 }
                 $account->member_account_expend = $account->member_account_expend + $params['order_amount_pay'];
                 $account->member_account_update_user_id = JwtToken::getCurrentId();
@@ -1681,8 +1681,8 @@ class GoodsController extends Curd
                     } else {
                         $account->member_account_surplus = $account->member_account_surplus - $item['amount'];
                     }
-                    if ($account->member_account_surplus == 0){
-                        MemberService::accountToDone($account->member_account_id,$account->member_account_surplus,$account->member_account_added);
+                    if ($account->member_account_surplus == 0) {
+                        MemberService::accountToDone($account->member_account_id, $account->member_account_surplus, $account->member_account_added);
                     }
                     $account->member_account_update_user_id = JwtToken::getCurrentId();
                     $account->member_account_updatetimes = time();
@@ -1794,6 +1794,8 @@ class GoodsController extends Curd
                             $payAmountUseCoupon = $params['order_amount_pay'] - ($params['order_amount_total'] - $orderAmount['amount']);
                             if (in_array($goods['goods_id'], $orderAmount['goodsIds'])) {
                                 $amountPay = round((floatval($goods['goods_sales_price']) * $goods['nbr'] / $orderAmount['amount']) * $payAmountUseCoupon, 2);
+                            }else{
+                                $amountPay = floatval($goods['goods_sales_price']) * $goods['nbr'];
                             }
                         } else {
                             $orderAmount['amount'] = $params['order_amount_total'];
@@ -1865,8 +1867,8 @@ class GoodsController extends Curd
                 $account->member_account_surplus = $account->member_account_surplus - $amount;
             }
 
-            if ($account->member_account_surplus == 0){
-                MemberService::accountToDone($account->member_account_id,$account->member_account_surplus,$account->member_account_added);
+            if ($account->member_account_surplus == 0) {
+                MemberService::accountToDone($account->member_account_id, $account->member_account_surplus, $account->member_account_added);
             }
             $account->member_account_update_user_id = JwtToken::getCurrentId();
             $account->member_account_updatetimes = time();

app/admin/controller/order/ServicesController.php

@@ -1884,6 +1884,8 @@ class ServicesController extends Curd
                             $payAmountUseCoupon = $params['order_amount_pay'] - ($params['order_amount_total'] - $orderAmount['amount']);
                             if (in_array($goods['goods_id'], $orderAmount['goodsIds'])) {
                                 $amountPay = round((floatval($goods['goods_sales_price']) * $goods['nbr'] / $orderAmount['amount']) * $payAmountUseCoupon, 2);
+                            }else{
+                                $amountPay = floatval($goods['goods_sales_price']) * $goods['nbr'];
                             }
                         } else {
                             $orderAmount['amount'] = $params['order_amount_total'];

app/admin/controller/order/WholeController.php

@@ -5552,7 +5552,6 @@ class WholeController extends Curd
                     'nbr' => 1,
                     'gain_datetime' => date('Y-m-d 00:00:00')
                 ];
-
                 CouponDetailService::customSendService($chooseCoupons, '', [$memberId], '');
             }
         }

app/admin/service/coupon/CardService.php

@@ -35,6 +35,13 @@ class CardService
         return $cardId;
     }
 
+    /**
+     * @Desc 储值卡过期
+     * @Author Gorden
+     * @Date 2024/12/6 14:38
+     *
+     * @return void
+     */
     public static function checkExpired()
     {
         $unixTime = time();
@@ -61,6 +68,8 @@ class CardService
             $cardNow->card_extend_json = json_encode($cardExtendJson);
             $cardNow->save();
 
+            _syslog('储值卡',"【" . $card['card_id'] . '】已过期',false,['card_id'=>$card['card_id']],1001);
+
             Log::info("储值卡：【" . $card['card_id'] . '】已过期');
         }
     }

app/admin/service/order/OrderService.php

@@ -595,12 +595,13 @@ class OrderService
                     ->where('join_goods_coupon_id', $couponId)
                     ->where('coupon_detail.join_coupon_detail_member_id', $memberId)
                     ->where('coupon_detail.coupon_detail_gain_datetime', '<=', date('Y-m-d H:i:s'))
-                    ->where('coupon_detail.coupon_detail_deadline_datetime', '>=', date('Y-m-d H:i:s'));
-                if ($settlementNow == 'Y' && $type == 'pay') {
-                    $couponDetail = $couponDetail->whereIn('coupon_detail.coupon_detail_status', ['ACTIVED']);
-                } else {
-                    $couponDetail = $couponDetail->where('coupon_detail.coupon_detail_status', 'ACTIVED');
-                }
+                    ->where('coupon_detail.coupon_detail_deadline_datetime', '>=', date('Y-m-d H:i:s'))
+                    ->where('coupon_detail.coupon_detail_status', 'ACTIVED');
+//                if ($settlementNow == 'Y' && $type == 'pay') {
+//                    $couponDetail = $couponDetail->whereIn('coupon_detail.coupon_detail_status', ['ACTIVED']);
+//                } else {
+//                    $couponDetail = $couponDetail->where('coupon_detail.coupon_detail_status', 'ACTIVED');
+//                }
                 $couponDetail = $couponDetail->orderBy('coupon_detail_id', 'DESC')
                     ->first();
                 if (!$couponDetail) {