订单核销

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

@@ -51,12 +51,32 @@ public class GicOrderController {
             @RequestParam(defaultValue = "1") int status, BasePageInfo pageInfo) {
         // 查询门店
         ListOrderManageQDTO qdto = new ListOrderManageQDTO();
+        qdto.setEnterpriseId(enterpriseId);
         qdto.setOrderStep(status);
         qdto.setBusinessType(OrderEnum.BusinessTypeEnum.MICRO_MALL.getType());
         qdto.setSearchOrderParam(search);
         // 配送方式 -1：所有 0：门店自提 1：快递发货
         qdto.setDeliveryType(1);
+        return this.orderListSelect(qdto, pageInfo);
+    }
+
+    // 核销订单查询
+    // status 1待核销 2已核销
+    @RequestMapping("list-verification-order")
+    public RestResponse<Object> mallOrderList(String enterpriseId, String storeId, String clerkId,
+            @RequestParam(defaultValue = "1") int status, String search, BasePageInfo pageInfo) {
+        // 查询门店
+        ListOrderManageQDTO qdto = new ListOrderManageQDTO();
         qdto.setEnterpriseId(enterpriseId);
+        qdto.setOrderStep(status);
+        qdto.setBusinessType(OrderEnum.BusinessTypeEnum.MICRO_MALL.getType());
+        qdto.setSearchOrderParam(search);
+        // 配送方式 -1：所有 0：门店自提 1：快递发货
+        qdto.setDeliveryType(1);
+        return this.orderListSelect(qdto, pageInfo);
+    }
+
+    private RestResponse<Object> orderListSelect(ListOrderManageQDTO qdto, BasePageInfo pageInfo) {
         qdto.setPageNum(pageInfo.getPageNum());
         qdto.setPageSize(pageInfo.getPageSize());
         ServiceResponse<Page<ListOrderDTO>> ret = webOrderManageApiService.listOrder(qdto);

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

@@ -20,11 +20,15 @@ import com.gic.api.base.commons.Page;
 import com.gic.api.base.commons.ServiceResponse;
 import com.gic.business.order.dto.ordermanage.DispatchGoodsInfoDTO;
 import com.gic.business.order.dto.ordermanage.ListOrderDTO;
+import com.gic.business.order.dto.ordermanage.ListOrderItemDTO;
+import com.gic.business.order.dto.ordermanage.OrderDetailDTO;
+import com.gic.business.order.dto.ordermanage.OrderInfoDTO;
 import com.gic.business.order.enums.OrderEnum;
 import com.gic.business.order.qdto.ordermanage.ListOrderManageQDTO;
 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.util.PageHelperUtils;
 import com.gic.commons.webapi.reponse.RestResponse;
 import com.gic.haoban.app.aggregation.api.dto.evaluation.CreateRecordRequest;
@@ -36,6 +40,10 @@ 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.OrderListItemVO;
 import com.gic.haoban.manage.web.vo.order.OrderListVO;
 import com.gic.haoban.manage.web.vo.order.integral.CheckVO;
 import com.gic.haoban.manage.web.vo.order.integral.OrderCountVO;
@@ -71,51 +79,6 @@ public class GicOrderVerificationController {
     private ClerkService clerkService;
 
     /**
-     * 
-    * @Title: scan
-    * @Description: 商城订单列表查询
-    * @author xugh
-    * @param enterpriseId
-    * @param storeId
-    * @param clerkId
-    * @param verificationType  2待核销记录 1已核销
-    * @return
-    * @throws
-     */
-    @RequestMapping("/mall-verification-list")
-    public RestResponse<Object> mallOrderList(String enterpriseId, String storeId, String clerkId, BasePageInfo page,
-            @RequestParam("1") int verificationType, BasePageInfo pageInfo) {
-        ListOrderManageQDTO qdto = new ListOrderManageQDTO();
-        qdto.setOrderShow(1);
-        qdto.setOrderStep(9);
-        qdto.setBusinessType(OrderEnum.BusinessTypeEnum.MICRO_MALL.getType());
-        qdto.setDeliveryType(-1);
-        qdto.setEnterpriseId(enterpriseId);
-        qdto.setPageSizeZero(false);
-        qdto.setCount(false);
-        qdto.setPageNum(pageInfo.getPageNum());
-        qdto.setPageSize(pageInfo.getPageSize());
-        ServiceResponse<Page<ListOrderDTO>> ret = webOrderManageApiService.listOrder(qdto);
-        logger.info("订单信息={}", JSON.toJSONString(ret, true));
-        if (ret.isSuccess()) {
-            Page<OrderListVO> retPage = PageHelperUtils.changePageToCurrentPage(ret.getResult(), OrderListVO.class);
-            return RestResponse.successResult(retPage);
-        }
-        return RestResponse.failure(ret.getCode(), ret.getMessage());
-    }
-
-    @RequestMapping("/mall-verification-detail")
-    public RestResponse<Object> mallOrderDetail(String enterpriseId, String orderId) {
-        ServiceResponse<DispatchGoodsInfoDTO> resp = this.webOrderManageApiService.getDispatchGoodsInfo(enterpriseId,
-                orderId);
-        logger.info("核销订单详情={}", JSON.toJSONString(resp));
-        if (resp.isSuccess()) {
-            return RestResponse.successResult(resp.getResult());
-        }
-        return RestResponse.failure("9999", "订单查询不到");
-    }
-
-    /**
      * 核销订单
      */
     @RequestMapping("/verification")