Commit 0895a328 by zhangzhendong

订单交易

parent e2a9daff
......@@ -4,6 +4,7 @@ import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
import com.gic.business.order.qdto.ordermanage.QueryOrderDetailQDTO;
import org.apache.commons.lang3.StringUtils;
import org.apache.logging.log4j.LogManager;
import org.springframework.beans.factory.annotation.Autowired;
......@@ -113,7 +114,10 @@ public class GicOrderController {
@RequestMapping("order-detail")
public RestResponse<Object> orderDetail(String enterpriseId, String clerkId, String searchParams,
@RequestParam(defaultValue = "1") int orderType, String orderId) {
ServiceResponse<OrderDetailDTO> ret = webOrderManageApiService.getOrderDetail(enterpriseId, orderId);
QueryOrderDetailQDTO queryOrderDetailQDTO = new QueryOrderDetailQDTO();
queryOrderDetailQDTO.setOrderId(orderId);
queryOrderDetailQDTO.setEnterpriseId(enterpriseId);
ServiceResponse<OrderDetailDTO> ret = webOrderManageApiService.getOrderDetail(queryOrderDetailQDTO);
if (!ret.isSuccess()) {
return RestResponse.failure(ret.getCode(), ret.getMessage());
}
......@@ -138,7 +142,10 @@ public class GicOrderController {
// 订单发货商品列表
@RequestMapping("order-deliver-list")
public RestResponse<Object> orderDeliverList(String enterpriseId, String orderId) {
ServiceResponse<OrderDetailDTO> resp = this.webOrderManageApiService.getOrderDetail(enterpriseId, orderId);
QueryOrderDetailQDTO queryOrderDetailQDTO = new QueryOrderDetailQDTO();
queryOrderDetailQDTO.setOrderId(orderId);
queryOrderDetailQDTO.setEnterpriseId(enterpriseId);
ServiceResponse<OrderDetailDTO> resp = this.webOrderManageApiService.getOrderDetail(queryOrderDetailQDTO);
List<ListOrderItemDTO> list = resp.getResult().getOrderItemList();
List<OrderListItemVO> voList = new ArrayList<>();
for (ListOrderItemDTO item : list) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment