Skip to content

ShopXO
ShopXO

jamesyang1999 / ShopXO
与 Fork 源项目一致

Fork自 纵之格 / ShopXO

通知 1
Star 0
Fork 0
ShopXO
ShopXO

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

提交 c549dafe 编写于 作者: D devil_gong
浏览文件
操作

库存扣除

上级 70a4a67f
隐藏空白更改
内联 并排
Showing with 236 addition and 71 deletion
service/Application/Admin/Controller/OrderController.class.php
浏览文件 @ c549dafe
......@@ -318,6 +318,30 @@ class OrderController extends CommonController
$this->ajaxReturn($ret['msg'], $ret['code'], $ret['data']);
}
/**
* [Confirm 订单确认]
* @author Devil
* @blog http://gong.gg/
* @version 0.0.1
* @datetime 2016-12-15T11:03:30+0800
*/
public function Confirm()
{
// 是否ajax请求
if(!IS_AJAX)
{
$this->error(L('common_unauthorized_access'));
}
// 订单确认
$params = $_POST;
$params['user_id'] = $params['value'];
$params['creator'] = $this->admin['id'];
$params['creator_name'] = $this->admin['username'];
$ret = OrderService::OrderConfirm($params);
$this->ajaxReturn($ret['msg'], $ret['code'], $ret['data']);
}
/**
* 订单支付
* @author Devil
......
service/Application/Admin/View/Default/Config/Index.html
浏览文件 @ c549dafe
......@@ -33,6 +33,14 @@
</foreach>
</select>
</div>
<div class="am-form-group">
<label>{{$data.common_order_is_booking.name}}<span class="fs-12 fw-100 cr-999">（{{$data.common_order_is_booking.describe}}）</span></label>
<select name="{{$data.common_order_is_booking.only_tag}}" class="am-radius chosen-select c-p" data-validation-message="{{$data.common_order_is_booking.error_tips}}" required>
<foreach name="common_is_text_list" item="v">
<option value="{{$v.id}}" <if condition="isset($data['common_order_is_booking']['value']) and $data['common_order_is_booking']['value'] eq $v['id']">selected</if>>{{$v.name}}</option>
</foreach>
</select>
</div>
<div class="am-form-group">
<label>{{$data.common_share_giving_integral_frequency.name}}<span class="fs-12 fw-100 cr-999">（{{$data.common_share_giving_integral_frequency.describe}}）</span></label>
<input type="number" name="{{$data.common_share_giving_integral_frequency.only_tag}}" placeholder="{{$data.common_share_giving_integral_frequency.name}}" data-validation-message="{{$data.common_share_giving_integral_frequency.error_tips}}" class="am-radius" <present name="data"> value="{{$data.common_share_giving_integral_frequency.value}}"</present> />
......
service/Application/Admin/View/Default/Goods/SaveInfo.html
浏览文件 @ c549dafe
......@@ -149,15 +149,15 @@
</div>
<div class="am-form-group">
<label class="block">{{:L('goods_is_deduction_inventory_text')}}<span class="fs-12 fw-100 cr-999">（{{:L('goods_is_deduction_inventory_tips')}}）</span></label>
<input name="is_deduction_inventory" value="1" type="checkbox" data-off-text="{{:L('common_operation_off_is_text')}}" data-on-text="{{:L('common_operation_on_is_text')}}" data-size="xs" data-on-color="success" data-off-color="default" data-handle-width="50" data-am-switch <if condition="!empty($data) and $data['is_deduction_inventory'] eq 1">checked="true"</if> />
<input name="is_deduction_inventory" value="1" type="checkbox" data-off-text="{{:L('common_operation_off_is_text')}}" data-on-text="{{:L('common_operation_on_is_text')}}" data-size="xs" data-on-color="success" data-off-color="default" data-handle-width="50" data-am-switch <if condition="(isset($data['is_deduction_inventory']) and $data['is_deduction_inventory'] eq 1) or empty($data)">checked="true"</if> />
</div>
<div class="am-form-group">
<label class="block">{{:L('goods_is_shelves_text')}}<span class="fs-12 fw-100 cr-999">（{{:L('goods_is_shelves_tips')}}）</span></label>
<input name="is_shelves" value="1" type="checkbox" data-off-text="{{:L('common_operation_off_goods_text')}}" data-on-text="{{:L('common_operation_on_goods_text')}}" data-size="xs" data-on-color="success" data-off-color="default" data-handle-width="50" data-am-switch <if condition="(!empty($data) and $data['is_shelves'] eq 1) or (empty($data))">checked="true"</if> />
<input name="is_shelves" value="1" type="checkbox" data-off-text="{{:L('common_operation_off_goods_text')}}" data-on-text="{{:L('common_operation_on_goods_text')}}" data-size="xs" data-on-color="success" data-off-color="default" data-handle-width="50" data-am-switch <if condition="(isset($data['is_shelves']) and $data['is_shelves'] eq 1) or empty($data)">checked="true"</if> />
</div>
<div class="am-form-group">
<label class="block">{{:L('goods_is_home_recommended_text')}}<span class="fs-12 fw-100 cr-999">（{{:L('goods_is_home_recommended_tips')}}）</span></label>
<input name="is_home_recommended" value="1" type="checkbox" data-off-text="{{:L('common_operation_off_is_text')}}" data-on-text="{{:L('common_operation_on_is_text')}}" data-size="xs" data-on-color="success" data-off-color="default" data-handle-width="50" data-am-switch <if condition="!empty($data) and $data['is_home_recommended'] eq 1">checked="true"</if> />
<input name="is_home_recommended" value="1" type="checkbox" data-off-text="{{:L('common_operation_off_is_text')}}" data-on-text="{{:L('common_operation_on_is_text')}}" data-size="xs" data-on-color="success" data-off-color="default" data-handle-width="50" data-am-switch <if condition="isset($data['is_home_recommended']) and $data['is_home_recommended'] eq 1">checked="true"</if> />
</div>
</div>
<div id="goods-nav-photo" class="division-block">
......
service/Application/Admin/View/Default/Order/Index.html
浏览文件 @ c549dafe
......@@ -216,6 +216,9 @@
</div>
</td>
<td class="view-operation">
<if condition="in_array($v['status'], [0])">
<button class="am-btn am-btn-default am-btn-xs am-radius am-icon-check-circle-o am-btn-block submit-ajax" data-url="{{:U('Admin/Order/Confirm')}}" data-id="{{$v.id}}" data-value="{{$v.user_id}}" data-view="reload" data-msg="{{:L('common_collect_tips')}}"> {{:L('common_operation_confirm')}}</button>
</if>
<if condition="in_array($v['status'], [0,1])">
<button class="am-btn am-btn-default am-btn-xs am-radius am-icon-paint-brush am-btn-block submit-ajax" data-url="{{:U('Admin/Order/Cancel')}}" data-id="{{$v.id}}" data-value="{{$v.user_id}}" data-view="reload" data-msg="{{:L('common_cancel_tips')}}"> {{:L('common_operation_cancel')}}</button>
<if condition="in_array($v['status'], [1])">
......
service/Application/Home/View/Default/Buy/Index.html
浏览文件 @ c549dafe
......@@ -275,7 +275,7 @@ function BuySubmitBack(e)
}
setTimeout(function()
{
window.location.href = e.data.pay_url;
window.location.href = e.data.jump_url;
}, 1500);
} else {
$('form.form-validation').find('button[type="submit"]').button('reset');
......
service/Application/Home/View/Default/Goods/Index.html
浏览文件 @ c549dafe
......@@ -118,7 +118,7 @@
</ul>
<!--各种规格-->
<if condition="$goods['is_shelves'] == 1">
<if condition="$goods['is_shelves'] == 1 and $goods['inventory'] gt 0">
<dl class="iteminfo_parameter sys_item_specpara">
<dt class="buy-event login-event" data-type="buy">
<div class="cart-title">
......@@ -184,46 +184,51 @@
</if>
</div>
<!--手机导航-->
<!-- 购买导航 -->
<div class="buy-nav">
<if condition="$goods['is_shelves'] == 1">
<div class="buy-nav-opt">
<a href="{{:__MY_URL__}}">
<span class="am-icon-home am-icon-fw"> 首页</span>
</a>
<if condition="isset($goods['is_favor']) and $goods['is_favor'] eq 1">
<span class="am-icon-heart am-icon-fw login-event favor-submit text-active" data-ajax-url="{{:U('Home/Goods/Favor')}}">
<em class="goods-favor-text">已收藏</em>
<em class="goods-favor-count">({{$goods.favor_count}})</em>
</span>
<else />
<span class="am-icon-heart am-icon-fw favor-submit login-event" data-ajax-url="{{:U('Home/Goods/Favor')}}"> <em class="goods-favor-text">收藏</em>
<em class="goods-favor-count">({{$goods.favor_count}})</em>
</span>
</if>
</div>
<div class="submit">
<div class="clearfix tb-btn tb-btn-buy buy-event login-event buy-submit" data-type="buy">
<button title="点此按钮到下一步确认购买信息" href="javascript:;" type="button">立即购买</button>
<notempty name="goods.is_shelves">
<if condition="$goods['inventory'] gt 0">
<div class="buy-nav-opt">
<a href="{{:__MY_URL__}}">
<span class="am-icon-home am-icon-fw"> 首页</span>
</a>
<if condition="isset($goods['is_favor']) and $goods['is_favor'] eq 1">
<span class="am-icon-heart am-icon-fw login-event favor-submit text-active" data-ajax-url="{{:U('Home/Goods/Favor')}}">
<em class="goods-favor-text">已收藏</em>
<em class="goods-favor-count">({{$goods.favor_count}})</em>
</span>
<else />
<span class="am-icon-heart am-icon-fw favor-submit login-event" data-ajax-url="{{:U('Home/Goods/Favor')}}"> <em class="goods-favor-text">收藏</em>
<em class="goods-favor-count">({{$goods.favor_count}})</em>
</span>
</if>
</div>
</div>
<div class="submit">
<div class="clearfix tb-btn tb-btn-basket buy-event login-event cart-submit" data-type="cart" data-ajax-url="{{:U('Home/Cart/Save')}}">
<button title="加入购物车" href="javascript:;" type="button"><i></i>加入购物车</button>
<div class="submit">
<div class="clearfix tb-btn tb-btn-buy buy-event login-event buy-submit" data-type="buy">
<button title="点此按钮到下一步确认购买信息" href="javascript:;" type="button">立即购买</button>
</div>
</div>
<div class="submit">
<div class="clearfix tb-btn tb-btn-basket buy-event login-event cart-submit" data-type="cart" data-ajax-url="{{:U('Home/Cart/Save')}}">
<button title="加入购物车" href="javascript:;" type="button"><i></i>加入购物车</button>
</div>
</div>
</div>
<!-- 购买表单 -->
<form action="{{:U('Home/Buy/Index')}}" method="post" class="buy-form">
<input type="hidden" name="goods_id" value="{{$goods.id}}" />
<input type="hidden" name="buy_type" value="goods" />
<input type="hidden" name="stock" value="1" />
<input type="hidden" name="attr" value="" />
<button type="submit"></button>
</form>
<else />
<p class="shelves-tips">商品已下架</p>
</if>
<!-- 购买表单 -->
<form action="{{:U('Home/Buy/Index')}}" method="post" class="buy-form">
<input type="hidden" name="goods_id" value="{{$goods.id}}" />
<input type="hidden" name="buy_type" value="goods" />
<input type="hidden" name="stock" value="1" />
<input type="hidden" name="attr" value="" />
<button type="submit"></button>
</form>
<else />
<p class="goods-not-buy-tips">商品卖光了</p>
</if>
</notempty>
<empty name="goods.is_shelves">
<p class="goods-not-buy-tips">商品已下架</p>
</empty>
</div>
</div>
</div>
......
service/Application/Service/BuyService.class.php
浏览文件 @ c549dafe
......@@ -599,15 +599,18 @@ class BuyService
'receive_county' => $address['data']['county'],
'receive_address' => $address['data']['address'],
'user_note' => I('user_note', null, null, $params),
'status' => 1,
'status' => (intval(MyC('common_order_is_booking', 0)) == 1) ? 0 : 1,
'preferential_price' => $preferential_price,
'price' => $check['data']['total_price'],
'total_price' => $check['data']['total_price']-$preferential_price,
'express_id' => intval($params['express_id']),
'payment_id' => intval($params['payment_id']),
'add_time' => time(),
'confirm_time' => time(),
];
if($order['status'] == 1)
{
$order['confirm_time'] = time();
}
// 开始事务
$m = M('Order');
......@@ -644,12 +647,32 @@ class BuyService
return DataReturn('订单添加失败', -1);
}
// 库存扣除
if($order['status'] == 1)
{
$ret = self::OrderInventoryDeduct(['order_id'=>$order_id, 'order_data'=>$order]);
if($ret['status'] != 0)
{
// 事务回滚
$m->rollback();
return DataReturn($ret['msg'], -10);
}
}
// 订单提交成功
$m->commit();
// 删除购物车
self::BuyCartDelete($params);
// 返回信息
$result = [
'order' => $m->find($order_id),
'jump_url' => U('Home/Order/Index'),
];
// 获取订单信息
switch($order['status'])
{
......@@ -661,6 +684,7 @@ class BuyService
// 提交成功
case 1 :
$msg = L('common_submit_success');
$result['jump_url'] = U('Home/Order/Pay', ['id'=>$order_id]);
break;
// 默认操作成功
......@@ -668,10 +692,6 @@ class BuyService
$msg = L('common_operation_success');
}
$result = [
'order' => $m->find($order_id),
'pay_url' => U('Home/Order/Pay', ['id'=>$order_id]),
];
return DataReturn($msg, 0, $result);
}
......@@ -795,25 +815,30 @@ class BuyService
$log_m = M('OrderGoodsInventoryLog');
foreach($order_detail as $v)
{
$goods = $goods_m->field('is_deduction_inventory,inventory')->find($v['goods_id']);
if(isset($goods['is_deduction_inventory']) && $goods['is_deduction_inventory'] == 1)
// 查看是否已扣除过库存,避免更改模式导致重复扣除
$temp = $log_m->where(['order_id'=>$params['order_id'], 'goods_id'=>$v['goods_id']])->find();
if(empty($temp))
{
// 扣除操作
if(!$goods_m->where(['id'=>$v['goods_id']])->setDec('inventory', $v['buy_number']))
$goods = $goods_m->field('is_deduction_inventory,inventory')->find($v['goods_id']);
if(isset($goods['is_deduction_inventory']) && $goods['is_deduction_inventory'] == 1)
{
return DataReturn('库存扣减失败['.$params['order_id'].'-'.$v['goods_id'].']', -10);
// 扣除操作
if(!$goods_m->where(['id'=>$v['goods_id']])->setDec('inventory', $v['buy_number']))
{
return DataReturn('库存扣减失败['.$params['order_id'].'-'.$v['goods_id'].']', -10);
}
// 扣除日志添加
$log_data = [
'order_id' => $params['order_id'],
'goods_id' => $v['goods_id'],
'order_status' => $params['order_data']['status'],
'original_inventory' => $goods['inventory'],
'new_inventory' => $goods_m->where(['id'=>$v['goods_id']])->getField('inventory'),
'add_time' => time(),
];
$log_m->add($log_data);
}
// 扣除日志添加
$log_data = [
'order_id' => $params['order_id'],
'goods_id' => $v['goods_id'],
'order_status' => $params['order_data']['status'],
'original_inventory' => $goods['inventory'],
'new_inventory' => $goods['inventory']+$v['buy_number'],
'add_time' => time(),
];
$log_m->add($log_data);
}
}
}
......
service/Application/Service/OrderService.class.php
浏览文件 @ c549dafe
......@@ -734,24 +734,41 @@ class OrderService
return DataReturn('状态不可操作['.$status_text.']', -1);
}
$data = [
// 开启事务
$m->startTrans();
$upd_data = [
'status' => 3,
'express_id' => intval($params['express_id']),
'express_number' => I('express_number', '', '', $params),
'delivery_time' => time(),
'upd_time' => time(),
];
if($m->where($where)->save($data))
if($m->where($where)->save($upd_data))
{
// 库存扣除
$ret = BuyService::OrderInventoryDeduct(['order_id'=>$params['id'], 'order_data'=>$upd_data]);
if($ret['status'] != 0)
{
// 事务回滚
$m->rollback();
return DataReturn($ret['msg'], -10);
}
// 用户消息
MessageService::MessageAdd($order['user_id'], '订单发货', '订单已发货', 1, $order['id']);
// 订单状态日志
$creator = isset($params['creator']) ? intval($params['creator']) : 0;
$creator_name = isset($params['creator_name']) ? htmlentities($params['creator_name']) : '';
self::OrderHistoryAdd($order['id'], $data['status'], $order['status'], '收货', $creator, $creator_name);
self::OrderHistoryAdd($order['id'], $upd_data['status'], $order['status'], '收货', $creator, $creator_name);
// 提交事务
$m->commit();
return DataReturn(L('common_operation_delivery_success'), 0);
}
// 事务回滚
$m->rollback();
return DataReturn(L('common_operation_delivery_error'), -1);
}
......@@ -799,12 +816,13 @@ class OrderService
return DataReturn('状态不可操作['.$status_text.']', -1);
}
$data = [
// 更新订单状态
$upd_data = [
'status' => 4,
'collect_time' => time(),
'upd_time' => time(),
];
if($m->where($where)->save($data))
if($m->where($where)->save($upd_data))
{
// 用户消息
MessageService::MessageAdd($order['user_id'], '订单收货', '订单收货成功', 1, $order['id']);
......@@ -812,12 +830,94 @@ class OrderService
// 订单状态日志
$creator = isset($params['creator']) ? intval($params['creator']) : 0;
$creator_name = isset($params['creator_name']) ? htmlentities($params['creator_name']) : '';
self::OrderHistoryAdd($order['id'], $data['status'], $order['status'], '收货', $creator, $creator_name);
self::OrderHistoryAdd($order['id'], $upd_data['status'], $order['status'], '收货', $creator, $creator_name);
return DataReturn(L('common_operation_collect_success'), 0);
}
return DataReturn(L('common_operation_collect_error'), -1);
}
/**
* 订单确认
* @author Devil
* @blog http://gong.gg/
* @version 1.0.0
* @date 2018-09-30
* @desc description
* @param [array] $params [输入参数]
*/
public static function OrderConfirm($params = [])
{
// 请求参数
$p = [
[
'checked_type' => 'empty',
'key_name' => 'id',
'error_msg' => '订单id有误',
],
[
'checked_type' => 'empty',
'key_name' => 'user_id',
'error_msg' => '用户id有误',
],
];
$ret = params_checked($params, $p);
if($ret !== true)
{
return DataReturn($ret, -1);
}
// 获取订单信息
$m = M('Order');
$where = ['id'=>intval($params['id']), 'user_id'=>$params['user_id'], 'is_delete_time'=>0, 'user_is_delete_time'=>0];
$order = $m->where($where)->field('id,status,user_id')->find();
if(empty($order))
{
return DataReturn(L('common_data_no_exist_error'), -1);
}
if(!in_array($order['status'], [0]))
{
$status_text = L('common_order_admin_status')[$order['status']]['name'];
return DataReturn('状态不可操作['.$status_text.']', -1);
}
// 开启事务
$m->startTrans();
// 更新订单状态
$upd_data = [
'status' => 1,
'confirm_time' => time(),
'upd_time' => time(),
];
if($m->where($where)->save($upd_data))
{
// 库存扣除
$ret = BuyService::OrderInventoryDeduct(['order_id'=>$params['id'], 'order_data'=>$upd_data]);
if($ret['status'] != 0)
{
// 事务回滚
$m->rollback();
return DataReturn($ret['msg'], -10);
}
// 用户消息
MessageService::MessageAdd($order['user_id'], '订单确认', '订单确认成功', 1, $order['id']);
// 订单状态日志
$creator = isset($params['creator']) ? intval($params['creator']) : 0;
$creator_name = isset($params['creator_name']) ? htmlentities($params['creator_name']) : '';
self::OrderHistoryAdd($order['id'], $upd_data['status'], $order['status'], '确认', $creator, $creator_name);
// 事务提交
$m->commit();
return DataReturn(L('common_confirm_success'), 0);
}
// 事务回滚
$m->rollback();
return DataReturn(L('common_confirm_error'), -1);
}
/**
* 订单删除
* @author Devil
......
service/Public/Home/Default/Css/Goods.css
浏览文件 @ c549dafe
......@@ -289,7 +289,7 @@ li.am-comment{ width:100%}
.nav.white,.tip{z-index:999}
/* 文字提示 */
.shelves-tips { color: #FF5722; margin: 5px 0; font-size: 14px; }
.goods-not-buy-tips { color: #FF5722; margin: 5px 0; font-size: 14px; }
@media only screen and (min-width:640px) {
/*导航固定*/
......@@ -456,7 +456,7 @@ li.am-comment{ width:100%}
/* 推荐商品 */
.like li:not(:nth-of-type(2n)) { border-right: 1px solid #eee; }
.like li:nth-child(1), .like li:nth-child(2) { border-top: 0px; }
.shelves-tips { text-align: center; }
.goods-not-buy-tips { text-align: center; }
.goods-favor-count { display: none; }
/* 视频操作 */
......
Markdown is supported
0% 或 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑！
想要评论请 注册 或