diff --git a/app/admin/controller/Finance.php b/app/admin/controller/Finance.php index cda3e77..87426d5 100755 --- a/app/admin/controller/Finance.php +++ b/app/admin/controller/Finance.php @@ -59,7 +59,7 @@ class Finance extends Base foreach ($data['list'] as &$value) { $user_info = User::field('nickname,headimg,mobile')->where('id', '=', $value['user_id'])->find(); if (empty($user_info)) { - $user_info['nickname'] =''; + $user_info['nickname'] = ''; $user_info['headimg'] = ''; $user_info['mobile'] = ''; } @@ -149,7 +149,7 @@ class Finance extends Base foreach ($data['list'] as &$value) { $user_info = User::field('nickname,headimg,mobile')->where(['id' => $value['user_id']])->find(); if (empty($user_info)) { - $user_info['nickname'] =''; + $user_info['nickname'] = ''; $user_info['headimg'] = ''; $user_info['mobile'] = ''; } @@ -193,7 +193,7 @@ class Finance extends Base foreach ($data['list'] as &$value) { $user_info = User::field('nickname,headimg,mobile')->where(['id' => $value['user_id']])->find(); if (empty($user_info)) { - $user_info['nickname'] =''; + $user_info['nickname'] = ''; $user_info['headimg'] = ''; $user_info['mobile'] = ''; } @@ -241,7 +241,7 @@ class Finance extends Base foreach ($data['list'] as &$value) { $user_info = User::field('nickname,headimg,mobile')->where(['id' => $value['user_id']])->find(); if (empty($user_info)) { - $user_info['nickname'] =''; + $user_info['nickname'] = ''; $user_info['headimg'] = ''; $user_info['mobile'] = ''; } @@ -296,16 +296,19 @@ class Finance extends Base foreach ($data['list'] as &$value) { $content = json_decode($value['content'], true); - $value['money'] = $content['total_fee'] / 100; - - $total_money += $value['money']; + if (!is_string($content)) { + $value['money'] = intval($content['total_fee']) / 100; + $total_money += $value['money']; + }else{ + $value['money'] =$content; + } $user_info = User::field('nickname,headimg,mobile')->where(['id' => $value['user_id']])->find(); if ($user_info != null) { $value['nickname'] = $user_info['nickname']; $value['headimg'] = $user_info['headimg']; $value['mobile'] = $user_info['mobile']; } else { - $value['nickname'] =''; + $value['nickname'] = ''; $value['headimg'] = ''; $value['mobile'] = ''; } diff --git a/app/admin/controller/Order.php b/app/admin/controller/Order.php index 70e5583..09d9d92 100755 --- a/app/admin/controller/Order.php +++ b/app/admin/controller/Order.php @@ -780,7 +780,7 @@ class Order extends Base $goods = OrderList::where('send_num', $value['send_num']) ->append(['shang_title', 'card_no']) - ->group('prize_code') + // ->group('prize_code') ->order('id desc') ->select() ->toArray(); @@ -794,7 +794,7 @@ class Order extends Base $value['mobile'], $value['address'], $goods_value['goodslist_title'], - $goods_value['goodslist_price'], + $goods_value['goodslist_money'], $goods_value['num'], $goods_value['card_no'], $goods_value['shang_title'], diff --git a/app/common/server/WechatRefund.php b/app/common/server/WechatRefund.php index fcce458..a8dfddb 100755 --- a/app/common/server/WechatRefund.php +++ b/app/common/server/WechatRefund.php @@ -33,7 +33,8 @@ class WechatRefund extends MyController if ($result['return_code'] === 'SUCCESS' && $result['result_code'] === 'SUCCESS') { return ['status' => 1, 'msg' => $result]; } else { - return ['status' => 0, 'msg' => $result['err_code_des']]; + // return ['status' => 0, 'msg' => $result['err_code_des']]; + return ['status' => 0, 'msg' => '运费订单退款失败!,退款订单号==》' . $info['send_num']]; } } @@ -124,12 +125,68 @@ class WechatRefund extends MyController private function genRandomString($len = 32) { $chars = array( - "a", "b", "c", "d", "e", "f", "g", "h", "i", "j", "k", - "l", "m", "n", "o", "p", "q", "r", "s", "t", "u", "v", - "w", "x", "y", "z", "A", "B", "C", "D", "E", "F", "G", - "H", "I", "J", "K", "L", "M", "N", "O", "P", "Q", "R", - "S", "T", "U", "V", "W", "X", "Y", "Z", "0", "1", "2", - "3", "4", "5", "6", "7", "8", "9" + "a", + "b", + "c", + "d", + "e", + "f", + "g", + "h", + "i", + "j", + "k", + "l", + "m", + "n", + "o", + "p", + "q", + "r", + "s", + "t", + "u", + "v", + "w", + "x", + "y", + "z", + "A", + "B", + "C", + "D", + "E", + "F", + "G", + "H", + "I", + "J", + "K", + "L", + "M", + "N", + "O", + "P", + "Q", + "R", + "S", + "T", + "U", + "V", + "W", + "X", + "Y", + "Z", + "0", + "1", + "2", + "3", + "4", + "5", + "6", + "7", + "8", + "9" ); $charsLen = count($chars) - 1; // 将数组打乱 diff --git a/public/ueditor/php/upload/image/20250314/1741947804199541.jpg b/public/ueditor/php/upload/image/20250314/1741947804199541.jpg new file mode 100644 index 0000000..6eb21bc Binary files /dev/null and b/public/ueditor/php/upload/image/20250314/1741947804199541.jpg differ diff --git a/public/ueditor/php/upload/image/20250316/1742120928268655.png b/public/ueditor/php/upload/image/20250316/1742120928268655.png new file mode 100644 index 0000000..df4d8c2 Binary files /dev/null and b/public/ueditor/php/upload/image/20250316/1742120928268655.png differ