郭盛 / scrap · 提交

转到一个项目

作者 郭盛
提交 0136ba5291ff601855088d9cc87adfeb670bc23d 1 个父辈 c3d4fb7b
1 个管道 的构建 通过 耗费 1 秒

修改服务费

内嵌 并排对比
正在显示 2 个修改的文件 包含 75 行增加 和 66 行删除
... ... @@ -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$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/api/index/controller/SubscribeController.php" afterPath="$PROJECT_DIR$/api/index/controller/SubscribeController.php" />
<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="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="817">
<caret line="1007" column="7" lean-forward="true" selection-start-line="1007" selection-start-column="7" selection-end-line="1007" selection-end-column="7" />
<state relative-caret-position="500">
<caret line="1027" column="43" lean-forward="true" selection-start-line="1027" selection-start-column="43" selection-end-line="1027" selection-end-column="43" />
<folding>
<element signature="e#366#791#0#PHP" expanded="false" />
<element signature="e#796#1608#0#PHP" expanded="false" />
... ... @@ -75,29 +73,28 @@
<element signature="e#30189#30613#0#PHP" expanded="false" />
<element signature="e#30618#31229#0#PHP" expanded="false" />
<element signature="e#31235#31731#0#PHP" expanded="false" />
<element signature="e#31736#35383#0#PHP" expanded="false" />
<element signature="e#32538#33665#0#PHP" expanded="false" />
<element signature="e#35389#35673#0#PHP" expanded="false" />
<element signature="e#35678#36314#0#PHP" expanded="false" />
<element signature="e#36335#36654#0#PHP" expanded="false" />
<element signature="e#36660#37068#0#PHP" expanded="false" />
<element signature="e#37074#37833#0#PHP" expanded="false" />
<element signature="e#37852#38716#0#PHP" expanded="false" />
<element signature="e#38742#39142#0#PHP" expanded="false" />
<element signature="e#39165#39738#0#PHP" expanded="false" />
<element signature="e#39761#40571#0#PHP" expanded="false" />
<element signature="e#40577#41176#0#PHP" expanded="false" />
<element signature="e#41181#42145#0#PHP" expanded="false" />
<element signature="e#42151#42818#0#PHP" expanded="false" />
<element signature="e#42823#43864#0#PHP" expanded="false" />
<element signature="e#43870#44533#0#PHP" expanded="false" />
<element signature="e#44538#45565#0#PHP" expanded="false" />
<element signature="e#45572#46003#0#PHP" expanded="false" />
<element signature="e#46008#46586#0#PHP" expanded="false" />
<element signature="e#46592#47021#0#PHP" expanded="false" />
<element signature="e#47026#47628#0#PHP" expanded="false" />
<element signature="e#47634#48061#0#PHP" expanded="false" />
<element signature="e#48066#48632#0#PHP" expanded="false" />
<element signature="e#32548#33675#0#PHP" expanded="false" />
<element signature="e#35400#35684#0#PHP" expanded="false" />
<element signature="e#35689#36325#0#PHP" expanded="false" />
<element signature="e#36346#36665#0#PHP" expanded="false" />
<element signature="e#36671#37079#0#PHP" expanded="false" />
<element signature="e#37085#37844#0#PHP" expanded="false" />
<element signature="e#37863#38727#0#PHP" expanded="false" />
<element signature="e#38753#39153#0#PHP" expanded="false" />
<element signature="e#39176#39749#0#PHP" expanded="false" />
<element signature="e#39772#40582#0#PHP" expanded="false" />
<element signature="e#40588#41187#0#PHP" expanded="false" />
<element signature="e#41192#42156#0#PHP" expanded="false" />
<element signature="e#42162#42829#0#PHP" expanded="false" />
<element signature="e#42834#43875#0#PHP" expanded="false" />
<element signature="e#43881#44544#0#PHP" expanded="false" />
<element signature="e#44549#45576#0#PHP" expanded="false" />
<element signature="e#45583#46014#0#PHP" expanded="false" />
<element signature="e#46019#46597#0#PHP" expanded="false" />
<element signature="e#46603#47032#0#PHP" expanded="false" />
<element signature="e#47037#47639#0#PHP" expanded="false" />
<element signature="e#47645#48072#0#PHP" expanded="false" />
<element signature="e#48077#48643#0#PHP" expanded="false" />
</folding>
</state>
</provider>
... ... @@ -191,9 +188,9 @@
<sorting>DEFINITION_ORDER</sorting>
</component>
<component name="PhpWorkspaceProjectConfiguration" backward_compatibility_performed="true" />
<component name="ProjectFrameBounds">
<option name="x" value="249" />
<option name="y" value="26" />
<component name="ProjectFrameBounds" extendedState="1">
<option name="x" value="6" />
<option name="y" value="76" />
<option name="width" value="1618" />
<option name="height" value="1096" />
</component>
... ... @@ -360,15 +357,15 @@
<workItem from="1576298110450" duration="8414000" />
<workItem from="1576455946584" duration="1141000" />
<workItem from="1576459063836" duration="389000" />
<workItem from="1576463908857" duration="935000" />
<workItem from="1576463908857" duration="1619000" />
</task>
<servers />
</component>
<component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="574967000" />
<option name="totallyTimeSpent" value="575651000" />
</component>
<component name="ToolWindowManager">
<frame x="249" y="26" width="1618" height="1096" extended-state="0" />
<frame x="6" y="76" width="1618" height="1096" 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.19640565" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
... ... @@ -639,13 +636,6 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/api/index/controller/OrderController.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="506">
<caret line="107" column="14" lean-forward="true" selection-start-line="107" selection-start-column="14" selection-end-line="107" selection-end-column="14" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/api/index/controller/ProjectController.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="127">
... ... @@ -807,10 +797,29 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/api/index/controller/OrderController.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="609">
<caret line="178" column="0" lean-forward="true" selection-start-line="178" selection-start-column="0" selection-end-line="178" selection-end-column="0" />
<folding>
<element signature="e#336#608#0#PHP" expanded="false" />
<element signature="e#614#976#0#PHP" expanded="false" />
<element signature="e#981#2020#0#PHP" expanded="false" />
<element signature="e#2026#2263#0#PHP" expanded="false" />
<element signature="e#2268#3049#0#PHP" expanded="false" />
<element signature="e#3055#3364#0#PHP" expanded="false" />
<element signature="e#3369#5259#0#PHP" expanded="false" />
<element signature="e#5267#5746#0#PHP" expanded="false" />
<element signature="e#5751#6318#0#PHP" expanded="false" />
<element signature="e#6324#6577#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="817">
<caret line="1007" column="7" lean-forward="true" selection-start-line="1007" selection-start-column="7" selection-end-line="1007" selection-end-column="7" />
<state relative-caret-position="500">
<caret line="1027" column="43" lean-forward="true" selection-start-line="1027" selection-start-column="43" selection-end-line="1027" selection-end-column="43" />
<folding>
<element signature="e#366#791#0#PHP" expanded="false" />
<element signature="e#796#1608#0#PHP" expanded="false" />
... ... @@ -855,29 +864,28 @@
<element signature="e#30189#30613#0#PHP" expanded="false" />
<element signature="e#30618#31229#0#PHP" expanded="false" />
<element signature="e#31235#31731#0#PHP" expanded="false" />
<element signature="e#31736#35383#0#PHP" expanded="false" />
<element signature="e#32538#33665#0#PHP" expanded="false" />
<element signature="e#35389#35673#0#PHP" expanded="false" />
<element signature="e#35678#36314#0#PHP" expanded="false" />
<element signature="e#36335#36654#0#PHP" expanded="false" />
<element signature="e#36660#37068#0#PHP" expanded="false" />
<element signature="e#37074#37833#0#PHP" expanded="false" />
<element signature="e#37852#38716#0#PHP" expanded="false" />
<element signature="e#38742#39142#0#PHP" expanded="false" />
<element signature="e#39165#39738#0#PHP" expanded="false" />
<element signature="e#39761#40571#0#PHP" expanded="false" />
<element signature="e#40577#41176#0#PHP" expanded="false" />
<element signature="e#41181#42145#0#PHP" expanded="false" />
<element signature="e#42151#42818#0#PHP" expanded="false" />
<element signature="e#42823#43864#0#PHP" expanded="false" />
<element signature="e#43870#44533#0#PHP" expanded="false" />
<element signature="e#44538#45565#0#PHP" expanded="false" />
<element signature="e#45572#46003#0#PHP" expanded="false" />
<element signature="e#46008#46586#0#PHP" expanded="false" />
<element signature="e#46592#47021#0#PHP" expanded="false" />
<element signature="e#47026#47628#0#PHP" expanded="false" />
<element signature="e#47634#48061#0#PHP" expanded="false" />
<element signature="e#48066#48632#0#PHP" expanded="false" />
<element signature="e#32548#33675#0#PHP" expanded="false" />
<element signature="e#35400#35684#0#PHP" expanded="false" />
<element signature="e#35689#36325#0#PHP" expanded="false" />
<element signature="e#36346#36665#0#PHP" expanded="false" />
<element signature="e#36671#37079#0#PHP" expanded="false" />
<element signature="e#37085#37844#0#PHP" expanded="false" />
<element signature="e#37863#38727#0#PHP" expanded="false" />
<element signature="e#38753#39153#0#PHP" expanded="false" />
<element signature="e#39176#39749#0#PHP" expanded="false" />
<element signature="e#39772#40582#0#PHP" expanded="false" />
<element signature="e#40588#41187#0#PHP" expanded="false" />
<element signature="e#41192#42156#0#PHP" expanded="false" />
<element signature="e#42162#42829#0#PHP" expanded="false" />
<element signature="e#42834#43875#0#PHP" expanded="false" />
<element signature="e#43881#44544#0#PHP" expanded="false" />
<element signature="e#44549#45576#0#PHP" expanded="false" />
<element signature="e#45583#46014#0#PHP" expanded="false" />
<element signature="e#46019#46597#0#PHP" expanded="false" />
<element signature="e#46603#47032#0#PHP" expanded="false" />
<element signature="e#47037#47639#0#PHP" expanded="false" />
<element signature="e#47645#48072#0#PHP" expanded="false" />
<element signature="e#48077#48643#0#PHP" expanded="false" />
</folding>
</state>
</provider>
... ...
... ... @@ -1025,7 +1025,7 @@ class UserController extends RestBaseController
//通过传入的订单ID来算出该订单的用户ID
$order = Db::name('subscribe')
->where('id',$order_id)
->field('id,user_id')
->field('id,user_id,fee_money')
->find();
//通过查出来的用户ID来算出该用户的积分信息
$info = Db::name('integral')
... ... @@ -1060,6 +1060,7 @@ class UserController extends RestBaseController
Db::name('detail')->insertGetId($ji);
}
}
//添加对应的积分明细
$detail['user_id'] = $order['user_id'];
//判断是否存在服务费
... ...