Merge branch '20211102-支持查询会员合并后的订单-zhiwei.zha'

assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/adapter/OrderSdkAdapter.java

@@ -619,6 +619,7 @@ public class OrderSdkAdapter {
 
         orderConditionsReq.setPartnerId(queryOrdersRequest.getCompanyId());
         orderConditionsReq.setUserId(queryOrdersRequest.getUserId());
+        orderConditionsReq.setUserIds(queryOrdersRequest.getUserIds());
         orderConditionsReq.setPageSize(queryOrdersRequest.getPageSize());
         orderConditionsReq.setPageNum(queryOrdersRequest.getPageNumber());
         orderConditionsReq.setNeedInvoice(queryOrdersRequest.getNeedInvoice());
@@ -658,25 +659,28 @@ public class OrderSdkAdapter {
         for (int i = 0; i < queryOrdersRequest.getSource().length; i++) {
             if ("saas".equals(queryOrdersRequest.getSource()[i])) {
                 orderClients.add(OrderClientType.SAAS.getIndex());
+                orderClients.add(OrderClientType.ALIPAY.getIndex());
             }
             else if ("meals".equals(queryOrdersRequest.getSource()[i])) {
                 orderClients.add(OrderClientType.WAI_MEAL.getIndex());
+                orderClients.add(OrderClientType.ALIPAY.getIndex());
             }
             else if ("saasmall".equals(queryOrdersRequest.getSource()[i])) {
                 orderClients.add(OrderClientType.SAASMALL.getIndex());
             }
             else if ("app".equals(queryOrdersRequest.getSource()[i])) {
                 orderClients.add(OrderClientType.APP.getIndex());
+                orderClients.add(OrderClientType.ALIPAY.getIndex());
             }
             else if ("beautiful".equals(queryOrdersRequest.getSource()[i])) {
                 orderClients.add(OrderClientType.BEAUTIFUL.getIndex());
+                orderClients.add(OrderClientType.ALIPAY.getIndex());
             }
             else if ("cashier".equals(queryOrdersRequest.getSource()[i])) {
                 orderClients.add(OrderClientType.CASHIER.getIndex());
             }
         }
         orderClients.add(OrderClientType.TIKTOKPAY.getIndex());
-        orderClients.add(OrderClientType.ALIPAY.getIndex());
         orderConditionsReq.setOrderClients(orderClients);
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
         try {

assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/request/order/QueryOrdersRequest.java

@@ -13,6 +13,10 @@ public class QueryOrdersRequest extends BaseConfig {
      */
     private String userId;
     /**
+     * 用户id集合（userId和userIds两者不能同时为空）
+     */
+    private List<String> userIds;
+    /**
      * 商户ID
      */
     private String companyId;

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

@@ -1020,7 +1020,6 @@ public class OrderAdapter {
 
     public QueryOrdersDto convent2QueryOrdersDto(QueryOrderDto 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);
@@ -4254,7 +4253,6 @@ public class OrderAdapter {
 
     public OrderConditionsReq convent2QueryOrdersDtoES(OrderConditionsReq query, String memberId, String channelType, Integer queryOrderStatus, Integer queryOrderType, Integer queryPayStatus) {
         OrderConditionsReq queryOrdersDto = new OrderConditionsReq();
-        queryOrdersDto.setUserId(memberId);
         queryOrdersDto.setPartnerId(query.getPartnerId());
         queryOrdersDto.setPageSize(query.getPageSize() != null ? query.getPageSize() : 10);
         queryOrdersDto.setPageNum(query.getPageNum() != null ? query.getPageNum() : 1);
@@ -4266,23 +4264,22 @@ public class OrderAdapter {
         List<Integer> orderClients = new ArrayList<>();
         if (OrderChannelType.IWC.getCode().equals(channelType)) {
             orderClients.add(OrderClientType.WAI_MEAL.getIndex());
-            //queryOrdersDto.setSource(new String[]{"meals"});
+            orderClients.add(OrderClientType.ALIPAY.getIndex());
         } else if (OrderChannelType.SAASMALL.getCode().equals(channelType)) {
             orderClients.add(OrderClientType.SAASMALL.getIndex());
-            //queryOrdersDto.setSource(new String[]{"saasmall"});
         } else if (OrderChannelType.APP.getCode().equals(channelType)) {
             orderClients.add(OrderClientType.APP.getIndex());
-            //queryOrdersDto.setSource(new String[]{"app"});
+            orderClients.add(OrderClientType.ALIPAY.getIndex());
         } else if (OrderChannelType.BEAUTIFUL.getCode().equals(channelType)) {// 美业新加
             orderClients.add(OrderClientType.BEAUTIFUL.getIndex());
+            orderClients.add(OrderClientType.ALIPAY.getIndex());
         } else if (OrderChannelType.CASHIER.getCode().equals(channelType)) {
             orderClients.add(OrderClientType.CASHIER.getIndex());
         } else {
             orderClients.add(OrderClientType.SAAS.getIndex());
-            //queryOrdersDto.setSource(new String[]{"saas"});
+            orderClients.add(OrderClientType.ALIPAY.getIndex());
         }
         orderClients.add(OrderClientType.TIKTOKPAY.getIndex());
-        orderClients.add(OrderClientType.ALIPAY.getIndex());
         queryOrdersDto.setOrderClients(orderClients);
 
         List<Integer> payStatus = new ArrayList<>();

order-application-service/src/main/java/cn/freemud/entities/dto/member/GetMemberIdsReq.java

+package cn.freemud.entities.dto.member;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+
+/**
+ * @author Clover.z
+ * @Date 2021/11/2
+ * @Desc
+ */
+@Data
+@AllArgsConstructor
+public class GetMemberIdsReq {
+
+    /**
+     * 商户号
+     */
+    private String partnerId;
+
+    /**
+     * 会员编号
+     */
+    private String memberId;
+
+}

order-application-service/src/main/java/cn/freemud/entities/dto/member/GetMemberIdsResp.java

+package cn.freemud.entities.dto.member;
+
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * @author Clover.z
+ * @Date 2021/11/2
+ * @Desc
+ */
+@Data
+public class GetMemberIdsResp {
+
+    private String code;
+
+    private String message;
+
+    private List<String> data;
+}

order-application-service/src/main/java/cn/freemud/service/customer/MemberInfoManager.java

+package cn.freemud.service.customer;
+
+import cn.freemud.constant.ResponseCodeConstant;
+import cn.freemud.entities.dto.member.GetMemberIdsReq;
+import cn.freemud.entities.dto.member.GetMemberIdsResp;
+import cn.freemud.service.thirdparty.CustomerClient;
+import lombok.RequiredArgsConstructor;
+import org.apache.commons.collections4.CollectionUtils;
+import org.springframework.stereotype.Component;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * @author Clover.z
+ * @Date 2021/11/2
+ * @Desc 会员信息通用
+ */
+@Component
+@RequiredArgsConstructor
+public class MemberInfoManager {
+
+    private final CustomerClient customerClient;
+
+    /**
+     * 查询会员名下的所有会员id（合并前的）
+     * @param partnerId 商户号
+     * @param memberId 会员编号
+     * @return 所有的会员id集合
+     */
+    public List<String> getMemberAllIds(String partnerId, String memberId) {
+        List<String> result = new ArrayList<>();
+        GetMemberIdsReq query = new GetMemberIdsReq(partnerId, memberId);
+        try {
+            GetMemberIdsResp resp = customerClient.getMemberIds(query);
+            if (null == resp || !ResponseCodeConstant.RESPONSE_SUCCESS_STR.equals(resp.getCode()) || CollectionUtils.isEmpty(resp.getData())) {
+                result.add(memberId);
+            } else {
+                result = resp.getData();
+            }
+        } catch (Exception e) {
+            // 该接口如果异常，不影响主链路流程
+            result.add(memberId);
+        }
+        return result;
+    }
+
+}

order-application-service/src/main/java/cn/freemud/service/impl/OrderServiceImpl.java

@@ -55,6 +55,7 @@ import cn.freemud.redis.RedisCache;
 import cn.freemud.service.CouponActivityService;
 import cn.freemud.service.Orderservice;
 import cn.freemud.service.business.OrderBusinessService;
+import cn.freemud.service.customer.MemberInfoManager;
 import cn.freemud.service.order.OrderRelationFactory;
 import cn.freemud.service.order.OrderRelationService;
 import cn.freemud.service.thirdparty.*;
@@ -241,6 +242,8 @@ public class OrderServiceImpl implements Orderservice {
 
     @Autowired
     private OrderManager orderManager;
+    @Autowired
+    private MemberInfoManager memberInfoManager;
 
     @Autowired
     private OrderServiceClient orderServiceClient;
@@ -768,6 +771,9 @@ public class OrderServiceImpl implements Orderservice {
         BeanUtil.convertBean(queryOrdersDto, queryOrdersRequest2);
         queryOrdersRequest2.setTrackingNo(LogThreadLocal.getTrackingNo());
         queryOrdersRequest2.setNeedInvoice(queryOrderVo.getNeedInvoice());
+        // 查询支持查询会员合并后的所有订单
+        List<String> memberIds = memberInfoManager.getMemberAllIds(partnerId, userId);
+        queryOrdersRequest2.setUserIds(memberIds);
         if (Objects.equals(QueryOrderStatus.REFUND_BILL.getCode(), queryOrderVo.getQueryOrderStatus())) {
             queryOrdersRequest2.setPayStatus(new Integer[]{3});//发票其他订单查询已退款
         }
@@ -783,6 +789,7 @@ public class OrderServiceImpl implements Orderservice {
             es.setMarketingType(queryOrderVo.getMarketingType());
             OrderConditionsReq queryEs = orderAdapter.convent2QueryOrdersDtoES(es, userId, channelType, queryOrderVo.getQueryOrderStatus(), queryOrderVo.getQueryOrderType(), queryOrderVo.getQueryPayStatus());
             queryEs.setNeedInvoice(queryOrderVo.getNeedInvoice());
+            queryEs.setUserIds(memberIds);
             BaseDownLoadResponse<List<OrderInfoReqs>> response = orderDownLoadSdkService.queryOrderByConditions(queryEs, LogThreadLocal.getTrackingNo());
 
             queryOrderResponse = orderAdapter.conventEs2queryOrderResponse(response);

order-application-service/src/main/java/cn/freemud/service/thirdparty/CustomerClient.java

@@ -14,7 +14,12 @@
 package cn.freemud.service.thirdparty;
 
 import cn.freemud.annotations.LogIgnoreFeign;
-import cn.freemud.entities.dto.*;
+import cn.freemud.entities.dto.GetMemberExtendInfoRequestDto;
+import cn.freemud.entities.dto.GetMemberExtendInfoResponseDto;
+import cn.freemud.entities.dto.GetMemberInfoByIdRequestDto;
+import cn.freemud.entities.dto.GetMemberInfoByIdResponseDto;
+import cn.freemud.entities.dto.member.GetMemberIdsReq;
+import cn.freemud.entities.dto.member.GetMemberIdsResp;
 import com.freemud.application.sdk.api.base.BaseResponse;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -48,6 +53,16 @@ public interface CustomerClient {
      */
      @PostMapping(value = "/customerservice/getMemberById")
      GetMemberInfoByIdResponseDto getMemberInfoById(@RequestBody GetMemberInfoByIdRequestDto getMemberInfoByIdRequestDto);
+
+
+    /**
+     * 查询memberId的对应的客户下所有会员编号（资产合并前的）
+     */
+    @PostMapping("/customerservice/customer/getMemberIds")
+    @LogIgnoreFeign
+    GetMemberIdsResp getMemberIds(@RequestBody GetMemberIdsReq request);
+
+
     //
     // /**
     // * 修改顾客信息

ordercenter-sdk/src/main/java/com/freemud/application/sdk/api/ordercenter/request/OrderUserConditionsReq.java

@@ -22,6 +22,11 @@ public class OrderUserConditionsReq {
     //用户ID
     private String userId;
 
+    /**
+     * 用户id集合（userId和userIds两者不能同时为空）
+     */
+    private List<String> userIds;
+
     //商户号
     private String partnerId;