Merge branch 'v5.0.0dev' of https://gitee.com/ZhongBangKeJi/CRMEB into v5.0.0dev

crmeb/app/api/controller/v2/user/StoreService.php

@@ -40,8 +40,11 @@ class StoreService
     /**
      * 客服聊天记录
      * @param Request $request
-     * @param $toUid
+     * @param StoreServiceServices $services
      * @return array
+     * @throws \think\db\exception\DataNotFoundException
+     * @throws \think\db\exception\DbException
+     * @throws \think\db\exception\ModelNotFoundException
      */
     public function record(Request $request, StoreServiceServices $services)
     {

crmeb/app/dao/service/StoreServiceLogDao.php

@@ -83,7 +83,7 @@ class StoreServiceLogDao extends BaseDao
             $query->where('id', '<', $upperId)->limit($limit)->order('id DESC');
         })->when(!$upperId, function ($query) use ($limit) {
             $query->limit($limit)->order('id DESC');
-        })->with(['user', 'service'])->select()->toArray();
+        })->with(['user'])->select()->toArray();
     }
 
     /**

crmeb/app/kefuapi/controller/Service.php

@@ -261,8 +261,11 @@ class Service extends AuthController
 
     /**
      * 聊天记录
-     * @param $uid
+     * @param Request $request
      * @return mixed
+     * @throws \think\db\exception\DataNotFoundException
+     * @throws \think\db\exception\DbException
+     * @throws \think\db\exception\ModelNotFoundException
      */
     public function getChatList(Request $request)
     {

crmeb/app/services/order/StoreOrderCreateServices.php

@@ -223,6 +223,7 @@ class StoreOrderCreateServices extends BaseServices
         $deduction = $seckillId || $bargainId || $combinationId;
         if ($deduction) {
             $couponId = 0;
+            $gainIntegral = 0;
             $useIntegral = false;
         }
         //$shipping_type = 1 快递发货 $shipping_type = 2 门店自提

crmeb/app/services/order/StoreOrderRefundServices.php

@@ -145,7 +145,7 @@ class StoreOrderRefundServices extends BaseServices
                 throw new AdminException(400489);
             }
             //退拼团
-            if ($splitOrderInfo['pid'] == 0 && !$splitOrderInfo['pink_id']) {
+            if ($splitOrderInfo['pid'] == 0 && $splitOrderInfo['pink_id'] > 0) {
                 /** @var StorePinkServices $pinkServices */
                 $pinkServices = app()->make(StorePinkServices::class);
                 if (!$pinkServices->setRefundPink($splitOrderInfo)) {

template/admin/src/pages/order/invoice/index.vue

@@ -94,7 +94,7 @@
         </template>
         <template slot-scope="{ row, index }" slot="is_invoice">
           <div v-if="row.is_invoice === 1">已开票</div>
-          <div v-else>--</div>
+          <div v-else>未开票</div>
         </template>
         <template slot-scope="{ row, index }" slot="status">
           <div v-if="row.status === 0">未发货</div>