goods

application/api/controller/mall/Orders.php

@@ -84,7 +84,7 @@ class Orders extends Api
         Db::startTrans();
         $info=$service->calculate();
         //Db::commit();
-        $this->success();
+        $this->success('',$info);
     }
 
     protected function validateTax(){

application/common/model/Goods.php

@@ -77,50 +77,6 @@ class Goods Extends Model
 
 
 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
     protected static function init()
     {
         self::beforeWrite(function (self $goods){

application/common/service/OrderService.php

@@ -172,7 +172,7 @@ class OrderService extends BaseService {
         $info['num']=array_sum(array_column($info['goods'],'num'));
         $info['num_install']=array_sum(array_column($info['goods'],'num_install'));
 
-        foreach ($info['goods'] as $goods){
+        foreach ($info['goods'] as &$goods){
             $amount=bcmul($this->getAmount($goods['sku'],$goods['goods']),$goods['num']);
             $goods['this_amount']=$amount;
             $info['amount_total']=bcadd($info['amount_total'],$amount);
@@ -187,11 +187,12 @@ class OrderService extends BaseService {
         if(!empty($this->coupon_use)){
             $use=false;
             $coupon=$user->coupon()->lock($this->isSubmit())->findOrFail($this->coupon_id);
-            foreach ($info['goods'] as $goods){
+            foreach ($info['goods'] as &$goods){
                 $amount=$goods['this_amount'];
                 if($coupon->canUse($amount,$goods['goods_id'])){
                     $use=true;
                     $couponAmount=$coupon['amount'];
+                    $goods['use_coupon_id']=$coupon['id'];
                     if($this->isSubmit()){
                         $coupon->setUse();
                     }