订单列表

app-ghs/controllers/OrderController.php

@@ -213,10 +213,6 @@ class OrderController extends BaseController
             $input->SetOpenid($openId);
         }
 
-//        if (httpUtil::isMiniProgram()) {
-//            $merchantExtend['wxAppId'] = $merchantExtend['miniAppId'];
-//        }
-
         //强制使用小程序的miniAppId
         $merchantExtend['wxAppId'] = $merchantExtend['miniAppId'];
 
@@ -478,8 +474,6 @@ class OrderController extends BaseController
             //直接将支付宝的html返回给前端
             echo $result;
         } elseif ($payWay == 2) {
-            //余额支付，验证支付密码是否正确
-            $payPassword = isset($post['payPassword']) ? $post['payPassword'] : 0;
             $typeList = dict::getConfig('capitalType');
             $capitalType = $typeList['xhGhsOrder']['id'];
             $callbackParams = [];

biz-ghs/order/classes/OrderClass.php

@@ -105,7 +105,7 @@ class OrderClass extends BaseClass
     public static function getOrderList($where)
     {
         $data = self::getList('*', $where, 'addTime DESC');
-        $data['list'] = self::groupOrder($data['list'], true, false, false, false, true);
+        $data['list'] = self::groupOrder($data['list'], true, false, false, true);
         $data['allNum'] = 0;
         $data['unPayNum'] = 0;
         $data['unSendNum'] = 0;