WIN-2308041133\Administrator 2 months ago
parent
commit
c711443720

+ 3 - 2
app/common/repositories/store/order/StoreOrderRepository.php

@@ -3260,7 +3260,8 @@ class StoreOrderRepository extends BaseRepository
                 $balance = bcsub($cart_info['cart_num'], $verify_num, 0);
 //                $v['verify_num'] = \app\common\model\store\order\StoreCart::where('product_id',$v['product_id'])->where('cart_id',$v['cart_id'])->value('verify_num');
                 $store_name = $storeProduct->where('product_id', $v->product_id)->value('store_name');
-                self::verifyRecord($order->order_id,$serviceId , $v->product_id, $num,$balance,$user_name,$store_name);
+                $order_sn = $storeProduct->where('product_id', $v->product_id)->value('order_sn');
+                self::verifyRecord($order_sn,$serviceId , $v->product_id, $num,$balance,$user_name,$store_name);
 //                ($order_id,$uid,$product_id,$num,$balance,$mark){
             }
             // 调用订单分割函数进行订单核销操作,并更新订单对象
@@ -3327,7 +3328,7 @@ class StoreOrderRepository extends BaseRepository
 
     public function verifyRecord($order_id,$uid,$product_id,$num,$balance,$user_name,$product_name){
             $mark = $user_name.'服务中心核销'.$product_name.'商品'.$num.'件';
-            VerifyRecord::create(['order_id'=>$order_id,'uid'=>$uid,'product_id'=>$product_id,'num'=>$num,'balance'=>$balance,'mark'=>$mark,'status'=>0,'verify_time'=>time()]);
+            VerifyRecord::create(['order_sn'=>$order_id,'uid'=>$uid,'product_id'=>$product_id,'num'=>$num,'balance'=>$balance,'mark'=>$mark,'status'=>0,'verify_time'=>time()]);
             return true;
     }
 

+ 5 - 0
app/common/repositories/store/order/VerifyRecordRepository.php

@@ -84,6 +84,11 @@ class VerifyRecordRepository extends BaseRepository
         // 查询满足条件的数据列表,带有 'label' 关联数据,按 'label_rule_id' 倒序排列
         // 分页查询,返回当前页码的 $limit 条数据,并将结果转换为数组形式
         $list = $query->page($page, $limit)->order('verify_time DESC')->select()->toArray();
+        foreach ($list as &$item){
+            $product = $item['product'];
+            unset($item['product']);
+            $item['product'][0]=$product;
+        }
         // 返回包含数据总数和数据列表的数组
         return compact('count', 'list');
     }