Skip to content

ShopXO
ShopXO

jamesyang1999 / ShopXO
与 Fork 源项目一致

Fork自 纵之格 / ShopXO

通知 1
Star 0
Fork 0
ShopXO
ShopXO

体验新版 GitCode，发现更多精彩内容 >>

提交 e9e7a001 编写于 作者: D devil
浏览文件
操作

订单根据仓库自动拆单，订单售后新增时限

上级 7ead9573
展开全部 隐藏空白更改
内联 并排
Showing with 435 addition and 319 deletion
application/admin/view/default/site/orderaftersale.html
浏览文件 @ e9e7a001
......@@ -24,6 +24,16 @@
<input type="text" name="{{$data.home_order_aftersale_return_goods_address.only_tag}}" placeholder="{{$data.home_order_aftersale_return_goods_address.name}}" data-validation-message="{{$data.home_order_aftersale_return_goods_address.error_tips}}" class="am-radius" {{if !empty($data)}}value="{{$data.home_order_aftersale_return_goods_address.value}}"{{/if}} />
</div>
<div class="am-form-group">
<label>{{$data.home_order_aftersale_return_launch_day.name}}<span class="am-form-group-label-tips">{{$data.home_order_aftersale_return_launch_day.describe}}</span></label>
<div class="am-input-group am-input-group-sm">
<input type="number" min="0" name="{{$data.home_order_aftersale_return_launch_day.only_tag}}" placeholder="{{$data.home_order_aftersale_return_launch_day.name}}" data-validation-message="{{$data.home_order_aftersale_return_launch_day.error_tips}}" class="am-radius" {{if !empty($data)}}value="{{$data.home_order_aftersale_return_launch_day.value}}"{{/if}} />
<span class="am-input-group-btn">
<button class="am-btn am-btn-default" type="button">天</button>
</span>
</div>
</div>
<div class="am-form-group am-form-group-refreshing">
<input type="hidden" name="nav_type" value="{{$nav_type}}" />
<button type="submit" class="am-btn am-btn-primary am-radius btn-loading-example am-btn-sm am-btn-block" data-am-loading="{loadingText:'处理中...'}">保存</button>
......
application/index/view/default/buy/index.html
浏览文件 @ e9e7a001
......@@ -342,7 +342,7 @@
{{$goods.stock}} {{$goods.inventory_unit}}
</td>
<td class="total-price am-hide-sm-only">
<strong>{{$price_symbol}}</strong><strong class="total-price-content">{{$goods.total_price}}</strong>
<span>{{$price_symbol}}</span><strong class="total-price-content">{{$goods.total_price}}</strong>
</td>
</tr>
{{/foreach}}
......@@ -377,9 +377,9 @@
{{/php}}
<!-- 扩展展示数据 -->
{{if !empty($v['extension_data'])}}
{{if !empty($v['order_base']['extension_data'])}}
<ul class="buy-extension-data am-padding-xs am-margin-bottom-sm">
{{foreach $v['extension_data'] as $ext}}
{{foreach $v['order_base']['extension_data'] as $ext}}
<li>
<span class="extension-items-name">{{$ext.name}}</span>
<span class="am-fr extension-items-tips">{{$ext.tips}}</span>
......@@ -390,9 +390,12 @@
<!-- 含运费小计 -->
<div class="buy-point-discharge am-text-right">
<p>
合计 <span class="price"><strong>{{$price_symbol}}</strong><strong class="total-price-content am-text-lg">{{$v.items_total_price}}</strong></span>
</p>
{{if $v['order_base']['total_price'] neq $v['order_base']['actual_price']}}
<span class="original-price am-margin-right-xs">{{$price_symbol}}{{$v.order_base.total_price}}</span>
{{/if}}
<span>
合计 <span class="price"><span>{{$price_symbol}}</span><strong class="total-price-content line-price am-text-sm">{{$v.order_base.actual_price}}</strong></span>
</span>
</div>
</div>
</div>
......@@ -458,10 +461,9 @@
<div class="pay-confirm">
<div class="box">
<div class="base-real-pay">
<em>实付款：</em>
<em>实付款 :</em>
<span class="price">
<strong>{{$price_symbol}}</strong>
<strong class="nav-total-price">{{$base.actual_price}}</strong>
<span>{{$price_symbol}}</span><strong class="nav-total-price">{{$base.actual_price}}</strong>
</span>
</div>
......@@ -469,7 +471,7 @@
{{if in_array($common_site_type, [0,2,4]) and !empty($base['address'])}}
<div class="pay-address">
<div class="buy-footer-address">
<span class="buy-line-title">联系人：</span>
<span class="buy-line-title">联系人 :</span>
<span class="buy-user">
{{if !empty($base['address'])}}
{{$base.address.name}}
......@@ -486,7 +488,7 @@
</span>
</div>
<div class="buy-footer-address">
<span class="buy-line-title buy-line-title-type">地址：</span>
<span class="buy-line-title buy-line-title-type">地址 :</span>
<span class="buy-address-detail">
{{if !empty($base['address'])}}
{{$base.address.province_name}} {{$base.address.city_name}} {{$base.address.county_name}} {{$base.address.address}}
......
application/index/view/default/order/index.html
浏览文件 @ e9e7a001
......@@ -192,15 +192,15 @@
{{/if}}
</td>
<td class="row-number">
<a href="{{:MyUrl('index/orderaftersale/detail', ['oid'=>$order['id'], 'did'=>$goods['id']])}}" target="_blank">
{{if !empty($goods['orderaftersale_btn_text'])}}
{{if ($order['is_can_launch_aftersale'] eq 1 or !empty($goods['orderaftersale'])) and !empty($goods['orderaftersale_btn_text'])}}
<a href="{{:MyUrl('index/orderaftersale/detail', ['oid'=>$order['id'], 'did'=>$goods['id']])}}" target="_blank">
{{if empty($goods['orderaftersale'])}}
{{$goods.orderaftersale_btn_text}}
{{else /}}
<span class="{{if $goods['orderaftersale']['status'] eq 3}}am-text-success{{else /}}am-text-secondary{{/if}}">{{$goods.orderaftersale_btn_text}}</span>
{{/if}}
{{/if}}
</a>
</a>
{{/if}}
</td>
{{if $keys eq 0}}
<td class="row-total-price am-hide-sm-only" rowspan="{{$order.items_count}}">
......
application/service/BuyService.php
浏览文件 @ e9e7a001
此差异已折叠。
application/service/OrderAftersaleService.php
浏览文件 @ e9e7a001
......@@ -141,6 +141,12 @@ class OrderAftersaleService
return $order;
}
// 订单是否可发起售后
if($order['data']['is_can_launch_aftersale'] != 1)
{
return DataReturn('订单已过售后期，请联系客服处理', -1);
}
// 当前是否存在进行中
$where = [
['order_id', '=', intval($params['order_id'])],
......@@ -1559,5 +1565,28 @@ class OrderAftersaleService
return ['step0'=>$step0, 'step1'=>$step1];
}
/**
* 订单是否可发起售后
* @author Devil
* @blog http://gong.gg/
* @version 1.0.0
* @date 2020-07-24
* @desc description
* @param [int] $collect_time [收货时间]
*/
public static function OrderIsCanLaunchAftersale($collect_time)
{
// 未收货
if(empty($collect_time))
{
return 1;
}
// 是否超出限制时间
$launch_day = intval(MyC('home_order_aftersale_return_launch_day', 30, true));
$end_time = $collect_time+($launch_day*86400);
return ($end_time >= time()) ? 1 : 0;
}
}
?>
\ No newline at end of file
application/service/OrderService.php
浏览文件 @ e9e7a001
......@@ -20,6 +20,7 @@ use app\service\ExpressService;
use app\service\ResourcesService;
use app\service\PayLogService;
use app\service\UserService;
use app\service\OrderAftersaleService;
/**
* 订单服务层
......@@ -871,6 +872,9 @@ class OrderService
// 线下支付 icon 名称
$v['is_under_line_text'] = ($v['is_under_line'] == 1) ? '线下支付' : null;
// 是否可发起售后
$v['is_can_launch_aftersale'] = OrderAftersaleService::OrderIsCanLaunchAftersale($v['collect_time']);
// 创建时间
$v['add_time_time'] = date('Y-m-d H:i:s', $v['add_time']);
$v['add_time_date'] = date('Y-m-d', $v['add_time']);
......
application/service/OrderSplitService.php
浏览文件 @ e9e7a001
......@@ -11,6 +11,7 @@
namespace app\service;
use think\Db;
use think\facade\Hook;
use app\service\WarehouseService;
/**
......@@ -54,10 +55,173 @@ class OrderSplitService
}
// 商品仓库集合
$data = self::GoodsWarehouseAggregate($params['goods']);
$warehouse_goods = self::GoodsWarehouseAggregate($params['goods']);
// 分组商品基础处理
$data = self::GroupGoodsBaseHandle($warehouse_goods, $params);
// 生成订单仓库分组商品数据处理钩子
$hook_name = 'plugins_service_buy_group_goods_handle';
$ret = HookReturnHandle(Hook::listen($hook_name, [
'hook_name' => $hook_name,
'is_backend' => true,
'params' => $params,
'data' => &$data,
]));
if(isset($ret['code']) && $ret['code'] != 0)
{
return $ret;
}
// 根据扩展数据重新计算金额
if(!empty($data))
{
foreach($data as &$v)
{
// 是否存在扩展数据
if(!empty($v['order_base']['extension_data']))
{
// 扩展数据金额计算
$ext = self::ExtensionDataPriceHandle($v['order_base']['extension_data']);
// 增加/减少
$v['order_base']['increase_price'] = PriceNumberFormat($v['order_base']['increase_price']+$ext['inc']);
$v['order_base']['preferential_price'] = PriceNumberFormat($v['order_base']['preferential_price']+$ext['dec']);
// 实际金额/总额处理
$v['order_base']['actual_price'] = PriceNumberFormat(($v['order_base']['actual_price']+$ext['inc'])-$ext['dec']);
$v['order_base']['total_price'] = PriceNumberFormat($v['order_base']['total_price']);
}
}
}
// 返回数据
return DataReturn('操作成功', 0, $data);
}
/**
* 扩展数据解析金额
* @author Devil
* @blog http://gong.gg/
* @version 1.0.0
* @date 2020-07-23
* @desc description
* @param [array] $data [扩展数据]
*/
public static function ExtensionDataPriceHandle($data)
{
$inc = 0;
$dec = 0;
if(!empty($data))
{
if(!is_array($data))
{
$data = json_decode($data, true);
}
foreach($data as $v)
{
if(isset($v['type']) && isset($v['price']) && $v['price'] > 0)
{
switch($v['type'])
{
// 减
case 0 :
$dec += $v['price'];
break;
// 加
case 1 :
$inc += $v['price'];
break;
}
}
}
}
return [
'inc' => $inc,
'dec' => $dec,
];
}
/**
* 分组商品基础处理
* @author Devil
* @blog http://gong.gg/
* @version 1.0.0
* @date 2020-07-23
* @desc description
* @param [array] $data [分组商品]
* @param [array] $params [输入参数]
*/
public static function GroupGoodsBaseHandle($data, $params)
{
if(!empty($data))
{
foreach($data as &$v)
{
// 当前仓库的商品总价
$total_price = PriceNumberFormat(array_sum(array_column($v['goods_items'], 'total_price')));
// 订单基础信息
$v['order_base'] = [
// 总价
'total_price' => $total_price,
// 订单实际支付金额(已减去优惠金额, 已加上增加金额)
'actual_price' => $total_price,
// 优惠金额
'preferential_price' => 0.00,
// 增加金额
'increase_price' => 0.00,
// 商品总数
'goods_count' => count($v['goods_items']),
// 规格重量总计
'spec_weight_total' => array_sum(array_map(function($v) {return $v['spec_weight']*$v['stock'];}, $v['goods_items'])),
// 购买总数
'buy_count' => array_sum(array_column($v['goods_items'], 'stock')),
// 默认地址
'address' => $params['address'],
// 自提地址列表
'extraction_address' => $params['extraction_address'],
// 当前使用的站点模式
'site_model' => $params['site_model'],
// 公共站点模式
'common_site_type' => $params['common_site_type'],
// 仓库组扩展展示数据
// name 名称
// price 金额
// type 类型（0减少, 1增加）
// tips 提示信息
// business 业务类型（内容格式不限）
// ext 扩展数据（内容格式不限）
// $extension_data = [
// [
// 'name' => '感恩节9折',
// 'price' => 23,
// 'type' => 0,
// 'tips' => '-￥23元',
// 'business' => null,
// 'ext' => null,
// ],
// ];
'extension_data' => [],
];
}
}
return $data;
}
/**
* 商品仓库集合
* @author Devil
......@@ -69,24 +233,6 @@ class OrderSplitService
*/
public static function GoodsWarehouseAggregate($data)
{
// 仓库组扩展展示数据
// name 名称
// price 金额
// type 类型（0减少, 1增加）
// tips 提示信息
// business 业务类型（内容格式不限）
// ext 扩展数据（内容格式不限）
// $extension_data = [
// [
// 'name' => '感恩节9折',
// 'price' => 23,
// 'type' => 0,
// 'tips' => '-￥23元',
// 'business' => null,
// 'ext' => null,
// ],
// ];
// 数据分组
$result = [];
foreach($data as $v)
......@@ -126,7 +272,7 @@ class OrderSplitService
}
// 总价计算
$temp_v['total_price'] = $temp_v['price']*$temp_v['stock'];
$temp_v['total_price'] = PriceNumberFormat($temp_v['price']*$temp_v['stock']);
// 减除数量
$v['stock'] -= $w['inventory'];
......@@ -137,30 +283,12 @@ class OrderSplitService
// 仓库
$warehouse_handle = WarehouseService::DataHandle([$w]);
$result[$w['id']] = $warehouse_handle[0];
$result[$w['id']]['extension_data'] = [
[
'name' => '感恩节9折',
'price' => 23,
'type' => 0,
'tips' => '-￥23元',
'business' => null,
'ext' => null,
],
];
$result[$w['id']]['goods_items'] = [];
unset($result[$w['id']]['is_default'], $result[$w['id']]['level'], $result[$w['id']]['inventory']);
// 订单基础信息
$result[$w['id']]['items_total_price'] = 0;
$result[$w['id']]['items_stock_total'] = 0;
}
// 商品归属到仓库下
$result[$w['id']]['goods_items'] = array_merge($result[$w['id']]['goods_items'], [$temp_v]);
// 基础信息
$result[$w['id']]['items_total_price'] += $temp_v['total_price'];
$result[$w['id']]['items_stock_total'] += $temp_v['stock'];
} else {
break;
}
......@@ -178,20 +306,11 @@ class OrderSplitService
// 仓库
$warehouse_handle = WarehouseService::DataHandle([$warehouse_default]);
$result[$warehouse_default['id']] = $warehouse_handle[0];
$result[$warehouse_default['id']]['extension_data'] = [];
$result[$warehouse_default['id']]['goods_items'] = [];
// 订单基础信息
$result[$warehouse_default['id']]['items_total_price'] = 0;
$result[$warehouse_default['id']]['items_stock_total'] = 0;
}
// 商品归属到仓库下
$result[$warehouse_default['id']]['goods_items'][] = $v;
// 基础信息
$result[$warehouse_default['id']]['items_total_price'] += $temp_v['total_price'];
$result[$warehouse_default['id']]['items_stock_total'] += $temp_v['stock'];
}
}
}
......
application/tags.php
浏览文件 @ e9e7a001
......@@ -36,7 +36,7 @@ return array (
array (
0 => 'app\\plugins\\freightfee\\Hook',
),
'plugins_service_buy_handle' =>
'plugins_service_buy_group_goods_handle' =>
array (
0 => 'app\\plugins\\freightfee\\Hook',
),
......
public/static/index/default/css/buy.css
浏览文件 @ e9e7a001
......@@ -48,7 +48,6 @@ ul.logistics-list li img, ul.payment-list li img { width: 36px; height: 36px; ve
}
/*合计*/
.buy-point-discharge{font-size:14px ;font-weight: 700;}
.box{float:left;width:70%;height:40px ;line-height:40px ;font-size: 14px;text-align: right;padding-right:10px ;}
.pay-address{display: none;}
.nav-buy .btn-go{float:left;width:30%;color:#fff ;background:#d2364c ;text-align: center;height:40px ;line-height:40px ;font-size: 14px; border: 0; }
......@@ -111,7 +110,6 @@ ul.address-list, .business-item ul { overflow: hidden; }
.base-real-pay {line-height: 16px;margin: 0px 0px 10px;position: relative;}
.base-real-pay .g_price span {font-size: 26px;}
.price .nav-total-price {font: 700 26px tahoma;}
.order-nav .buy-footer-address .buy-line-title {color: #404040;font-weight: 700;}
/*地址管理*/
.address ul{margin-top: 10px; padding: 1px;}
ul.address-list li{display:block; width: calc(33% - 5px);height: 130px;float: left;margin:0 10px 10px 0 ;padding:10px;border: 1px solid #e5e5e5;}
......@@ -167,7 +165,6 @@ ul.address-list, .business-item ul { overflow: hidden; }
.goods-base { float: left; top: 0; margin-left: 85px; }
.goods-attr { margin-top: 5px; }
.goods-attr li { color: #888; line-height: 16px; }
.original-price, .line-price { font-family: Verdana,Tahoma,arial; }
.original-price { color: #999; text-decoration: line-through; }
.am-table { margin-bottom: 10px; }
.am-table > tbody > tr > td { border-top: 1px solid #eee; }
......
public/static/index/default/css/common.css
浏览文件 @ e9e7a001
......@@ -241,13 +241,8 @@ color: #F5F5F2;font-size: 12px;cursor:pointer;border-radius:0px 0px; position: a
font-weight: bold;
}
/**
* 灰色文字标记
*/
.gray-text { color: #999; }
/* 价格颜色 */
.price strong {color: #c00; font-weight: 600; }
.price, .price strong {color: #c00; }
/* 公共错误提示页面 */
.tips-error, .tips-success { margin: 10% 0; background: #fff; }
......
public/static/index/default/css/goods.css
浏览文件 @ e9e7a001
......@@ -180,7 +180,7 @@ fieldset legend{margin-left:15px;padding-left:3px;padding-right:3px;color:#333;}
/*价格*/
.tb-detail-price{text-align: left; position: relative;}
.tb-detail-price .price em {font-family: arial;}
.tb-detail-price .original-price-value {text-decoration:line-through; font-size:14px; }
.tb-detail-price .original-price-value {text-decoration:line-through; font-size:14px; color: #999; }
.iteminfo_mktprice {padding-top: 10px;}
.iteminfo_mktprice em, .goods-price { color:#c00;}
.tb-detail-price dd {display: inline-block;}
......@@ -205,7 +205,7 @@ fieldset legend{margin-left:15px;padding-left:3px;padding-right:3px;color:#333;}
.goods-video-submit-close { font-size: 60px; color: #999; cursor: pointer; }
.goods-video-submit-start:hover,
.goods-video-submit-close:hover { color: #666; }
.goods-video-submit-close { z-index: 4; width: 50px; height: 50px; line-height: 48px; text-align: center; padding: 0; border: 2px solid #999; border-radius: 1000px; }
.goods-video-submit-close { z-index: 4; width: 50px; height: 50px; line-height: 35px; text-align: center; padding: 0; border: 2px solid #999; border-radius: 1000px; }
/* 视频 放大镜 */
.box .goods-video-submit-start { left: 1px; bottom: 85px; z-index: 2; padding: 10px 10px 2px 10px; }
......
public/static/index/default/js/search.js
浏览文件 @ e9e7a001
......@@ -206,7 +206,7 @@ $(function()
} else {
Prompt(result.msg);
}
$('.select .title-tips strong').text(result.data.total);
$('.select .title-tips strong').text(result.data.total || 0);
},
error:function(xhr, type)
{
......
sourcecode/alipay/pages/user-order/user-order.axml
浏览文件 @ e9e7a001
......@@ -26,7 +26,7 @@
{{spec.type}}:{{spec.value}}
</view>
</block>
<view class="orderaftersale-btn-text" catchTap="orderaftersale_event" data-oid="{{item.id}}" data-did="{{detail.id}}">{{detail.orderaftersale_btn_text}}</view>
<view a:if="{{(item.is_can_launch_aftersale == 1 || (detail.orderaftersale || null) != null) && ($detail.orderaftersale_btn_text || null) != null}}" class="orderaftersale-btn-text" catchTap="orderaftersale_event" data-oid="{{item.id}}" data-did="{{detail.id}}">{{detail.orderaftersale_btn_text}}</view>
</view>
<view class="oh goods-price">
<text class="sales-price">{{price_symbol}}{{detail.price}}</text>
......
sourcecode/baidu/pages/user-order/user-order.swan
浏览文件 @ e9e7a001
......@@ -26,7 +26,7 @@
{{spec.type}}:{{spec.value}}
</view>
</block>
<view class="orderaftersale-btn-text" catchtap="orderaftersale_event" data-oid="{{item.id}}" data-did="{{detail.id}}">{{detail.orderaftersale_btn_text}}</view>
<view s-if="(item.is_can_launch_aftersale == 1 || (detail.orderaftersale || null) != null) && ($detail.orderaftersale_btn_text || null) != null" class="orderaftersale-btn-text" catchtap="orderaftersale_event" data-oid="{{item.id}}" data-did="{{detail.id}}">{{detail.orderaftersale_btn_text}}</view>
</view>
<view class="oh goods-price">
<text class="sales-price">{{price_symbol}}{{detail.price}}</text>
......
sourcecode/qq/pages/user-order/user-order.qml
浏览文件 @ e9e7a001
......@@ -26,7 +26,7 @@
{{spec.type}}:{{spec.value}}
</view>
</block>
<view class="orderaftersale-btn-text" catchtap="orderaftersale_event" data-oid="{{item.id}}" data-did="{{detail.id}}">{{detail.orderaftersale_btn_text}}</view>
<view qq:if="{{(item.is_can_launch_aftersale == 1 || (detail.orderaftersale || null) != null) && ($detail.orderaftersale_btn_text || null) != null}}" class="orderaftersale-btn-text" catchtap="orderaftersale_event" data-oid="{{item.id}}" data-did="{{detail.id}}">{{detail.orderaftersale_btn_text}}</view>
</view>
<view class="oh goods-price">
<text class="sales-price">{{price_symbol}}{{detail.price}}</text>
......
sourcecode/toutiao/pages/user-order/user-order.ttml
浏览文件 @ e9e7a001
......@@ -26,7 +26,7 @@
{{spec.type}}:{{spec.value}}
</view>
</block>
<view class="orderaftersale-btn-text" catchtap="orderaftersale_event" data-oid="{{item.id}}" data-did="{{detail.id}}">{{detail.orderaftersale_btn_text}}</view>
<view tt:if="{{(item.is_can_launch_aftersale == 1 || (detail.orderaftersale || null) != null) && ($detail.orderaftersale_btn_text || null) != null}}" class="orderaftersale-btn-text" catchtap="orderaftersale_event" data-oid="{{item.id}}" data-did="{{detail.id}}">{{detail.orderaftersale_btn_text}}</view>
</view>
<view class="oh goods-price">
<text class="sales-price">{{price_symbol}}{{detail.price}}</text>
......
sourcecode/weixin/pages/user-order/user-order.wxml
浏览文件 @ e9e7a001
......@@ -26,7 +26,7 @@
{{spec.type}}:{{spec.value}}
</view>
</block>
<view class="orderaftersale-btn-text" catchtap="orderaftersale_event" data-oid="{{item.id}}" data-did="{{detail.id}}">{{detail.orderaftersale_btn_text}}</view>
<view wx:if="{{(item.is_can_launch_aftersale == 1 || (detail.orderaftersale || null) != null) && ($detail.orderaftersale_btn_text || null) != null}}" class="orderaftersale-btn-text" catchtap="orderaftersale_event" data-oid="{{item.id}}" data-did="{{detail.id}}">{{detail.orderaftersale_btn_text}}</view>
</view>
<view class="oh goods-price">
<text class="sales-price">{{price_symbol}}{{detail.price}}</text>
......
Markdown is supported
0% 或 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑！
想要评论请 注册 或