commit

app/admin/controller/many/Many.php

@@ -229,7 +229,7 @@ class Many extends AuthController
         $details = $model->find($data['id']);
         if ($details['status'] == 1) return Json::fail('未结束不能进行下一场');
         if ($details['suc'] == 2) return Json::fail('已众筹失败无法就行下一场');
-
+        if (strtotime($data['end_time']) < strtotime($data['add_time'])) return Json::fail('结束时间不能小于开启时间');
         $details['stage'] += 1;
         $details['status'] = 1;
         $details['number'] = 0;//重置额度
@@ -257,7 +257,7 @@ class Many extends AuthController
         if (!$id) Json::fail('删除失败');
         $model = new \app\admin\model\many\Many();
 
-        $res = $model->where('id', $id)->delete();
+        $res = \app\admin\model\many\Many::destroy($id);
         if ($res){
             return Json::success('删除成功!');
         }else{

app/admin/model/many/Many.php

@@ -8,6 +8,7 @@ namespace app\admin\model\many;
 
 use crmeb\traits\ModelTrait;
 use crmeb\basic\BaseModel;
+use think\model\concern\SoftDelete;
 
 /**
  * Class StoreCategory
@@ -29,7 +30,9 @@ class Many extends BaseModel
     protected $name = 'many';
 
     use ModelTrait;
+    use SoftDelete;
     protected $autoWriteTimestamp = true;
+    protected $deleteTime = 'delete_time';
 
 
 

app/admin/model/user/UserExtract.php

@@ -86,12 +86,12 @@ class UserExtract extends BaseModel
         $fail_time = time();
         $data = self::get($id);
         $extract_number = $data['extract_price'];
-        $mark = '提现失败,退回佣金' . $extract_number . '元';
+        $mark = '提现失败,退回阳光积分' . $extract_number;
         $uid = $data['uid'];
         $status = -1;
         $User = User::where('uid', $uid)->find()->toArray();
-        UserBill::income('提现失败', $uid, 'now_money', 'extract', $extract_number, $id, bcadd($User['now_money'], $extract_number, 2), $mark);
-        User::bcInc($uid, 'brokerage_price', $extract_number, 'uid');
+        UserBill::income('提现失败', $uid, 'purple_integral', 'extract', $extract_number, $id, bcadd($User['purple_integral'], $extract_number, 2), $mark);
+        User::bcInc($uid, 'purple_integral', $extract_number, 'uid');
         $extract_type = '未知方式';
         switch ($data['extract_type']) {
             case 'alipay':
@@ -107,7 +107,7 @@ class UserExtract extends BaseModel
         if (strtolower($User['user_type']) == 'wechat') {
             WechatTemplateService::sendTemplate(WechatUser::where('uid', $uid)->value('openid'), WechatTemplateService::USER_BALANCE_CHANGE, [
                 'first' => $mark,
-                'keyword1' => '佣金提现',
+                'keyword1' => '积分提现',
                 'keyword2' => date('Y-m-d H:i:s', time()),
                 'keyword3' => $extract_number,
                 'remark' => '错误原因:' . $fail_msg

app/admin/view/many/many_order/index.php

@@ -187,7 +187,7 @@
     layList.tool(function (event,data,obj) {
         switch (event) {
             case 'delete':
-                var url=layList.U({c:'many.many',a:'delete',q:{id:data.id}});
+                var url=layList.U({c:'many.many_order',a:'delete',q:{id:data.id}});
                 var code = {title:"操作提示",text:"确定将该商品移入回收站吗？",type:'info',confirm:'是的，移入回收站'};
                 $eb.$swal('delete',function(){
                     $eb.axios.get(url).then(function(res){

app/models/many/Many.php

@@ -10,6 +10,7 @@ use app\models\user\User;
 use app\models\user\UserBill;
 use crmeb\traits\ModelTrait;
 use crmeb\basic\BaseModel;
+use think\model\concern\SoftDelete;
 
 /**
  * Class StoreCategory
@@ -31,6 +32,7 @@ class Many extends BaseModel
     protected $name = 'many';
 
     use ModelTrait;
+    use SoftDelete;
     protected $autoWriteTimestamp = true;
 
 

app/models/many/ManyOrder.php

@@ -108,8 +108,8 @@ class ManyOrder extends BaseModel
                         $user1->save();
                     }
                     if ($user2){
-                        UserBill::income('间推奖励阳光积分', $user1['uid'], 'purple_integral', 'jt_purple_integral', $sy2*0.7, $user2['spread_uid'], $user2['purple_integral'], '间推奖励阳光积分');
-                        UserBill::income('间推奖励商城积分', $user1['uid'], 'integral', 'jt_integral', $sy2*0.3, $user2['spread_uid'], $user2['integral'], '间推奖励商家积分');
+                        UserBill::income('间推奖励阳光积分', $user2['uid'], 'purple_integral', 'jt_purple_integral', $sy2*0.7, $user2['spread_uid'], $user2['purple_integral'], '间推奖励阳光积分');
+                        UserBill::income('间推奖励商城积分', $user2['uid'], 'integral', 'jt_integral', $sy2*0.3, $user2['spread_uid'], $user2['integral'], '间推奖励商家积分');
                         $user2->save();
                     }
                 }