订单查询

haoban-manage3-wx/src/main/java/com/gic/haoban/manage/web/controller/order/GicOrderController.java

@@ -23,6 +23,7 @@ import com.gic.business.order.enums.OrderEnum;
 import com.gic.business.order.qdto.ordermanage.ListOrderManageQDTO;
 import com.gic.business.order.qdto.ordermanage.OrderItemShipmentQDTO;
 import com.gic.business.order.qdto.ordermanage.OrderShipmentQDTO;
+import com.gic.business.order.qdto.ordermanage.QueryOrderDetailQDTO;
 import com.gic.business.order.qdto.ordermanage.UpdateOrderLogisticsQDTO;
 import com.gic.business.order.service.ordermanage.WebOrderManageApiService;
 import com.gic.commons.util.EntityUtil;
@@ -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 qdto = new QueryOrderDetailQDTO();
+        qdto.setEnterpriseId(enterpriseId);
+        qdto.setOrderId(orderId);
+        ServiceResponse<OrderDetailDTO> ret = webOrderManageApiService.getOrderDetail(qdto);
         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 qdto = new QueryOrderDetailQDTO();
+        qdto.setEnterpriseId(enterpriseId);
+        qdto.setOrderId(orderId);
+        ServiceResponse<OrderDetailDTO> resp = webOrderManageApiService.getOrderDetail(qdto);
         List<ListOrderItemDTO> list = resp.getResult().getOrderItemList();
         List<OrderListItemVO> voList = new ArrayList<>();
         for (ListOrderItemDTO item : list) {

haoban-manage3-wx/src/main/java/com/gic/haoban/manage/web/controller/order/GicOrderVerificationController.java

@@ -16,10 +16,14 @@ import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
 import com.gic.api.base.commons.Page;
 import com.gic.api.base.commons.ServiceResponse;
+import com.gic.business.order.dto.ordermanage.OrderDetailDTO;
+import com.gic.business.order.dto.ordermanage.OrderInfoDTO;
+import com.gic.business.order.qdto.ordermanage.QueryOrderDetailQDTO;
 import com.gic.business.order.qdto.ordermanage.SelfPickOffQDTO;
 import com.gic.business.order.service.ordermanage.WebOrderManageApiService;
 import com.gic.clerk.api.dto.ClerkDTO;
 import com.gic.clerk.api.service.ClerkService;
+import com.gic.commons.util.EntityUtil;
 import com.gic.commons.webapi.reponse.RestResponse;
 import com.gic.haoban.app.aggregation.api.dto.evaluation.CreateRecordRequest;
 import com.gic.haoban.app.aggregation.api.dto.evaluation.OrderProductRequest;
@@ -30,6 +34,9 @@ import com.gic.haoban.common.utils.HaobanResponse;
 import com.gic.haoban.manage.web.controller.marketing.MemberMarketingController;
 import com.gic.haoban.manage.web.errCode.HaoBanErrCode;
 import com.gic.haoban.manage.web.qo.order.integral.ClerkQo;
+import com.gic.haoban.manage.web.vo.order.MemberInfoVO;
+import com.gic.haoban.manage.web.vo.order.OrderDetailItemVO;
+import com.gic.haoban.manage.web.vo.order.OrderDetailVO;
 import com.gic.haoban.manage.web.vo.order.integral.CheckVO;
 import com.gic.haoban.manage.web.vo.order.integral.OrderCountVO;
 import com.gic.haoban.manage.web.vo.order.integral.ProductSku;
@@ -152,7 +159,26 @@ public class GicOrderVerificationController {
         // 微商城
         if (writeOffCode.startsWith("M")) {
             // 通过核销码查询
-            return RestResponse.successResult();
+            QueryOrderDetailQDTO qdto = new QueryOrderDetailQDTO();
+            qdto.setEnterpriseId(enterpriseId);
+            qdto.setWriteOffCode(writeOffCode);
+            ServiceResponse<OrderDetailDTO> ret = webOrderManageApiService.getOrderDetail(qdto);
+            logger.info("订单信息={}", JSON.toJSONString(ret, true));
+            OrderInfoDTO orderInfo = ret.getResult().getOrderInfo();
+            OrderDetailVO orderDetailVO = EntityUtil.changeEntityByJSON(OrderDetailVO.class,
+                    ret.getResult().getOrderInfo());
+            orderDetailVO.setBuyerRemark(orderInfo.getRemarks());
+            List<OrderDetailItemVO> orderItemList = EntityUtil.changeEntityListNew(OrderDetailItemVO.class,
+                    ret.getResult().getOrderItemList());
+            orderDetailVO.setOrderItemList(orderItemList);
+            MemberInfoVO member = new MemberInfoVO();
+            member.setMemberId("");
+            member.setMemberImage("");
+            member.setAddressPhone(orderInfo.getBuyerPhone());
+            member.setAddressName(orderInfo.getBuyerName());
+            member.setAddressDetail(orderInfo.getAddressInfo());
+            orderDetailVO.setMember(member);
+            return RestResponse.successResult(orderDetailVO);
         } else {
             // 积分商城
             DubboResult<IntegralMallExchangeLogDTO> integralResult = integralmallService