github/CRMEB
1
0
Fork 0
mirror of https://github.com/crmeb/CRMEB.git synced 2026-10-29 14:01:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
From-wh 2023-04-21 11:53:50 +08:00
commit d01fa342ea
6 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
crmeb/app/api/controller/v2/user/StoreService.php
View File

@ -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)
{

2
crmeb/app/dao/service/StoreServiceLogDao.php
View File

@ -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();
}
/**

5
crmeb/app/kefuapi/controller/Service.php
View File

@ -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)
{

1
crmeb/app/services/order/StoreOrderCreateServices.php
View File

@ -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 门店自提

2
crmeb/app/services/order/StoreOrderRefundServices.php
View File

@ -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)) {

2
template/admin/src/pages/order/invoice/index.vue
View File

@ -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>