From 710fa976b0f1684b506ee29b45649ba6cba16069 Mon Sep 17 00:00:00 2001
From: wuhui_zzw <1760308791@qq.com>
Date: Fri, 29 Dec 2023 19:21:09 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=EF=BC=9A=E5=95=86=E5=93=81?=
 =?UTF-8?q?=E6=8A=B5=E6=89=A3=E5=92=8C=E7=A7=AF=E5=88=86=E5=95=86=E5=93=81?=
 =?UTF-8?q?=E5=85=91=E6=8D=A2=E7=9A=84=E5=A4=87=E6=B3=A8=E5=BA=94=E8=AF=A5?=
 =?UTF-8?q?=E4=B8=8D=E4=B8=80=E8=87=B4=EF=BC=8C=E6=98=BE=E7=A4=BA=E5=AF=B9?=
 =?UTF-8?q?=E5=BA=94=E7=9A=84=E5=A4=87=E6=B3=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../store/platformCommission/UseLegumesIntegralJob.php    | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/app/jobs/store/platformCommission/UseLegumesIntegralJob.php b/app/jobs/store/platformCommission/UseLegumesIntegralJob.php
index 1206e9d..656440a 100644
--- a/app/jobs/store/platformCommission/UseLegumesIntegralJob.php
+++ b/app/jobs/store/platformCommission/UseLegumesIntegralJob.php
@@ -25,7 +25,7 @@ class UseLegumesIntegralJob implements JobInterface{
             // 获取订单信息
             $orderInfo = app()->make(StoreOrderRepository::class)
                 ->getSearch([])
-                ->field('order_id,uid,use_legumes_integral,use_legumes_integral_price')
+                ->field('order_id,uid,use_legumes_integral,use_legumes_integral_price,order_type')
                 ->where('order_id',$data['order_id'])
                 ->find();
             if(!$orderInfo) throw new \Exception('信息不存在！');
@@ -52,6 +52,10 @@ class UseLegumesIntegralJob implements JobInterface{
                 $totalGetIntegral = $legumesModel->sum('get_integral');// 总获取积分
                 $totalUseIntegral = $legumesModel->sum('use_integral');// 总已使用积分
                 $hold_legumes_integral = (float)sprintf("%.2f",$totalGetIntegral - $totalUseIntegral);// 持有可使用积分
+                if($orderInfo['order_type'] == 20) $mark = '兑换积分商品消耗'.$orderInfo['use_legumes_integral'].'积分';
+                else $mark = '购买商品使用'.$orderInfo['use_legumes_integral'].'积分抵扣'.floatval($orderInfo['use_legumes_integral_price']).'元';
+
+
                 $bills[] = [
                     'uid'      => $orderInfo['uid'],
                     'link_id'  => $orderInfo['order_id'],
@@ -61,7 +65,7 @@ class UseLegumesIntegralJob implements JobInterface{
                     'type'     => 'deduction',
                     'number'   => (float)$orderInfo['use_legumes_integral'],
                     'balance'  => $hold_legumes_integral,
-                    'mark'     => '购买商品使用'.$orderInfo['use_legumes_integral'].'积分抵扣'.floatval($orderInfo['use_legumes_integral_price']).'元',
+                    'mark'     => $mark,
                     'mer_id'   => 0,
                     'status'   => 1
                 ];