wesmiler ECY 画画交易平台

application/api/controller/Index.php

@@ -67,7 +67,7 @@ class Index extends Api
             $this->error('非法请求');
         }
 
-        if(date('H:i') >= '23:00'){
+        if(date('H:i') >= '23:50'){
             $this->error('不在释放处理时间段内');
         }
 

application/api/controller/Trade.php

@@ -3,6 +3,7 @@
 namespace app\api\controller;
 
 use app\common\controller\Api;
+use app\common\library\CoinRate;
 use app\common\library\Ems;
 use app\common\library\Sms;
 use app\common\model\Config;
@@ -906,8 +907,19 @@ class Trade extends Api
             $this->error('订单商品已转售');
         }
 
+        $studio=db('studio')->where(['title'=>$this->auth->login_studio])->find();
+        $startTime = isset($studio['start'])? $studio['start'] : 0;
+        $endTime = isset($studio['end'])? $studio['end'] : 0;
+        $startTime = $startTime? strtotime(date('Y-m-d').' '.$startTime) : 0;
+        $endTime = $endTime? strtotime(date('Y-m-d').' '.$endTime) : 0;
+        $expired = $startTime > time()? $startTime - time() : 0;
+        if(time()>= $startTime && time() <= $endTime){
+            $this->error('抱歉，请在营业时间以外转售');
+        }
+
         db()->startTrans();
-        $res=db('trade')->where(['id'=>$id,'status'=>3])->update(['on_resale'=>1,'status'=>4]);
+        $totalUsdt = CoinRate::transfer($trade['endnums']);
+        $res=db('trade')->where(['id'=>$id,'status'=>3])->update(['on_resale'=>1,'status'=>4,'release_total_usdt'=> $totalUsdt]);
         $res1=db('goods')->where(['id'=>$trade['goodsid']])->update(['time1'=>time(),'on_resale'=> 1]);
         if($res && $res1)
         {

application/shop/view/trade/trade3.html

@@ -56,7 +56,7 @@
                         <div class="am-u-sm-8">单号：{$v.orderNo}</div>
                         <div class="am-u-sm-4 am-text-right am-text-danger">
                             {if $v['issell'] == 0}
-                                待代售
+                                待上架
                             {elseif $v['issell'] ==1/}
                                 待茶室长确认
 
@@ -64,7 +64,7 @@
                                 {if $v['on_resale'] == 1}
                                 已置换
                                 {else/}
-                                已代售
+                                已上架
                                 {/if}
 
                             {else/}
@@ -187,7 +187,7 @@
     function toresell(e)
     {
         //询问框
-        layer.confirm('确认要转售此商品给平台？', {
+        layer.confirm('确认转售此商品，享受平台流拍资金池每日返回本金？', {
             title:'提示',
             btn: ['确认','取消'] //按钮
         }, function(){

application/shop/view/trade/trade4.html

@@ -142,18 +142,20 @@
                                '<div class="am-g am-padding-bottom-xs am-padding-top-xs ubb">' +
                                     '<div class="am-u-sm-8 am-padding-right-0">买入单时间：'+json[i].ctime1+'</div>'+
                                     '<div class="am-u-sm-4 am-padding-left-0 am-text-right am-text-danger">价值￥'+json[i].endnums+'</div>'+
-                                '</div>'+
-                                '<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>';
                     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-u-sm-6">应得返还：'+json[i].release_total_usdt+' USDT</div>'+
+                            '<div class="am-u-sm-6">已返还：'+json[i].release_usdt+' USDT</div>'+
+                            '<div class="am-u-sm-8">返还速度'+json[i].speed_rate+'%/天</div>'+
+                            '<div class="am-u-sm-4 am-padding-left-0 am-text-right am-text-danger" onclick="javascript: location=\'/shop/user/releaseLog?id='+json[i].id+'\';">查看返还明细</div>'+
+                            '</div>';
                     }
-                                _ +='<div class="am-padding-top-sm am-text-right">'+
+                                _ +='<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">'+
                                     '<span><input type="button" class="am-btn am-btn-default am-btn-xs" value="订单详情" onclick="showtrade('+json[i].id+')"></span>'+
                                 '</div>'+
                             '</div>'+

application/shop/view/trade/tradelist.html

@@ -208,7 +208,7 @@
     function toresell(e)
     {
         //询问框
-        layer.confirm('确认要转售此商品给平台？', {
+        layer.confirm('确认转售此商品，享受平台流拍资金池每日返回本金？', {
             title:'提示',
             btn: ['确认','取消'] //按钮
         }, function(){