quyixiao/eb-service-api
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

提交修改

Browse Source
This commit is contained in:
quyixiao 2025-11-16 17:16:08 +08:00
parent 8ab5899631
commit 7e0ec93706
2 changed files with 6 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
api-third/src/main/java/com/heyu/api/alibaba/request/mm/order/resp/VVOrderDetailResp.java
View File

@ -1,37 +1,24 @@
package com.heyu.api.alibaba.request.mm.order.resp; package com.heyu.api.alibaba.request.mm.order.resp;
import com.heyu.api.data.entity.vv.VvBuyerAddressEntity;
import com.heyu.api.data.entity.vv.VvBuyerEntity; import com.heyu.api.data.entity.vv.VvBuyerEntity;
import com.heyu.api.data.entity.vv.VvTradeOrderEntity;
import lombok.Data; import lombok.Data;
import java.util.List;
@Data @Data
public class VVOrderDetailResp { public class VVOrderDetailResp {
/***
* 订单信息
*/
private VvTradeOrderEntity vvTradeOrderEntity;
/*** /***
* 订单行信息 * 订单行信息
*/ */
private List<VVOrderListResp> vvTradeOrderLineEntityList; private VVOrderListResp vvTradeOrderResp;
/*** /***
* 订单信息 * 订单信息
*/ */
private VvBuyerEntity vvBuyerEntity; private VvBuyerEntity vvBuyerEntity;
} }

6
api-web/api-interface/src/main/java/com/heyu/api/controller/mm/AdminOrderController.java
View File

@ -177,6 +177,7 @@ public class AdminOrderController {
@RequestMapping("/detail") @RequestMapping("/detail")
public R detail(@RequestBody VVOrderDetailRequest request) { public R detail(@RequestBody VVOrderDetailRequest request) {
VvTradeOrderEntity vvTradeOrderEntity = vvTradeOrderDao.selectVvTradeOrderById(request.getTradeOrderId()); VvTradeOrderEntity vvTradeOrderEntity = vvTradeOrderDao.selectVvTradeOrderById(request.getTradeOrderId());
List<VvTradeOrderLineEntity> vvTradeOrderLineEntityList = vvTradeOrderLineDao.selectVvTradeOrderLineByTradeOrderId(request.getTradeOrderId()); List<VvTradeOrderLineEntity> vvTradeOrderLineEntityList = vvTradeOrderLineDao.selectVvTradeOrderLineByTradeOrderId(request.getTradeOrderId());
List<VvTradeOrderEntity> vvTradeOrderEntities = SanUtils.asList(vvTradeOrderEntity); List<VvTradeOrderEntity> vvTradeOrderEntities = SanUtils.asList(vvTradeOrderEntity);
@ -184,10 +185,11 @@ public class AdminOrderController {
List<VVOrderListResp> vvOrderListResps = vvTradeOrderConvertService.convertTradeOrderLineResp(vvTradeOrderEntities, vvTradeOrderLineEntityList, false); List<VVOrderListResp> vvOrderListResps = vvTradeOrderConvertService.convertTradeOrderLineResp(vvTradeOrderEntities, vvTradeOrderLineEntityList, false);
VVOrderDetailResp vvOrderDetailResp = new VVOrderDetailResp(); VVOrderDetailResp vvOrderDetailResp = new VVOrderDetailResp();
vvOrderDetailResp.setVvTradeOrderEntity(vvTradeOrderEntity);
vvOrderDetailResp.setVvTradeOrderLineEntityList(vvOrderListResps); vvOrderDetailResp.setVvTradeOrderResp(vvOrderListResps.get(0));
VvBuyerEntity vvBuyerEntity = vvBuyerDao.selectVvBuyerById(vvTradeOrderEntity.getBuyerId()); VvBuyerEntity vvBuyerEntity = vvBuyerDao.selectVvBuyerById(vvTradeOrderEntity.getBuyerId());
vvOrderDetailResp.setVvBuyerEntity(vvBuyerEntity); vvOrderDetailResp.setVvBuyerEntity(vvBuyerEntity);
return R.ok().setData(vvOrderDetailResp); return R.ok().setData(vvOrderDetailResp);