wesmiler ECY 画画交易平台

application/api/controller/Index.php

@@ -97,7 +97,7 @@ class Index extends Api
             ->whereIn('status', [3,4])
             ->whereRaw('release_usdt < endnums')
             ->where('release_time','<', strtotime(date('Y-m-d')))
-            ->field('id,orderNo,goodsid,userid,relevant_userid,status,endnums,release_total,release_usdt,release_time')
+            ->field('id,orderNo,goodsid,userid,relevant_userid,status,endnums,release_total,release_usdt,release_total_usdt,release_time')
             ->order('ctime','asc')
             ->limit(1000)
             ->select();
@@ -110,6 +110,7 @@ class Index extends Api
         $fail = 0;
         foreach ($tradeList as $k => $item){
             $tradeUserId = isset($item['relevant_userid'])? $item['relevant_userid'] : 0;
+            $releaseTotalUsdt = isset($item['release_total_usdt'])? $item['release_total_usdt'] : 0;
             $speedData = Trade::getSpeedTotalByUser($tradeUserId); // 加速值
             $speedUsdt = isset($speedData['speed_usdt'])? $speedData['speed_usdt'] : 0;
             $speedTotal = isset($speedData['speed_total'])? $speedData['speed_total'] : 0;
@@ -119,7 +120,9 @@ class Index extends Api
             $releaseUsdt = isset($item['release_usdt'])? $item['release_usdt'] : 0;
             $releaseAmount = $amount? round($amount * $config['release_rate']/100 + $speedTotal, 2) : 0;
             $releaseAmount = ($amount-$releaseAmount)<$releaseAmount? ($amount-$releaseAmount) : $releaseAmount;
-            $usdt = round(CoinRate::transfer($releaseAmount, 'CNY','USD'), 2);
+            $totalUsdt = $releaseTotalUsdt? $releaseTotalUsdt : round(CoinRate::transfer($amount, 'CNY','USD'), 2);
+            $usdt = $totalUsdt? round($totalUsdt * $config['release_rate']/100 + $speedUsdt, 2) : 0;
+            $usdt = ($totalUsdt-$usdt)<$usdt? ($totalUsdt-$usdt) : $usdt;
 
             $releaseTotal = isset($item['release_total'])? $item['release_total'] : 0;
             if($tradeUserId<=0 || $amount<=0 || $usdt<=0 || $amount<=$releaseUsdt){
@@ -190,6 +193,9 @@ class Index extends Api
 
             // 更新释放交易商品数据
             $tradeData = ['release_total'=> $releaseTotal+$releaseAmount,'release_usdt'=> $releaseUsdt+$usdt,'release_time'=> time()];
+            if($releaseTotalUsdt<=0){
+                $tradeUserId['release_total_usdt'] = $totalUsdt;
+            }
             if($releaseUsdt+$usdt >= $amount){
                 $tradeData['status'] = 4;
             }

application/api/controller/Trade.php

@@ -5,6 +5,7 @@ namespace app\api\controller;
 use app\common\controller\Api;
 use app\common\library\Ems;
 use app\common\library\Sms;
+use app\common\model\Config;
 use fast\Random;
 use think\Session;
 use think\Validate;
@@ -489,11 +490,21 @@ class Trade extends Api
     function gettradeout()
     {
         $times=strtotime('today')-60*60*24*2;
+        $userId = $this->auth->id;
         $map['ctime']=['gt',$times];
-        $map['userid'] = $this->auth->id;
+//        $map['userid'] = $this->auth->id;
         $map['status'] = ['egt',3];
         $p = $this->request->post('p');
-        $data_list = db('trade')->where($map)->page($p, 10)->order("id desc")->select();
+        $data_list = db('trade')->where($map)->where(function($query) use($userId){
+            $query->where(['userid'=> $userId])->whereOr(function($query) use($userId){
+                $query->where(['relevant_userid'=> $userId,'on_resale'=>1]);
+            });
+        })->page($p, 10)->order("id desc")->select();
+
+        //var_dump(db('trade')->getLastSql());
+        //$speedData = \app\common\model\Trade::getSpeedTotalByUser($userId);
+        $config = Config::getConfigByGroup('trade');
+        $speedRate = isset($config['speed_rate'])? floatval($config['speed_rate']['value']) : 0;
         foreach ($data_list as &$v) {
             $goods=db('goods')->where(['id'=>$v['goodsid']])->find();
             $v['goods']=$goods;
@@ -503,6 +514,7 @@ class Trade extends Api
             $v['status_desc']=config('tradeStatus')[$v['status']];
             $v['selluser']=get_user_info($v['userid'],'nickname','mobile');
             $v['buyuser']=get_user_info($v['relevant_userid'],'nickname','mobile');
+            $v['speed_rate']=$speedRate;
             $v['flag']=0;
             if($v['userid']== $this->auth->id)
             {

application/shop/view/trade/trade4.html

@@ -121,9 +121,13 @@
                     var _ =
                         '<div class="am-margin-bottom-xs am-bg-white">'+
                             '<div class="am-g  ubb am-padding-xs am-text-left">'+
-                                '<div class="am-u-sm-8">单号：'+json[i].orderNo+'</div>'+
-                                '<div class="am-u-sm-4 am-text-right am-text-danger">已出售</div>'+
-                            '</div>'+
+                                '<div class="am-u-sm-8">单号：'+json[i].orderNo+'</div>';
+                            if(json[i].on_resale == 1){
+                               _ +=  '<div class="am-u-sm-4 am-text-right am-text-danger">已转售</div>';
+                            }else{
+                                _ += '<div class="am-u-sm-4 am-text-right am-text-danger">已出售</div>';
+                            }
+                            _ +='</div>'+
                             '<div class="am-padding-xs am-text-left">'+
                                 '<div class="am-g ubb">'+
                                     '<div class="am-u-sm-3">'+
@@ -142,8 +146,14 @@
                                 '<div class="am-g  am-padding-bottom-xs am-padding-top-xs  ubb">' +
                                     '<div class="am-u-sm-8">确认时间：'+json[i].confirm_time1+'</div>'+
                                     '<div class="am-u-sm-4 am-padding-left-0 am-text-right am-text-danger">上架费￥'+json[i].fee+'</div>'+
-                                '</div>'+
-                                '<div class="am-padding-top-sm am-text-right">'+
+                                '</div>';
+                    if(json[i].on_resale == 1) {
+                        _ +='<div class="am-g  am-padding-bottom-xs am-padding-top-xs  ubb">' +
+                        '<div class="am-u-sm-8">应得返还：'+json[i].release_usdt+'</div>'+
+                        '<div class="am-u-sm-4 am-padding-left-0 am-text-right am-text-danger">上架费￥'+json[i].fee+'</div>'+
+                        '</div>';
+                    }
+                                _ +='<div class="am-padding-top-sm am-text-right">'+
                                     '<span><input type="button" class="am-btn am-btn-default am-btn-xs" value="订单详情" onclick="showtrade('+json[i].id+')"></span>'+
                                 '</div>'+
                             '</div>'+