作者 sgj

修改积分反馈相关规则

... ... @@ -16,7 +16,7 @@ class Mission extends Validate
'time_long' => 'require',
'is_fixedlist' => 'require',
'start_times' => 'require',
'is_pledge' => 'require',
'begin_times' => 'require',
];
/**
* 提示消息
... ... @@ -26,6 +26,8 @@ class Mission extends Validate
'mission_name.require' => '名称不能未为空',
'cycle.require' => '周期不能未为空',
'time_long.require' => '时长不能未为空',
'start_times.require' => '开始时间不能为空',
'begin_times.require' => '开始时间不能为空',
];
/**
* 验证场景
... ...
... ... @@ -17,6 +17,7 @@ use app\admin\model\MissionJoin;
use app\admin\model\MissionOrder;
use app\admin\model\MissionType;
use app\admin\model\Pledge;
use app\admin\model\ShareLog;
use app\admin\validate\Mission;
use app\common\controller\Api;
use app\common\model\ScoreLog;
... ... @@ -38,6 +39,7 @@ class Clock extends Api
/**
* @ApiTitle (创建任务)
* @ApiSummary (创建认为)
* @ApiSector (三开相关接口)
* @ApiMethod (POST)
* @ApiParams (name="mission_type_id", type="integer", required=true, description="任务类型")
* @ApiParams (name="mission_name", type="integer", required=true, description="任务名称")
... ... @@ -49,7 +51,6 @@ class Clock extends Api
* @ApiParams (name="longitude", type="integer", required=true, description="打卡经度")
* @ApiParams (name="latitude", type="integer", required=true, description="打卡纬度")
* @ApiParams (name="position_name", type="integer", required=true, description="打卡地点名称")
* @ApiParams (name="is_pledge", type="integer", required=true, description="是需要缴纳押金0:不需要1:需要")
* @ApiParams (name="fee", type="integer", required=true, description="缴纳押金金额")
* @ApiReturnParams (name="code", type="integer", required=true, description="状态码")
* @ApiReturnParams (name="msg", type="string", required=true, description="提示语")
... ... @@ -62,7 +63,6 @@ class Clock extends Api
})
*/
public function insertMission(){
$Mission=new \app\admin\model\Mission();
$data=input();
$validate = Loader::validate('admin/Mission');
... ... @@ -299,6 +299,7 @@ class Clock extends Api
*/
public function endClock(){
$data=input();
$config=config('site');
$Log=new ClockLog();
$user_id=$this->auth->id;
$log=$Log->logInfo($user_id,$data['join_id']);
... ... @@ -324,7 +325,7 @@ class Clock extends Api
if ($joinInfo['mission']['longitude']!=0){
$distance=getDistance($joinInfo['mission']['longitude'],$joinInfo['mission']['latitude'],$data['longitude'],$data['latitude']);
$config=config('site');
if ($joinInfo['mission']['is_fixedlist']=='是'||$joinInfo['mission']['is_fixedlist']=='1'){
if ($distance>$config['range']){
$this->error('请在范围内进行打卡');
... ... @@ -344,6 +345,19 @@ class Clock extends Api
$update['finishtime']=time();
$Join->where('id',$joinInfo['id'])->Update($update);
}
/*奖励默认打卡成功积分*/
Db::startTrans();
try{
$User=new \app\admin\model\User();
$User->setInc('score', $config['clock_socre_num']);
$data['user_id']=$user_id;
$data['score']=$config['clock_socre_num'];
$data['memo']='任务获得';
ScoreLog::create($data);
}catch (\Exception $e){
}
$this->success('打卡成功!',$return);
}
... ... @@ -459,6 +473,7 @@ class Clock extends Api
}
/**
* @ApiTitle (参加活动)
* @ApiSector (三开相关接口)
* @ApiSummary (参加活动需要付费的会返回支付参数)
* @ApiMethod (POST)
* @ApiParams (name="id", type="integer", required=true, description="活动id")
... ...
... ... @@ -30,9 +30,12 @@ class Shop extends Api
* @ApiTitle (商品首页)
* @ApiSummary (商品首页)
* @ApiMethod (POST)
* @ApiSector (三开相关接口)
* @ApiReturnParams (name="goods_avatar_text", type="string", required=true, description="商品图片")
* @ApiReturnParams (name="good_name", type="string", required=true, description="商品名称")
* @ApiReturnParams (name="price", type="string", required=true, description="商品价格")
* @ApiReturnParams (name="price", type="string", required=true, description="商品积分价格")
* @ApiReturnParams (name="money", type="string", required=true, description="商品现金价格")
* @ApiReturnParams (name="good_data", type="string", required=true, description="1:普通商品2:现金商品(无法用现金支付)")
* @ApiReturnParams (name="id", type="string", required=true, description="商品id")
* @ApiReturnParams (name="msg", type="string", required=true, description="提示语")
* @ApiReturnParams (name="data", type="object", description="扩展数据返回")
... ... @@ -67,6 +70,18 @@ class Shop extends Api
$goods=$Goods->getIndexGoods();
$this->success('',$goods);
}
/**
* @ApiTitle (商品详情)
* @ApiSummary (商品详情)
* @ApiMethod (POST)
* @ApiReturnParams (name="logo", type="string", required=true, description="logo图片")
* */
public function logo(){
$site=config('site');
$return['logo']=cdnurl($site['logo'],true);
$this->success('',$return);
}
/**
* @ApiTitle (商品详情)
... ... @@ -317,16 +332,68 @@ class Shop extends Api
}
}
/**
* @ApiTitle (获取抵扣信息)
* @ApiSummary (获取抵扣信息)
* @ApiSector (三开相关接口)
* @ApiMethod (POST)
* @ApiParams (name="good_id", type="string", required=true, description="商品id")
* @ApiReturnParams (name="remark", type="string", required=true, description="标注积分抵扣详情")
* @ApiReturnParams (name="good_price", type="string", required=true, description="商品价格")
* @ApiReturnParams (name="discount_money", type="string", required=true, description="抵扣金额")
* @ApiReturnParams (name="real_fee", type="string", required=true, description="实付金额")
* @ApiReturnParams (name="cost_score", type="string", required=true, description="消耗积分数")
* @ApiReturnParams (name="user_score", type="string", required=true, description="用户剩余积分数")
* @ApiReturn ({
"code": 1,
"msg": "",
"time": "1570533464",
"data": {
}
})
*/
public function getDiscount(){
$user_id=$this->auth->id;
/*查询当前商品积分数*/
$good_id=input('good_id');
$good=Goods::get($good_id);
$user=\app\admin\model\User::get($user_id);
$money=$good->money;
$user_score=$user->score;
$site=config('site');
$rate=$site['ratio'];
$return['remark']='每'.$rate.'分=1元';
$return['good_price']=$money;
$discount_money=$user_score/$rate;
if ($discount_money>$money){
$cost_score=$money*$rate;
$real_fee=0;
$discount_money=$money;
}else{
$cost_score=$user->score;
$real_fee=ceil(($good['price']-$user_score/$site['ratio'])*100)/100;
$discount_money=ceil($user_score/$site['ratio']*100)/100;
}
$return['discount_money']=$discount_money;
$return['real_fee']=$real_fee;
$return['cost_score']=$cost_score;
$return['user_score']=$user_score;
$this->success('',$return);
/*查询当前商品积分数*/
}
/**
* @ApiTitle (提交订单)
* @ApiSummary (提交订单)
* @ApiSector (三开相关接口)
* @ApiMethod (POST)
* @ApiParams (name="address_id", type="string", required=true, description="地址id")
* @ApiParams (name="good_id", type="string", required=true, description="商品id")
* @ApiParams (name="change_type", type="string", required=true, description="1:纯积分兑换2:现金组合兑换")
* @ApiParams (name="msg", type="string", required=true, description="提示语")
* @ApiParams (name="data", type="object", description="扩展数据返回")
* @ApiParams (name="data", type="object", description="扩展数据返回(需要微信支付时会返回支付参数)")
* @ApiReturn ({
"code": 1,
"msg": "",
... ...