1

application/api/controller/Order.php

@@ -199,6 +199,7 @@ class Order extends Base
             ->where(['id'=>$goods_id,'status'=>1,'is_deleted'=>0])
             ->find();
         if(empty($goods_info))  $this->error('商品已下架');
+        $send_info = Db::table('delivery_address')->field('pro_name,city_name,county_name,mer_name,detail,phone,name')->find($add_id);
         $source = $goods_info['is_integral'];
         $spec_info = [];
         $goods_spec = json_decode($goods_info['spec'],true);
@@ -252,7 +253,8 @@ class Order extends Base
             'coupon_cash'   =>$coupon_cash,
             'remark'        =>$remark,
             'goods_num'     =>$num,
-            'pro_info'      =>json_encode($pro_info)
+            'pro_info'      =>json_encode($pro_info),
+            'send_info'      =>json_encode($send_info)
         ];
         Db::startTrans();
         $msg= '';$com=true;
@@ -376,6 +378,7 @@ class Order extends Base
         $trolley_arr = Db::table('shopping_trolley')
             ->where(['user_id'=>$this->uid,'id'=>explode(',',$ids)])
             ->select();
+        $send_info = Db::table('delivery_address')->field('pro_name,city_name,county_name,mer_name,detail,phone,name')->find($add_id);
         $pro_info = [];$total_num = 0;$check_goods = true;
         // 验证商品是否下架 && 获取订单商品详情
         foreach ($trolley_arr as $tv) {
@@ -435,7 +438,8 @@ class Order extends Base
             'coupon_cash'   =>$coupon_cash,
             'remark'        =>$remark,
             'goods_num'     =>$total_num,
-            'pro_info'      =>json_encode($pro_info)
+            'pro_info'      =>json_encode($pro_info),
+            'send_info'     =>json_encode($send_info)
         ];
         Db::startTrans();
         $msg= '';$com=true;
@@ -517,7 +521,7 @@ class Order extends Base
     {
         $order_id = input('id',0);
         $detail = Db::table('store_order')->find($order_id);
-        $add_info = Db::table('delivery_address')->find($detail['address_id']);
+        $add_info = json_decode($detail['send_info'],true);
         $detail['address_area']  = $add_info['mer_name'];
         $detail['address_detail'] = $add_info['detail'];
         $detail['address_user'] = $add_info['name'];

application/store/controller/Order.php

@@ -84,7 +84,8 @@ class Order extends Controller
         }
         if ($this->request->isGet() && $this->request->action() == 'deliver') {
             if (isset($data['address_id'])){
-                $this->address_info = Db::table('delivery_address')->field('id,mer_name,detail,phone,name')->find($data['address_id']);
+                $this->address_info = json_decode($data['send_info'],true);
+                //$this->address_info = Db::table('delivery_address')->field('id,mer_name,detail,phone,name')->find($data['address_id']);
             }
         }
     }