郭盛 / scrap · 提交

转到一个项目

作者 郭盛
提交 c9b32f315225d422364c3084f5725894195be0b5 1 个父辈 f6626fb2
1 个管道 的构建 通过 耗费 4 秒

商品金额

内嵌 并排对比
正在显示 2 个修改的文件 包含 109 行增加 和 60 行删除
... ... @@ -2,7 +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/ShopgoodsController.php" afterPath="$PROJECT_DIR$/api/index/controller/ShopgoodsController.php" />
</list>
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
... ... @@ -25,11 +24,58 @@
</component>
<component name="FileEditorManager">
<leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
<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="882">
<caret line="504" column="7" lean-forward="true" selection-start-line="504" selection-start-column="7" selection-end-line="504" selection-end-column="7" />
<folding>
<element signature="e#345#694#0#PHP" expanded="false" />
<element signature="e#699#1464#0#PHP" expanded="false" />
<element signature="e#1470#1699#0#PHP" expanded="false" />
<element signature="e#1704#3337#0#PHP" expanded="false" />
<element signature="e#3343#3583#0#PHP" expanded="false" />
<element signature="e#3588#3836#0#PHP" expanded="false" />
<element signature="e#3842#4189#0#PHP" expanded="false" />
<element signature="e#4194#4640#0#PHP" expanded="false" />
<element signature="e#4646#4906#0#PHP" expanded="false" />
<element signature="e#4911#5112#0#PHP" expanded="false" />
<element signature="e#5118#5380#0#PHP" expanded="false" />
<element signature="e#5385#5590#0#PHP" expanded="false" />
<element signature="e#5596#6038#0#PHP" expanded="false" />
<element signature="e#6043#7271#0#PHP" expanded="false" />
<element signature="e#7294#7839#0#PHP" expanded="false" />
<element signature="e#7845#8126#0#PHP" expanded="false" />
<element signature="e#8131#8523#0#PHP" expanded="false" />
<element signature="e#8529#9078#0#PHP" expanded="false" />
<element signature="e#9083#10282#0#PHP" expanded="false" />
<element signature="e#10288#10745#0#PHP" expanded="false" />
<element signature="e#10750#12013#0#PHP" expanded="false" />
<element signature="e#12036#12388#0#PHP" expanded="false" />
<element signature="e#12394#13078#0#PHP" expanded="false" />
<element signature="e#13083#14342#0#PHP" expanded="false" />
<element signature="e#14348#14810#0#PHP" expanded="false" />
<element signature="e#14815#17020#0#PHP" expanded="false" />
<element signature="e#17026#17635#0#PHP" expanded="false" />
<element signature="e#17640#18973#0#PHP" expanded="false" />
<element signature="e#18979#19336#0#PHP" expanded="false" />
<element signature="e#19341#20222#0#PHP" expanded="false" />
<element signature="e#20228#20580#0#PHP" expanded="false" />
<element signature="e#20585#21662#0#PHP" expanded="false" />
<element signature="e#21668#22023#0#PHP" expanded="false" />
<element signature="e#22028#23108#0#PHP" expanded="false" />
<element signature="e#23114#23538#0#PHP" expanded="false" />
<element signature="e#23543#24154#0#PHP" expanded="false" />
</folding>
</state>
</provider>
</entry>
</file>
<file leaf-file-name="ShopgoodsController.php" pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/api/index/controller/ShopgoodsController.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="313">
<caret line="415" column="28" lean-forward="true" selection-start-line="415" selection-start-column="28" selection-end-line="415" selection-end-column="28" />
<state relative-caret-position="209">
<caret line="421" column="38" lean-forward="true" selection-start-line="421" selection-start-column="38" selection-end-line="421" selection-end-column="38" />
<folding>
<element signature="e#411#604#0#PHP" expanded="false" />
<element signature="e#609#825#0#PHP" expanded="false" />
... ... @@ -147,8 +193,8 @@
</component>
<component name="PhpWorkspaceProjectConfiguration" backward_compatibility_performed="true" />
<component name="ProjectFrameBounds">
<option name="x" value="414" />
<option name="y" value="18" />
<option name="x" value="286" />
<option name="y" value="102" />
<option name="width" value="1582" />
<option name="height" value="969" />
</component>
... ... @@ -202,7 +248,7 @@
</component>
<component name="PropertiesComponent">
<property name="WebServerToolWindowFactoryState" value="false" />
<property name="last_opened_file_path" value="$PROJECT_DIR$/../../project/competition" />
<property name="last_opened_file_path" value="$PROJECT_DIR$/../../decor/decor" />
<property name="DefaultHtmlFileTemplate" value="HTML File" />
</component>
<component name="RecentsManager">
... ... @@ -290,15 +336,15 @@
<workItem from="1575016153150" duration="3315000" />
<workItem from="1575246616478" duration="21722000" />
<workItem from="1575278769037" duration="7395000" />
<workItem from="1575332430854" duration="3632000" />
<workItem from="1575332430854" duration="6882000" />
</task>
<servers />
</component>
<component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="414090000" />
<option name="totallyTimeSpent" value="417340000" />
</component>
<component name="ToolWindowManager">
<frame x="414" y="18" width="1582" height="969" extended-state="0" />
<frame x="286" y="102" width="1582" height="969" extended-state="0" />
<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.19513798" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
... ... @@ -662,18 +708,59 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/api/index/model/ShopgoodsModel.php">
<entry file="file://$PROJECT_DIR$/simplewind/cmf/controller/RestBaseController.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="106">
<caret line="13" column="34" lean-forward="true" selection-start-line="13" selection-start-column="34" selection-end-line="13" selection-end-column="34" />
<state relative-caret-position="210">
<caret line="93" column="57" lean-forward="false" selection-start-line="93" selection-start-column="57" selection-end-line="93" selection-end-column="57" />
<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="-194">
<caret line="37" column="28" lean-forward="false" selection-start-line="37" selection-start-column="28" selection-end-line="37" selection-end-column="28" />
<folding>
<element signature="e#342#596#0#PHP" expanded="false" />
<element signature="e#601#886#0#PHP" expanded="false" />
<element signature="e#892#1227#0#PHP" expanded="false" />
<element signature="e#1232#1729#0#PHP" expanded="false" />
<element signature="e#1735#1995#0#PHP" expanded="false" />
<element signature="e#2000#2289#0#PHP" expanded="false" />
<element signature="e#2295#2634#0#PHP" expanded="false" />
<element signature="e#2639#3142#0#PHP" expanded="false" />
<element signature="e#3148#3364#0#PHP" expanded="false" />
<element signature="e#3369#3738#0#PHP" expanded="false" />
<element signature="e#3744#4046#0#PHP" expanded="false" />
<element signature="e#4051#4450#0#PHP" expanded="false" />
<element signature="e#4456#4653#0#PHP" expanded="false" />
<element signature="e#4658#4915#0#PHP" expanded="false" />
<element signature="e#4921#5117#0#PHP" expanded="false" />
<element signature="e#5122#5384#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="407">
<caret line="167" column="8" lean-forward="false" selection-start-line="167" selection-start-column="8" selection-end-line="173" selection-end-column="11" />
<folding>
<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="235">
<caret line="36" column="27" lean-forward="false" selection-start-line="36" selection-start-column="27" selection-end-line="36" selection-end-column="27" />
<state relative-caret-position="882">
<caret line="504" column="7" lean-forward="true" selection-start-line="504" selection-start-column="7" selection-end-line="504" selection-end-column="7" />
<folding>
<element signature="e#345#694#0#PHP" expanded="false" />
<element signature="e#699#1464#0#PHP" expanded="false" />
... ... @@ -715,59 +802,18 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/simplewind/cmf/controller/RestBaseController.php">
<entry file="file://$PROJECT_DIR$/api/index/model/ShopgoodsModel.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="210">
<caret line="93" column="57" lean-forward="false" selection-start-line="93" selection-start-column="57" selection-end-line="93" selection-end-column="57" />
<state relative-caret-position="556">
<caret line="43" column="37" lean-forward="true" selection-start-line="43" selection-start-column="37" selection-end-line="43" selection-end-column="37" />
<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="-194">
<caret line="37" column="28" lean-forward="false" selection-start-line="37" selection-start-column="28" selection-end-line="37" selection-end-column="28" />
<folding>
<element signature="e#342#596#0#PHP" expanded="false" />
<element signature="e#601#886#0#PHP" expanded="false" />
<element signature="e#892#1227#0#PHP" expanded="false" />
<element signature="e#1232#1729#0#PHP" expanded="false" />
<element signature="e#1735#1995#0#PHP" expanded="false" />
<element signature="e#2000#2289#0#PHP" expanded="false" />
<element signature="e#2295#2634#0#PHP" expanded="false" />
<element signature="e#2639#3142#0#PHP" expanded="false" />
<element signature="e#3148#3364#0#PHP" expanded="false" />
<element signature="e#3369#3738#0#PHP" expanded="false" />
<element signature="e#3744#4046#0#PHP" expanded="false" />
<element signature="e#4051#4450#0#PHP" expanded="false" />
<element signature="e#4456#4653#0#PHP" expanded="false" />
<element signature="e#4658#4915#0#PHP" expanded="false" />
<element signature="e#4921#5117#0#PHP" expanded="false" />
<element signature="e#5122#5384#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="407">
<caret line="167" column="8" lean-forward="false" selection-start-line="167" selection-start-column="8" selection-end-line="173" selection-end-column="11" />
<folding>
<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/ShopgoodsController.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="313">
<caret line="415" column="28" lean-forward="true" selection-start-line="415" selection-start-column="28" selection-end-line="415" selection-end-column="28" />
<state relative-caret-position="209">
<caret line="421" column="38" lean-forward="true" selection-start-line="421" selection-start-column="38" selection-end-line="421" selection-end-column="38" />
<folding>
<element signature="e#411#604#0#PHP" expanded="false" />
<element signature="e#609#825#0#PHP" expanded="false" />
... ...
... ... @@ -388,6 +388,7 @@ class ShopgoodsController extends RestBaseController
* @param name:shoprecycle_id require:1 other: desc: 上门回收地址ID
* @param name:shopgoods_id require:1 other desc: 商品ID
* @param name:num require:1 other desc: 购买数量
* @param name:goods_money require:1 other desc: 商品金额
* @param name:total require:1 other desc: 总价
* @param name:express require:1 other desc: 配送方式(1快递配送 2同城配送)
* @param name:content require:1 other desc: 留言备注
... ... @@ -410,6 +411,7 @@ class ShopgoodsController extends RestBaseController
'shopgoods_id' => 'require',
'num'=>'require',
'total'=>'require',
'goods_money'=>'require',
'express'=>'require',
'content'=>'require'
]);
... ... @@ -417,6 +419,7 @@ class ShopgoodsController extends RestBaseController
'shoprecycle_id'=>'收货地址不能为空',
'shopgoods_id'=>'商品ID不能为空',
'num'=>'购买数量不能为空',
'goods_money'=>'商品金额不能为空',
'total'=>'总价不能为空',
'express'=>'配送方式不能为空',
'content'=>'留言备注不能为空'
... ...