作者 郭盛
1 个管道 的构建 通过 耗费 5 秒

修改积分明细,已经下订单时对应扣除积分

... ... @@ -2,7 +2,7 @@
<project version="4">
<component name="ChangeListManager">
<list default="true" id="0011664b-87e9-41bd-9f37-18792fb15777" name="Default" comment="">
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/api/index/controller/HomeController.php" afterPath="$PROJECT_DIR$/api/index/controller/HomeController.php" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/api/index/controller/ShopgoodsController.php" afterPath="$PROJECT_DIR$/api/index/controller/ShopgoodsController.php" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/api/index/controller/UserController.php" afterPath="$PROJECT_DIR$/api/index/controller/UserController.php" />
</list>
... ... @@ -26,11 +26,11 @@
</component>
<component name="FileEditorManager">
<leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
<file leaf-file-name="UserController.php" pinned="false" current-in-tab="true">
<file leaf-file-name="UserController.php" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/api/index/controller/UserController.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-30">
<caret line="415" column="33" lean-forward="false" selection-start-line="415" selection-start-column="33" selection-end-line="415" selection-end-column="33" />
<state relative-caret-position="519">
<caret line="947" column="27" lean-forward="false" selection-start-line="947" selection-start-column="27" selection-end-line="947" selection-end-column="27" />
<folding>
<element signature="e#366#715#0#PHP" expanded="false" />
<element signature="e#720#1485#0#PHP" expanded="false" />
... ... @@ -73,27 +73,27 @@
<element signature="e#27210#27634#0#PHP" expanded="false" />
<element signature="e#27639#28250#0#PHP" expanded="false" />
<element signature="e#28256#28752#0#PHP" expanded="false" />
<element signature="e#29937#30221#0#PHP" expanded="false" />
<element signature="e#30226#30862#0#PHP" expanded="false" />
<element signature="e#30883#31202#0#PHP" expanded="false" />
<element signature="e#31208#31616#0#PHP" expanded="false" />
<element signature="e#31622#32381#0#PHP" expanded="false" />
<element signature="e#32400#33264#0#PHP" expanded="false" />
<element signature="e#33290#33690#0#PHP" expanded="false" />
<element signature="e#33713#34286#0#PHP" expanded="false" />
<element signature="e#34309#35119#0#PHP" expanded="false" />
<element signature="e#35125#35724#0#PHP" expanded="false" />
<element signature="e#35729#36693#0#PHP" expanded="false" />
<element signature="e#36699#37366#0#PHP" expanded="false" />
<element signature="e#37371#38412#0#PHP" expanded="false" />
<element signature="e#38418#39081#0#PHP" expanded="false" />
<element signature="e#39086#40113#0#PHP" expanded="false" />
<element signature="e#40120#40551#0#PHP" expanded="false" />
<element signature="e#40556#41134#0#PHP" expanded="false" />
<element signature="e#41140#41569#0#PHP" expanded="false" />
<element signature="e#41574#42176#0#PHP" expanded="false" />
<element signature="e#42182#42609#0#PHP" expanded="false" />
<element signature="e#42614#43180#0#PHP" expanded="false" />
<element signature="e#30061#30345#0#PHP" expanded="false" />
<element signature="e#30350#30986#0#PHP" expanded="false" />
<element signature="e#31007#31326#0#PHP" expanded="false" />
<element signature="e#31332#31740#0#PHP" expanded="false" />
<element signature="e#31746#32505#0#PHP" expanded="false" />
<element signature="e#32524#33388#0#PHP" expanded="false" />
<element signature="e#33414#33814#0#PHP" expanded="false" />
<element signature="e#33837#34410#0#PHP" expanded="false" />
<element signature="e#34433#35243#0#PHP" expanded="false" />
<element signature="e#35249#35848#0#PHP" expanded="false" />
<element signature="e#35853#36817#0#PHP" expanded="false" />
<element signature="e#36823#37490#0#PHP" expanded="false" />
<element signature="e#37495#38536#0#PHP" expanded="false" />
<element signature="e#38542#39205#0#PHP" expanded="false" />
<element signature="e#39210#40237#0#PHP" expanded="false" />
<element signature="e#40244#40675#0#PHP" expanded="false" />
<element signature="e#40680#41258#0#PHP" expanded="false" />
<element signature="e#41264#41693#0#PHP" expanded="false" />
<element signature="e#41698#42300#0#PHP" expanded="false" />
<element signature="e#42306#42733#0#PHP" expanded="false" />
<element signature="e#42738#43304#0#PHP" expanded="false" />
</folding>
</state>
</provider>
... ... @@ -102,8 +102,8 @@
<file leaf-file-name="ShopgoodsController.php" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/api/index/controller/ShopgoodsController.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="674">
<caret line="434" column="129" lean-forward="true" selection-start-line="434" selection-start-column="129" selection-end-line="434" selection-end-column="129" />
<state relative-caret-position="444">
<caret line="429" column="8" lean-forward="false" selection-start-line="429" selection-start-column="8" selection-end-line="440" selection-end-column="9" />
<folding>
<element signature="e#411#604#0#PHP" expanded="false" />
<element signature="e#609#825#0#PHP" expanded="false" />
... ... @@ -127,6 +127,40 @@
<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" />
</folding>
</state>
</provider>
</entry>
</file>
<file leaf-file-name="HomeController.php" pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/api/index/controller/HomeController.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="769">
<caret line="394" column="30" lean-forward="true" selection-start-line="394" selection-start-column="30" selection-end-line="394" selection-end-column="30" />
<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#2125#2642#0#PHP" expanded="false" />
<element signature="e#2647#3162#0#PHP" expanded="false" />
<element signature="e#3168#3696#0#PHP" expanded="false" />
<element signature="e#3701#4539#0#PHP" expanded="false" />
<element signature="e#4545#4858#0#PHP" expanded="false" />
<element signature="e#4863#5238#0#PHP" expanded="false" />
<element signature="e#5244#5596#0#PHP" expanded="false" />
<element signature="e#5601#6009#0#PHP" expanded="false" />
<element signature="e#6015#6397#0#PHP" expanded="false" />
<element signature="e#6402#7072#0#PHP" expanded="false" />
<element signature="e#7078#7521#0#PHP" expanded="false" />
<element signature="e#7526#8376#0#PHP" expanded="false" />
<element signature="e#8382#8649#0#PHP" expanded="false" />
<element signature="e#8654#9129#0#PHP" expanded="false" />
<element signature="e#11556#11923#0#PHP" expanded="false" />
<element signature="e#11928#12368#0#PHP" expanded="false" />
</folding>
</state>
</provider>
... ... @@ -199,10 +233,10 @@
<option value="$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/subhome/index.html" />
<option value="$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/subhome/edit.html" />
<option value="$PROJECT_DIR$/app/admin/controller/SubhomeController.php" />
<option value="$PROJECT_DIR$/api/index/controller/HomeController.php" />
<option value="$PROJECT_DIR$/api/index/model/ShopgoodsModel.php" />
<option value="$PROJECT_DIR$/api/index/controller/ShopgoodsController.php" />
<option value="$PROJECT_DIR$/api/index/controller/UserController.php" />
<option value="$PROJECT_DIR$/api/index/controller/ShopgoodsController.php" />
<option value="$PROJECT_DIR$/api/index/controller/HomeController.php" />
</list>
</option>
</component>
... ... @@ -220,11 +254,11 @@
<sorting>DEFINITION_ORDER</sorting>
</component>
<component name="PhpWorkspaceProjectConfiguration" backward_compatibility_performed="true" />
<component name="ProjectFrameBounds" extendedState="1">
<option name="x" value="281" />
<option name="y" value="7" />
<component name="ProjectFrameBounds">
<option name="x" value="295" />
<option name="y" value="53" />
<option name="width" value="1582" />
<option name="height" value="1042" />
<option name="height" value="1056" />
</component>
<component name="ProjectView">
<navigator currentView="ProjectPane" proportions="" version="1">
... ... @@ -371,18 +405,18 @@
<workItem from="1575431441427" duration="8414000" />
<workItem from="1575444399653" duration="12810000" />
<workItem from="1575462840839" duration="250000" />
<workItem from="1575506248144" duration="2503000" />
<workItem from="1575506248144" duration="3519000" />
</task>
<servers />
</component>
<component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="469212000" />
<option name="totallyTimeSpent" value="470228000" />
</component>
<component name="ToolWindowManager">
<frame x="281" y="7" width="1582" height="1042" extended-state="1" />
<frame x="295" y="53" width="1582" height="1056" extended-state="0" />
<editor active="true" />
<layout>
<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="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="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" />
... ... @@ -738,13 +772,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="185">
<caret line="188" column="7" lean-forward="true" selection-start-line="188" selection-start-column="7" selection-end-line="188" selection-end-column="7" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/index/controller/ShopgoodsController.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="0">
... ... @@ -766,37 +793,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="674">
<caret line="434" column="129" lean-forward="true" selection-start-line="434" selection-start-column="129" selection-end-line="434" selection-end-column="129" />
<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" />
</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="450">
... ... @@ -841,8 +837,8 @@
</entry>
<entry file="file://$PROJECT_DIR$/api/index/controller/UserController.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-30">
<caret line="415" column="33" lean-forward="false" selection-start-line="415" selection-start-column="33" selection-end-line="415" selection-end-column="33" />
<state relative-caret-position="519">
<caret line="947" column="27" lean-forward="false" selection-start-line="947" selection-start-column="27" selection-end-line="947" selection-end-column="27" />
<folding>
<element signature="e#366#715#0#PHP" expanded="false" />
<element signature="e#720#1485#0#PHP" expanded="false" />
... ... @@ -885,27 +881,90 @@
<element signature="e#27210#27634#0#PHP" expanded="false" />
<element signature="e#27639#28250#0#PHP" expanded="false" />
<element signature="e#28256#28752#0#PHP" expanded="false" />
<element signature="e#29937#30221#0#PHP" expanded="false" />
<element signature="e#30226#30862#0#PHP" expanded="false" />
<element signature="e#30883#31202#0#PHP" expanded="false" />
<element signature="e#31208#31616#0#PHP" expanded="false" />
<element signature="e#31622#32381#0#PHP" expanded="false" />
<element signature="e#32400#33264#0#PHP" expanded="false" />
<element signature="e#33290#33690#0#PHP" expanded="false" />
<element signature="e#33713#34286#0#PHP" expanded="false" />
<element signature="e#34309#35119#0#PHP" expanded="false" />
<element signature="e#35125#35724#0#PHP" expanded="false" />
<element signature="e#35729#36693#0#PHP" expanded="false" />
<element signature="e#36699#37366#0#PHP" expanded="false" />
<element signature="e#37371#38412#0#PHP" expanded="false" />
<element signature="e#38418#39081#0#PHP" expanded="false" />
<element signature="e#39086#40113#0#PHP" expanded="false" />
<element signature="e#40120#40551#0#PHP" expanded="false" />
<element signature="e#40556#41134#0#PHP" expanded="false" />
<element signature="e#41140#41569#0#PHP" expanded="false" />
<element signature="e#41574#42176#0#PHP" expanded="false" />
<element signature="e#42182#42609#0#PHP" expanded="false" />
<element signature="e#42614#43180#0#PHP" expanded="false" />
<element signature="e#30061#30345#0#PHP" expanded="false" />
<element signature="e#30350#30986#0#PHP" expanded="false" />
<element signature="e#31007#31326#0#PHP" expanded="false" />
<element signature="e#31332#31740#0#PHP" expanded="false" />
<element signature="e#31746#32505#0#PHP" expanded="false" />
<element signature="e#32524#33388#0#PHP" expanded="false" />
<element signature="e#33414#33814#0#PHP" expanded="false" />
<element signature="e#33837#34410#0#PHP" expanded="false" />
<element signature="e#34433#35243#0#PHP" expanded="false" />
<element signature="e#35249#35848#0#PHP" expanded="false" />
<element signature="e#35853#36817#0#PHP" expanded="false" />
<element signature="e#36823#37490#0#PHP" expanded="false" />
<element signature="e#37495#38536#0#PHP" expanded="false" />
<element signature="e#38542#39205#0#PHP" expanded="false" />
<element signature="e#39210#40237#0#PHP" expanded="false" />
<element signature="e#40244#40675#0#PHP" expanded="false" />
<element signature="e#40680#41258#0#PHP" expanded="false" />
<element signature="e#41264#41693#0#PHP" expanded="false" />
<element signature="e#41698#42300#0#PHP" expanded="false" />
<element signature="e#42306#42733#0#PHP" expanded="false" />
<element signature="e#42738#43304#0#PHP" expanded="false" />
</folding>
</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="444">
<caret line="429" column="8" lean-forward="false" selection-start-line="429" selection-start-column="8" selection-end-line="440" selection-end-column="9" />
<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" />
</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="769">
<caret line="394" column="30" lean-forward="true" selection-start-line="394" selection-start-column="30" selection-end-line="394" selection-end-column="30" />
<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#2125#2642#0#PHP" expanded="false" />
<element signature="e#2647#3162#0#PHP" expanded="false" />
<element signature="e#3168#3696#0#PHP" expanded="false" />
<element signature="e#3701#4539#0#PHP" expanded="false" />
<element signature="e#4545#4858#0#PHP" expanded="false" />
<element signature="e#4863#5238#0#PHP" expanded="false" />
<element signature="e#5244#5596#0#PHP" expanded="false" />
<element signature="e#5601#6009#0#PHP" expanded="false" />
<element signature="e#6015#6397#0#PHP" expanded="false" />
<element signature="e#6402#7072#0#PHP" expanded="false" />
<element signature="e#7078#7521#0#PHP" expanded="false" />
<element signature="e#7526#8376#0#PHP" expanded="false" />
<element signature="e#8382#8649#0#PHP" expanded="false" />
<element signature="e#8654#9129#0#PHP" expanded="false" />
<element signature="e#11556#11923#0#PHP" expanded="false" />
<element signature="e#11928#12368#0#PHP" expanded="false" />
</folding>
</state>
</provider>
... ...
... ... @@ -94,7 +94,6 @@ class HomeController extends RestBaseController
$this->success('SUCCESS',$data);
}
/**
* @title 家政公司详情
* @description 家政公司详情
... ... @@ -349,6 +348,7 @@ class HomeController extends RestBaseController
* @param name:homeaddress_id require:1 other: desc:预约家政服务地址ID
* @param name:home_id require:1 other: desc:家政公司ID
* @param name:service_id require:1 other desc:服务类目ID
* @param name:total require:1 other desc:所需积分
* @param name:sub_time require:1 other desc:预约时间
* @param name:content require:1 other desc:留言备注
*
... ... @@ -356,6 +356,12 @@ class HomeController extends RestBaseController
public function subscribe()
{
$user_id = $this->getUserId();
$login = Db::name('integral')
->where('user_id',$user_id)
->find();
if(empty($login)){
$this->error(['code'=>40005,'msg'=>'请先注册']);
}
$param = $this->request->param();
$param['user_id'] = $user_id;
$param['create_time'] = time();
... ... @@ -363,6 +369,7 @@ class HomeController extends RestBaseController
'homeaddress_id' => 'require',
'home_id' => 'require',
'service_id'=>'require',
'total'=>'require',
'sub_time'=>'require',
'content'=>'require'
]);
... ... @@ -370,12 +377,25 @@ class HomeController extends RestBaseController
'homeaddress_id'=>'预约家政地址不能为空',
'home_id'=>'家政公司不能为空',
'service_id'=>'服务类目不能为空',
'total'=>'所需积分不能为空',
'sub_time'=>'预约时间不能为空',
'content'=>'留言备注不能为空'
]);
if (!$validate->check($param)) {
$this->error(['code'=>40005,'msg'=>$validate->getError()]);
}
if($param['total']>$login['now_integral']){
$this->error(['code'=>2,'msg'=>'您的积分不足']);
}else{
$now_integral = $login['now_integral'] - $param['total'];
$update_time = time();
Db::name('integral')->where('user_id',$user_id)->update(['now_integral'=>$now_integral,'update_time'=>$update_time]);
$info['user_id'] = $user_id;
$info['create_time'] = time();
$info['type'] = 6;
$info['total'] = $param['total'];
Db::name('detail')->insertGetId($info);
}
$param['num'] = cmf_get_order_sn();
$data = Db::name('subhome')
->insert($param);
... ...
... ... @@ -433,6 +433,11 @@ class ShopgoodsController extends RestBaseController
$now_integral = $login['now_integral'] - $param['total'];
$update_time = time();
Db::name('integral')->where('user_id',$user_id)->update(['now_integral'=>$now_integral,'update_time'=>$update_time]);
$info['user_id'] = $user_id;
$info['create_time'] = time();
$info['type'] = 2;
$info['total'] = $param['total'];
Db::name('detail')->insertGetId($info);
}
$param['number'] = cmf_get_order_sn();
$data = Db::name('shoporder')
... ...
... ... @@ -946,10 +946,11 @@ class UserController extends RestBaseController
Db::name('integral')
->where('user_id',$user_id)
->update($res);
// $info = Db::name('detail')->where('user_id',$user_id)
$info['user_id'] = $user_id;
$info['total'] = $get_integral;
$info['create_time'] = time();
$info['type'] = 5;
Db::name('detail')->insertGetId($info);
$res = Db::name('collector')
->insertGetId($data);
if($res){
... ...