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:31:36 +08:00
parent 3078e8e4c6
commit 05c0bcba80
4 changed files with 37 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -41,6 +41,7 @@ import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@ -67,6 +68,8 @@ public class OrderMasterController extends BaseController {
@Autowired
private OrderGoodsService orderGoodsService;
@Autowired
private CustomerAddressService addressService;
@Autowired
private GoodsService goodsService;
@Autowired
private CustomerAddressService customerAddressService;
@ -90,28 +93,34 @@ public class OrderMasterController extends BaseController {
List<OrderListResponse> orderListResponses = new ArrayList<>();
List<OrderMaster> list = orderMasterService.selectOrderMasterList(orderMaster);
list.forEach(master->{
// 初始化属性
OrderListResponse orderListResponse = new OrderListResponse();
// 添加师傅信息
List<Map<String, Integer>> standardList = new ArrayList<>();
// 师傅信息
Worker worker = workerService.selectById(master.getWorkerId());
// 商品信息
OrderGoods orderGoods = orderGoodsService.selectByOrderMasterId(master.getId());
// 添加商品信息
// 规格信息
List<GoodsStandard> goodsStandardList = goodsStandardService.selectByGoodsStandardId(orderGoods.getGoodsId());
if(!CollectionUtils.isEmpty(goodsStandardList)){
orderGoods.setGoodsStandard(goodsStandardList.get(0));
orderGoods.setGoodsLogoUrl(goodsService.selectById(goodsStandardList.get(0).getGoodsId()).getGoodsImgUrl());
}
// 添加订单商品信息
master.setOrderGoods(orderGoods);
// 财务信息
FinancialMaster financialMaster = financialMasterService.selectByOrderMasterId(master.getId());
// 地址信息
CustomerAddress customerAddress = addressService.selectByCustomerAddressId(master.getAddressId());
for(GoodsStandard goodsStandard : goodsStandardList){
Map<String, Integer> standardMap = new HashMap<>();
standardMap.put(goodsStandard.getGoodsStandardName(), goodsStandard.getGoodsNum());
standardList.add(standardMap);
}
// 编辑返回属性
orderListResponse.setOrderMasterId(master.getId());
orderListResponse.setNum(orderGoods.getGoodsNum());
orderListResponse.setGoodsName(orderGoods.getGoodsName());
orderListResponse.setStandardName(orderGoods.getGoodsStandard().getGoodsStandardName());
orderListResponse.setGoodsLogoUrl(orderGoods.getGoodsLogoUrl());
orderListResponse.setDiscountMoney(financialMaster.getDiscountMoney());
orderListResponse.setTotalMoney(financialMaster.getTotalMoney());
@ -121,6 +130,8 @@ public class OrderMasterController extends BaseController {
orderListResponse.setPayStatus(master.getPayStatus());
orderListResponse.setPayType(master.getPayType());
orderListResponse.setOrderMasterCode(master.getCode());
orderListResponse.setStandardList(standardList);
orderListResponse.setAddress(customerAddress.getAddress());
orderListResponses.add(orderListResponse);
});

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

@ -3,6 +3,8 @@ package com.ghy.web.pojo.vo;
import lombok.Data;
import java.math.BigDecimal;
import java.util.List;
import java.util.Map;
@Data
public class OrderListResponse {
@ -15,16 +17,12 @@ public class OrderListResponse {
private String goodsName;
private String standardName;
private Integer orderStatus;
private Integer payStatus;
private Integer payType;
private Integer num;
private BigDecimal totalMoney;
private BigDecimal payMoney;
@ -33,4 +31,7 @@ public class OrderListResponse {
private String goodsLogoUrl;
private String address;
private List<Map<String, Integer>> standardList;
}

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

@ -0,0 +1,7 @@
package com.ghy.web.pojo.vo;
public class WorkerOrderResponse {
}

3
ghy-order/src/main/java/com/ghy/order/domain/OrderMaster.java
View File

@ -29,6 +29,9 @@ public class OrderMaster extends BaseEntity {
@Excel(name = "消费者用户id", cellType = Excel.ColumnType.NUMERIC)
private Long customerId;
@Excel(name = "地址id", cellType = Excel.ColumnType.NUMERIC)
private Long addressId;
@Excel(name = "订单类型", cellType = Excel.ColumnType.NUMERIC)
private Integer orderType;