麦咖啡查询订单列表优化

order-application-service/src/main/java/cn/freemud/adapter/OrderAdapter.java

@@ -17,9 +17,9 @@ import cn.freemud.base.util.DateUtil;
 import cn.freemud.constant.CustomerScoreConstant;
 import cn.freemud.entities.dto.*;
 import cn.freemud.entities.dto.activity.ShareDiscountActivityDto;
-import cn.freemud.entities.dto.order.*;
 import cn.freemud.entities.dto.order.CreateOrderAccountDto;
 import cn.freemud.entities.dto.order.CreateOrderProductDto;
+import cn.freemud.entities.dto.order.*;
 import cn.freemud.entities.dto.promotion.OrderBeanRequest;
 import cn.freemud.entities.dto.promotion.ShoppingCartGoodsResponse;
 import cn.freemud.entities.dto.shoppingCart.ActivityDiscountsDto;
@@ -28,29 +28,31 @@ import cn.freemud.entities.vo.*;
 import cn.freemud.entities.vo.encircle.CreateReserveOrderVo;
 import cn.freemud.entities.vo.encircle.PreviewOrderInfoVo;
 import cn.freemud.enums.ActivityTypeEnum;
-import cn.freemud.enums.*;
 import cn.freemud.enums.OrderChannelType;
 import cn.freemud.enums.OrderSourceType;
-import cn.freemud.enums.OrderType;
 import cn.freemud.enums.PayStatus;
 import cn.freemud.enums.QueryOrderStatus;
 import cn.freemud.enums.ResponseResult;
+import cn.freemud.enums.*;
 import cn.freemud.interceptor.ServiceException;
-import cn.freemud.redis.RedisCache;
 import cn.freemud.request.wechat.dto.SignMessageBuilder;
 import cn.freemud.service.impl.OrderCommonService;
-import cn.freemud.utils.*;
-import com.alibaba.fastjson.JSON;
+import cn.freemud.utils.LogUtil;
+import cn.freemud.utils.QrCodeUtil;
+import cn.freemud.utils.RSAUtils;
+import cn.freemud.utils.WebUtil;
 import com.alibaba.fastjson.JSONObject;
 import com.freemud.api.assortment.datamanager.entity.db.AssortmentOpenPlatformPartnerWxappConfig;
 import com.freemud.api.assortment.datamanager.entity.vo.AssortmentCustomerInfoVo;
 import com.freemud.api.assortment.datamanager.enums.IappIdType;
-import com.freemud.application.sdk.api.log.LogThreadLocal;
 import com.freemud.api.assortment.datamanager.manager.cache.CacheOpenPlatformPartnerWxappConfigManager;
-import com.freemud.application.sdk.api.ordercenter.enums.*;
+import com.freemud.application.sdk.api.log.LogThreadLocal;
+import com.freemud.application.sdk.api.ordercenter.enums.AfterSalesType;
+import com.freemud.application.sdk.api.ordercenter.enums.OrderClientType;
+import com.freemud.application.sdk.api.ordercenter.enums.OrderSettlementType;
+import com.freemud.application.sdk.api.ordercenter.enums.ProductTypeEnum;
 import com.freemud.application.sdk.api.ordercenter.request.OrderExtInfoDto;
 import com.freemud.application.sdk.api.ordercenter.request.OrderExtendedReq;
-import com.freemud.application.sdk.api.ordercenter.request.create.OrderTaskReq;
 import com.freemud.application.sdk.api.promotioncenter.dto.promotion.GoodsStockDTO;
 import com.freemud.application.sdk.api.promotioncenter.request.promotion.ActivityUpdateStockRequest;
 import com.freemud.application.sdk.api.storecenter.response.StoreResponse;
@@ -827,6 +829,74 @@ public class OrderAdapter {
         return queryOrdersDto;
     }
 
+    public QueryOrdersDto convent2QueryOrdersDtoMcCafe(McCafeQueryOrderVo queryOrderDto, String memberId, String channelType) {
+        QueryOrdersDto queryOrdersDto = new QueryOrdersDto();
+        queryOrdersDto.setUserId(memberId);
+        queryOrdersDto.setCompanyId(queryOrderDto.getPartnerId());
+        queryOrdersDto.setPageSize(queryOrderDto.getPageSize() != null ? queryOrderDto.getPageSize() : 10);
+        queryOrdersDto.setPageNumber(queryOrderDto.getPageNumber() != null ? queryOrderDto.getPageNumber() : 1);
+        queryOrdersDto.setStartDate(queryOrderDto.getStartDate());
+        queryOrdersDto.setEndDate(queryOrderDto.getEndDate());
+
+        if(OrderChannelType.IWC.getCode().equals(channelType)) {
+            queryOrdersDto.setSource(new String[]{"meals"});
+        } else if(OrderChannelType.SAASMALL.getCode().equals(channelType)) {
+            queryOrdersDto.setSource(new String[]{"saasmall"});
+        } else if(OrderChannelType.APP.getCode().equals(channelType)){
+            queryOrdersDto.setSource(new String[]{"app"});
+        } else {
+            queryOrdersDto.setSource(new String[]{"saas"});
+        }
+
+        List<Integer> payStatus = Arrays.asList(PayStatus.HAVE_PAID.getCode(), PayStatus.HAVE_REFUND.getCode(), PayStatus.COMPLETE.getCode());
+        queryOrdersDto.setPayStatus((Integer[]) payStatus.toArray());
+        if (CollectionUtils.isNotEmpty(queryOrderDto.getQueryOrderStatus())) {
+            Set<Integer> setStatus =new HashSet<>();
+            if (queryOrderDto.getQueryOrderStatus().contains(QueryOrderStatus.ALL_BILL.getCode())) {
+                List<Integer> integers = Arrays.asList(OrderStatus.getAllCodes());
+                setStatus.addAll(integers);
+            }
+            if (queryOrderDto.getQueryOrderStatus().contains(QueryOrderStatus.TAKE_MEAL.getCode())) {
+                Integer[] statuses = new Integer[]{OrderStatus.TAKE_ORDER.getCode(), OrderStatus.RECEIPT.getCode(),
+                        OrderStatus.DISTRIBUTION.getCode(), OrderStatus.COMPLETE_MAKE.getCode()};
+                List<Integer> integers = Arrays.asList(statuses);
+                setStatus.addAll(integers);
+            }
+            if (queryOrderDto.getQueryOrderStatus().contains(QueryOrderStatus.FINISH.getCode())) {
+                setStatus.add(OrderStatus.COMPLETE.getCode());
+            }
+            if (queryOrderDto.getQueryOrderStatus().contains(QueryOrderStatus.REFUND_BILL.getCode())) {
+                Integer[] statuses = new Integer[]{RefundStatus.APPLY_REFUND.getCode(), RefundStatus.AGREE_REFUND.getCode(), RefundStatus.COMPLETE_REFUND.getCode()};
+                queryOrdersDto.setRefundStatus(statuses);
+            }
+            if (queryOrderDto.getQueryOrderStatus().contains(QueryOrderStatus.NO_PAY.getCode())) {
+                queryOrdersDto.setPayStatus(new Integer[]{PayStatus.NOT_PAY.getCode()});
+            }
+            if (queryOrderDto.getQueryOrderStatus().contains(QueryOrderStatus.ORDER_CANCEL.getCode())) {
+                setStatus.add(OrderStatus.CALCEL.getCode());
+            }
+            queryOrdersDto.setStatus(setStatus.toArray(new Integer[setStatus.size()]));
+        }
+
+        // 兼容历史版本，如果传参是4 查询拆程4和5
+        if (CollectionUtils.isNotEmpty(queryOrderDto.getQueryOrderType()) ) {
+            Set<Integer> set =new HashSet<>();
+            if (queryOrderDto.getQueryOrderType().contains(OrderType.COLLECT_GOODS.getCode()) ){
+                set.add(OrderType.COLLECT_GOODS.getCode());
+                set.add(OrderType.EAT_IN.getCode());
+            }
+            if (queryOrderDto.getQueryOrderType().contains(OrderType.TAKE_OUT.getCode()) ){
+                set.add(OrderType.TAKE_OUT.getCode());
+            }
+            queryOrdersDto.setType(set.toArray(new Integer[set.size()]));
+        }
+
+        //商品订单和卖券订单
+        queryOrdersDto.setBizTypes(Arrays.asList(1,6));
+
+        return queryOrdersDto;
+    }
+
     public List<QueryOrderResponseVo> convent2QueryOrderResponseVos(List<QueryOrdersResponse.DataBean.OrderBean> ordersBeans, String wxAppId, String iAppId) {
         if (CollectionUtils.isEmpty(ordersBeans)) {
             return Collections.emptyList();

order-application-service/src/main/java/cn/freemud/controller/OrderController.java

@@ -132,8 +132,8 @@ public class OrderController {
      */
     @ApiAnnotation(logMessage = "maCafeQueryOrders")
     @PostMapping("/maCafeQueryOrders")
-    public BaseResponse maCafeQueryOrders(@Validated @LogParams @RequestBody QueryOrderVo queryOrderVo) {
-        return orderservice.queryOrders(queryOrderVo);
+    public BaseResponse maCafeQueryOrders(@Validated @LogParams @RequestBody McCafeQueryOrderVo queryOrderVo) {
+        return orderservice.mcCafeQueryOrders(queryOrderVo);
     }
 
     /**

order-application-service/src/main/java/cn/freemud/entities/vo/McCafeQueryOrderVo.java

+/**
+ * All rights Reserved, Designed By www.freemud.cn
+ *
+ * @Title: QueryOrderVo
+ * @Package cn.freemud.entities.vo
+ * @Description:
+ * @author: liming.guo
+ * @date: 2018/5/22 17:35
+ * @version V1.0
+ * @Copyright: 2018 www.freemud.cn Inc. All rights reserved.
+ * 注意：本内容仅限于上海非码科技内部传阅，禁止外泄以及用于其他的商业目
+ */
+
+package cn.freemud.entities.vo;
+
+import lombok.Data;
+import org.hibernate.validator.constraints.NotEmpty;
+
+import java.util.List;
+
+@Data
+public class McCafeQueryOrderVo {
+
+    @NotEmpty(message = "sessionId 不能为空")
+    private String sessionId;
+    /**
+     * 商户ID
+     */
+    private String partnerId;
+    /**
+     * 订单ID
+     */
+    private String oid;
+    /**
+     * 订单状态 enum queryOrderStatus   全部订单 1 待取餐 2 已完成 3 全部   4.退款,5 待支付 ,6 已取消
+     */
+    private List<Integer> queryOrderStatus;
+    /**
+     * 查询订单状态 1 外卖  4 门店自提
+     */
+    private List<Integer> queryOrderType;
+    /**
+     *  每页显示几条数据
+     */
+    private Integer pageSize;
+    /**
+     * 第几页
+     */
+    private Integer pageNumber;
+
+    private String startDate;
+
+    private String endDate;
+
+    /**
+     * 渠道信息 saas; img; iwc; saasmall
+     */
+    private String channelType;
+
+}

order-application-service/src/main/java/cn/freemud/enums/OrderType.java

@@ -13,7 +13,9 @@
 package cn.freemud.enums;
 
 import com.google.common.collect.Lists;
+import org.springframework.util.CollectionUtils;
 
+import java.util.ArrayList;
 import java.util.List;
 
 public enum OrderType {
@@ -53,6 +55,21 @@ public enum OrderType {
         return null;
     }
 
+    public static List getByCode(List<Integer> list) {
+        List returnList = new ArrayList();
+        if (CollectionUtils.isEmpty(list)) {
+            return returnList;
+        }
+        for (OrderType orderType : values()) {
+            for (Integer code: list) {
+                if (orderType.getCode().equals(code)) {
+                    returnList.add(code);
+                }
+            }
+        }
+        return returnList;
+    }
+
     public Integer getCode() {
         return code;
     }

order-application-service/src/main/java/cn/freemud/service/Orderservice.java

@@ -123,4 +123,5 @@ public interface Orderservice {
 
     BaseResponse mcCafeQueryOrderById(MaCafeQueryOrderVo queryOrderVo);
 
+    BaseResponse mcCafeQueryOrders(McCafeQueryOrderVo queryOrderVo);
 }