cxc/wisdommining-serve
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

修改地址

Browse Source
This commit is contained in:
quantulr
2024-05-10 16:40:07 +08:00
parent ca5ad7ecdb
commit 1a293a85cc
4 changed files with 11 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
.idea/misc.xml generated
View File

@ -1,4 +1,3 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4"> <project version="4">
<component name="ExternalStorageConfigurationManager" enabled="true" /> <component name="ExternalStorageConfigurationManager" enabled="true" />
<component name="FrameworkDetectionExcludesConfiguration"> <component name="FrameworkDetectionExcludesConfiguration">

15
.idea/workspace.xml generated
View File

@ -5,10 +5,10 @@
</component> </component>
<component name="ChangeListManager"> <component name="ChangeListManager">
<list default="true" id="bdad98b9-7a5e-48f7-b79e-ed6a34d55dab" name="Default Changelist" comment="第一次提交"> <list default="true" id="bdad98b9-7a5e-48f7-b79e-ed6a34d55dab" name="Default Changelist" comment="第一次提交">
<change beforePath="$PROJECT_DIR$/.idea/misc.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/misc.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" /> <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/com/wisdo/mmining/api/OrderApi.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/wisdo/mmining/api/OrderApi.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/src/main/java/com/wisdo/mmining/api/OrderApi.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/wisdo/mmining/api/OrderApi.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/resources/application-db.yml" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/application-db.yml" afterDir="false" /> <change beforePath="$PROJECT_DIR$/src/main/webapp/WEB-INF/view/pages/order/order_list.jsp" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/webapp/WEB-INF/view/pages/order/order_list.jsp" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/webapp/WEB-INF/view/pages/order/order_edit_address.jsp" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/webapp/WEB-INF/view/pages/order/order_edit_address.jsp" afterDir="false" />
</list> </list>
<option name="SHOW_DIALOG" value="false" /> <option name="SHOW_DIALOG" value="false" />
<option name="HIGHLIGHT_CONFLICTS" value="true" /> <option name="HIGHLIGHT_CONFLICTS" value="true" />
@ -453,6 +453,7 @@
"RequestMappingsPanelWidth1": "75", "RequestMappingsPanelWidth1": "75",
"RunOnceActivity.ShowReadmeOnStart": "true", "RunOnceActivity.ShowReadmeOnStart": "true",
"Spring Boot.WisdoMminingApplication.executor": "Debug", "Spring Boot.WisdoMminingApplication.executor": "Debug",
"dart.analysis.tool.window.visible": "false",
"git-widget-placeholder": "master", "git-widget-placeholder": "master",
"kotlin-language-version-configured": "true", "kotlin-language-version-configured": "true",
"last_opened_file_path": "D:/Documents/IdeaProjects/wisdommining-serve/src/main/webapp/WEB-INF/view/pages/order", "last_opened_file_path": "D:/Documents/IdeaProjects/wisdommining-serve/src/main/webapp/WEB-INF/view/pages/order",
@ -461,7 +462,8 @@
"node.js.selected.package.eslint": "(autodetect)", "node.js.selected.package.eslint": "(autodetect)",
"node.js.selected.package.tslint": "(autodetect)", "node.js.selected.package.tslint": "(autodetect)",
"nodejs_package_manager_path": "npm", "nodejs_package_manager_path": "npm",
"settings.editor.selected.configurable": "editor.preferences.fonts.default", "settings.editor.selected.configurable": "preferences.pluginManager",
"show.migrate.to.gradle.popup": "false",
"vue.rearranger.settings.migration": "true" "vue.rearranger.settings.migration": "true"
} }
}]]></component> }]]></component>
@ -503,8 +505,8 @@
<component name="SharedIndexes"> <component name="SharedIndexes">
<attachedChunks> <attachedChunks>
<set> <set>
<option value="bundled-jdk-9f38398b9061-18abd8497189-intellij.indexing.shared.core-IU-241.14494.240" /> <option value="bundled-jdk-9f38398b9061-39b83d9b5494-intellij.indexing.shared.core-IU-241.15989.150" />
<option value="bundled-js-predefined-1d06a55b98c1-74d2a5396914-JavaScript-IU-241.14494.240" /> <option value="bundled-js-predefined-1d06a55b98c1-91d5c284f522-JavaScript-IU-241.15989.150" />
</set> </set>
</attachedChunks> </attachedChunks>
</component> </component>
@ -598,7 +600,8 @@
<workItem from="1715153690971" duration="5114000" /> <workItem from="1715153690971" duration="5114000" />
<workItem from="1715220865862" duration="17980000" /> <workItem from="1715220865862" duration="17980000" />
<workItem from="1715302389730" duration="350000" /> <workItem from="1715302389730" duration="350000" />
<workItem from="1715303161489" duration="2121000" /> <workItem from="1715303161489" duration="3672000" />
<workItem from="1715307843757" duration="4090000" />
</task> </task>
<task id="LOCAL-00001" summary="第一次提交"> <task id="LOCAL-00001" summary="第一次提交">
<created>1623736948713</created> <created>1623736948713</created>

1
src/main/java/com/wisdo/mmining/api/OrderApi.java
View File

@ -327,6 +327,7 @@ public class OrderApi {
if (order.getStatus().equals(1) || order.getStatus().equals(2)) { if (order.getStatus().equals(1) || order.getStatus().equals(2)) {
order.setAddressId(addressId); order.setAddressId(addressId);
order.setOrderAddress(address.getAddressProvince() + address.getAddressCity() + address.getAddressArea() + address.getAddressDetailed()); order.setOrderAddress(address.getAddressProvince() + address.getAddressCity() + address.getAddressArea() + address.getAddressDetailed());
orderService.updateById(order);
return ResultUtil.success("地址修改成功"); return ResultUtil.success("地址修改成功");
} }
order.setPendingApprovalAddressId(addressId); order.setPendingApprovalAddressId(addressId);

2
src/main/webapp/WEB-INF/view/pages/order/order_list.jsp
View File

@ -294,7 +294,7 @@
sort: true sort: true
}, },
{ {
fixed: 'right', align: 'center', width: 320, title: '操作', templet: function (item) { fixed: 'right', align: 'center', width: 360, title: '操作', templet: function (item) {
if (item.status != 4 && item.orderPick == 2 && item.pendingApprovalAddressId) { if (item.status != 4 && item.orderPick == 2 && item.pendingApprovalAddressId) {
return '<button class="layui-btn layui-btn-sm" lay-event="editAddress">修改地址</button><button class="layui-btn layui-btn-sm" lay-event="edit">详情</button><button class="layui-btn layui-btn-sm layui-btn-danger" lay-event="del">删除</button><button class="layui-btn layui-btn-sm layui-btn-normal" lay-event="updateAddress">处理地址修改申请</button>'; return '<button class="layui-btn layui-btn-sm" lay-event="editAddress">修改地址</button><button class="layui-btn layui-btn-sm" lay-event="edit">详情</button><button class="layui-btn layui-btn-sm layui-btn-danger" lay-event="del">删除</button><button class="layui-btn layui-btn-sm layui-btn-normal" lay-event="updateAddress">处理地址修改申请</button>';
} else if (item.status == 2 && item.orderPick == 2) { } else if (item.status == 2 && item.orderPick == 2) {