|
@@ -116,13 +116,36 @@ class Order extends Common
|
|
|
public function calc()
|
|
|
{
|
|
|
$params = $this->request->param();
|
|
|
+
|
|
|
+ //购物车
|
|
|
+ $cart = input('cart',0);
|
|
|
+ if(!empty($cart)){
|
|
|
+ unset($params['goods_list']);
|
|
|
+ // 多个商品
|
|
|
+ $carts = (new \app\admin\model\shopro\Cart)
|
|
|
+ ->whereIn('id', $cart)
|
|
|
+ ->order(['id' => 'desc'])
|
|
|
+ ->select();
|
|
|
+ $goods_list = [];
|
|
|
+ foreach ($carts as $cart) {
|
|
|
+ $goods_list[] = [
|
|
|
+ 'goods_id' => $cart['goods_id'],
|
|
|
+ 'goods_sku_price_id' => $cart['goods_sku_price_id'],
|
|
|
+ 'goods_num' => $cart['goods_num'],
|
|
|
+ ];
|
|
|
+ }
|
|
|
+ $params['goods_list'] = empty($goods_list) ? '' : json_encode($goods_list);
|
|
|
+ }
|
|
|
+ //购物车
|
|
|
+
|
|
|
$this->svalidate($params, ".calc");
|
|
|
|
|
|
$orderCreate = new OrderCreate($params);
|
|
|
$result = $orderCreate->calc();
|
|
|
|
|
|
if (isset($result['msg']) && $result['msg']) {
|
|
|
- $this->error($result['msg'], 1, $result);
|
|
|
+// $this->error($result['msg'], 1, $result);
|
|
|
+ $this->error($result['msg']);
|
|
|
} else {
|
|
|
$this->success('计算成功', $result);
|
|
|
}
|