From f84a99c9581d07d8b943522196e38fadb6878ec7 Mon Sep 17 00:00:00 2001
From: wuhui_zzw <1760308791@qq.com>
Date: Fri, 29 Dec 2023 19:41:56 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=EF=BC=9A=E9=83=A8=E5=88=86?=
 =?UTF-8?q?=E8=AE=A2=E5=8D=95=E9=87=91=E9=A2=9D=E8=AE=A1=E7=AE=97=E7=9B=B8?=
 =?UTF-8?q?=E5=85=B3=E5=86=85=E5=AE=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/jobs/store/platformCommission/GiveWeightValueJob.php | 2 +-
 app/jobs/store/platformCommission/SparateLegumesJob.php  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/jobs/store/platformCommission/GiveWeightValueJob.php b/app/jobs/store/platformCommission/GiveWeightValueJob.php
index acf9075..4729be9 100644
--- a/app/jobs/store/platformCommission/GiveWeightValueJob.php
+++ b/app/jobs/store/platformCommission/GiveWeightValueJob.php
@@ -27,7 +27,7 @@ class GiveWeightValueJob implements JobInterface{
             $userList = app()->make(WeightValueRepository::class)->getUserHoldList($data['uid']);
             $orderIds = StoreOrder::where('group_order_id',$data['group_order_id'])->column('order_id');// 获取订单id
             $productList = StoreOrderProduct::whereIn('order_id',$orderIds)
-                ->field('order_product_id,order_id,product_id,product_price')
+                ->field('order_product_id,order_id,product_id,(product_price + integral + integral_price) as product_price')
                 ->select()
                 ->toArray();// 获取当前订单中所有商品
             $updateData = [];
diff --git a/app/jobs/store/platformCommission/SparateLegumesJob.php b/app/jobs/store/platformCommission/SparateLegumesJob.php
index 6f794b5..c574636 100644
--- a/app/jobs/store/platformCommission/SparateLegumesJob.php
+++ b/app/jobs/store/platformCommission/SparateLegumesJob.php
@@ -28,7 +28,7 @@ class SparateLegumesJob implements JobInterface{
             if((int)$cycleLegumes['status'] != 0) throw new \Exception('当前豆豆已分配！');
             // 获取时间段所有消费用户
             $orderList = StoreOrder::whereNotIn('status',[-1,11])
-                ->field('order_id,uid,(sum(pay_price) + sum(use_platform_integral_price)) as sum_money')
+                ->field('order_id,uid,(sum(pay_price) + sum(use_legumes_integral)) as sum_money')
                 ->whereBetweenTime('pay_time',$cycleLegumes['start_time'],$cycleLegumes['end_time'])
                 ->group('order_id')
                 ->select()