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:
liaofei 2023-04-20 14:07:32 +08:00
commit e1643bf910
6 changed files with 20 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
crmeb/app/api/controller/v1/order/StoreIntegralOrderController.php
View File

@ -121,6 +121,7 @@ class StoreIntegralOrderController
/**
* 订单 查看物流
* @param Request $request
* @param ExpressServices $expressServices
* @param $uni
* @return mixed
*/
@ -128,6 +129,8 @@ class StoreIntegralOrderController
{
if (!$uni || !($order = $this->services->getUserOrderDetail($uni, $request->uid()))) return app('json')->fail(410173);
if ($order['delivery_type'] != 'express' || !$order['delivery_id']) return app('json')->fail(410206);
$order['price'] = (int)$order['price'];
$order['total_price'] = (int)$order['total_price'];
$cacheName = 'integral' . $order['order_id'] . $order['delivery_id'];
return app('json')->success([
'order' => $order,

1
crmeb/app/services/activity/combination/StorePinkServices.php
View File

@ -184,6 +184,7 @@ class StorePinkServices extends BaseServices
$v['s'] = date('s', (int)$v['stop_time']);
$pinkAll[] = $v['id'];//开团团长ID
$v['stop_time'] = (int)$v['stop_time'];
$v['avatar'] = set_file_url($v['avatar']);
}
return [$list, $pinkAll];
}

7
crmeb/app/services/activity/integral/StoreIntegralOrderServices.php
View File

@ -120,6 +120,8 @@ class StoreIntegralOrderServices extends BaseServices
} else if ($order['status'] == 3) {
$order['status_name'] = '已完成';
}
$order['price'] = (int)$order['price'];
$order['total_price'] = (int)$order['total_price'];
return $order;
}
@ -139,6 +141,8 @@ class StoreIntegralOrderServices extends BaseServices
} else if ($item['status'] == 3) {
$item['status_name'] = '已完成';
}
$item['price'] = (int)$item['price'];
$item['total_price'] = (int)$item['total_price'];
}
return $data;
}
@ -338,11 +342,12 @@ class StoreIntegralOrderServices extends BaseServices
}
$data = [];
$attrValue = is_object($attrValue) ? $attrValue->toArray() : $attrValue;
$attrValue['price'] = (int)$attrValue['price'];
/** @var UserBillServices $userBillServices */
$userBillServices = app()->make(UserBillServices::class);
$data['integral'] = bcsub((string)$user['integral'], (string)$userBillServices->getBillSum(['uid' => $user['uid'], 'is_frozen' => 1]), 0);
$data['num'] = $num;
$data['total_price'] = bcmul($num, $attrValue['price'], 2);
$data['total_price'] = bcmul($num, $attrValue['price']);
$data['productInfo'] = $attrValue;
return $data;
}

9
crmeb/app/services/activity/integral/StoreIntegralServices.php
View File

@ -119,7 +119,7 @@ class StoreIntegralServices extends BaseServices
if (!$data) {
throw new AdminException(400337);
}
if(!$data['attrs']) throw new AdminException(400337);
if (!$data['attrs']) throw new AdminException(400337);
$attrs = [];
foreach ($data['attrs'] as $k => $v) {
$attrs[$v['product_id']][] = $v;
@ -283,6 +283,7 @@ class StoreIntegralServices extends BaseServices
$siteUrl = sys_config('site_url');
$storeInfo['image'] = set_file_url($storeInfo['image'], $siteUrl);
$storeInfo['image_base'] = set_file_url($storeInfo['image'], $siteUrl);
$storeInfo['product_price'] = (int)$storeInfo['product_price'];
$storeInfo['sale_stock'] = 0;
if ($storeInfo['stock'] > 0) $storeInfo['sale_stock'] = 1;
$uid = $request->uid();
@ -296,6 +297,12 @@ class StoreIntegralServices extends BaseServices
/** @var StoreProductAttrServices $storeProductAttrServices */
$storeProductAttrServices = app()->make(StoreProductAttrServices::class);
list($productAttr, $productValue) = $storeProductAttrServices->getProductAttrDetail($id, $uid, 0, 4, $storeInfo['product_id']);
foreach ($productValue as &$item) {
$item['cost'] = (int)$item['cost'];
$item['ot_price'] = (int)$item['ot_price'];
$item['price'] = (int)$item['price'];
$item['vip_price'] = (int)$item['vip_price'];
}
$data['productAttr'] = $productAttr;
$data['productValue'] = $productValue;
/** @var StoreVisitServices $storeVisit */

2
crmeb/app/services/activity/seckill/StoreSeckillServices.php
View File

@ -469,7 +469,7 @@ class StoreSeckillServices extends BaseServices
/** @var StoreProductServices $storeProductService */
$storeProductService = app()->make(StoreProductServices::class);
$productInfo = $storeProductService->get($storeInfo['product_id']);
$storeInfo['total'] = $productInfo['sales'] + $productInfo['ficti'];
$storeInfo['total'] = $productInfo['sales'] + $productInfo['ficti'] + $storeInfo['sales'];
if (sys_config('share_qrcode', 0) && request()->isWechat()) {
/** @var QrcodeServices $qrcodeService */

1
template/uni-app/pages/points_mall/exchange_record.vue
View File

@ -18,6 +18,7 @@
<view class="text acea-row row-column-around">
<view class="line1" style="width: 100%;">{{ item.store_name }}</view>
<view class="line1 gray-sty">{{item.suk}}</view>
<view class="line1 gray-sty">{{$t(`积分`)}}:{{item.total_price}}</view>
</view>
</view>
<view class="bottom acea-row row-between-wrapper">