Merge branch 'dev' into dev-sxb

app/command/PensionTasks.php

@@ -18,6 +18,9 @@ use Carbon\Carbon;
 use think\console\Command;
 use think\console\Input;
 use think\console\Output;
+use think\db\exception\DataNotFoundException;
+use think\db\exception\DbException;
+use think\db\exception\ModelNotFoundException;
 use think\Exception;
 use think\facade\Db;
 use think\facade\Log;
@@ -64,7 +67,7 @@ class PensionTasks extends Command
 //            $this->doThridVipOrderGzc($nowTime, $timeLimit = 30);
 //            $this->doThridDyOrderGzc($nowTime, $timeLimit = 30);
 //            $this->doThridHfOrderGzc($nowTime, $timeLimit = 30);
-//            $this->billGzcAdd($nowTime);
+            $this->billGzcAdd($nowTime);
             //升级
 //            $this -> doUpgrade();
         } catch (\Throwable $e) {
@@ -87,10 +90,23 @@ class PensionTasks extends Command
         $OrderGzcRepository      = app()->make(OrderGzcRepository::class);
         $OrderMerchantRepository = app()->make(OrderMerchantRepository::class);
         $StoreOrderRepository    = app()->make(StoreOrderRepository::class);
+        $testUserIdList = [];
+        /** @var UserRepository $userRepository */
+        $userRepository = app()->make(UserRepository::class);
+        try {
+            $userIdData = $userRepository->selectWhere(['test_user' => 1], 'uid')->toArray();
+            if (!empty($userIdData)) {
+                $testUserIdList = array_column($userIdData, 'uid');
+            }
+        } catch (DataNotFoundException|ModelNotFoundException|DbException $e) {
+
+        }
+
         $cursor = Db::name('user_bill')
         ->where('status', 1)
         ->where('is_gzc', 0)
         ->where('commission_type', 5)
+        ->whereNotIn('uid', $testUserIdList)
         ->select()->toArray();
         if($cursor) {
             foreach ($cursor as $bill) {

app/common/repositories/store/order/StoreOrderRepository.php

@@ -3130,7 +3130,7 @@ class StoreOrderRepository extends BaseRepository
         Db::name("log")->insert(array('data' => '确认收货：' . json_encode($order)));//日志记录
         if (!$order)
             throw new ValidateException('订单不存在');
-        if ($order['status'] != 1 || $order['order_type'])
+        if (!in_array($order['status'], [0, 1]) || $order['order_type'])
             throw new ValidateException('订单状态有误');
         if (!$user) $user = $order->user;
         $order->status = 2;
@@ -5390,15 +5390,16 @@ class StoreOrderRepository extends BaseRepository
      */
     public function carryOrder($id, $merId, $serviceId, $order_id)
     {
-        $order = $this->dao->getWhere(['order_id' => $order_id, 'status' => 1, 'mer_id' => $merId]);
+        $order = $this->dao->getWhere(['order_id' => $order_id, 'mer_id' => $merId]);
         if (!$order)
             throw new ValidateException('订单不存在或已支付~');
-        if ($order->verify_code != $id)
+        if (!in_array($order->status, [0, 1])) {
+            throw new ValidateException('订单状态错误');
+        }
+        if ($id != null && $order->verify_code != $id)
             throw new ValidateException('提货码错误~');
         if (!$order->paid)
             throw new ValidateException('订单未支付');
-        if ($order->status != 1)
-            throw new ValidateException('订单已核销');
         $order->status = 2;
         $order->verify_time = date('Y-m-d H:i:s');
         $order->verify_service_id = $serviceId;

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

@@ -13,8 +13,8 @@ use think\Request;
 class Taskorderlianc
 {
 
-    private const API_KEY = "EXTERNAL_SYSTEM_B_KEY";
-    private const API_SECRET = "STRONG_SECRET_123456";
+    private const API_KEY = "HXJT_XFXD_B31_M_3279_Y_250707_01";
+    private const API_SECRET = '8f^ynijrE9Mc9Q5ez5e8$Tm&$6Xx!ycQ';
     private const GATEWAY_URL = "http://localhost:9002";
 
     public function getUserPoints()
@@ -29,6 +29,7 @@ class Taskorderlianc
             "X-SIGNATURE: " . $signature,
             "Content-Type: application/json"
         ];
+        return json($headers);
         // 请求的 POST 数据（例如用户信息）
 //        $postData = [
 //            'pm' => 1,

app/controller/merchant/store/order/Order.php

@@ -263,6 +263,20 @@ class Order extends BaseController
     }
 
     /**
+     * 手动操作订单为 已自提 关单
+     * @return mixed
+     * @throws \think\db\exception\DataNotFoundException
+     * @throws \think\db\exception\DbException
+     * @throws \think\db\exception\ModelNotFoundException
+     */
+    public function carryByWithoutCode()
+    {
+        $order_id = input('order_id');
+        $this->repository->carryOrder(null, $this->request->merId(), 0, $order_id);
+        return app('json')->success('订单核销成功');
+    }
+
+    /**
      * @param $id
      * @return mixed
      * @author Qinii

route/merchant.php

@@ -460,6 +460,7 @@ Route::group(config('admin.api_merchant_prefix') . '/', function () {
             Route::post('remark/:id', 'Order/remark')->name('merchantStoreOrderRemark');
             Route::post('verify/:code', 'Order/verify')->name('merchantStoreOrderVerify');
             Route::post('carry/:code', 'Order/carry')->name('merchantStoreOrderCarry');
+            Route::post('carryByWithoutCode', 'Order/carryByWithoutCode')->name('carryByWithoutCode');// 奖励统计-导出
             Route::post('delete/:id', 'Order/delete')->name('merchantStoreOrderDelete');
             Route::get('reconciliation/lst', 'Reconciliation/lst')->name('sysMerchantReconciliationLst');
             Route::get('reconciliation/mark/:id/form', 'Reconciliation/markForm')->name('merchantReconciliationMarkForm');