clunt
/
ghy-all
1
0
Fork 0
Code Issues Pull Requests 1 Packages Projects Releases Wiki Activity

修改查询返回实体

This commit is contained in:
kuang.yifei@iwhalecloud.com 2022-06-09 14:51:01 +08:00
parent 10be655d16
commit 6f37b29eb7
3 changed files with 19 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
ghy-admin/src/main/java/com/ghy/web/controller/order/OrderMasterController.java
View File

@ -27,6 +27,7 @@ import com.ghy.payment.service.FinancialDetailService;
import com.ghy.payment.service.FinancialMasterService; import com.ghy.payment.service.FinancialMasterService;
import com.ghy.web.pojo.vo.OrderDetailsResponseVo; import com.ghy.web.pojo.vo.OrderDetailsResponseVo;
import com.ghy.web.pojo.vo.OrderListResponse; import com.ghy.web.pojo.vo.OrderListResponse;
import com.ghy.web.pojo.vo.OrderStandard;
import com.ghy.worker.domain.Worker; import com.ghy.worker.domain.Worker;
import com.ghy.worker.service.WorkerService; import com.ghy.worker.service.WorkerService;
import com.github.pagehelper.PageInfo; import com.github.pagehelper.PageInfo;
@ -95,7 +96,7 @@ public class OrderMasterController extends BaseController {
list.forEach(master->{ list.forEach(master->{
// 初始化属性 // 初始化属性
OrderListResponse orderListResponse = new OrderListResponse(); OrderListResponse orderListResponse = new OrderListResponse();
List<Map<String, Integer>> standardList = new ArrayList<>(); List<OrderStandard> standardList = new ArrayList<>();
// 师傅信息 // 师傅信息
Worker worker = workerService.selectById(master.getWorkerId()); Worker worker = workerService.selectById(master.getWorkerId());
@ -113,9 +114,10 @@ public class OrderMasterController extends BaseController {
CustomerAddress customerAddress = addressService.selectByCustomerAddressId(master.getAddressId()); CustomerAddress customerAddress = addressService.selectByCustomerAddressId(master.getAddressId());
for(GoodsStandard goodsStandard : goodsStandardList){ for(GoodsStandard goodsStandard : goodsStandardList){
Map<String, Integer> standardMap = new HashMap<>(); OrderStandard orderStandard = new OrderStandard();
standardMap.put(goodsStandard.getGoodsStandardName(), goodsStandard.getGoodsNum()); orderStandard.setStandardName(goodsStandard.getGoodsStandardName());
standardList.add(standardMap); orderStandard.setStandardNum(goodsStandard.getGoodsNum());
standardList.add(orderStandard);
} }
// 编辑返回属性 // 编辑返回属性

2
ghy-admin/src/main/java/com/ghy/web/pojo/vo/OrderListResponse.java
View File

@ -33,5 +33,5 @@ public class OrderListResponse {
private String address; private String address;
private List<Map<String, Integer>> standardList; private List<OrderStandard> standardList;
} }

12
ghy-admin/src/main/java/com/ghy/web/pojo/vo/OrderStandard.java Normal file
View File

@ -0,0 +1,12 @@
package com.ghy.web.pojo.vo;
import lombok.Data;
@Data
public class OrderStandard {
private String standardName;
private Integer standardNum;
}