分红-增加限制分配条件，并增加记录日志

app/controller/api/store/merchant/TaskPartnerProfits.php

@@ -94,7 +94,7 @@ class TaskPartnerProfits
      */
     public function getOrderUidListByTime($startTime, $endTime, array $removeUserIdList = []): array
     {
-        $uidList = [];
+        $orderUidMap = [];
         try {
             // 本地订单
             $storeOrder = Db::name("store_order")
@@ -103,22 +103,28 @@ class TaskPartnerProfits
                 ->whereIn('status', [0, 1, 2, 3])
                 ->whereBetween("pay_time", [$startTime, $endTime])
                 ->whereNotNull("pay_time") // 排除 pay_time 为 NULL 的订单
-                ->field('mer_id, status, pay_time, total_price, uid')
+                ->field('mer_id, status, pay_time, total_price, uid, order_id, order_sn')
                 ->select()
                 ->toArray();
-            $storeOrderUidList = array_column($storeOrder, 'uid');
-            $uidList = array_merge($uidList, $storeOrderUidList);
+            foreach ($storeOrder as $order) {
+                $orderUidMap[$order['uid']][] = ['orderTable' => 'store_order', 'orderId' => $order['order_id'], 'orderSn' => $order['order_sn']];
+            }
+            // $storeOrderUidList = array_column($storeOrder, 'uid');
+            // $uidList = array_merge($uidList, $storeOrderUidList);
 
             // 话费订单 order_huafei
             $orderHuafei = Db::name("order_huafei")
                 ->whereNotIn('uid', $removeUserIdList)
                 ->where('status', '<>', 0) // 只要不是待支付的 即算是有效活跃度
                 ->whereBetween("finish_time", [$startTime, $endTime])
-                ->field('order_huafei_id, uid, status, finish_time, amount_price')
+                ->field('order_huafei_id, uid, status, finish_time, amount_price, order_sn')
                 ->select()
                 ->toArray();
-            $orderHuafeiUidList = array_column($orderHuafei, 'uid');
-            $uidList = array_merge($uidList, $orderHuafeiUidList);
+            foreach ($orderHuafei as $order) {
+                $orderUidMap[$order['uid']][] = ['orderTable' => 'order_huafei', 'orderId' => $order['order_huafei_id'], 'orderSn' => $order['order_sn']];
+            }
+            // $orderHuafeiUidList = array_column($orderHuafei, 'uid');
+            // $uidList = array_merge($uidList, $orderHuafeiUidList);
 
             // 三方订单
             // 京东
@@ -126,41 +132,53 @@ class TaskPartnerProfits
                 ->whereNotIn('uid', $removeUserIdList)
                 ->where('status', '<>', 15) // 只要不是待支付的 即算是有效活跃度
                 ->whereBetween("create_time", [$startTime, $endTime])
-                ->field('order_jd_id, uid, status, create_time, price')
+                ->field('order_jd_id, uid, status, create_time, price, order_sn')
                 ->select()
                 ->toArray();
-            $orderJdUidList = array_column($orderJd, 'uid');
-            $uidList = array_merge($uidList, $orderJdUidList);
+            foreach ($orderJd as $order) {
+                $orderUidMap[$order['uid']][] = ['orderTable' => 'order_jd', 'orderId' => $order['order_jd_id'], 'orderSn' => $order['order_sn']];
+            }
+            // $orderJdUidList = array_column($orderJd, 'uid');
+            // $uidList = array_merge($uidList, $orderJdUidList);
             // 淘宝
             $orderTb = Db::name("order_tb")
                 ->whereNotIn('uid', $removeUserIdList)
                 // ->where('status', '<>', 15) // 只要不是待支付的 即算是有效活跃度 不能明确状态信息
                 ->whereBetween("create_time", [$startTime, $endTime])
-                ->field('order_tb_id, uid, tk_status, create_time, pay_price')
+                ->field('order_tb_id, uid, tk_status, create_time, pay_price, order_sn')
                 ->select()
                 ->toArray();
-            $orderTbUidList = array_column($orderTb, 'uid');
-            $uidList = array_merge($uidList, $orderTbUidList);
+            foreach ($orderTb as $order) {
+                $orderUidMap[$order['uid']][] = ['orderTable' => 'order_tb', 'orderId' => $order['order_tb_id'], 'orderSn' => $order['order_sn']];
+            }
+            // $orderTbUidList = array_column($orderTb, 'uid');
+            // $uidList = array_merge($uidList, $orderTbUidList);
             // 拼多多
             $orderPdd = Db::name("order_pdd")
                 ->whereNotIn('uid', $removeUserIdList)
                 ->where('pin_order_status', '<>', -1) // 只要不是待支付的 即算是有效活跃度 不能明确状态信息
                 ->whereBetween("group_time", [strtotime($startTime), strtotime($endTime)])
-                ->field('order_pdd_id, uid, pin_order_status, create_time, pay_money')
+                ->field('order_pdd_id, uid, pin_order_status, create_time, pay_money, order_sn')
                 ->select()
                 ->toArray();
-            $orderPddUidList = array_column($orderPdd, 'uid');
-            $uidList = array_merge($uidList, $orderPddUidList);
+            foreach ($orderPdd as $order) {
+                $orderUidMap[$order['uid']][] = ['orderTable' => 'order_pdd', 'orderId' => $order['order_pdd_id'], 'orderSn' => $order['order_sn']];
+            }
+            // $orderPddUidList = array_column($orderPdd, 'uid');
+            // $uidList = array_merge($uidList, $orderPddUidList);
             // 唯品会
             $orderVip = Db::name("order_vip")
                 ->whereNotIn('uid', $removeUserIdList)
                 ->where('status', '<>', 0) // 只要不是待支付的 即算是有效活跃度 不能明确状态信息
                 ->whereBetween("order_time", [strtotime($startTime), strtotime($endTime)])
-                ->field('order_vip_id, uid, status, order_time, pay_money')
+                ->field('order_vip_id, uid, status, order_time, pay_money, order_sn')
                 ->select()
                 ->toArray();
-            $orderVipUidList = array_column($orderVip, 'uid');
-            $uidList = array_merge($uidList, $orderVipUidList);
+            foreach ($orderVip as $order) {
+                $orderUidMap[$order['uid']][] = ['orderTable' => 'order_vip', 'orderId' => $order['order_vip_id'], 'orderSn' => $order['order_sn']];
+            }
+            // $orderVipUidList = array_column($orderVip, 'uid');
+            // $uidList = array_merge($uidList, $orderVipUidList);
         } catch (DataNotFoundException|ModelNotFoundException|DbException $e) {
             Log::error('分红-获取下单用户列表失败：' . json_encode([
                     'error_message' => $e->getMessage(),
@@ -171,7 +189,7 @@ class TaskPartnerProfits
                     'trace' => $e->getTraceAsString()
                 ], JSON_UNESCAPED_UNICODE));
         }
-        return $uidList;
+        return $orderUidMap;
     }
 
     public function getRedEnvelopeByTime($startTime, $endTime, $removeUserIdList = [])
@@ -415,8 +433,8 @@ class TaskPartnerProfits
 
         // 6、记录日志
         // 获取周期内所有符合条件的订单
-        $feeUids = $this->getOrderUidListByTime($startTime, $endTime, $removeUserIdList);
-
+        $orderUidMap = $this->getOrderUidListByTime($startTime, $endTime, $removeUserIdList);
+        $feeUids = array_keys($orderUidMap);
 
         // 7、执行分红
         $testRecord = [];
@@ -479,6 +497,9 @@ class TaskPartnerProfits
                     continue;
                 }
                 $dividendLogEntity->setArrivalPoint(bcadd($dividendLogEntity->getArrivalPoint() ?: '0.00', $allAward, 2));
+                $arrivalInfo = $dividendLogEntity->getArrivalInfo() ?: [];
+                $arrivalInfo[$v] = $orderUidMap[$v];
+                $dividendLogEntity->setArrivalInfo($arrivalInfo);
 
                 if ($isTest == 0) {
                     $userdatassss = db::name("old_user_jbp")->where("id", $v)->find();

app/entity/data/dividend/DividendLogEntity.php

@@ -17,6 +17,7 @@ class DividendLogEntity extends DataEntity
     public $expected = null;
     public $feeWaiverUids = null;  // 免分配人员ID集合（可能由于业绩不达标）
     public $arrivalPoint = null;  // 到账金额
+    public $arrivalInfo = null;  // 到账金额
     public $result = null;  // 实际分配结果
     public $isTest = null;  // 是否为测试数据
     public $remark = null;  // 备注
@@ -229,6 +230,30 @@ class DividendLogEntity extends DataEntity
     /**
      * @return mixed
      */
+    public function getArrivalInfo()
+    {
+        if (is_string($this->arrivalInfo)) {
+            return json_decode($this->arrivalInfo, true);
+        }
+        return $this->arrivalInfo;
+    }
+
+    /**
+     * @param mixed $arrivalInfo
+     * @return DividendLogEntity
+     */
+    public function setArrivalInfo($arrivalInfo): DividendLogEntity
+    {
+        if (is_array($arrivalInfo)) {
+            $arrivalInfo = json_encode($arrivalInfo);
+        }
+        $this->arrivalInfo = $arrivalInfo;
+        return $this;
+    }
+
+    /**
+     * @return mixed
+     */
     public function getResult()
     {
         return $this->result;