订单改价没有更新订单号问题

crmeb/app/api/controller/admin/StoreOrderController.php

@@ -1,4 +1,5 @@
 <?php
+
 namespace app\api\controller\admin;
 
 use app\models\store\StoreOrder;
@@ -28,7 +29,7 @@ class StoreOrderController
     public function statistics(Request $request)
     {
         $uid = $request->uid();
-        if(!StoreService::orderServiceStatus($uid))
+        if (!StoreService::orderServiceStatus($uid))
             return app('json')->fail('权限不足');
         $dataCount = StoreOrder::getOrderDataAdmin();
         $dataPrice = StoreOrder::getOrderTimeData();
@@ -44,12 +45,12 @@ class StoreOrderController
     public function data(Request $request)
     {
         $uid = $request->uid();
-        if(!StoreService::orderServiceStatus($uid))
+        if (!StoreService::orderServiceStatus($uid))
             return app('json')->fail('权限不足');
-        list($page, $limit) = UtilService::getMore([['page',1],['limit',7]], $request, true);
-        if(!$limit) return app('json')->successful([]);
+        list($page, $limit) = UtilService::getMore([['page', 1], ['limit', 7]], $request, true);
+        if (!$limit) return app('json')->successful([]);
         $data = StoreOrder::getOrderDataPriceCount($page, $limit);
-        if($data)  return app('json')->successful($data->toArray());
+        if ($data) return app('json')->successful($data->toArray());
         return app('json')->successful([]);
     }
 
@@ -61,18 +62,18 @@ class StoreOrderController
     public function lst(Request $request)
     {
         $uid = $request->uid();
-        if(!StoreService::orderServiceStatus($uid))
+        if (!StoreService::orderServiceStatus($uid))
             return app('json')->fail('权限不足');
         $where = UtilService::getMore([
-            ['status',''],
-            ['is_del',0],
-            ['data',''],
-            ['type',''],
-            ['order',''],
-            ['page',0],
-            ['limit',0]
+            ['status', ''],
+            ['is_del', 0],
+            ['data', ''],
+            ['type', ''],
+            ['order', ''],
+            ['page', 0],
+            ['limit', 0]
         ], $request);
-        if(!$where['limit']) return app('json')->successful([]);
+        if (!$where['limit']) return app('json')->successful([]);
         return app('json')->successful(StoreOrder::orderList($where));
     }
 
@@ -89,16 +90,16 @@ class StoreOrderController
     public function detail(Request $request, $orderId)
     {
         $uid = $request->uid();
-        if(!StoreService::orderServiceStatus($uid))
+        if (!StoreService::orderServiceStatus($uid))
             return app('json')->fail('权限不足');
         $order = StoreOrder::getAdminOrderDetail($orderId, 'id,uid,order_id,add_time,status,total_num,total_price,total_postage,pay_price,pay_postage,paid,refund_status,remark,pink_id,combination_id,mark,seckill_id,bargain_id,delivery_type,pay_type,real_name,user_phone,user_address,coupon_price,freight_price,delivery_name,delivery_type,delivery_id');
-        if(!$order) return app('json')->fail('订单不存在');
+        if (!$order) return app('json')->fail('订单不存在');
         $order = $order->toArray();
         $nickname = User::getUserInfo($order['uid'], 'nickname')['nickname'];
         $orderInfo = StoreOrder::tidyAdminOrder([$order], true)[0];
         unset($orderInfo['uid'], $orderInfo['seckill_id'], $orderInfo['pink_id'], $orderInfo['combination_id'], $orderInfo['bargain_id'], $orderInfo['status'], $orderInfo['total_postage']);
         $orderInfo['nickname'] = $nickname;
-        return app('json')->successful('ok',$orderInfo);
+        return app('json')->successful('ok', $orderInfo);
     }
 
     /**
@@ -114,14 +115,14 @@ class StoreOrderController
     public function delivery_gain(Request $request, $orderId)
     {
         $uid = $request->uid();
-        if(!StoreService::orderServiceStatus($uid))
+        if (!StoreService::orderServiceStatus($uid))
             return app('json')->fail('权限不足');
         $order = StoreOrder::getAdminOrderDetail($orderId, 'real_name,user_phone,user_address,order_id,uid,status,paid');
-        if(!$order) return app('json')->fail('订单不存在');
-        if($order['paid']){
+        if (!$order) return app('json')->fail('订单不存在');
+        if ($order['paid']) {
             $order['nickname'] = User::getUserInfo($order['uid'], 'nickname')['nickname'];
-            $order = $order->hidden(['uid','status','paid'])->toArray();
-            return app('json')->successful('ok',$order);
+            $order = $order->hidden(['uid', 'status', 'paid'])->toArray();
+            return app('json')->successful('ok', $order);
         }
         return app('json')->fail('状态错误');
     }
@@ -137,43 +138,43 @@ class StoreOrderController
     public function delivery_keep(Request $request)
     {
         $uid = $request->uid();
-        if(!StoreService::orderServiceStatus($uid))
+        if (!StoreService::orderServiceStatus($uid))
             return app('json')->fail('权限不足');
         list($order_id, $delivery_type, $delivery_name, $delivery_id) = UtilService::postMore([
-            ['order_id',''],
+            ['order_id', ''],
             ['delivery_type', 0],
             ['delivery_name', ''],
             ['delivery_id', ''],
         ], $request, true);
         $order = StoreOrder::getAdminOrderDetail($order_id, 'id,status,paid');
-        if(!$order) return app('json')->fail('订单不存在');
-        if(!$order['status'] && $order['paid']){
-            $deliveryTypeArr = ['send','express','fictitious'];
-            if(!strlen(trim($delivery_type))) return app('json')->fail('请填写发货方式');
-            if(!in_array($delivery_type, $deliveryTypeArr)) return app('json')->fail('发货方式错误');
-            if($delivery_type == 'express'){
-                if(!strlen(trim($delivery_name))) return app('json')->fail('请选择快递公司');
-                if(!strlen(trim($delivery_id))) return app('json')->fail('请填写快递单号');
+        if (!$order) return app('json')->fail('订单不存在');
+        if (!$order['status'] && $order['paid']) {
+            $deliveryTypeArr = ['send', 'express', 'fictitious'];
+            if (!strlen(trim($delivery_type))) return app('json')->fail('请填写发货方式');
+            if (!in_array($delivery_type, $deliveryTypeArr)) return app('json')->fail('发货方式错误');
+            if ($delivery_type == 'express') {
+                if (!strlen(trim($delivery_name))) return app('json')->fail('请选择快递公司');
+                if (!strlen(trim($delivery_id))) return app('json')->fail('请填写快递单号');
+            }
+            if ($delivery_type == 'send') {
+                if (!strlen(trim($delivery_name))) return app('json')->fail('请填写发货人');
+                if (!strlen(trim($delivery_id))) return app('json')->fail('请填写发货手机号');
             }
-            if($delivery_type == 'send'){
-                if(!strlen(trim($delivery_name))) return app('json')->fail('请填写发货人');
-                if(!strlen(trim($delivery_id))) return app('json')->fail('请填写发货手机号');
-             }
             $data['status'] = 1;
             $data['delivery_type'] = $delivery_type;
             $data['delivery_name'] = $delivery_name;
             $data['delivery_id'] = $delivery_id;
             $res = StoreOrder::edit($data, $order['id'], 'id');
-            if($res){
-                if($delivery_type == 'express'){
-                    StoreOrderStatus::status($order['id'],'delivery_goods','已发货 快递公司：'.$data['delivery_name'].' 快递单号：'.$data['delivery_id']);
-                }else if($delivery_type == 'send'){
-                    StoreOrderStatus::status($order['id'],'delivery','已配送 发货人：'.$delivery_name.' 发货人电话：'.$delivery_id);
-                }else if($delivery_type == 'fictitious'){
-                    StoreOrderStatus::status($order['id'],'delivery_fictitious','虚拟产品已发货');
+            if ($res) {
+                if ($delivery_type == 'express') {
+                    StoreOrderStatus::status($order['id'], 'delivery_goods', '已发货 快递公司：' . $data['delivery_name'] . ' 快递单号：' . $data['delivery_id']);
+                } else if ($delivery_type == 'send') {
+                    StoreOrderStatus::status($order['id'], 'delivery', '已配送 发货人：' . $delivery_name . ' 发货人电话：' . $delivery_id);
+                } else if ($delivery_type == 'fictitious') {
+                    StoreOrderStatus::status($order['id'], 'delivery_fictitious', '虚拟产品已发货');
                 }
             }
-            event('StoreProductOrderDeliveryGoodsAfter',[$data,$order['id']]);
+            event('StoreProductOrderDeliveryGoodsAfter', [$data, $order['id']]);
             return app('json')->successful('发货成功!');
         }
         return app('json')->fail('状态错误');
@@ -190,24 +191,25 @@ class StoreOrderController
     public function price(Request $request)
     {
         $uid = $request->uid();
-        if(!StoreService::orderServiceStatus($uid))
+        if (!StoreService::orderServiceStatus($uid))
             return app('json')->fail('权限不足');
         list($order_id, $price) = UtilService::postMore([
-            ['order_id',''],
+            ['order_id', ''],
             ['price', '']
         ], $request, true);
         $order = StoreOrder::getAdminOrderDetail($order_id, 'id,paid,pay_price,order_id,total_price,total_postage,pay_postage,gain_integral');
-        if(!$order) return app('json')->fail('订单不存在');
+        if (!$order) return app('json')->fail('订单不存在');
         $order = $order->toArray();
-        if(!$order['paid']){
-            if($price === '') return app('json')->fail('请填写实际支付金额');
-            if($price < 0) return app('json')->fail('实际支付金额不能小于0元');
-            if($order['pay_price'] == $price) return app('json')->successful('修改成功');
-            if(!StoreOrder::edit(['pay_price'=>$price], $order['id'], 'id'))
+        if (!$order['paid']) {
+            if ($price === '') return app('json')->fail('请填写实际支付金额');
+            if ($price < 0) return app('json')->fail('实际支付金额不能小于0元');
+            if ($order['pay_price'] == $price) return app('json')->successful('修改成功');
+            $order['order_id'] = StoreOrder::changeOrderId($order['order_id']);
+            if (!StoreOrder::edit(['pay_price' => $price, 'order_id' => $order['order_id']], $order['id'], 'id'))
                 return app('json')->fail('状态错误');
             $order['pay_price'] = $price;
-            event('StoreProductOrderEditAfter',[$order,$order['id']]);
-            StoreOrderStatus::status($order['id'],'order_edit','修改实际支付金额'.$price);
+            event('StoreProductOrderEditAfter', [$order, $order['id']]);
+            StoreOrderStatus::status($order['id'], 'order_edit', '修改实际支付金额' . $price);
             return app('json')->successful('修改成功');
         }
         return app('json')->fail('状态错误');
@@ -224,17 +226,17 @@ class StoreOrderController
     public function remark(Request $request)
     {
         $uid = $request->uid();
-        if(!StoreService::orderServiceStatus($uid))
+        if (!StoreService::orderServiceStatus($uid))
             return app('json')->fail('权限不足');
         list($order_id, $remark) = UtilService::postMore([
-            ['order_id',''],
+            ['order_id', ''],
             ['remark', '']
         ], $request, true);
         $order = StoreOrder::getAdminOrderDetail($order_id, 'id');
-        if(!$order) return app('json')->fail('订单不存在');
+        if (!$order) return app('json')->fail('订单不存在');
         $order = $order->toArray();
-        if(!strlen(trim($remark))) return app('json')->fail('请填写备注内容');
-        if(!StoreOrder::edit(['remark'=>$remark],$order['id']))
+        if (!strlen(trim($remark))) return app('json')->fail('请填写备注内容');
+        if (!StoreOrder::edit(['remark' => $remark], $order['id']))
             return app('json')->fail('备注失败');
         return app('json')->successful('备注成功');
     }
@@ -247,22 +249,22 @@ class StoreOrderController
     public function time(Request $request)
     {
         $uid = $request->uid();
-        if(!StoreService::orderServiceStatus($uid))
+        if (!StoreService::orderServiceStatus($uid))
             return app('json')->fail('权限不足');
         list($start, $stop, $type) = UtilService::getMore([
-            ['start',strtotime(date('Y-m'))],
-            ['stop',time()],
-            ['type',1]
+            ['start', strtotime(date('Y-m'))],
+            ['stop', time()],
+            ['type', 1]
         ], $request, true);
-        if($start == $stop) return false;
-        if($start > $stop){
+        if ($start == $stop) return false;
+        if ($start > $stop) {
             $middle = $stop;
             $stop = $start;
             $start = $middle;
         }
-        $space = bcsub($stop, $start,0);//间隔时间段
+        $space = bcsub($stop, $start, 0);//间隔时间段
         $front = bcsub($start, $space, 0);//第一个时间段
-        if($type == 1){//销售额
+        if ($type == 1) {//销售额
             $frontPrice = StoreOrder:: getOrderTimeBusinessVolumePrice($front, $start);
             $afterPrice = StoreOrder:: getOrderTimeBusinessVolumePrice($start, $stop);
             $chartInfo = StoreOrder::chartTimePrice($start, $stop);
@@ -270,12 +272,12 @@ class StoreOrderController
             $data['time'] = $afterPrice;//时间区间营业额
             $increase = (float)bcsub($afterPrice, $frontPrice, 2); //同比上个时间区间增长营业额
             $growthRate = abs($increase);
-            if($growthRate == 0) $data['growth_rate'] = 0;
-            else if($frontPrice == 0) $data['growth_rate'] = $growthRate;
+            if ($growthRate == 0) $data['growth_rate'] = 0;
+            else if ($frontPrice == 0) $data['growth_rate'] = $growthRate;
             else $data['growth_rate'] = (int)bcmul(bcdiv($growthRate, $frontPrice, 2), 100, 0);//时间区间增长率
             $data['increase_time'] = abs($increase); //同比上个时间区间增长营业额
-            $data['increase_time_status'] =  $increase >= 0 ? 1 : 2; //同比上个时间区间增长营业额增长 1 减少 2
-        }else{//订单数
+            $data['increase_time_status'] = $increase >= 0 ? 1 : 2; //同比上个时间区间增长营业额增长 1 减少 2
+        } else {//订单数
             $frontNumber = StoreOrder:: getOrderTimeBusinessVolumeNumber($front, $start);
             $afterNumber = StoreOrder:: getOrderTimeBusinessVolumeNumber($start, $stop);
             $chartInfo = StoreOrder::chartTimeNumber($start, $stop);
@@ -283,11 +285,11 @@ class StoreOrderController
             $data['time'] = $afterNumber;//时间区间订单数
             $increase = (int)bcsub($afterNumber, $frontNumber, 0); //同比上个时间区间增长订单数
             $growthRate = abs($increase);
-            if($growthRate == 0) $data['growth_rate'] = 0;
-            else if($frontNumber == 0) $data['growth_rate'] = $growthRate;
+            if ($growthRate == 0) $data['growth_rate'] = 0;
+            else if ($frontNumber == 0) $data['growth_rate'] = $growthRate;
             else $data['growth_rate'] = (int)bcmul(bcdiv($growthRate, $frontNumber, 2), 100, 0);//时间区间增长率
             $data['increase_time'] = abs($increase); //同比上个时间区间增长营业额
-            $data['increase_time_status'] =  $increase >= 0 ? 1 : 2; //同比上个时间区间增长营业额增长 1 减少 2
+            $data['increase_time_status'] = $increase >= 0 ? 1 : 2; //同比上个时间区间增长营业额增长 1 减少 2
         }
         return app('json')->successful($data);
     }
@@ -300,15 +302,16 @@ class StoreOrderController
      * @throws \think\db\exception\ModelNotFoundException
      * @throws \think\exception\DbException
      */
-    public function offline(Request $request){
+    public function offline(Request $request)
+    {
         list($orderId) = UtilService::postMore([['order_id', '']], $request, true);
         $orderInfo = StoreOrder::getAdminOrderDetail($orderId, 'id');
-        if(!$orderInfo) return app('json')->fail('参数错误');
+        if (!$orderInfo) return app('json')->fail('参数错误');
         $id = $orderInfo->id;
         $res = StoreOrder::updateOffline($id);
-        if($res){
-            event('StoreProductOrderOffline',[$id]);
-            StoreOrderStatus::status($id,'offline','线下付款');
+        if ($res) {
+            event('StoreProductOrderOffline', [$id]);
+            StoreOrderStatus::status($id, 'offline', '线下付款');
             return app('json')->successful('修改成功!');
         }
         return app('json')->fail(StoreOrder::getErrorInfo('修改失败!'));
@@ -326,77 +329,77 @@ class StoreOrderController
     public function refund(Request $request)
     {
         list($orderId, $price, $type) = UtilService::postMore([
-            ['order_id',''],
+            ['order_id', ''],
             ['price', 0],
-            ['type',1],
+            ['type', 1],
         ], $request, true);
-        if(!strlen(trim($orderId))) return app('json')->fail('参数错误');
+        if (!strlen(trim($orderId))) return app('json')->fail('参数错误');
         $orderInfo = StoreOrder::getAdminOrderDetail($orderId);
-        if(!$orderInfo) return app('json')->fail('数据不存在!');
+        if (!$orderInfo) return app('json')->fail('数据不存在!');
         $orderInfo = $orderInfo->toArray();
-        if($type == 1)
+        if ($type == 1)
             $data['refund_status'] = 2;
-        else if($type == 2)
+        else if ($type == 2)
             $data['refund_status'] = 0;
         else
             return app('json')->fail('退款修改状态错误');
-        if($orderInfo['pay_price'] == 0 || $type == 2) {
-            StoreOrder::update($data,['order_id'=>$orderId]);
+        if ($orderInfo['pay_price'] == 0 || $type == 2) {
+            StoreOrder::update($data, ['order_id' => $orderId]);
             return app('json')->successful('修改退款状态成功!');
         }
-        if($orderInfo['pay_price'] == $orderInfo['refund_price']) return app('json')->fail('已退完支付金额!不能再退款了');
-        if(!$price) return app('json')->fail('请输入退款金额');
+        if ($orderInfo['pay_price'] == $orderInfo['refund_price']) return app('json')->fail('已退完支付金额!不能再退款了');
+        if (!$price) return app('json')->fail('请输入退款金额');
         $data['refund_price'] = bcadd($price, $orderInfo['refund_price'], 2);
-        $bj = bccomp((float)$orderInfo['pay_price'],(float)$data['refund_price'],2);
-        if($bj < 0) return app('json')->fail('退款金额大于支付金额，请修改退款金额');
+        $bj = bccomp((float)$orderInfo['pay_price'], (float)$data['refund_price'], 2);
+        if ($bj < 0) return app('json')->fail('退款金额大于支付金额，请修改退款金额');
         $refundData['pay_price'] = $orderInfo['pay_price'];
         $refundData['refund_price'] = $price;
-        if($orderInfo['pay_type'] == 'weixin'){
-            if($orderInfo['is_channel'] == 1){// 小程序
-                try{
+        if ($orderInfo['pay_type'] == 'weixin') {
+            if ($orderInfo['is_channel'] == 1) {// 小程序
+                try {
                     MiniProgramService::payOrderRefund($orderInfo['order_id'], $refundData);
-                }catch(\Exception $e){
+                } catch (\Exception $e) {
                     return app('json')->fail($e->getMessage());
                 }
-            }else{// 公众号
-                try{
+            } else {// 公众号
+                try {
                     WechatService::payOrderRefund($orderInfo['order_id'], $refundData);
-                }catch(\Exception $e){
+                } catch (\Exception $e) {
                     return app('json')->fail($e->getMessage());
                 }
             }
-        }else if($orderInfo['pay_type'] == 'yue'){//余额
+        } else if ($orderInfo['pay_type'] == 'yue') {//余额
             StoreOrder::beginTrans();
             $userInfo = User::getUserInfo($orderInfo['uid'], 'now_money');
-            if(!$userInfo){
+            if (!$userInfo) {
                 StoreOrder::rollbackTrans();
                 return app('json')->fail('订单用户不存在');
             }
-            $res1 = User::bcInc($orderInfo['uid'],'now_money',$price,'uid');
-            $res2 = $res2 = UserBill::income('商品退款',$orderInfo['uid'],'now_money','pay_product_refund', $price, $orderInfo['id'],bcadd($userInfo['now_money'], $price,2),'订单退款到余额'.floatval($price).'元');
-            try{
+            $res1 = User::bcInc($orderInfo['uid'], 'now_money', $price, 'uid');
+            $res2 = $res2 = UserBill::income('商品退款', $orderInfo['uid'], 'now_money', 'pay_product_refund', $price, $orderInfo['id'], bcadd($userInfo['now_money'], $price, 2), '订单退款到余额' . floatval($price) . '元');
+            try {
                 OrderRepository::storeOrderYueRefund($orderInfo, $refundData);
-            }catch (\Exception $e){
+            } catch (\Exception $e) {
                 StoreOrder::rollbackTrans();
                 return app('json')->fail($e->getMessage());
             }
             $res = $res1 && $res2;
             StoreOrder::checkTrans($res);
-            if(!$res) return app('json')->fail('余额退款失败!');
+            if (!$res) return app('json')->fail('余额退款失败!');
         }
-        $resEdit = StoreOrder::edit($data,$orderInfo['id'], 'id');
-        if($resEdit){
+        $resEdit = StoreOrder::edit($data, $orderInfo['id'], 'id');
+        if ($resEdit) {
             $data['type'] = $type;
-            if($data['type'] == 1)  StorePink::setRefundPink($orderInfo['id']);
-            try{
+            if ($data['type'] == 1) StorePink::setRefundPink($orderInfo['id']);
+            try {
                 OrderRepository::storeProductOrderRefundY($data, $orderInfo['id']);
-            }catch (\Exception $e){
+            } catch (\Exception $e) {
                 return app('json')->fail($e->getMessage());
             }
-            StoreOrderStatus::status($orderInfo['id'],'refund_price','退款给用户'.$price.'元');
+            StoreOrderStatus::status($orderInfo['id'], 'refund_price', '退款给用户' . $price . '元');
             return app('json')->successful('修改成功!');
-        }else{
-            StoreOrderStatus::status($orderInfo['id'],'refund_price','退款给用户'.$price.'元失败');
+        } else {
+            StoreOrderStatus::status($orderInfo['id'], 'refund_price', '退款给用户' . $price . '元失败');
             return app('json')->successful('修改失败!');
         }
     }

crmeb/app/models/system/SystemStore.php

@@ -50,7 +50,7 @@ class SystemStore extends BaseModel
         if($storeInfo) {
             $storeInfo['latlng'] = self::getLatlngAttr(null, $storeInfo);
             $storeInfo['valid_time'] = $storeInfo['valid_time'] ? explode(' - ', $storeInfo['valid_time']) : [];
-            $storeInfo['_valid_time'] = str_replace('-','/',$storeInfo['valid_time'][0].' ~ '.$storeInfo['valid_time'][1]);
+            $storeInfo['_valid_time'] = str_replace('-','/',($storeInfo['valid_time'][0] ?? '').' ~ '.($storeInfo['valid_time'][1]) ?? '');
             $storeInfo['day_time'] = $storeInfo['day_time'] ? str_replace(' - ',' ~ ',$storeInfo['day_time']) : [];
             $storeInfo['_detailed_address'] = $storeInfo['address'].' '.$storeInfo['detailed_address'];
             $storeInfo['address'] = $storeInfo['address'] ? explode(',', $storeInfo['address']) : [];