update
This commit is contained in:
quantulr
67
.idea/workspace.xml
generated
67
.idea/workspace.xml
generated
@ -6,8 +6,10 @@
|
||||
<component name="ChangeListManager">
|
||||
<list default="true" id="bdad98b9-7a5e-48f7-b79e-ed6a34d55dab" name="Default Changelist" comment="第一次提交">
|
||||
<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/controller/OrderController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/wisdo/mmining/controller/OrderController.java" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/src/main/code/com/wisdo/mmining/config/shiro/ShiroConfiguration.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/code/com/wisdo/mmining/config/shiro/ShiroConfiguration.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/resources/application.yml" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/application.yml" afterDir="false" />
|
||||
</list>
|
||||
<option name="SHOW_DIALOG" value="false" />
|
||||
<option name="HIGHLIGHT_CONFLICTS" value="true" />
|
||||
@ -445,33 +447,33 @@
|
||||
<option name="hideEmptyMiddlePackages" value="true" />
|
||||
<option name="showLibraryContents" value="true" />
|
||||
</component>
|
||||
<component name="PropertiesComponent">{
|
||||
"keyToString": {
|
||||
"Maven.wisdommining [clean].executor": "Run",
|
||||
"Maven.wisdommining [package].executor": "Run",
|
||||
"RequestMappingsPanelOrder0": "0",
|
||||
"RequestMappingsPanelOrder1": "1",
|
||||
"RequestMappingsPanelWidth0": "75",
|
||||
"RequestMappingsPanelWidth1": "75",
|
||||
"RunOnceActivity.ShowReadmeOnStart": "true",
|
||||
"Spring Boot.WisdoMminingApplication.executor": "Debug",
|
||||
"dart.analysis.tool.window.visible": "false",
|
||||
"git-widget-placeholder": "master",
|
||||
"kotlin-language-version-configured": "true",
|
||||
"last_opened_file_path": "D:/Documents/IdeaProjects/wisdommining-serve/src/main/webapp/static/dist/order_logistics",
|
||||
"node.js.detected.package.eslint": "true",
|
||||
"node.js.detected.package.tslint": "true",
|
||||
"node.js.selected.package.eslint": "(autodetect)",
|
||||
"node.js.selected.package.tslint": "(autodetect)",
|
||||
"nodejs_package_manager_path": "npm",
|
||||
"project.structure.last.edited": "全局库",
|
||||
"project.structure.proportion": "0.0",
|
||||
"project.structure.side.proportion": "0.2",
|
||||
"settings.editor.selected.configurable": "preferences.pluginManager",
|
||||
"show.migrate.to.gradle.popup": "false",
|
||||
"vue.rearranger.settings.migration": "true"
|
||||
<component name="PropertiesComponent"><![CDATA[{
|
||||
"keyToString": {
|
||||
"Maven.wisdommining [clean].executor": "Run",
|
||||
"Maven.wisdommining [package].executor": "Run",
|
||||
"RequestMappingsPanelOrder0": "0",
|
||||
"RequestMappingsPanelOrder1": "1",
|
||||
"RequestMappingsPanelWidth0": "75",
|
||||
"RequestMappingsPanelWidth1": "75",
|
||||
"RunOnceActivity.ShowReadmeOnStart": "true",
|
||||
"Spring Boot.WisdoMminingApplication.executor": "Debug",
|
||||
"dart.analysis.tool.window.visible": "false",
|
||||
"git-widget-placeholder": "master",
|
||||
"kotlin-language-version-configured": "true",
|
||||
"last_opened_file_path": "D:/Documents/AndroidStudioProjects/logistics_tools",
|
||||
"node.js.detected.package.eslint": "true",
|
||||
"node.js.detected.package.tslint": "true",
|
||||
"node.js.selected.package.eslint": "(autodetect)",
|
||||
"node.js.selected.package.tslint": "(autodetect)",
|
||||
"nodejs_package_manager_path": "npm",
|
||||
"project.structure.last.edited": "SDK",
|
||||
"project.structure.proportion": "0.0",
|
||||
"project.structure.side.proportion": "0.2",
|
||||
"settings.editor.selected.configurable": "preferences.pluginManager",
|
||||
"show.migrate.to.gradle.popup": "false",
|
||||
"vue.rearranger.settings.migration": "true"
|
||||
}
|
||||
}</component>
|
||||
}]]></component>
|
||||
<component name="ReactorSettings">
|
||||
<option name="notificationShown" value="true" />
|
||||
</component>
|
||||
@ -521,8 +523,8 @@
|
||||
<component name="SharedIndexes">
|
||||
<attachedChunks>
|
||||
<set>
|
||||
<option value="bundled-jdk-9f38398b9061-39b83d9b5494-intellij.indexing.shared.core-IU-241.17890.1" />
|
||||
<option value="bundled-js-predefined-1d06a55b98c1-0b3e54e931b4-JavaScript-IU-241.17890.1" />
|
||||
<option value="bundled-jdk-9f38398b9061-39b83d9b5494-intellij.indexing.shared.core-IU-241.18034.62" />
|
||||
<option value="bundled-js-predefined-1d06a55b98c1-0b3e54e931b4-JavaScript-IU-241.18034.62" />
|
||||
</set>
|
||||
</attachedChunks>
|
||||
</component>
|
||||
@ -644,6 +646,13 @@
|
||||
<workItem from="1718159326654" duration="105000" />
|
||||
<workItem from="1718159470340" duration="5886000" />
|
||||
<workItem from="1718241682223" duration="12310000" />
|
||||
<workItem from="1718592234647" duration="2574000" />
|
||||
<workItem from="1718608230011" duration="94000" />
|
||||
<workItem from="1718764279034" duration="362000" />
|
||||
<workItem from="1719207318590" duration="683000" />
|
||||
<workItem from="1719210374799" duration="28000" />
|
||||
<workItem from="1719296864680" duration="33000" />
|
||||
<workItem from="1719564748404" duration="335000" />
|
||||
</task>
|
||||
<task id="LOCAL-00001" summary="第一次提交">
|
||||
<created>1623736948713</created>
|
||||
|
||||
@ -222,6 +222,7 @@ public class ShiroConfiguration {
|
||||
// anon:不授权访问
|
||||
filterChainDefinitionMap.put("/doLogin", "anon");
|
||||
filterChainDefinitionMap.put("/login", "anon");
|
||||
filterChainDefinitionMap.put("/goodsOfOrder", "anon");
|
||||
filterChainDefinitionMap.put("/qqApi/**","anon");
|
||||
//错误跳转
|
||||
filterChainDefinitionMap.put("/error/**", "anon");
|
||||
|
||||
@ -170,6 +170,26 @@ public class OrderApi {
|
||||
return new Result(ResultUtil.SUCCESS, ResultUtil.SUCCESS_MSG, wisdWxuser);
|
||||
}
|
||||
|
||||
@ApiOperation(value = "获取订单的商品列表")
|
||||
@ApiImplicitParams({@ApiImplicitParam(name = "orderNumber", value = "订单号", paramType = "orderNumber")})
|
||||
@GetMapping("goodsOfOrder")
|
||||
public Result getGoodsOfOrder(String orderNumber) {
|
||||
WisdOeder wisdOeder = orderService.getOrderByNumber(orderNumber);
|
||||
List<WisdOrderDetail> orderDetailList = orderDetailService.getByOrderId(wisdOeder.getId());
|
||||
List<WisdGoods> wisdGoodsList = new ArrayList<>();
|
||||
for (WisdOrderDetail wisdOrderDetail : orderDetailList) {
|
||||
WisdGoods wisdGoods = goodsService.getInfoById(wisdOrderDetail.getGoodsId());
|
||||
WisdGoodsSpec wisdGoodsSpec = goodsSpecService.getById(wisdOrderDetail.getSpecId());
|
||||
wisdGoods.setWisdGoodsSpec(wisdGoodsSpec);
|
||||
wisdGoods.setGoodsNum(wisdOrderDetail.getGoodsNum());
|
||||
if (wisdOrderDetail.getSpecPrice() != null) {
|
||||
wisdGoods.setSprice(wisdOrderDetail.getSpecPrice().doubleValue());
|
||||
}
|
||||
wisdGoodsList.add(wisdGoods);
|
||||
}
|
||||
return new Result(ResultUtil.SUCCESS, ResultUtil.SUCCESS, wisdGoodsList);
|
||||
}
|
||||
|
||||
@ApiOperation(value = "提交订单")
|
||||
@PostMapping("addOrder")
|
||||
public Result addOrder(@RequestBody WisdOeder wisdOeder, HttpServletRequest request) {
|
||||
|
||||
@ -1,12 +1,12 @@
|
||||
#开发环境
|
||||
spring:
|
||||
datasource:
|
||||
# url: jdbc:mysql://192.168.0.137:3306/wisdo?useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=GMT%2B8
|
||||
url: jdbc:mysql://146.56.198.32:3306/wisdo?useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=GMT%2B8
|
||||
# username: yshop
|
||||
username: root
|
||||
# password: Qwer1234.
|
||||
password: Sphc666888!
|
||||
url: jdbc:mysql://192.168.0.233:3306/wisdo?useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=GMT%2B8
|
||||
# url: jdbc:mysql://146.56.198.32:3306/wisdo?useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=GMT%2B8
|
||||
username: yshop
|
||||
# username: root
|
||||
password: Qwer1234.
|
||||
# password: Sphc666888!
|
||||
type: com.alibaba.druid.pool.DruidDataSource
|
||||
driver-class-name: com.mysql.cj.jdbc.Driver
|
||||
druid:
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
server:
|
||||
# port: 9000
|
||||
port: 9090
|
||||
port: 9000
|
||||
# port: 9090
|
||||
servlet:
|
||||
context-path: /wisdommining
|
||||
spring:
|
||||
@ -39,8 +39,8 @@ spring:
|
||||
# port: 6379
|
||||
redis:
|
||||
database: 10
|
||||
# host: localhost
|
||||
host: 146.56.198.32
|
||||
host: localhost
|
||||
# host: 146.56.198.32
|
||||
timeout: 100000
|
||||
jedis:
|
||||
pool:
|
||||
@ -49,8 +49,8 @@ spring:
|
||||
max-idle: 8
|
||||
min-idle: 0
|
||||
port: 6379
|
||||
password: Zsd@2021!
|
||||
# password:
|
||||
# password: Zsd@2021!
|
||||
password:
|
||||
|
||||
|
||||
mybatis-plus:
|
||||
|
||||
Reference in New Issue
Block a user