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

update

Browse Source
This commit is contained in:
quantulr
2024-06-28 17:24:56 +08:00
parent 48a67dc374
commit 7bce49cefe
5 changed files with 71 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

67
.idea/workspace.xml generated
View File

@ -6,8 +6,10 @@
<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/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/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-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> </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" />
@ -445,33 +447,33 @@
<option name="hideEmptyMiddlePackages" value="true" /> <option name="hideEmptyMiddlePackages" value="true" />
<option name="showLibraryContents" value="true" /> <option name="showLibraryContents" value="true" />
</component> </component>
<component name="PropertiesComponent">{ <component name="PropertiesComponent"><![CDATA[{
&quot;keyToString&quot;: { "keyToString": {
&quot;Maven.wisdommining [clean].executor&quot;: &quot;Run&quot;, "Maven.wisdommining [clean].executor": "Run",
&quot;Maven.wisdommining [package].executor&quot;: &quot;Run&quot;, "Maven.wisdommining [package].executor": "Run",
&quot;RequestMappingsPanelOrder0&quot;: &quot;0&quot;, "RequestMappingsPanelOrder0": "0",
&quot;RequestMappingsPanelOrder1&quot;: &quot;1&quot;, "RequestMappingsPanelOrder1": "1",
&quot;RequestMappingsPanelWidth0&quot;: &quot;75&quot;, "RequestMappingsPanelWidth0": "75",
&quot;RequestMappingsPanelWidth1&quot;: &quot;75&quot;, "RequestMappingsPanelWidth1": "75",
&quot;RunOnceActivity.ShowReadmeOnStart&quot;: &quot;true&quot;, "RunOnceActivity.ShowReadmeOnStart": "true",
&quot;Spring Boot.WisdoMminingApplication.executor&quot;: &quot;Debug&quot;, "Spring Boot.WisdoMminingApplication.executor": "Debug",
&quot;dart.analysis.tool.window.visible&quot;: &quot;false&quot;, "dart.analysis.tool.window.visible": "false",
&quot;git-widget-placeholder&quot;: &quot;master&quot;, "git-widget-placeholder": "master",
&quot;kotlin-language-version-configured&quot;: &quot;true&quot;, "kotlin-language-version-configured": "true",
&quot;last_opened_file_path&quot;: &quot;D:/Documents/IdeaProjects/wisdommining-serve/src/main/webapp/static/dist/order_logistics&quot;, "last_opened_file_path": "D:/Documents/AndroidStudioProjects/logistics_tools",
&quot;node.js.detected.package.eslint&quot;: &quot;true&quot;, "node.js.detected.package.eslint": "true",
&quot;node.js.detected.package.tslint&quot;: &quot;true&quot;, "node.js.detected.package.tslint": "true",
&quot;node.js.selected.package.eslint&quot;: &quot;(autodetect)&quot;, "node.js.selected.package.eslint": "(autodetect)",
&quot;node.js.selected.package.tslint&quot;: &quot;(autodetect)&quot;, "node.js.selected.package.tslint": "(autodetect)",
&quot;nodejs_package_manager_path&quot;: &quot;npm&quot;, "nodejs_package_manager_path": "npm",
&quot;project.structure.last.edited&quot;: &quot;全局库&quot;, "project.structure.last.edited": "SDK",
&quot;project.structure.proportion&quot;: &quot;0.0&quot;, "project.structure.proportion": "0.0",
&quot;project.structure.side.proportion&quot;: &quot;0.2&quot;, "project.structure.side.proportion": "0.2",
&quot;settings.editor.selected.configurable&quot;: &quot;preferences.pluginManager&quot;, "settings.editor.selected.configurable": "preferences.pluginManager",
&quot;show.migrate.to.gradle.popup&quot;: &quot;false&quot;, "show.migrate.to.gradle.popup": "false",
&quot;vue.rearranger.settings.migration&quot;: &quot;true&quot; "vue.rearranger.settings.migration": "true"
} }
}</component> }]]></component>
<component name="ReactorSettings"> <component name="ReactorSettings">
<option name="notificationShown" value="true" /> <option name="notificationShown" value="true" />
</component> </component>
@ -521,8 +523,8 @@
<component name="SharedIndexes"> <component name="SharedIndexes">
<attachedChunks> <attachedChunks>
<set> <set>
<option value="bundled-jdk-9f38398b9061-39b83d9b5494-intellij.indexing.shared.core-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.17890.1" /> <option value="bundled-js-predefined-1d06a55b98c1-0b3e54e931b4-JavaScript-IU-241.18034.62" />
</set> </set>
</attachedChunks> </attachedChunks>
</component> </component>
@ -644,6 +646,13 @@
<workItem from="1718159326654" duration="105000" /> <workItem from="1718159326654" duration="105000" />
<workItem from="1718159470340" duration="5886000" /> <workItem from="1718159470340" duration="5886000" />
<workItem from="1718241682223" duration="12310000" /> <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>
<task id="LOCAL-00001" summary="第一次提交"> <task id="LOCAL-00001" summary="第一次提交">
<created>1623736948713</created> <created>1623736948713</created>

1
src/main/code/com/wisdo/mmining/config/shiro/ShiroConfiguration.java
View File

@ -222,6 +222,7 @@ public class ShiroConfiguration {
// anon:不授权访问 // anon:不授权访问
filterChainDefinitionMap.put("/doLogin", "anon"); filterChainDefinitionMap.put("/doLogin", "anon");
filterChainDefinitionMap.put("/login", "anon"); filterChainDefinitionMap.put("/login", "anon");
filterChainDefinitionMap.put("/goodsOfOrder", "anon");
filterChainDefinitionMap.put("/qqApi/**","anon"); filterChainDefinitionMap.put("/qqApi/**","anon");
//错误跳转 //错误跳转
filterChainDefinitionMap.put("/error/**", "anon"); filterChainDefinitionMap.put("/error/**", "anon");

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

@ -170,6 +170,26 @@ public class OrderApi {
return new Result(ResultUtil.SUCCESS, ResultUtil.SUCCESS_MSG, wisdWxuser); 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 = "提交订单") @ApiOperation(value = "提交订单")
@PostMapping("addOrder") @PostMapping("addOrder")
public Result addOrder(@RequestBody WisdOeder wisdOeder, HttpServletRequest request) { public Result addOrder(@RequestBody WisdOeder wisdOeder, HttpServletRequest request) {

12
src/main/resources/application-db.yml
View File

@ -1,12 +1,12 @@
#开发环境 #开发环境
spring: spring:
datasource: datasource:
# url: jdbc:mysql://192.168.0.137:3306/wisdo?useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=GMT%2B8 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 # url: jdbc:mysql://146.56.198.32:3306/wisdo?useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=GMT%2B8
# username: yshop username: yshop
username: root # username: root
# password: Qwer1234. password: Qwer1234.
password: Sphc666888! # password: Sphc666888!
type: com.alibaba.druid.pool.DruidDataSource type: com.alibaba.druid.pool.DruidDataSource
driver-class-name: com.mysql.cj.jdbc.Driver driver-class-name: com.mysql.cj.jdbc.Driver
druid: druid:

12
src/main/resources/application.yml
View File

@ -1,6 +1,6 @@
server: server:
# port: 9000 port: 9000
port: 9090 # port: 9090
servlet: servlet:
context-path: /wisdommining context-path: /wisdommining
spring: spring:
@ -39,8 +39,8 @@ spring:
# port: 6379 # port: 6379
redis: redis:
database: 10 database: 10
# host: localhost host: localhost
host: 146.56.198.32 # host: 146.56.198.32
timeout: 100000 timeout: 100000
jedis: jedis:
pool: pool:
@ -49,8 +49,8 @@ spring:
max-idle: 8 max-idle: 8
min-idle: 0 min-idle: 0
port: 6379 port: 6379
password: Zsd@2021! # password: Zsd@2021!
# password: password:
mybatis-plus: mybatis-plus: