核销

application/api/controller/Hexiao.php

@@ -63,29 +63,10 @@ class Hexiao extends Api
 
             unset($order['pay_out_trade_no']);
 
-            //预约日期
-            $week_data = [
-                0 => '周日',
-                1 => '周一',
-                2 => '周二',
-                3 => '周三',
-                4 => '周四',
-                5 => '周五',
-                6 => '周六',
-                7 => '周日',
-            ];
-            $order['bookdate'] = date('Y-m-d H:i',$order['booktime']) .' '. $week_data[date('w',$order['booktime'])];
-
-            //追加退改规则
-            $order['order_refund_rule'] = config('site.order_refund_rule');
-
-            //电子凭证，核销码
-            /*$qrcode_string = 'order_hexiao_no|' . $order['out_trade_no'];
-            $order['order_hexiao_qrcode'] = httpurllocal($this->inviteimage($qrcode_string));*/
+
 
         }
 
-        //追加退改规则
         $this->success(1,$order);
     }
 
@@ -103,7 +84,7 @@ class Hexiao extends Api
         Db::startTrans();
         $order = Db::name('unishop_order')->where(['out_trade_no' => $out_trade_no])->lock(true)->find();
 
-        if (!$order) {
+        if(empty($order_info)){
             Db::rollback();
             $this->error('不存在的订单');
         }
@@ -138,7 +119,7 @@ class Hexiao extends Api
         $money = bcdiv(bcmul($order['total_price'],$bili,2),100,2);
 
         if($money > 0){
-            $rs_wallet = model('Wallet')->lockChangeAccountRemain($this->auth->id,'hexiaomoney',$money,10,'核销订单:'.$out_trade_no,'unishop_order',$order['id']);
+            $rs_wallet = model('Wallet')->lockChangeAccountRemain($this->auth->id,'hexiaomoney',$money,201,'核销订单:'.$out_trade_no,'unishop_order',$order['id']);
             if($rs_wallet['status']===false)
             {
                 Db::rollback();

application/extra/wallet.php

@@ -10,58 +10,27 @@ return [
 
         10 => '钱包充值到账',//money +
 
-        11 => '图文问诊',//money -
-        12 => '视频问诊',//money -
-        13 => '图文问诊退款',//money +
-        14 => '视频问诊退款',//money +
+
 
 
         21 => '钱包余额提现',//money -
         22 => '提现拒绝返回',//money +
 
         31 => '商城购物',//money -
-        32 => '商城退款',//money +
-
-/////////////////医生//////////////////
-
-        111 => '图文问诊', //money +
-        112 => '视频问诊', //money +
-//        113 => '图文问诊退款', //money -
-//        114 => '视频问诊退款', //money -
-
-        121 => '钱包余额提现', //money -
-        122 => '提现拒绝返回', //money +
+//        32 => '商城退款',//money +
+///////////////////////
+        100 => '',
+///////////////////////
+        201 => '核销订单',//hexiaomoney +
 
 
 
     ],
-    'logtype_en' => [
-
-/////////////////用户////////
-        1 => '',//money + -
-
-        10 => 'Funds added to Wallet',//money +
-
-        11 => 'Visual Order',//money -
-        12 => 'Video Order',//money -
 
-
-        21 => 'Withdrawal of wallet balance',//money -
-        22 => 'Withdrawal refused',//money +
-
-
-/////////////////医生//////////////////
-
-        111 => 'Visual Order', //money +
-        112 => 'Video Order', //money +
-
-        121 => 'Withdrawal of wallet balance', //money -
-        122 => 'Withdrawal refused', //money +
-
-
-    ],
     'moneyname' => [
-        'money'    => '余额',
+        'money'    => '充值余额',
+        'hexiaomoney'    => '核销余额',
+        'intromoney'    => '分销余额',
     ],
 
 ];