郭盛 / scrap · 提交

转到一个项目

作者 郭盛
提交 a10ac1fc5a742660b468635dd72c1a7fbe18349a 1 个父辈 5e296273
1 个管道 的构建 通过 耗费 2 秒

添加3模块的评价接口

内嵌 并排对比
正在显示 2 个修改的文件 包含 268 行增加 和 98 行删除
... ... @@ -2,8 +2,6 @@
<project version="4">
<component name="ChangeListManager">
<list default="true" id="0011664b-87e9-41bd-9f37-18792fb15777" name="Default" comment="">
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/public/upload/qrcode/code_9.jpg" afterPath="$PROJECT_DIR$/public/upload/qrcode/code_9.jpg" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/api/index/controller/UserController.php" afterPath="$PROJECT_DIR$/api/index/controller/UserController.php" />
</list>
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
... ... @@ -29,8 +27,8 @@
<file leaf-file-name="HomeController.php" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/api/index/controller/HomeController.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="0">
<caret line="355" column="31" lean-forward="false" selection-start-line="355" selection-start-column="31" selection-end-line="355" selection-end-column="31" />
<state relative-caret-position="160">
<caret line="132" column="7" lean-forward="false" selection-start-line="132" selection-start-column="7" selection-end-line="132" selection-end-column="7" />
<folding>
<element signature="e#329#544#0#PHP" expanded="false" />
<element signature="e#549#890#0#PHP" expanded="false" />
... ... @@ -64,8 +62,8 @@
<file leaf-file-name="UserController.php" pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/api/index/controller/UserController.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="132">
<caret line="925" column="46" lean-forward="true" selection-start-line="925" selection-start-column="46" selection-end-line="925" selection-end-column="46" />
<state relative-caret-position="434">
<caret line="1071" column="7" lean-forward="true" selection-start-line="1071" selection-start-column="7" selection-end-line="1071" selection-end-column="7" />
<folding>
<element signature="e#366#715#0#PHP" expanded="false" />
<element signature="e#720#1485#0#PHP" expanded="false" />
... ... @@ -111,11 +109,20 @@
<element signature="e#26370#26866#0#PHP" expanded="false" />
<element signature="e#26871#27978#0#PHP" expanded="false" />
<element signature="e#27984#28268#0#PHP" expanded="false" />
<element signature="e#28273#28909#0#PHP" expanded="false" />
<element signature="e#28930#29249#0#PHP" expanded="false" />
<element signature="e#29255#29663#0#PHP" expanded="false" />
<element signature="e#29669#30428#0#PHP" expanded="false" />
<element signature="e#30447#31311#0#PHP" expanded="false" />
<element signature="e#31337#31737#0#PHP" expanded="false" />
<element signature="e#31760#32333#0#PHP" expanded="false" />
<element signature="e#32356#33166#0#PHP" expanded="false" />
<element signature="e#33172#33771#0#PHP" expanded="false" />
<element signature="e#33776#34740#0#PHP" expanded="false" />
<element signature="e#34746#35413#0#PHP" expanded="false" />
<element signature="e#35418#36459#0#PHP" expanded="false" />
<element signature="e#36465#37122#0#PHP" expanded="false" />
<element signature="e#37127#38144#0#PHP" expanded="false" />
</folding>
</state>
</provider>
... ... @@ -254,8 +261,8 @@
</component>
<component name="PhpWorkspaceProjectConfiguration" backward_compatibility_performed="true" />
<component name="ProjectFrameBounds" extendedState="1">
<option name="x" value="237" />
<option name="y" value="74" />
<option name="x" value="284" />
<option name="y" value="22" />
<option name="width" value="1582" />
<option name="height" value="1021" />
</component>
... ... @@ -420,18 +427,18 @@
<workItem from="1575419186725" duration="599000" />
<workItem from="1575420787741" duration="2879000" />
<workItem from="1575431441427" duration="8414000" />
<workItem from="1575444399653" duration="5919000" />
<workItem from="1575444399653" duration="7712000" />
</task>
<servers />
</component>
<component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="459568000" />
<option name="totallyTimeSpent" value="461361000" />
</component>
<component name="ToolWindowManager">
<frame x="237" y="74" width="1582" height="1021" extended-state="1" />
<frame x="284" y="22" width="1582" height="1021" extended-state="1" />
<editor active="true" />
<layout>
<window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.174113" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
<window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.174113" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
<window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
<window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="true" content_ui="tabs" />
<window_info id="Database" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32982457" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
... ... @@ -671,39 +678,6 @@
<state />
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/api/index/controller/ShopgoodsController.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="525">
<caret line="307" column="7" lean-forward="false" selection-start-line="307" selection-start-column="7" selection-end-line="307" selection-end-column="7" />
<folding>
<element signature="e#411#604#0#PHP" expanded="false" />
<element signature="e#609#825#0#PHP" expanded="false" />
<element signature="e#831#1329#0#PHP" expanded="false" />
<element signature="e#1334#2102#0#PHP" expanded="false" />
<element signature="e#2108#2326#0#PHP" expanded="false" />
<element signature="e#2331#2539#0#PHP" expanded="false" />
<element signature="e#2545#3052#0#PHP" expanded="false" />
<element signature="e#3057#3575#0#PHP" expanded="false" />
<element signature="e#3581#4093#0#PHP" expanded="false" />
<element signature="e#4098#4661#0#PHP" expanded="false" />
<element signature="e#4667#5257#0#PHP" expanded="false" />
<element signature="e#5262#6260#0#PHP" expanded="false" />
<element signature="e#6266#6584#0#PHP" expanded="false" />
<element signature="e#6589#6965#0#PHP" expanded="false" />
<element signature="e#6971#7326#0#PHP" expanded="false" />
<element signature="e#7331#7740#0#PHP" expanded="false" />
<element signature="e#7746#8131#0#PHP" expanded="false" />
<element signature="e#8136#8807#0#PHP" expanded="false" />
<element signature="e#8813#9259#0#PHP" expanded="false" />
<element signature="e#9264#10115#0#PHP" expanded="false" />
<element signature="e#10121#10391#0#PHP" expanded="false" />
<element signature="e#10396#10872#0#PHP" expanded="false" />
<element signature="e#10878#11508#0#PHP" expanded="false" />
<element signature="e#11513#12865#0#PHP" expanded="false" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/simplewind/cmf/lib/Storage.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="268">
... ... @@ -825,57 +799,6 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/api/index/controller/HomeController.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="0">
<caret line="355" column="31" lean-forward="false" selection-start-line="355" selection-start-column="31" selection-end-line="355" selection-end-column="31" />
<folding>
<element signature="e#329#544#0#PHP" expanded="false" />
<element signature="e#549#890#0#PHP" expanded="false" />
<element signature="e#896#1112#0#PHP" expanded="false" />
<element signature="e#1117#1500#0#PHP" expanded="false" />
<element signature="e#1506#1726#0#PHP" expanded="false" />
<element signature="e#1731#2119#0#PHP" expanded="false" />
<element signature="e#2126#2643#0#PHP" expanded="false" />
<element signature="e#2648#3163#0#PHP" expanded="false" />
<element signature="e#3169#3697#0#PHP" expanded="false" />
<element signature="e#3702#4540#0#PHP" expanded="false" />
<element signature="e#4546#4859#0#PHP" expanded="false" />
<element signature="e#4864#5239#0#PHP" expanded="false" />
<element signature="e#5245#5597#0#PHP" expanded="false" />
<element signature="e#5602#6010#0#PHP" expanded="false" />
<element signature="e#6016#6398#0#PHP" expanded="false" />
<element signature="e#6403#7073#0#PHP" expanded="false" />
<element signature="e#7079#7522#0#PHP" expanded="false" />
<element signature="e#7527#8377#0#PHP" expanded="false" />
<element signature="e#8383#8650#0#PHP" expanded="false" />
<element signature="e#8655#9130#0#PHP" expanded="false" />
<element signature="e#9136#9635#0#PHP" expanded="false" />
<element signature="e#9640#10661#0#PHP" expanded="false" />
<element signature="e#10667#11034#0#PHP" expanded="false" />
<element signature="e#11039#11479#0#PHP" expanded="false" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/api/index/controller/SubscribeController.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="458">
<caret line="73" column="7" lean-forward="true" selection-start-line="73" selection-start-column="7" selection-end-line="73" selection-end-column="7" />
<folding>
<element signature="e#305#577#0#PHP" expanded="false" />
<element signature="e#583#854#0#PHP" expanded="false" />
<element signature="e#859#1113#0#PHP" expanded="false" />
<element signature="e#1119#1594#0#PHP" expanded="false" />
<element signature="e#1599#2490#0#PHP" expanded="false" />
<element signature="e#2497#2911#0#PHP" expanded="false" />
<element signature="e#2916#3386#0#PHP" expanded="false" />
<element signature="e#3393#3889#0#PHP" expanded="false" />
<element signature="e#3894#4897#0#PHP" expanded="false" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/api/index/controller/RecycleController.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="759">
... ... @@ -923,10 +846,93 @@
<state />
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/api/index/controller/ShopgoodsController.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="225">
<caret line="167" column="4" lean-forward="false" selection-start-line="167" selection-start-column="4" selection-end-line="211" selection-end-column="5" />
<folding>
<element signature="e#411#604#0#PHP" expanded="false" />
<element signature="e#609#825#0#PHP" expanded="false" />
<element signature="e#831#1329#0#PHP" expanded="false" />
<element signature="e#1334#2102#0#PHP" expanded="false" />
<element signature="e#2108#2326#0#PHP" expanded="false" />
<element signature="e#2331#2539#0#PHP" expanded="false" />
<element signature="e#2545#3052#0#PHP" expanded="false" />
<element signature="e#3057#3575#0#PHP" expanded="false" />
<element signature="e#3581#4093#0#PHP" expanded="false" />
<element signature="e#4098#4661#0#PHP" expanded="false" />
<element signature="e#4667#5257#0#PHP" expanded="false" />
<element signature="e#5262#6260#0#PHP" expanded="false" />
<element signature="e#6266#6584#0#PHP" expanded="false" />
<element signature="e#6589#6965#0#PHP" expanded="false" />
<element signature="e#6971#7326#0#PHP" expanded="false" />
<element signature="e#7331#7740#0#PHP" expanded="false" />
<element signature="e#7746#8131#0#PHP" expanded="false" />
<element signature="e#8136#8807#0#PHP" expanded="false" />
<element signature="e#8813#9259#0#PHP" expanded="false" />
<element signature="e#9264#10115#0#PHP" expanded="false" />
<element signature="e#10121#10391#0#PHP" expanded="false" />
<element signature="e#10396#10872#0#PHP" expanded="false" />
<element signature="e#10878#11508#0#PHP" expanded="false" />
<element signature="e#11513#12865#0#PHP" expanded="false" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/api/index/controller/HomeController.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="160">
<caret line="132" column="7" lean-forward="false" selection-start-line="132" selection-start-column="7" selection-end-line="132" selection-end-column="7" />
<folding>
<element signature="e#329#544#0#PHP" expanded="false" />
<element signature="e#549#890#0#PHP" expanded="false" />
<element signature="e#896#1112#0#PHP" expanded="false" />
<element signature="e#1117#1500#0#PHP" expanded="false" />
<element signature="e#1506#1726#0#PHP" expanded="false" />
<element signature="e#1731#2119#0#PHP" expanded="false" />
<element signature="e#2126#2643#0#PHP" expanded="false" />
<element signature="e#2648#3163#0#PHP" expanded="false" />
<element signature="e#3169#3697#0#PHP" expanded="false" />
<element signature="e#3702#4540#0#PHP" expanded="false" />
<element signature="e#4546#4859#0#PHP" expanded="false" />
<element signature="e#4864#5239#0#PHP" expanded="false" />
<element signature="e#5245#5597#0#PHP" expanded="false" />
<element signature="e#5602#6010#0#PHP" expanded="false" />
<element signature="e#6016#6398#0#PHP" expanded="false" />
<element signature="e#6403#7073#0#PHP" expanded="false" />
<element signature="e#7079#7522#0#PHP" expanded="false" />
<element signature="e#7527#8377#0#PHP" expanded="false" />
<element signature="e#8383#8650#0#PHP" expanded="false" />
<element signature="e#8655#9130#0#PHP" expanded="false" />
<element signature="e#9136#9635#0#PHP" expanded="false" />
<element signature="e#9640#10661#0#PHP" expanded="false" />
<element signature="e#10667#11034#0#PHP" expanded="false" />
<element signature="e#11039#11479#0#PHP" expanded="false" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/api/index/controller/SubscribeController.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="175">
<caret line="156" column="8" lean-forward="false" selection-start-line="156" selection-start-column="8" selection-end-line="183" selection-end-column="34" />
<folding>
<element signature="e#305#577#0#PHP" expanded="false" />
<element signature="e#583#854#0#PHP" expanded="false" />
<element signature="e#859#1113#0#PHP" expanded="false" />
<element signature="e#1119#1594#0#PHP" expanded="false" />
<element signature="e#1599#2490#0#PHP" expanded="false" />
<element signature="e#2497#2911#0#PHP" expanded="false" />
<element signature="e#2916#3386#0#PHP" expanded="false" />
<element signature="e#3393#3889#0#PHP" expanded="false" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/api/index/controller/UserController.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="132">
<caret line="925" column="46" lean-forward="true" selection-start-line="925" selection-start-column="46" selection-end-line="925" selection-end-column="46" />
<state relative-caret-position="434">
<caret line="1071" column="7" lean-forward="true" selection-start-line="1071" selection-start-column="7" selection-end-line="1071" selection-end-column="7" />
<folding>
<element signature="e#366#715#0#PHP" expanded="false" />
<element signature="e#720#1485#0#PHP" expanded="false" />
... ... @@ -972,11 +978,20 @@
<element signature="e#26370#26866#0#PHP" expanded="false" />
<element signature="e#26871#27978#0#PHP" expanded="false" />
<element signature="e#27984#28268#0#PHP" expanded="false" />
<element signature="e#28273#28909#0#PHP" expanded="false" />
<element signature="e#28930#29249#0#PHP" expanded="false" />
<element signature="e#29255#29663#0#PHP" expanded="false" />
<element signature="e#29669#30428#0#PHP" expanded="false" />
<element signature="e#30447#31311#0#PHP" expanded="false" />
<element signature="e#31337#31737#0#PHP" expanded="false" />
<element signature="e#31760#32333#0#PHP" expanded="false" />
<element signature="e#32356#33166#0#PHP" expanded="false" />
<element signature="e#33172#33771#0#PHP" expanded="false" />
<element signature="e#33776#34740#0#PHP" expanded="false" />
<element signature="e#34746#35413#0#PHP" expanded="false" />
<element signature="e#35418#36459#0#PHP" expanded="false" />
<element signature="e#36465#37122#0#PHP" expanded="false" />
<element signature="e#37127#38144#0#PHP" expanded="false" />
</folding>
</state>
</provider>
... ...
... ... @@ -1052,4 +1052,159 @@ class UserController extends RestBaseController
curl_close($curl);
return $result;
}
/**
* @title 添加回收订单评价
* @description
* @author GuoSheng
* @url /index/User/comment
* @method GET
*
* @header name:XX-Token require:1 default: desc:token
*
* @param name:recycleorder_id type:int require:1 other: desc:订单id
* @param name:speed type:int require:1 other: desc:上门速度
* @param name:service type:int require:1 other: desc:服务态度
* @param name:recycle type:int require:1 other: desc:回收体验
* @param name:content type:string require:1 other: desc:评价内容
* @param name:thumbnail type:string require:1 other: desc:图片
*
*/
public function comment()
{
$user_id = $this->getUserId();
$param = $this->request->param();
$param['user_id'] = $user_id;
$param['create_time'] = time();
$validate = new Validate([
'recycleorder_id' => 'require',
'speed' => 'require',
'service'=>'require',
'recycle'=>'require',
'content'=>'require'
]);
$validate->message([
'recycle_id'=>'订单ID不能为空',
'speed'=>'上门速度不能为空',
'service'=>'服务态度不能为空',
'recycle'=>'回收体验不能为空',
'content'=>'评价不能为空'
]);
if (!$validate->check($param)) {
$this->error(['code'=>40005,'msg'=>$validate->getError()]);
}
$data = Db::name('recyclecomment')
->insert($param);
if(empty($data)){
$this->error(['code'=>40006,'msg'=>'sql执行失败']);
}
$this->success('SUCCESS');
}
/**
* @title 添加商城订单评价
* @description
* @author GuoSheng
* @url /index/User/shopcomment
* @method GET
*
* @header name:XX-Token require:1 default: desc:token
*
* @param name:shoporder_id type:int require:1 other: desc:订单id
* @param name:shopgood_id type:int require:1 other: desc:商品ID
* @param name:speed type:int require:1 other: desc:上门速度
* @param name:service type:int require:1 other: desc:服务态度
* @param name:recycle type:int require:1 other: desc:回收体验
* @param name:content type:string require:1 other: desc:评价内容
* @param name:thumbnail type:string require:1 other: desc:图片
*
*/
public function shopcomment()
{
$user_id = $this->getUserId();
$param = $this->request->param();
$param['user_id'] = $user_id;
$param['create_time'] = time();
$validate = new Validate([
'shoporder_id' => 'require',
'shopgood_id'=>'require',
'speed' => 'require',
'service'=>'require',
'recycle'=>'require',
'content'=>'require'
]);
$validate->message([
'shoporder_id'=>'订单ID不能为空',
'shopgood_id'=>'商品ID不能为空',
'speed'=>'上门速度不能为空',
'service'=>'服务态度不能为空',
'recycle'=>'回收体验不能为空',
'content'=>'评价不能为空'
]);
if (!$validate->check($param)) {
$this->error(['code'=>40005,'msg'=>$validate->getError()]);
}
$data = Db::name('shopcomment')
->insert($param);
if(empty($data)){
$this->error(['code'=>40006,'msg'=>'sql执行失败']);
}
$this->success('SUCCESS');
}
/**
* @title 添加家政预约订单评价
* @description
* @author GuoSheng
* @url /index/User/homecomment
* @method GET
*
* @header name:XX-Token require:1 default: desc:token
*
* @param name:num type:int require:1 other: desc:订单号
* @param name:home_id type:int require:1 other: desc:家政公司ID
* @param name:speed type:int require:1 other: desc:服务质量
* @param name:service type:int require:1 other: desc:服务态度
* @param name:recycle type:int require:1 other: desc:服务体验
* @param name:content type:string require:1 other: desc:评价内容
* @param name:thumbnail type:string require:1 other: desc:图片
*
*/
public function homecomment()
{
$user_id = $this->getUserId();
$param = $this->request->param();
$param['user_id'] = $user_id;
$param['create_time'] = time();
$validate = new Validate([
'num' => 'require',
'home_id'=>'require',
'speed' => 'require',
'service'=>'require',
'recycle'=>'require',
'content'=>'require'
]);
$validate->message([
'num'=>'订单ID不能为空',
'home_id'=>'家政公司ID不能为空',
'speed'=>'服务质量不能为空',
'service'=>'服务态度不能为空',
'recycle'=>'服务体验不能为空',
'content'=>'评价不能为空'
]);
if (!$validate->check($param)) {
$this->error(['code'=>40005,'msg'=>$validate->getError()]);
}
$data = Db::name('homecomment')
->insert($param);
if(empty($data)){
$this->error(['code'=>40006,'msg'=>'sql执行失败']);
}
$this->success('SUCCESS');
}
}
\ No newline at end of file
... ...