gengx

addon/futures/model/Futures.php

@@ -363,6 +363,12 @@ class Futures extends BaseModel
             ->where('member_id', $date['member_id'])
             ->find();
         $basics = (new Futures())->getBasicsConfig($futuresUserInfo['site_id'])['data']['value'];
+        $punish_money=$basics['punish_money'];
+        if($punish_money){
+            //扣除服务费
+            $memberAccountModel = new MemberAccount();
+            $memberAccountModel->addMemberAccount($date['site_id'], $date['member_id'], 'balance_money', -$punish_money, 'service_price', $id, '服务罚金', $id);
+        }else{
             $violationHour = $basics['violation_hour'] ?? 0;
             $violationUnpaid = $basics['violation_unpaid'] ?? 0;
             if ($violationUnpaid > 0 && $futuresUserInfo['violation_num'] >= $violationUnpaid) {
@@ -374,6 +380,7 @@ class Futures extends BaseModel
                         'violation_num' => Db::raw("violation_num - {$violationUnpaid}")// 减少违规次数
                     ]);
             }
+        }
         return $this->success();
     }
 

addon/futures/model/User.php

@@ -143,9 +143,10 @@ class User extends BaseModel{
             return $this->success('未达开启回购');
         }
         $status = 0;
+
         foreach($basics['times'] as $times){
             if($nowTime <= $times['jianlou_end_time'] && $nowTime >= $times['jianlou_end_time'] - $basics['auto_buyback_time'] * 60){// 配置在结束时间前多久开始回购
-                $status = 7;
+                $status = 7; //捡漏
                 break;
             }
             if($nowTime <= $times['miaosha_end_time'] && $nowTime >= $times['miaosha_end_time'] - $basics['auto_buyback_time'] * 60){// 配置在结束时间前多久开始回购
@@ -154,7 +155,7 @@ class User extends BaseModel{
             }
         }
         if($status == 0){
-            return $this->success('未达到回购时间');
+            return error('未达到回购时间');
         }
         $menberList = model('futures_user')->getList([['is_special', '=', 1]]);
         $futuresList = model('futures')->getList([
@@ -191,12 +192,14 @@ class User extends BaseModel{
                 'form_data'  => [],
                 'goods_sku_list'  => [],
                 'sku_id'          => '',
+                'pay_password'    => $basics['pay_password'], //回购账号密码
             ];
             $res = $order_create->create($data);
             //支付订单
             $pay_type = 'wechatpay';
             $out_trade_no = $res['data'];
             $app_type = 'weapp';
+            if($out_trade_no){
                 $scene = 0;
                 $is_balance = 1;
                 $hb_fq_num = 0;
@@ -207,10 +210,11 @@ class User extends BaseModel{
                     'pay' => $info
                 ];
             }
+        }
         return $this->success([
             'member_list' => $menberList,
             'futures_list' => $futuresList,
-            'log' => $log
+            'log' => $log??''
         ]);
     }
     /**

addon/futures/shop/controller/Futures.php

@@ -27,7 +27,7 @@ class Futures extends BaseShop{
             $page      = input('page',1);
             $pageSize  = input('page_size',PAGE_LIST_ROWS);
             $nickname  = input('nickname','');
-            $status    = (int)input('status',0);// 状态（1=库存，2=已上架，3=已售出，4=提货中，5=提货完成，6=待支付，7=捡漏)
+            $status    = (int)input('status',0);// 状态（1=库存，2=已上架，3=已售出，4=提货中，5=提货完成，6=待支付，7=捡漏，8=待上架)
             $timeType  = (string)input('time_type','created');
             $startTime = (int)input('start_time',0);
             $endTime   = (int)input('end_time',0);
@@ -58,7 +58,12 @@ class Futures extends BaseShop{
                 ['a.site_id','=',$this->site_id]
             ];
             if($nickname) $condition[] = ['seller.username|seller.nickname',"like","%{$nickname}%"];
-            if($status > 0) $condition[] = ['a.status',"=",$status];
+            if($status==8){
+                $condition[] = ['a.release_time',">=",strtotime(date('Y-m-d',strtotime('+1 day')))];
+                $condition[] = ['a.release_time',"<=",strtotime(date('Y-m-d',strtotime('+1 day')).'23:59:59')];
+            } elseif($status > 0){
+                $condition[] = ['a.status',"=",$status];
+            }
             $timeField = [
                 'created' => 'a.created_time',
                 'release' => 'a.release_time',
@@ -67,11 +72,25 @@ class Futures extends BaseShop{
             ];
             if($startTime > 0) $condition[] = [$timeField[$timeType],">=",$startTime];
             if($endTime > 0) $condition[] = [$timeField[$timeType],"<=",$endTime];
-
             return (new futuresModel())->getPageList($condition, $page, $pageSize, 'a.created_time desc,a.id desc', $field, 'a', $join);
         }
 
-
+        $where=[
+            ['site_id','=',$this->site_id],
+            ['release_time','BETWEEN',[strtotime(date('Y-m-d',strtotime('+1 day'))),strtotime(date('Y-m-d',strtotime('+1 day')).'23:59:59')]]
+        ];
+        $where1=[
+            ['site_id','=',$this->site_id],
+            ['release_time','BETWEEN',[strtotime(date('Y-m-d')),strtotime(date('Y-m-d',strtotime('+1 day')))]]
+        ];
+        $newCount=model('futures')->getSum($where1,'total');
+        $todayCount=model('futures')->getSum($where,'total');
+        $todayMoney=model('futures')->getSum($where,'price');
+        $history=model('futures')->getSum(['status'=>3,'site_id'=>$this->site_id],'price');
+        $this->assign("newCount",$newCount);
+        $this->assign("todayCount",$todayCount);
+        $this->assign("todayMoney",$todayMoney);
+        $this->assign("historyMoney",$history);
         $this->forthMenu();
         return $this->fetch('futures/index');
     }

addon/futures/shop/view/config/basics.html

@@ -271,6 +271,17 @@
                 </div>
                 <div class="word-aux ">用户在秒杀专区购买商品后，多少次为支付则进行违规惩罚！</div>
             </div>
+
+            <div class="layui-form-item">
+                <label class="layui-form-label">违规罚金：</label>
+                <div class="layui-input-block">
+                    <div class="layui-input-inline">
+                        <input type="number" name="punish_money" class="layui-input ns-len-mid" value="{$info.punish_money ?? 0}" />
+                    </div>
+                    <div class="layui-form-mid">元</div>
+                </div>
+                <div class="word-aux ">用户在规定时间未付款处罚金额</div>
+            </div>
             <div class="layui-form-item">
                 <label class="layui-form-label">惩罚时间：</label>
                 <div class="layui-input-block">
@@ -306,6 +317,14 @@
                 </div>
                 <div class="word-aux ">秒杀/捡漏结束前几分钟开始自动回购</div>
             </div>
+            <div class="layui-form-item">
+                <label class="layui-form-label">回购账号支付密码：</label>
+                <div class="layui-input-block">
+                    <div class="layui-input-inline">
+                        <input type="password" name="pay_password" class="layui-input ns-len-mid" value="{$info.pay_password ?? ''}" />
+                    </div>
+                </div>
+            </div>
         </div>
     </div>
     <div class="form-row">

addon/futures/shop/view/futures/index.html

@@ -40,6 +40,7 @@
 					<div class="layui-input-inline">
 						<select name="status" lay-filter="is_settlement">
 							<option value="">全部</option>
+							<option value="8">待上架(审核)</option>
 							<option value="1">库存</option>
 							<option value="2">已上架</option>
 							<option value="3">已售出</option>
@@ -75,12 +76,43 @@
 					</div>
 				</div>
 			</div>
+			<div class="layui-form-item">
+				<div class="layui-inline">
+					<label class="layui-form-label">正在销售：</label>
+					<!--交易时间类型-->
+					<div class="layui-input-inline">
+						<div>{$newCount}</div>
+					</div>
+				</div>
+				<div class="layui-inline">
+					<label class="layui-form-label">明日上架：</label>
+					<!--交易时间类型-->
+					<div class="layui-input-inline">
+						<div>{$todayCount}</div>
+					</div>
+				</div>
+				<div class="layui-inline">
+					<label class="layui-form-label">交易额：</label>
+					<!--交易时间类型-->
+					<div class="layui-input-inline">
+						<div>{$todayMoney}</div>
+					</div>
+				</div>
+				<div class="layui-inline">
+					<label class="layui-form-label">历史额：</label>
+					<!--交易时间类型-->
+					<div class="layui-input-inline">
+						<div>{$historyMoney}</div>
+					</div>
+				</div>
+			</div>
 			<div class="form-row">
 				<button class="layui-btn" lay-submit lay-filter="search">筛选</button>
 				<button type="reset" lay-submit lay-filter="reset" class="layui-btn layui-btn-primary">重置</button>
 			</div>
 		</div>
 	</div>
+
 </div>
 <!-- 列表 -->
 <table id="listContent" lay-filter="listContent"></table>

app/pay/controller/Test.php

@@ -18,7 +18,7 @@ use addon\futures\model\Forder;
 use app\Controller;
 use think\Validate;
 use think\facade\Db;
-
+use addon\futures\model\User;
 class Test extends Controller
 {
 
@@ -32,12 +32,13 @@ class Test extends Controller
      public function s(){
 
 
-          $order=model('order')->getInfo(['order_id'=>258]);
+//          $order=model('order')->getInfo(['order_id'=>258]);
 
 
-          $res= (new Forder())->calculate($order);  //计算订单佣金
+         $userModel = new User(1);
+         var_dump($userModel->buyBack());
 
-         var_dump($res);
+//         var_dump($res);
 //          var_dump(329*1/100);
 //         $paydata='{"item_code":"AM010201000000117823","charset":"UTF-8","notify_time":"2023-02-02 10:41:48","commodity_order_id":"202302020000000008847076","quantity":"1","total_price":"0.00","method":"alipay.open.servicemarket.order.notify","sign":"PrqlBU8y1sIIS962JrLmAuggPH89kSTy1cPLur9z0ynHI0YurAVVahaxxt9iWErUMOQGNKehyilyMtCeZdRh84hSdHKktSTHpDvy423sX9xVLYvPBii05joMBJUZ3PM4y7BbizyPamie3yPqdomDuGQ539AYTA\/9YtmwUoh62zjloIoq4UefDOihwuESGFmB5B3HYbw6HpSiVbe8lHEGNSKOGBTCi2OowaSk1sGaT9\/5dQgBCARDGb+amg4pKGMkw105ERlD2EEW9qoGQNwQVP7o9R5UP+7KqgOhg+X95kW5qcIjltjF6rRPa2cH\/j1WQ1RSeTfTuuRBOMLAOr3xuw==","order_time":"2023-02-02 10:38:00","title":"客单豹","specifications":"客单豹","version":"1.0","notify_id":"2023020200222103800094771410174673","merchant_pid":"2088402283167085","package_count":"0","notify_type":"servicemarket_order_notify","period_day":"-1","phone":"18980669271","name":"*敏","order_item_num":"1","contactor":"柏鸿凯","app_id":"2021003167617037","sign_type":"RSA2","timestamp":"2023-02-02 10:41:48"}';
 //         $res= event('AliAuthNotify',json_decode($paydata,true));