Merge branch 'main' of 123.207.203.228:server/baji

app/admin/controller/Finance.php

@@ -296,9 +296,12 @@ class Finance extends Base
         foreach ($data['list'] as &$value) {
             $content = json_decode($value['content'], true);
 
-            $value['money'] = $content['total_fee'] / 100;
+            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'];

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'],

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",
+            "a",
-            "l", "m", "n", "o", "p", "q", "r", "s", "t", "u", "v",
+            "b",
-            "w", "x", "y", "z", "A", "B", "C", "D", "E", "F", "G",
+            "c",
-            "H", "I", "J", "K", "L", "M", "N", "O", "P", "Q", "R",
+            "d",
-            "S", "T", "U", "V", "W", "X", "Y", "Z", "0", "1", "2",
+            "e",
-            "3", "4", "5", "6", "7", "8", "9"
+            "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;
         // 将数组打乱