.well-known/acme-challenge/QGTfAcLOWmw4whJ02mWHaWLj2CWDjuREt6_TsDW90AU

@@ -1 +0,0 @@
-QGTfAcLOWmw4whJ02mWHaWLj2CWDjuREt6_TsDW90AU.ygZpRA3Elso4JmfhhS2sEZzf8WSBgcsagKxvXavv6_M

app/ExceptionHandle.php

@@ -23,8 +23,6 @@ use think\exception\HttpResponseException;
 use think\exception\ValidateException;
 use think\Response;
 use Throwable;
-use Exception;
-use think\facade\Request;
 
 /**
  * 应用异常处理类
@@ -52,22 +50,8 @@ class ExceptionHandle extends Handle
      */
     public function report(Throwable $exception): void
     {
-        $data = [
-            'file'    => $exception->getFile(),
-            'line'    => $exception->getLine(),
-            'message' => $this->getMessage($exception),
-            'code'    => $this->getCode($exception),
-            'http'    =>Request::url()
-        ];
-        $log = "[{$data['code']}]{$data['message']}[{$data['file']}:{$data['line']}]";
-        if ($this->app->config->get('log.record_trace')) {
-            $log .= PHP_EOL . $exception->getTraceAsString();
-        }
-        try {
-            $this->app->log->record($log, 'error');
-        } catch (Exception $e) {}
         // 使用内置的方式记录异常日志
-        // parent::report($exception);
+        parent::report($exception);
     }
 
     /**

app/common/dao/store/StoreActivityDao.php

@@ -16,14 +16,12 @@ namespace app\common\dao\store;
 use app\common\dao\BaseDao;
 use app\common\dao\store\product\CloudProductDao;
 use app\common\model\store\product\CloudProduct;
-use app\common\model\store\product\Product;
 use app\common\model\store\StoreActivity;
 use app\common\model\store\StoreActivityOrderProduct;
 use app\common\repositories\store\product\SpuRepository;
 use think\db\Query;
 use think\exception\ValidateException;
 use think\facade\Db;
-use think\facade\Log;
 
 /**
  *
@@ -56,9 +54,8 @@ class StoreActivityDao extends BaseDao
      */
     public function product($userId, $location, $streetCode, $activityId)
     {
-        $limit = 5;
         [$lat, $lng] = (new CityAreaDao())->getLngAndLat($location, $streetCode);
-        $cloud_product_arr = (new CloudProductDao())->getByDistance($lat, $lng, ['activity_id' => $activityId], $limit);
+        $cloud_product_arr = (new CloudProductDao())->getByDistance($lat, $lng, ['activity_id' => $activityId], 4);
         $cloud_product = [];
         foreach ($cloud_product_arr as $key => $value) {
             $cloud_product[] = $value['product_id'];
@@ -76,14 +73,10 @@ class StoreActivityDao extends BaseDao
         }
         /** @var SpuRepository $spuRep */
         $spuRep = app()->make(SpuRepository::class);
-        $products = $spuRep->getApiSearch($where, 1, $limit, false, true);
+        $products = $spuRep->getApiSearch($where, 1, 4, false, true);
         $canBuy = 1;
         if ($products['list']) {
             $list = $products['list'];
-            $productList = array_column($list->toArray(), 'product');
-            $oldProductIds = array_column($productList, 'old_product_id');
-            $oldProductList = Product::whereIn('product_id', $oldProductIds)->field('product_id,stock')->select()->toArray();
-            $oldProductList = reset_index($oldProductList, 'product_id');
             foreach ($cloud_product_arr as $key => $value) {
                 if (!empty($userId)) {
                     $buyRecord = $this->canBuy($userId, $value['product_id']);
@@ -94,13 +87,6 @@ class StoreActivityDao extends BaseDao
                 foreach ($list as $k => $v) {
                     if ($activityId == 2) {
                         $list[$k]['limited_price'] = '2.00';
-                        if (isset($oldProductList[$v['product']['old_product_id']])) {
-                            $list[$k]['product']['stock'] = $oldProductList[$v['product']['old_product_id']]['stock'];
-                            $list[$k]['stock'] = $oldProductList[$v['product']['old_product_id']]['stock'];
-                            if ($list[$k]['stock'] < 1) {
-                                $list[$k]['product']['image'] = $list[$k]['product']->sellOutImage;
-                            }
-                        }
                     }
                     if ($value['product_id'] == $v['product_id']) {
                         if ($value['mer_labels'] == ',5,') {
@@ -145,22 +131,14 @@ class StoreActivityDao extends BaseDao
     {
         $orderProductIds = array_column($order->orderProduct->toArray(), 'product_id');
         $productIds = CloudProduct::whereIn('product_id', $orderProductIds)->where('activity_id', $activityId)->column('product_id');
-        if (empty($productIds)) {
-            return;
-        }
-        // $find = StoreActivityOrderProduct::where('user_id', $order['uid'])->where('status', 1)->find();
         foreach ($productIds as $productId) {
-            // if (!empty($find['product_id']) && $find['product_id'] == $productId && $activityId == 2) {
-            //     throw new ValidateException('活动商品限购1个');
-            // }
             $model = new StoreActivityOrderProduct();
             $model->user_id = $order['uid'];
             $model->activity_id = $activityId;
             $model->product_id = $productId;
             $model->number = 1;
             if (!$model->save()) {
-                Log::error('活动商品数据保存失败productId'.$productId);
-                // throw new ValidateException('活动商品数据保存失败');
+                throw new ValidateException('活动商品数据保存失败');
             }
         }
     }

app/common/dao/store/StoreActivityOrderDao.php

@@ -62,11 +62,9 @@ class StoreActivityOrderDao extends BaseDao
     public function repeal(int $groupOrderId)
     {
         $model = StoreActivityOrder::where('group_order_id', $groupOrderId)->find();
-        if ($model) {
-            $model->status = StoreActivityOrder::STATUS_INVALID;
-            if (!$model->save()) {
-                throw new \Exception('活动订单保存失败');
-            }
+        $model->status = StoreActivityOrder::STATUS_INVALID;
+        if (!$model->save()) {
+            throw new \Exception('活动订单保存失败');
         }
     }
 

app/common/dao/store/StoreActivityUserDao.php

@@ -5,7 +5,6 @@ namespace app\common\dao\store;
 use app\common\dao\BaseDao;
 use app\common\dao\store\consumption\StoreConsumptionUserDao;
 use app\common\model\store\consumption\StoreConsumption;
-use app\common\model\store\consumption\StoreConsumptionDetail;
 use app\common\model\store\consumption\StoreConsumptionUser;
 use app\common\model\store\StoreActivityOrder;
 use app\common\model\store\StoreActivityUser;
@@ -85,44 +84,11 @@ class StoreActivityUserDao extends BaseDao
         return $data->value ?? 0;
     }
 
-    /**
-     * @deprecated 用下面的 default()
-     * @param int $userId
-     * @param int $activityId
-     * @return StoreActivityUser|array|mixed|\think\Model|null
-     * @throws \think\db\exception\DataNotFoundException
-     * @throws \think\db\exception\DbException
-     * @throws \think\db\exception\ModelNotFoundException
-     */
     public function getOne(int $userId, int $activityId = 1)
     {
         return StoreActivityUser::where('user_id', $userId)->where('activity_id', $activityId)->where('status', 1)->find();
     }
 
-    /**
-     * 获取用户参加的活动类型，默认为消费返利
-     * @param int $userId
-     * @param int $activityId
-     * @return StoreActivityUser|array|mixed|\think\Model|null
-     * @throws \think\db\exception\DataNotFoundException
-     * @throws \think\db\exception\DbException
-     * @throws \think\db\exception\ModelNotFoundException
-     */
-    public function default(int $userId, int $activityId = 1)
-    {
-        $default = StoreActivityUser::where('user_id', $userId)->where('activity_id', $activityId)->where('status', 1)->find();
-        if (empty($default)) {
-            $couponId = StoreConsumption::where('type', StoreConsumption::TYPE_OWNER_CONSUMPTION)->value('coupon_id');
-            $default = new StoreActivityUser();
-            $default->user_id = $userId;
-            $default->activity_id = $activityId;
-            $default->value = $couponId;
-            $default->status = 1;
-            $default->save();
-        }
-        return $default;
-    }
-
     /**
      * 获取用户参与活动的状态
      * @param int $userId 用户id
@@ -164,14 +130,11 @@ class StoreActivityUserDao extends BaseDao
         $userInfo = User::where('spread_uid', $userId)->field('uid,nickname,avatar')->select()->toArray();
         $storeConsumptionUserDao = new StoreConsumptionUserDao();
         $scope = $storeConsumptionUserDao->getScope($consumption, $myOrder['pay_price']);
-        // 订单有效金额为实付金额+红包金额
-        $orderValidAmount = bcadd($myOrder['pay_price'], $myOrder['red_pack'], 2);
-        $orderValidAmount = min($orderValidAmount, $storeConsumptionUserDao->maxAmount);
         $orderQuery = StoreActivityOrder::where('spread_id', $userId)
             ->whereIn('user_id', array_column($userInfo, 'uid'))
             ->where('activity_id', $activityId)
             ->where('is_first_order', StoreActivityOrder::IS_FIRST_ORDER)
-            ->where('pay_price', '>=', $orderValidAmount);
+            ->where('pay_price', '>=', $scope['start']);
         if (!empty($groupOrderIds)) {
             unset($groupOrderIds[0]);
             $orderQuery->whereIn('group_order_id', $groupOrderIds);
@@ -181,7 +144,7 @@ class StoreActivityUserDao extends BaseDao
         $orders = $orderQuery->select()->toArray();
         $orders = reset_index($orders, 'user_id');
         foreach ($userInfo as &$user) {
-            $user['target_amount'] = $orderValidAmount;
+            $user['target_amount'] = $scope['start'];
             $user['is_finish'] = isset($orders[$user['uid']]) ? 1 : 0;
         }
         return ['target' => $scope['num'], 'allow_receive' => count($orders) >= $scope['num'], 'user_info' => $userInfo];
@@ -236,7 +199,6 @@ class StoreActivityUserDao extends BaseDao
         $query = UserBill::field('link_id,create_time,number coupon_price,mark')
             ->where('uid', $userId)
             ->where('category', 'red_pack')
-            ->where('status', 1)
             ->where('type', "red_pack_{$type}");
         $count = $query->count();
         $record = $query->page($page)->limit($limit)->select()->toArray();
@@ -250,67 +212,37 @@ class StoreActivityUserDao extends BaseDao
         return ['total_amount' => $totalAmount, 'count' => $count, 'record' => $record];
     }
 
-    /**
-     * 红包获取记录
-     * @param int $userId
-     * @param int $type
-     * @param int $page
-     * @param int $limit
-     * @return array
-     * @throws \think\db\exception\DataNotFoundException
-     * @throws \think\db\exception\DbException
-     * @throws \think\db\exception\ModelNotFoundException
-     */
-    public function useRecord(int $userId, int $type, int $page, int $limit)
-    {
-        $totalAmount = StoreConsumptionUser::where('uid', $userId)
-            ->whereIn('type', $type)
-            ->where('status', StoreConsumptionUser::STATUS_UNUSED)
-            ->sum('balance');
-        $query = StoreConsumptionDetail::field('create_time,order_id,amount coupon_price,pay_price')
-            ->where('user_id', $userId)
-            ->where('type', 1);
-        $count = $query->count();
-        $record = $query->page($page)->limit($limit)->select()->toArray();
-        foreach ($record as &$item) {
-            $item['order_amount'] = bcadd($item['coupon_price'], $item['pay_price'], 2);
-        }
-        return ['total_amount' => $totalAmount, 'count' => $count, 'record' => $record];
-    }
-
     /**
      * 红包余额统计
      * @param int $userId
-     * @return array|array[]
-     * @throws \think\db\exception\DataNotFoundException
-     * @throws \think\db\exception\DbException
-     * @throws \think\db\exception\ModelNotFoundException
+     * @return array
      */
     public function total(int $userId)
     {
         $totalAmount = StoreConsumptionUser::where('uid', $userId)
             ->whereIn('type', [StoreConsumptionUser::TYPE_ONE, StoreConsumptionUser::TYPE_TWO])
-            ->whereIn('status', [StoreConsumptionUser::STATUS_UNUSED, StoreConsumptionUser::STATUS_REPEAL])
-            ->field('balance,type')
+            ->where('status', StoreConsumptionUser::STATUS_UNUSED)
+            ->field('SUM(balance) as total_amount,type')
+            ->group('type')
             ->select()->toArray();
+        $totalAmount = reset_index($totalAmount, 'type');
         $result = [
-            '1' => [
+            [
                 'type' => 1,
-                'total_amount' => 0.00,
-                'type_cn' => StoreConsumptionUser::TYPE_MAP[1],
+                'total_amount' => 0.00
             ],
-            '2' => [
+            [
                 'type' => 2,
-                'total_amount' => 0.00,
-                'type_cn' => StoreConsumptionUser::TYPE_MAP[2],
+                'total_amount' => 0.00
             ]
         ];
-        foreach ($totalAmount as $item) {
-            if (isset($result[$item['type']])) {
-                $result[$item['type']]['total_amount']= bcadd($result[$item['type']]['total_amount'], $item['balance'], 2);
+        foreach ($result as &$item) {
+            if (isset($totalAmount[$item['type']])) {
+                $item['total_amount'] = $totalAmount[$item['type']]['total_amount'];
             }
+            $item['type_cn'] = StoreConsumptionUser::TYPE_MAP[$item['type']];
         }
-        return array_values($result);
+        return $result;
     }
 
 }

app/common/dao/store/consumption/CommissionDao.php

@@ -2,14 +2,12 @@
 
 namespace app\common\dao\store\consumption;
 
-use app\common\dao\system\financial\FinancialDao;
 use app\common\model\store\consumption\StoreConsumption;
 use app\common\model\store\consumption\StoreConsumptionUser;
 use app\common\model\store\order\StoreOrder;
-use app\common\model\system\merchant\FinancialRecord;
 use app\common\model\system\merchant\Merchant;
 use app\common\model\user\User;
-use app\common\model\user\UserBill;
+use app\common\repositories\system\merchant\FinancialRecordRepository;
 use app\common\repositories\system\merchant\MerchantRepository;
 use crmeb\utils\Curl;
 use think\facade\Log;
@@ -20,56 +18,50 @@ class CommissionDao
     /**
      * 活动首单商户佣金 (支付成功后调用)
      * @param $order
-     * @param $financeDao
+     * @param $finance
+     * @param $financeSn
      * @return mixed
      * @throws \think\db\exception\DataNotFoundException
      * @throws \think\db\exception\DbException
      * @throws \think\db\exception\ModelNotFoundException
      */
-    public function firstOrderCommission($order, $financeDao)
+    public function firstOrderCommission($order, $finance, $financeSn)
     {
-        $commission = bcmul($order['pay_price'], 0.01, 2);
-        if ($commission > 0 && $order['order_type'] == 1) {
-            // 订单为自提，且佣金大于0
-            $financeDao->user = $order->user;
-            $financeDao->order = $order;
-            $financeDao->platformOut($commission, 'commission_to_store', $order['mer_id']);
-            app()->make(MerchantRepository::class)->addLockMoney($order['mer_id'], 'order', $order['order_id'], $commission);
-        }
         $consumption = StoreConsumption::where('status', 1)->where('type', StoreConsumption::TYPE_FIRST_ORDER_COMMISSION)->find();
         if (empty($consumption)) {
-            return $financeDao;
+            return $finance;
         }
         $storeConsumptionDao = new StoreConsumptionUserDao();
         $isFirstOrder = $storeConsumptionDao->isFirstOrder($order['uid'], $consumption['start_time'], $consumption['end_time']);
         if (!$isFirstOrder) {
-            return $financeDao;
+            return $finance;
+        }
+        $commission = bcmul($order['pay_price'], $consumption['config']['commission_rate'], 2);
+        if ($commission > 0) {
+            $finance[] = [
+                'order_id' => $order->order_id,
+                'order_sn' => $order->order_sn,
+                'user_info' => $order->user->nickname,
+                'user_id' => $order['uid'],
+                'financial_type' => 'first_order_commission',
+                'financial_pm' => 0,
+                'type' => 2,
+                'number' => $commission,
+                'mer_id' => $order->mer_id,
+                'financial_record_sn' => $financeSn
+            ];
+            app()->make(MerchantRepository::class)->addLockMoney($order['mer_id'], 'order', $order['order_id'], $commission);
+        }
+        $redPack = bcmul($order['pay_price'], $consumption['config']['red_pack_rate'], 2);
+        if ($redPack > 0) {
+            $userId = Merchant::where('mer_id', $order['mer_id'])->value('uid');
+            $storeConsumptionDao->send($consumption, $consumption['config']['red_pack_rate'], $userId, $order['order_id'], $order['pay_price'], StoreConsumptionUser::STATUS_UNUSED, StoreConsumptionUser::TYPE_TWO);
         }
-        // 给镇合伙人、村合伙人、小组服务团队、店铺分佣，仅直推
         $promotionCode = User::where('uid', $order['uid'])->value('promotion_code');
         if (!empty($promotionCode)) {
-            $merchantId = substr($promotionCode, strpos($promotionCode, 'mer_') + 4);
-            if (strpos($promotionCode, 'mer_') !== false && $merchantId) {
-                $userId = Merchant::where('mer_id', $merchantId)->value('uid');
-                $user = User::where('uid', $userId)->find();
-                $commission = bcmul($order['pay_price'], 0.03, 2);
-                $financeDao->user = $user;
-                $financeDao->order = $order;
-                $financeDao->platformOut($commission, 'commission_to_promoter', $merchantId);
-                app()->make(MerchantRepository::class)->addLockMoney($merchantId, 'order', $order['order_id'], $commission);
-                $redPack = bcmul($order['pay_price'], $consumption['config']['red_pack_rate'], 2);
-                if ($redPack > 0) {
-                    try {
-                        (new StoreConsumptionUserDao())->send($consumption, $consumption['config']['red_pack_rate'], $user['uid'], $order['order_id'], $order['pay_price'], StoreConsumptionUser::STATUS_UNUSED, StoreConsumptionUser::TYPE_TWO);
-                    } catch (\Exception $e) {
-                        Log::error($e->getMessage());
-                    }
-                }
-            } else {
-                $this->sendCommission($order, $promotionCode);
-            }
+            $this->sendCommission($order, $promotionCode);
         }
-        return $financeDao;
+        return $finance;
     }
 
     /**
@@ -80,45 +72,65 @@ class CommissionDao
      * @throws \think\db\exception\DbException
      * @throws \think\db\exception\ModelNotFoundException
      */
-    public function firstOrderCommissionCallback($data)
+    public function firstOrderBatchCommission($data)
     {
         $consumption = StoreConsumption::where('status', 1)->where('type', StoreConsumption::TYPE_FIRST_ORDER_COMMISSION)->find();
         if (empty($consumption)) {
             return [];
         }
-        $users = $this->getUsers($data['user']);
+        $financialRecordRepository = app()->make(FinancialRecordRepository::class);
+        $financeSn = $financialRecordRepository->getSn();
+        $users = $data['user'];
         $order = StoreOrder::where('order_id', $data['order_id'])->find();
         if (empty($order)) {
             return [];
         }
+        $finance = [];
         $result = [];
-        $financeDao = new FinancialDao();
-        foreach ($users as $user) {
+        foreach ($users as $k => $user) {
             $commission = bcdiv($user['user_profit'], 100, 2);
             if ($commission > 0) {
-                $financeDao->user = $user;
-                $financeDao->order = $order;
-                $financialType = $user['type'] == 4 ? 'commission_to_courier' : 'commission_to_promoter';
-                $financeDao->platformOut($commission, $financialType);
+                $finance[] = [
+                    'order_id' => $order->order_id,
+                    'order_sn' => $order->order_sn,
+                    'user_info' => $order->user->nickname,
+                    'user_id' => $order['uid'],
+                    'financial_type' => $user['type'] == 3 ? 'order_commission' : 'first_order_commission',
+                    'financial_pm' => 0,
+                    'type' => 2,
+                    'number' => $commission,
+                    'mer_id' => $order['mer_id'],
+                    'financial_record_sn' => $financeSn . ($k + 1)
+                ];
                 $result[] = $user;
             }
+            //用户是镇合伙人，不发放红包
+            if ($user['type'] == 3) {
+                continue;
+            }
             $redPack = bcmul($order['pay_price'], $consumption['config']['red_pack_rate'], 2);
-            if ($redPack > 0) {
+            $user = User::where('phone', $user['account'])->find();
+            if ($redPack > 0 && !empty($user)) {
                 try {
                     (new StoreConsumptionUserDao())->send($consumption, $consumption['config']['red_pack_rate'], $user['uid'], $order['order_id'], $order['pay_price'], StoreConsumptionUser::STATUS_UNUSED, StoreConsumptionUser::TYPE_TWO);
+                    $user->red_pack_balance = bcadd($user->red_pack_balance, $redPack, 2);
+                    if (!$user->save()) {
+                        throw new \Exception('红包余额更新出错');
+                    }
                 } catch (\Exception $e) {
                     Log::error($e->getMessage());
                 }
             }
         }
-        $financeDao->save();
+        if (count($finance) > 0) {
+            $financialRecordRepository->insertAll($finance);
+        }
         return $result;
     }
 
     /**
      * 给镇合伙人或推广人发放佣金（支付完成后调用，推广人仅首单奖励）
      * 请求发送给供应商平台后异步回调
-     * 暂时取消镇合伙人佣金
      * @param $order
      * @param $promotionCode
      * @param int $type 类型：1=>小组，2=>村合伙人，3=>镇合伙人，4=>配送员
@@ -130,127 +142,22 @@ class CommissionDao
         $timestamp = time();
         $json = ['timestamp' => $timestamp, 'data' => ['order_id' => $order['order_id'], 'order_sn' => $order['order_sn'], 'order_money' => bcmul($order['pay_price'], 100), 'promotion_code' => $promotionCode]];
         if ($type == 3) {
-            $json['data']['street_code'] = $promotionCode;
+            $json['street_code'] = $promotionCode;
         } elseif ($type == 4) {
-            $json['data']['courier_phone'] = $promotionCode;
+            $json['courier_phone'] = $promotionCode;
         } else {
-            $json['data']['promotion_code'] = $promotionCode;
+            $json['promotion_code'] = $promotionCode;
         }
         $aes = new \AES();
         $iv = $aes->buildIv($timestamp);
         $encrypt = $aes->encrypt($json, $iv);
         $api = in_array($type, [1, 2]) ? 'user_first_order_share_profit' : 'user_order_share_profit';
-        $url = env('task.new_worker_host_url') . '/api/shop_call/' . $api;
+        $url = env('task.worker_host_url') . '/api/shop_call/' . $api;
         $result = $curl->post($url, ['timestamp' => $timestamp, 'data' => $encrypt]);
         $result = json_decode($result, true);
-        Log::info('供销佣金：' . var_export($result, true));
-    }
-
-    /**
-     * 订单退款，店铺退佣金
-     * @param $refundOrder
-     * @return void
-     */
-    public function refundByOrder($refundOrder)
-    {
-        // 是否已经退过佣金
-        $refunded = FinancialRecord::where('order_id', $refundOrder->order['order_id'])
-            ->whereIn('financial_type', ['commission_to_store_refund', 'commission_to_courier_refund', 'commission_to_promoter_refund'])
-            ->count();
-        if ($refunded > 0) {
-            return;
-        }
-        // 退佣金和红包、保证金
-        $financeRecord = FinancialRecord::where('order_id', $refundOrder->order['order_id'])
-            ->whereIn('financial_type', ['commission_to_store', 'commission_to_courier', 'commission_to_promoter'])
-            ->field('user_id uid,user_info nickname,number,mer_id,financial_type')->select()->toArray();
-        if (empty($financeRecord)) {
-            return;
-        }
-        $userIds = [];
-        $financeDao = new FinancialDao();
-        foreach ($financeRecord as $item) {
-            $userIds[] = $item['uid'];
-            $financeDao->user = $item;
-            $financeDao->order = $refundOrder->order;
-            $financeDao->platformIn($item['number'], $item['financial_type'] . '_refund', $item['mer_id']);
-            if ($item['mer_id'] > 0) {
-                app()->make(MerchantRepository::class)->subLockMoney($item['mer_id'], 'order', $refundOrder->order['order_id'], $item['number']);
-            }
-        }
-        $financeDao->save();
-
-        // 服务团队退红包
-        $redPacks = UserBill::whereIn('uid', $userIds)->where('extra->order_id',$refundOrder->order['order_id'])->select()->toArray();
-        foreach ($redPacks as $redPack) {
-            (new StoreConsumptionUserDao())->refundByCommission($redPack['uid'], $refundOrder->order['order_id'], $redPack['number']);
-        }
-
-        $promotionCode = User::where('uid', $refundOrder['uid'])->value('promotion_code');
-        if ($promotionCode && strpos($promotionCode, 'mer_') === false){
-            $curl = new Curl();
-            $aes = new \AES();
-            $timestamp = time();
-            $json = ['timestamp' => $timestamp, 'data' => ['order_sn' => $refundOrder->order['order_sn']]];
-            $iv = $aes->buildIv($timestamp);
-            $encrypt = $aes->encrypt($json, $iv);
-            $url = env('task.new_worker_host_url') . '/api/shop_call/handleRefund';
-            $result = $curl->post($url, ['timestamp' => $timestamp, 'data' => $encrypt]);
-            $result = json_decode($result, true);
-            Log::error('发起佣金退款：' . var_export($result, true));
+        if ($result['code'] != 1) {
+            Log::error('发送佣金失败：', $result);
         }
     }
 
-    /**
-     * @deprecated 暂时弃用，后续可能会用
-     * 供销平台退佣金回调
-     * @param $data
-     * @return array
-     * @throws \think\db\exception\DataNotFoundException
-     * @throws \think\db\exception\DbException
-     * @throws \think\db\exception\ModelNotFoundException
-     */
-    public function refundByCallback($data)
-    {
-        $result = [];
-        $users = $this->getUsers($data['user']);
-        $order = StoreOrder::where('order_id', $data['order_id'])->find();
-        if (empty($order) || empty($users)) {
-            return [];
-        }
-        $financeDao = new FinancialDao();
-        foreach ($users as $user) {
-            $commission = bcdiv($user['user_profit'], 100, 2);
-            if ($commission > 0) {
-                $financeDao->user = $user;
-                $financeDao->order = $order;
-                $financialType = ($user['type'] == 3 ? 'order_commission' : 'first_order_commission') . '_refund';
-                $financeDao->platformIn($commission, $financialType);
-                $result[] = $user;
-            }
-            $redPack = bcmul($order['pay_price'], 0.07, 2);
-            if ($redPack > 0) {
-                try {
-                    (new StoreConsumptionUserDao())->refundByCommission($user['uid'], $order->order_id, $redPack);
-                } catch (\Exception $e) {
-                    Log::error($e->getMessage());
-                }
-            }
-        }
-        $financeDao->save();
-        return $result;
-    }
-
-    public function getUsers($info)
-    {
-        $info = reset_index($info, 'account');
-        $users = User::whereIn('account', array_keys($info))->field('uid,account,nickname')->select()->toArray();
-        foreach ($users as &$user) {
-            if (isset($info[$user['account']])) {
-                $user = array_merge($info[$user['account']], $user);
-            }
-        }
-        return $users;
-    }
-
-}
+}

app/common/dao/store/consumption/StoreConsumptionDao.php

@@ -27,7 +27,7 @@ class StoreConsumptionDao extends BaseDao
     {
         return StoreConsumption::whereIn('type', [StoreConsumption::TYPE_OWNER_CONSUMPTION, StoreConsumption::TYPE_PULL_CONSUMPTION])->where('status', StoreConsumption::STATUS_ENABLE)
         ->field('coupon_id,start_time,end_time,title')->select()->each(function ($item){
-                if($item['title']=='无门槛实物通用补贴'){
+                if($item['title']=='无门槛实物通用红包'){
                     $item['title'] = '用户推荐拉新活动';
                 }else{
                     $item['title'] = '用户消费补贴活动';

app/common/dao/store/consumption/StoreConsumptionUserDao.php

@@ -5,55 +5,19 @@ namespace app\common\dao\store\consumption;
 use app\common\dao\BaseDao;
 use app\common\dao\store\StoreActivityOrderDao;
 use app\common\dao\store\StoreActivityUserDao;
-use app\common\dao\system\financial\FinancialDao;
 use app\common\model\store\consumption\StoreConsumption;
 use app\common\model\store\consumption\StoreConsumptionUser;
 use app\common\model\store\order\StoreGroupOrder;
-use app\common\model\store\order\StoreOrder;
 use app\common\model\store\StoreActivityOrder;
 use app\common\model\user\User;
 use app\common\repositories\user\UserBillRepository;
-use think\exception\ValidateException;
 use think\facade\Db;
 
 class StoreConsumptionUserDao extends BaseDao
 {
 
-    /** @var float $maxAmount 单笔订单计算红包的最大有效金额 */
     public $maxAmount = 20000;
 
-    /** @var float $orderTotalPrice 订单总金额 */
-    public $orderTotalPrice;
-
-    /** @var float $orderPayPrice 订单实付金额 */
-    public $orderPayPrice;
-
-    /** @var float $orderProductPrice 当前商品金额 */
-    public $orderProductPrice;
-
-    /** @var float $realPriceTotal 扣除红包后实际支付金额 */
-    public $realPriceTotal = 0;
-
-    /** @var float $isLast 是否最后一条数据 */
-    public $isLast = false;
-
-    /** @var float $groupOrderTotalPrice 订单组总金额 */
-    public $groupOrderTotalPrice;
-
-    /** @var float $consumptionTotalAmount 红包总金额 */
-    public $consumptionTotalAmount;
-    /** @var int $orderType 订单类型：1 groupOrder，2 order */
-    public $orderType = 2;
-    /** @var float $consumptionUsed 已使用的红包金额 */
-    public $consumptionUsed;
-    /** @var float $profitRate 商品毛利率 */
-    public $profitRate;
-
-    public $startTime;
-    public $endTime;
-    public $billExtra;
-    public $onlyBill = false; // 是否只写入用户账单
-
     protected function getModel(): string
     {
         return StoreConsumptionUser::class;
@@ -91,7 +55,7 @@ class StoreConsumptionUserDao extends BaseDao
      */
     public function promoter(int $userId, $groupOrder, int $spreadUserId)
     {
-        $activityUser = (new StoreActivityUserDao())->default($userId);
+        $activityUser = (new StoreActivityUserDao())->getOne($userId);
         $consumption = (new StoreConsumptionDao())->getOne($activityUser['value'] ?? 0);
         //用户没有参加 消费金活动 或 已超过任务完成时间
         $endTime = $this->getEndTime($activityUser['create_time'] ?? '2024-01-01 00:00:00');
@@ -110,7 +74,6 @@ class StoreConsumptionUserDao extends BaseDao
             $storeActivityOrderDao = new StoreActivityOrderDao();
             $storeActivityOrder = $storeActivityOrderDao->save($groupOrder, $spreadUserId, $isFirstOrder);
             if ($consumption['type'] == StoreConsumption::TYPE_OWNER_CONSUMPTION && $storeActivityOrder['status'] == StoreActivityOrder::STATUS_VALID && $storeActivityOrder['red_pack'] == 0) {
-                $this->orderType = 1;
                 $this->send($consumption, $scope['rate'], $userId, $groupOrder['group_order_id'], $orderValidAmount, StoreConsumptionUser::STATUS_UNUSED);
                 $this->send($consumption, $scope['rate_two'], $userId, $groupOrder['group_order_id'], $orderValidAmount, StoreConsumptionUser::STATUS_UNUSED, StoreConsumptionUser::TYPE_TWO);
                 $storeActivityOrderDao->repeal($groupOrder['group_order_id']);
@@ -135,7 +98,7 @@ class StoreConsumptionUserDao extends BaseDao
     public function guest(int $userId, $groupOrder, int $spreadUserId)
     {
         // 查询推荐人的消费金类型
-        $spreadActivityUser = (new StoreActivityUserDao())->default($spreadUserId);
+        $spreadActivityUser = (new StoreActivityUserDao())->getOne($spreadUserId);
         $endTime = $this->getEndTime($spreadActivityUser['create_time'] ?? '2024-01-01 00:00:00');
         $spreadConsumption = (new StoreConsumptionDao())->getOne($spreadActivityUser['value'] ?? 0);
         // 查询推荐人满足条件的有效订单
@@ -165,7 +128,6 @@ class StoreConsumptionUserDao extends BaseDao
                     $spreadOrderIds = "{$spreadGroupOrder['group_order_id']}," . $spreadOrderIds;
                     // 使用了红包，订单有效金额需要乘以80%
                     $orderValidAmount = $spreadGroupOrder['red_pack'] > 0 ? bcmul($orderValidAmount, 0.8, 2) : $orderValidAmount;
-                    $this->orderType = 1;
                     $this->send($spreadConsumption, $spreadScope['rate'], $spreadUserId, $spreadOrderIds, $orderValidAmount);
                     $storeActivityOrderDao->batchRepeal(explode(',', $spreadOrderIds));
                 }
@@ -238,17 +200,12 @@ class StoreConsumptionUserDao extends BaseDao
      */
     public function send($consumption, float $rate, int $userId, string $groupOrderIds, float $amount, $status = -2, $type = 1)
     {
-        $title = $type == StoreConsumptionUser::TYPE_TWO ? '补贴' : '春耕采购余额';
+        $title = $type == StoreConsumptionUser::TYPE_TWO ? '现金抵扣红包' : '无门槛实物通用红包';
         $model = StoreConsumptionUser::where('uid', $userId)->where('type', StoreConsumptionUser::TYPE_TWO)->find();
         $couponPrice = bcmul($amount, $rate, 2);
         if (!empty($model) && $model['type'] == $type) {
-            if (!$this->onlyBill) {
-                $model->coupon_price = bcadd($model->coupon_price, $couponPrice, 2);
-                $model->balance = bcadd($model->balance, $couponPrice, 2);
-                if ($model->status != StoreConsumptionUser::STATUS_UNUSED) {
-                    $model->status = StoreConsumptionUser::STATUS_UNUSED;
-                }
-            }
+            $model->coupon_price = bcadd($model->coupon_price, $couponPrice, 2);
+            $model->balance = bcadd($model->balance, $couponPrice, 2);
         } else {
             $model = new StoreConsumptionUser();
             $model->coupon_id = $consumption['coupon_id'];
@@ -259,13 +216,10 @@ class StoreConsumptionUserDao extends BaseDao
             $model->balance = $model->coupon_price;
             $model->order_amount = $amount;
             $model->create_time = date('Y-m-d H:i:s');
-            $model->start_time = $this->startTime ?: date('Y-m-d H:i:s', time() + 7 * 86400);
-            $model->end_time = $this->endTime ?: '2026-01-15 23:59:59';
+            $model->start_time = date('Y-m-d H:i:s', time() + 7 * 86400);
+            $model->end_time = '2026-01-15 23:59:59';
             $model->type = $type;
             $model->status = $status;
-            if ($this->onlyBill === true) {
-                $model->status = StoreConsumptionUser::STATUS_REPEAL;
-            }
         }
         if (!$model->save()) {
             throw new \Exception('发放失败');
@@ -273,22 +227,12 @@ class StoreConsumptionUserDao extends BaseDao
         // 写入红包日志
         /** @var  $userBillRepository UserBillRepository */
         $userBillRepository = app()->make(UserBillRepository::class);
-        $extra = ['order_amount' => $amount, 'coupon_user_id' => $model['coupon_user_id']];
-        if ($this->orderType == 2) {
-            $extra['order_id'] = $groupOrderIds;
-        } else {
-            $extra['group_order_id'] = $groupOrderIds;
-        }
-        if (!empty($this->billExtra)) {
-            $extra = array_merge($extra, $this->billExtra);
-        }
         $userBillRepository->incBill($userId, 'red_pack', "red_pack_{$type}", [
             'link_id' => $model['coupon_user_id'],
-            'status' => $status == -1 ?: 1,
+            'status' => 1,
             'title' => '获得' . $title,
             'number' => $couponPrice,
             'mark' => '获得' . $title . $couponPrice . ",订单金额：{$amount}",
-            'extra' => json_encode($extra, JSON_UNESCAPED_UNICODE),
             'balance' => 0
         ]);
     }
@@ -307,16 +251,8 @@ class StoreConsumptionUserDao extends BaseDao
         if ($isNewUser == 0) {
             return 0;
         }
-        $exceptGroupOrderIds = StoreOrder::where('uid', $userId)
-            ->where('source', 105)
-            ->group('group_order_id')
-            ->column('group_order_id');
-        $count = StoreGroupOrder::where('uid', $userId)
-            ->whereNotIn('group_order_id', $exceptGroupOrderIds)
-            ->where('paid', 1)
-            ->whereBetweenTime('pay_time', $startTime, $endTime)
-            ->count();
-        return intval($count <= 0);
+        $count = StoreGroupOrder::where('uid', $userId)->where('paid', 1)->whereBetweenTime('pay_time', $startTime, $endTime)->count();
+        return intval($count <= 1);
     }
 
     public function getEndTime($datetime)
@@ -324,26 +260,6 @@ class StoreConsumptionUserDao extends BaseDao
         return strtotime('+1 year', strtotime($datetime));
     }
 
-    /**
-     * 增加红包余额
-     * @param $id
-     * @param $amount
-     * @throws \think\db\exception\DataNotFoundException
-     * @throws \think\db\exception\DbException
-     * @throws \think\db\exception\ModelNotFoundException
-     */
-    public function increase($id, $amount)
-    {
-        $storeConsumptionUser = StoreConsumptionUser::where('coupon_user_id', $id)->find();
-        if (empty($storeConsumptionUser)) {
-            throw new \Exception('红包记录不存在');
-        }
-        $storeConsumptionUser->balance = bcadd($storeConsumptionUser->balance, $amount, 2);
-        if (!$storeConsumptionUser->save()) {
-            throw new \Exception('红包余额更新出错');
-        }
-    }
-
     /**
      * 扣减红包余额
      * @param $id
@@ -359,221 +275,10 @@ class StoreConsumptionUserDao extends BaseDao
             throw new \Exception('红包余额不足');
         }
         $balance = bcsub($storeConsumptionUser->balance, $amount, 2);
-        $storeConsumptionUser->balance = $balance;
-        if ($balance <= 0 && $storeConsumptionUser->type == StoreConsumptionUser::TYPE_ONE) {
-            $storeConsumptionUser->status = StoreConsumptionUser::STATUS_USED;
-        }
+        $storeConsumptionUser->balance = max($balance, 0);
         if (!$storeConsumptionUser->save()) {
             throw new \Exception('红包余额更新出错');
         }
     }
 
-    /**
-     * @deprecated 已废弃，用下面的 typeTwoByProduct 和 typeOneByProduct
-     * 根据订单商品计算实际金额和红包金额
-     * @return array
-     */
-    public function calculate()
-    {
-        // 把所有金额转换成分，避免红包金额产生误差
-        $orderTotalPrice = $this->orderTotalPrice * 100;
-        $orderPayPrice = $this->orderPayPrice * 100;
-        $productPrice = $this->orderProductPrice * 100;
-        $realPriceTotal = $this->realPriceTotal * 100;
-        $consumptionAmount = 0;
-        if ($orderTotalPrice == $orderPayPrice) {
-            $realPrice = $productPrice;
-        } else {
-            $rate = bcdiv($productPrice, $orderTotalPrice, 5);
-            $realPrice = $this->isLast ? bcsub($orderPayPrice, $realPriceTotal, 2) : ceil(bcmul($orderPayPrice, $rate, 5));
-            $consumptionAmount = $productPrice - $realPrice;
-        }
-        $realPriceTotal += $realPrice;
-        $realPrice = bcdiv($realPrice, 100, 2);
-        $consumptionAmount = bcdiv($consumptionAmount, 100, 2);
-        $realPriceTotal = bcdiv($realPriceTotal, 100, 2);
-        /** $realPrice：实际支付的金额，$realPriceTotal：实际支付金额总计，$consumptionAmount：红包金额总计 */
-        return [$realPrice, $realPriceTotal, $consumptionAmount];
-    }
-
-    /**
-     * @deprecated 已废弃，用下面的 typeTwoByProduct 和 typeOneByProduct
-     * 根据订单计算实际金额和红包金额
-     * @return array
-     */
-    public function calculateByOrder()
-    {
-        // 把所有金额转换成分，避免红包金额产生误差
-        $orderTotalPrice = $this->orderTotalPrice * 100;
-        $groupOrderTotalPrice = $this->groupOrderTotalPrice * 100;
-        $consumptionBalance = $this->consumptionTotalAmount * 100;
-        $rate = bcdiv($orderTotalPrice, $groupOrderTotalPrice, 5);
-        if ($consumptionBalance >= $groupOrderTotalPrice) {
-            $useAmount = $orderTotalPrice;
-        } else {
-            $useAmount = $this->isLast ? $consumptionBalance : ceil(bcmul($consumptionBalance, $rate, 5));
-        }
-        $consumptionBalance -= $useAmount;
-        $payPrice = $orderTotalPrice - $useAmount;
-        $groupOrderTotalPrice -= $useAmount;
-
-        $payPrice = bcdiv($payPrice, 100, 2);
-        $useAmount = bcdiv($useAmount, 100, 2);
-        $consumptionBalance = bcdiv($consumptionBalance, 100, 2);
-        $groupOrderTotalPrice = bcdiv($groupOrderTotalPrice, 100, 2);
-        /** $payPrice：实际支付的金额，$groupOrderTotalPrice：实际支付金额总计，$useAmount：红包金额总计，$consumptionAmount：红包余额总计 */
-        return [$payPrice, $groupOrderTotalPrice, $useAmount, $consumptionBalance];
-    }
-
-    /**
-     * 通过订单id退用户红包
-     * @param $refundOrder
-     * @return void
-     * @throws \think\db\exception\DataNotFoundException
-     * @throws \think\db\exception\DbException
-     * @throws \think\db\exception\ModelNotFoundException
-     */
-    public function refundByOrder($refundOrder)
-    {
-        $order = StoreOrder::where('order_id', $refundOrder['order_id'])->find();
-        $model = StoreConsumptionUser::where('uid', $refundOrder['uid'])->where('coupon_user_id', $order['consumption_id'])->find();
-        if (empty($model) || $order['source'] == 105) {
-            return;
-        }
-        $model->balance = bcadd($model->balance, $refundOrder['refund_consumption'], 2);
-        $model->status = StoreConsumptionUser::STATUS_UNUSED;
-        if (!$model->save()) {
-            throw new ValidateException('红包退还失败');
-        }
-        // 写入红包日志
-        /** @var  $userBillRepository UserBillRepository */
-        $userBillRepository = app()->make(UserBillRepository::class);
-        $title = $model['type'] == StoreConsumptionUser::TYPE_TWO ? '现金抵扣补贴' : '无门槛实物通用补贴';
-        $userBillRepository->incBill($refundOrder['uid'], 'red_pack', "red_pack_{$model['type']}", [
-            'link_id' => $refundOrder['order_id'],
-            'status' => 1,
-            'title' => '订单退款，获得' . $title,
-            'number' => $refundOrder['refund_consumption'],
-            'mark' => '订单退款，获得' . $title . $refundOrder['refund_consumption'] . ",退款订单ID：{$refundOrder['order_id']}",
-            'balance' => 0
-        ]);
-        $financeDao = new FinancialDao();
-        $financeDao->user = $order->user;
-        $financeDao->order = $order;
-        $financeDao->platformIn($refundOrder['refund_consumption'], 'platform_consumption_refund');
-        $financeDao->save();
-    }
-
-    /**
-     * 订单退款，服务团队退红包
-     * @param $userId
-     * @param $orderId
-     * @param $amount
-     * @return void
-     * @throws \think\db\exception\DataNotFoundException
-     * @throws \think\db\exception\DbException
-     * @throws \think\db\exception\ModelNotFoundException
-     */
-    public function refundByCommission($userId, $orderId, $amount)
-    {
-        $model = StoreConsumptionUser::where('uid', $userId)->where('type', StoreConsumptionUser::TYPE_TWO)->find();
-        if (empty($model)) {
-            return;
-        }
-        $model->balance = bcsub($model->balance, $amount, 2);
-        if (!$model->save()) {
-            throw new ValidateException('红包退还失败');
-        }
-        // 写入红包日志
-        /** @var  $userBillRepository UserBillRepository */
-        $userBillRepository = app()->make(UserBillRepository::class);
-        $userBillRepository->decBill($userId, 'consumption_refund', 'deduction', [
-            'link_id' => $orderId,
-            'status' => 1,
-            'title' => '订单退款，退现金抵扣红包',
-            'number' => $amount,
-            'mark' => '订单退款，退现金抵扣红包' . floatval($amount) . '元',
-            'balance' => 0
-        ]);
-    }
-
-    /**
-     * 红包类型为 现金抵扣红包
-     * 根据商品毛利率计算红包金额
-     * @return array
-     */
-    public function typeTwoByProduct()
-    {
-        // 把所有金额转换成分，避免红包金额产生误差
-        $totalPrice = $this->orderProductPrice * 100;
-        $consumptionUsed = $this->consumptionUsed * 100;
-        $consumptionTotal = $this->consumptionTotalAmount * 100;
-        $consumptionBalance = $consumptionTotal - $consumptionUsed;
-        if ($consumptionBalance <= 0) {
-            return [$this->orderProductPrice, '0.00', $this->consumptionUsed];
-        }
-        $rate = $this->getRate($this->profitRate);
-        $useAmount = bcmul($totalPrice, $rate, 2);
-        if ($useAmount >= $consumptionBalance) {
-            $useAmount = $consumptionBalance;
-        }
-        $payPrice = $totalPrice - $useAmount;
-        $consumptionUsed += $useAmount;
-        $payPrice = bcdiv($payPrice, 100, 2);
-        $useAmount = bcdiv($useAmount, 100, 2);
-        $consumptionUsed = bcdiv($consumptionUsed, 100, 2);
-        /** $payPrice：实际支付的金额，$useAmount：当前商品使用的红包金额，$consumptionUsed：使用的红包金额总计 */
-        return [$payPrice, $useAmount, $consumptionUsed];
-    }
-
-    /**
-     * 红包类型为 无门槛红包
-     * 根据商品毛利率计算红包金额
-     * @return array
-     */
-    public function typeOneByProduct()
-    {
-        // 把所有金额转换成分，避免红包金额产生误差
-        $totalPrice = $this->orderProductPrice * 100;
-        $consumptionUsed = $this->consumptionUsed * 100;
-        $consumptionTotal = $this->consumptionTotalAmount * 100;
-        $groupOrderTotalPrice = $this->groupOrderTotalPrice * 100;
-        $rate = bcdiv($totalPrice, $groupOrderTotalPrice, 5);
-        if ($consumptionTotal >= $groupOrderTotalPrice) {
-            $useAmount = $totalPrice;
-        } else {
-            $useAmount = $this->isLast ? $consumptionTotal - $consumptionUsed : round(bcmul($consumptionTotal, $rate, 1));
-        }
-        $payPrice = $totalPrice - $useAmount;
-        $consumptionUsed += $useAmount;
-        $payPrice = bcdiv($payPrice, 100, 2);
-        $useAmount = bcdiv($useAmount, 100, 2);
-        $consumptionUsed = bcdiv($consumptionUsed, 100, 2);
-        /** $payPrice：实际支付的金额，$useAmount：当前商品使用的红包金额，$consumptionUsed：使用的红包金额总计 */
-        return [$payPrice, $useAmount, $consumptionUsed];
-    }
-
-    /**
-     * 根据商品毛利率计算红包抵扣比例
-     * @param float $profitRate 毛利率
-     * @return float|int
-     */
-    public function getRate($profitRate)
-    {
-        $rateArray = [
-            '0.25' => 0.4,
-            '0.2' => 0.3,
-            '0.15' => 0.2,
-            '0.1' => 0.1,
-        ];
-        $rate = 0;
-        foreach ($rateArray as $k => $item) {
-            if ($profitRate >= $k) {
-                $rate = $item;
-                break;
-            }
-        }
-        return $rate;
-    }
-
 }

app/common/dao/store/order/StoreOrderDao.php

@@ -74,20 +74,14 @@ class StoreOrderDao extends BaseDao
             }
             $query->where('is_del', 0);
         });
-        if (isset($where['source']) && ($where['source'] == 103||$where['source'] == 105)) {
-            $wheres['activity_type'] = [0, 2, 98];
-            $wheres['source'] = [0,2,103,105,999];
-            $query->where($wheres);
-            unset($where['source']);
-        } elseif (isset($where['source']) && ($where['source'] == 11 || $where['source'] == 12)) {
-            $wheres['activity_type'] = 98;
-            $wheres['source'] = [$where['source'], 999];
+        if (isset($where['source']) && $where['source'] == 103) {
+            $wheres['activity_type'] = [0,98];
+            $wheres['source'] = [0,2,103,105];
             $query->where($wheres);
             unset($where['source']);
         } else {
             if(isset($where['product_type']) && $where['product_type'] !== ''){
-                $where['product_type'] = [$where['product_type'], 2];
-                $query->whereIn('activity_type', $where['product_type']);
+                $query->where('activity_type', $where['product_type']);
             }
         }
         $query->when(($sysDel !== null), function ($query) use ($sysDel) {

app/common/dao/store/order/StoreOrderOtherDao.php

@@ -15,25 +15,18 @@ namespace app\common\dao\store\order;
 
 
 use app\common\dao\BaseDao;
-use app\common\dao\system\financial\FinancialDao;
 use app\common\model\store\order\StoreGroupOrderOther;
 use app\common\model\store\order\StoreOrderOther;
 use app\common\model\store\order\StoreOrderProductOther;
 use app\common\model\store\order\StoreOrderStatusOther;
-use app\common\model\store\order\StoreRefundOrder;
-use app\common\model\store\order\StoreRefundOrderOther;
-use app\common\model\store\order\StoreRefundProductOther;
-use app\common\model\system\merchant\FinancialRecord;
 use app\common\repositories\store\order\StoreOrderStatusRepository;
 use app\common\repositories\store\product\ProductAssistSetRepository;
 use app\common\repositories\store\product\ProductGroupBuyingRepository;
 
-use app\common\repositories\system\merchant\MerchantRepository;
 use think\db\BaseQuery;
 use think\db\exception\DataNotFoundException;
 use think\db\exception\DbException;
 use think\db\exception\ModelNotFoundException;
-use think\exception\ValidateException;
 use think\facade\Db;
 use think\Model;
 
@@ -283,8 +276,8 @@ class StoreOrderOtherDao extends BaseDao
     public function fieldExists($field, $value, ?int $except = null): bool
     {
         return ($this->getModel()::getDB())->when($except, function ($query) use ($field, $except) {
-                $query->where($field, '<>', $except);
-            })->where($field, $value)->count() > 0;
+            $query->where($field, '<>', $except);
+        })->where($field, $value)->count() > 0;
     }
 
     /**
@@ -771,99 +764,4 @@ class StoreOrderOtherDao extends BaseDao
                 });
             })->where('StoreOrderOther.uid', $uid)->count();
     }
-
-    /**
-     * 供应链订单退款
-     * @param $refundOrder
-     * @return void
-     * @throws DataNotFoundException
-     * @throws DbException
-     * @throws ModelNotFoundException
-     */
-    public function refund($refundOrder)
-    {
-        $refundProducts = [];
-        foreach ($refundOrder->refundProduct->toArray() as $item) {
-            $refundProducts[$item['product']['product_source_id']] = ['num' => $item['refund_num']];
-        }
-        $order = StoreOrderOther::where('order_sn', $refundOrder->order['order_sn'])->find();
-        if (empty($order)) {
-            return;
-        }
-        $refundOrderArray = $refundOrder->toArray();
-        unset($refundOrderArray['refund_order_id'], $refundOrderArray['refundProduct'], $refundOrderArray['order']);
-        Db::startTrans();
-        try {
-            $products = [];
-            $refundTotal = 0.00;
-            $orderProducts = StoreOrderProductOther::where('order_id', $order['order_id'])->select();
-            foreach ($orderProducts as $orderProduct) {
-                $refundProduct = $refundProducts[$orderProduct['product_id']] ?? [];
-                if (empty($refundProduct)) {
-                    continue;
-                }
-                $price = bcdiv($orderProduct['total_price'], $orderProduct['product_num'], 2);
-                $refundPrice = bcmul($price, $refundProduct['num'], 2);
-                $refundTotal = bcadd($refundTotal, $refundPrice, 2);
-                $products[] = [
-                    'order_product_id' => $orderProduct['order_product_id'],
-                    'refund_price' => $refundPrice,
-                    'refund_consumption' => 0,
-                    'platform_refund_price' => 0,
-                    'refund_postage' => 0,
-                    'refund_integral' => 0,
-                    'refund_num' => $refundProduct['num'],
-                ];
-                $orderProduct->refund_num -= $refundProduct['num'];
-                $orderProduct->is_refund = 1;
-                $orderProduct->save();
-            }
-            $model = new StoreRefundOrderOther();
-            $model->setAttrs($refundOrderArray);
-            $model->order_id = $order['order_id'];
-            $model->uid = $order['uid'];
-            $model->mer_id = $order['mer_id'];
-            $model->refund_price = $refundTotal;
-            $model->save();
-
-            foreach ($products as &$product) {
-                $product['refund_order_id'] = $model->refund_order_id;
-            }
-            if (count($products) > 0) {
-                StoreRefundProductOther::getDB()->insertAll($products);
-            }
-
-            $financeDao = new FinancialDao();
-            $financeDao->user = $order->user;
-            $financeDao->order = $order;
-            $financeDao->order->order_id = $model->refund_order_id;
-            $financeDao->platformIn($refundTotal, 'supply_chain_refund', $model->mer_id);
-
-            $marginRecord = FinancialRecord::where('order_id', $refundOrder['order_id'])
-                ->where('mer_id', $model->mer_id)
-                ->where('financial_type', 'auto_margin')
-                ->value('number');
-            $marginRefunded = FinancialRecord::where('order_id', $refundOrder['order_id'])
-                ->where('mer_id', $model->mer_id)
-                ->where('financial_type', 'auto_margin_refund')
-                ->sum('number');
-            if ($marginRecord > $marginRefunded) {
-                /** @var MerchantRepository $merchantRepo */
-                $merchantRepo = app()->make(MerchantRepository::class);
-                $merchantRepo->forceMargin = false;
-                $merchantRepo->merId = $model->mer_id;
-                [$margin, $financeDao] = $merchantRepo->refundDeposit($refundTotal, $financeDao);
-                $merchantRepo->addLockMoney($model->mer_id, 'order', $refundOrder['order_id'], $margin);
-            }
-
-            $financeDao->save();
-
-            app()->make(MerchantRepository::class)->subLockMoney($model->mer_id, 'order', $refundOrder['order_id'], $refundTotal);
-            Db::commit();
-        } catch (\Exception $e) {
-            Db::rollback();
-            throw new ValidateException($e->getMessage());
-        }
-    }
-
 }

app/common/dao/store/order/StoreRefundProductDao.php

@@ -40,7 +40,7 @@ class StoreRefundProductDao extends BaseDao
         $lst = $this->getModel()::getDB()->alias('A')->leftJoin('StoreRefundOrder B', 'A.refund_order_id = B.refund_order_id')
             ->where('B.status', '>', -1)
             ->whereIn('A.order_product_id', $ids)->group('A.order_product_id')
-            ->field('A.order_product_id, SUM(A.refund_price) as refund_price, SUM(A.platform_refund_price) as platform_refund_price, SUM(A.refund_postage) as refund_postage, SUM(A.refund_integral) as refund_integral, SUM(A.refund_consumption) as refund_consumption')
+            ->field('A.order_product_id, SUM(A.refund_price) as refund_price, SUM(A.platform_refund_price) as platform_refund_price, SUM(A.refund_postage) as refund_postage, SUM(A.refund_integral) as refund_integral')
             ->select()->toArray();
         $data = [];
         foreach ($lst as $item) {

app/common/dao/store/product/CloudProductDao.php

@@ -41,7 +41,7 @@ class CloudProductDao extends BaseDao
     {
         $query = CloudProduct::where('status', 1)
             ->where($where)
-            ->whereIn('store_name', ['耶贝尔柔韧布质竹纸特惠装（10包）', '家家宜除菌洗衣液阳光清香1千克', '家家宜除菌洗衣粉阳光清香1千克-New版', '家家宜柠檬高效除油洗洁精1.12千克', '蔺艺挂面1.5千克'])
+            ->whereIn('store_name', ['耶贝尔柔韧布质竹纸特惠装（10包）', '家家宜除菌洗衣液阳光清香1千克', '家家宜除菌洗衣粉阳光清香1千克-New版', '家家宜柠檬高效除油洗洁精1.12千克'])
             ->whereIn('type_id', [10, 17])
             ->whereNotNull('lat')
             ->whereNotNull('long')

app/common/dao/store/product/ProductDao.php

@@ -151,6 +151,9 @@ class ProductDao extends BaseDao
                     });
                 }
             })
+            ->when(isset($where['keyword']) && $where['keyword'] !== '', function ($query) use ($where) {
+                $query->whereLike('Product.store_name', "%{$where['keyword']}%");
+            })
             ->when(isset($where['mer_labels']) && $where['mer_labels'] !== '', function ($query) use ($where) {
                 $query->whereLike('U.mer_labels', "%,{$where['mer_labels']},%");
             })
@@ -171,11 +174,7 @@ class ProductDao extends BaseDao
                     }
                     $query->order($where['order'] . ',rank DESC ,create_time DESC ');
                 } else if($where['order'] !== ''){
-                    if($where['order'] == 'check'){
-                        $query->order('Product.update_time DESC');
-                    }else{
-                        $query->order('U.'.$where['order'].' DESC,U.create_time DESC');
-                    }
+                    $query->order('U.'.$where['order'].' DESC,U.create_time DESC');
                 } else {
                     $query->order('U.create_time DESC');
                 }
@@ -242,7 +241,7 @@ class ProductDao extends BaseDao
         }
         app()->make(SpuRepository::class)->getSearch(['product_id' => $id])->update(['is_del' => 1, 'status' => 0]);
         event('product.delete',compact('id'));
-        event('product.sell', ['product_id' => [$id], 'status' => 0]);
+        event('product.sell', ['product_id' => [$id]]);
     }
 
     /**