技术需求:所有请求基础服务接口新增商户号

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

@@ -2736,6 +2736,7 @@ public class OrderSdkAdapter {
         queryRelatedOrderByCodeReq.setOrderCode(request.getOrderCode());
         queryRelatedOrderByCodeReq.setThirdOrderCode(request.getThirdOrderCode());
         queryRelatedOrderByCodeReq.setWithOperationHistory(request.getWithOperationHistory());
+        queryRelatedOrderByCodeReq.setPartnerId(request.getPartnerId());
         return queryRelatedOrderByCodeReq;
     }
 
@@ -2743,6 +2744,7 @@ public class OrderSdkAdapter {
         SdkNewOrderUpdateThirdOrderCodeReq sdkNewOrderUpdateThirdOrderCodeReq = new SdkNewOrderUpdateThirdOrderCodeReq();
         sdkNewOrderUpdateThirdOrderCodeReq.setOrderCode(assortmentSdkUpdateThirdOrderCodeRequest.getOrderCode());
         sdkNewOrderUpdateThirdOrderCodeReq.setThirdOrderCode(assortmentSdkUpdateThirdOrderCodeRequest.getThirdOrderCode());
+        sdkNewOrderUpdateThirdOrderCodeReq.setPartnerId(assortmentSdkUpdateThirdOrderCodeRequest.getPartnerId());
         return sdkNewOrderUpdateThirdOrderCodeReq;
     }
 

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

@@ -626,6 +626,7 @@ public class OrderAdapter {
         confirmOrderDto.setPlatformCoupon(Double.valueOf(message.getPlatform_coupon()).intValue());
         confirmOrderDto.setMerchantCoupon(Double.valueOf(message.getMerchant_coupon()).intValue());
         confirmOrderDto.setOrderSettlementAmount(message.getTotal_fee());
+        confirmOrderDto.setPartnerId(message.getPartnerId());
         return confirmOrderDto;
     }
 

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

@@ -35,4 +35,6 @@ public class ConfirmOrderDto {
      */
     private Integer orderSettlementAmount;
 
+    private String partnerId;
+
 }

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

@@ -86,4 +86,6 @@ public class PaysuccessNoticeMessage {
      * 储值卡流水明细
      */
     private List<SvcPayItem> svcPayItems;
+
+    private String partnerId;
 }

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

@@ -112,14 +112,14 @@ public class AppOrderServiceImpl implements AppOrderService {
         //1.5.4版本，商品库存校验与扣库存
         //List<String> stockProductIds = checkOrder.getStockProductIdList(createOrderVo, shoppingCartGoodsDto);
         // 下单前检查优惠券是否可用
-        if (StringUtils.isNotBlank(createOrderVo.getCouponCode())){
+        if (StringUtils.isNotBlank(createOrderVo.getCouponCode())) {
             InvalidCouponsRequestDto requestDto = new InvalidCouponsRequestDto();
             List<String> couponList = new ArrayList<>();
             couponList.add(createOrderVo.getCouponCode());
             requestDto.setCouponCodes(couponList);
             requestDto.setPartnerId(Integer.valueOf(createOrderVo.getPartnerId()));
             InvalidCouponsResponseDto invalidCouponsResponseDto = couponOnlineClient.invalidCoupons(requestDto);
-            if (invalidCouponsResponseDto.getStatusCode() != 100 || invalidCouponsResponseDto.getData() == null || (invalidCouponsResponseDto.getData() != null && CollectionUtils.isNotEmpty(invalidCouponsResponseDto.getData().getInvalidCoupons()))){
+            if (invalidCouponsResponseDto.getStatusCode() != 100 || invalidCouponsResponseDto.getData() == null || (invalidCouponsResponseDto.getData() != null && CollectionUtils.isNotEmpty(invalidCouponsResponseDto.getData().getInvalidCoupons()))) {
                 return ResponseUtil.error(ResponseResult.COUPON_INVALID.getCode(), ResponseResult.COUPON_INVALID.getMessage());
             }
         }
@@ -142,7 +142,7 @@ public class AppOrderServiceImpl implements AppOrderService {
 
     @Override
     public BaseResponse createPrepay(CreatePrepayVo createPrepayVo) {
-        CreateOrderOperateDto createOrderOperateDto = this.getCreateOrderOperateDto(createPrepayVo.getOrderCode());
+        CreateOrderOperateDto createOrderOperateDto = this.getCreateOrderOperateDto(createPrepayVo.getOrderCode(), createPrepayVo.getPartnerId());
         OrderBeanV1 productOrderBean = createOrderOperateDto.getProductOrderBean();
         this.checkOrderBefore(createPrepayVo, productOrderBean);
         // 关闭历史预支付订单
@@ -239,8 +239,6 @@ public class AppOrderServiceImpl implements AppOrderService {
 //        CreateOrderResponseVo responseVo = orderAdapter.convent2CreateFatherSonOrderNoPayResponseVo(orderBean);
 //        return ResponseUtil.success(responseVo);
 //    }
-
-
     @Override
     public String paySuccessCallback(PaysuccessNoticeMessage message, ConfirmOrderDto confirmOrderDto, Map<String, OrderBeanV1> orderBeans) {
         String paySuccessCallbackResult = orderservice.paySuccessCallback(message, confirmOrderDto, orderBeans);
@@ -280,9 +278,10 @@ public class AppOrderServiceImpl implements AppOrderService {
         return null;
     }
 
-    private CreateOrderOperateDto getCreateOrderOperateDto(String orderId) {
+    private CreateOrderOperateDto getCreateOrderOperateDto(String orderId, String partnerId) {
         QueryRelatedOrderByCodeRequest baseQueryOrderRequest = new QueryRelatedOrderByCodeRequest();
         baseQueryOrderRequest.setOrderCode(orderId);
+        baseQueryOrderRequest.setPartnerId(partnerId);
         baseQueryOrderRequest.setTrackingNo(LogThreadLocal.getTrackingNo());
         QueryRelatedOrderByCodeResp queryOrderByIdResponse = orderCenterSdkService.queryRelatedOrderByCode(baseQueryOrderRequest);
         if (queryOrderByIdResponse == null || CollectionUtils.isEmpty(queryOrderByIdResponse.getOrderBeanList())) {

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

@@ -508,6 +508,7 @@ public class EncircleOrderServiceImpl implements EncircleOrderService {
         //拉取订单详细信息
         BaseQueryOrderRequest baseQueryOrderRequest = new BaseQueryOrderRequest();
         baseQueryOrderRequest.setOrderId(orderId);
+        baseQueryOrderRequest.setPartnerId(assortmentCustomerInfoVo.getPartnerId());
         baseQueryOrderRequest.setTrackingNo(LogThreadLocal.getTrackingNo());
         QueryOrderByIdResponse queryOrderByIdResponse = orderCenterSdkService.queryOrderById(baseQueryOrderRequest);
         //判断订单中是否存在未称重商品
@@ -606,6 +607,7 @@ public class EncircleOrderServiceImpl implements EncircleOrderService {
                     message.setOpenid(assortmentCustomerInfoVo.getOpenId());
                     message.setPlatform_coupon(0);
                     message.setMerchant_coupon(0);
+                    message.setPartnerId(assortmentCustomerInfoVo.getPartnerId());
                     orderAdapterService.paySuccessCallback(message);
                 }
             }else{

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

@@ -8,7 +8,6 @@ import cn.freemud.entities.EdenResponse;
 import cn.freemud.entities.bo.CreateOrderBONew;
 import cn.freemud.entities.db.OpenPlatformOrderConfig;
 import cn.freemud.entities.dto.ConfirmOrderDto;
-import cn.freemud.entities.dto.ecology.ReportActivityBehaviorsRequest;
 import cn.freemud.entities.dto.order.CreateCashierOrderDto;
 import cn.freemud.entities.dto.pay.SvcPayItem;
 import cn.freemud.entities.dto.pay.svc.ConsumeHistoryCreateRequest;
@@ -30,7 +29,6 @@ import cn.freemud.service.universal.factory.CreateOrderServiceFactory;
 import cn.freemud.utils.RedisUtil;
 import cn.freemud.utils.ResponseUtil;
 import com.alibaba.fastjson.JSON;
-import com.alibaba.fastjson.JSONObject;
 import com.freemud.api.assortment.datamanager.entity.vo.AssortmentCustomerInfoVo;
 import com.freemud.api.assortment.datamanager.enums.IappIdType;
 import com.freemud.api.assortment.datamanager.manager.customer.AssortmentCustomerInfoManager;
@@ -45,9 +43,7 @@ import com.freemud.application.sdk.api.ordercenter.entities.vo.OrderCallBackRequ
 import com.freemud.application.sdk.api.ordercenter.enums.BizTypeEnum;
 import com.freemud.application.sdk.api.ordercenter.enums.MarketTypeEnum;
 import com.freemud.application.sdk.api.ordercenter.enums.NewOrderStatus;
-import com.freemud.application.sdk.api.ordercenter.enums.PayChannelType;
 import com.freemud.application.sdk.api.ordercenter.response.orderInfo.OrderInfoReqs;
-import com.freemud.application.sdk.api.ordercenter.response.orderInfo.OrderPayItemResp;
 import com.freemud.application.sdk.api.ordercenter.response.orderInfo.QueryByCodeResponse;
 import com.freemud.application.sdk.api.ordercenter.service.OrderSdkService;
 import com.freemud.application.sdk.api.service.EmailAlertService;
@@ -333,7 +329,7 @@ public class OrderAdapterServiceImpl {
             if (StringUtils.isNotBlank(orderId)) {
                 confirmOrderDto.setOrderId(orderId);
             }
-            Map<String, OrderBeanV1> orderBeans = orderServiceImpl.getOrderBeanByOrderId(confirmOrderDto.getOrderId());
+            Map<String, OrderBeanV1> orderBeans = orderServiceImpl.getOrderBeanByOrderId(confirmOrderDto.getOrderId(),confirmOrderDto.getPartnerId());
             if (MapUtils.isEmpty(orderBeans)) {
                 return gson.toJson(message);
             }

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

@@ -254,6 +254,7 @@ public class PayServiceImpl {
             message.setMerchant_coupon(0);
             message.setSource(PaySuccessSource.OUTSIDE.getSource());
             message.setSvcPayItems(orderPayResponse.getSvcPayItems());
+            message.setPartnerId(createPrepayRequestDto.getPartnerId());
             orderAdapterService.paySuccessCallback(message);
             return createOrderResponse;
         }

order-application-service/src/main/java/cn/freemud/service/universal/UniversalOrderService.java

@@ -730,6 +730,7 @@ public abstract class UniversalOrderService {
             message.setPlatform_coupon(0);
             message.setMerchant_coupon(0);
             message.setSource(PaySuccessSource.OUTSIDE.getSource());
+            message.setPartnerId(createPrepayRequestDto.getPartnerId());
             orderAdapterService.paySuccessCallback(message);
             return ResponseUtil.success(createOrderResponse);
         }

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

@@ -294,7 +294,7 @@ public class SaasMallOrderService extends UniversalOrderService {
 
     private String paySuccessCallback(PaysuccessNoticeMessage message) {
         ConfirmOrderDto confirmOrderDto = orderAdapter.convent2ConfirmOrderDto(message);
-        Map<String, OrderBeanV1> orderBeans = getOrderBeanByOrderId(confirmOrderDto.getOrderId());
+        Map<String, OrderBeanV1> orderBeans = getOrderBeanByOrderId(confirmOrderDto.getOrderId(),confirmOrderDto.getPartnerId());
         return this.paySuccessCallback(message, confirmOrderDto, orderBeans);
     }
 
@@ -303,10 +303,10 @@ public class SaasMallOrderService extends UniversalOrderService {
         return mallOrderService.paySuccessCallback(message, confirmOrderDto, orderBeans);
     }
 
-    private Map<String, OrderBeanV1> getOrderBeanByOrderId(String orderId) {
+    private Map<String, OrderBeanV1> getOrderBeanByOrderId(String orderId, String partnerId) {
         // 订单查询：若结果集只有一个orderBean，则为普通订单，否则为会员卡订单（父子订单）
         Map<String, OrderBeanV1> result = new HashMap<>();
-        QueryRelationOrderByIdResponseDto queryOrderByIdResponseDto = getQueryRelationOrderByIdResponseDto(orderId);
+        QueryRelationOrderByIdResponseDto queryOrderByIdResponseDto = getQueryRelationOrderByIdResponseDto(orderId,partnerId);
         if (CollectionUtils.isEmpty(queryOrderByIdResponseDto.getData())) {
             return result;
         }
@@ -323,10 +323,11 @@ public class SaasMallOrderService extends UniversalOrderService {
         return result;
     }
 
-    private QueryRelationOrderByIdResponseDto getQueryRelationOrderByIdResponseDto(String oid) {
+    private QueryRelationOrderByIdResponseDto getQueryRelationOrderByIdResponseDto(String oid, String partnerId) {
         QueryRelatedOrderByCodeRequest baseQueryOrderRequest = new QueryRelatedOrderByCodeRequest();
         baseQueryOrderRequest.setOrderCode(oid);
         baseQueryOrderRequest.setTrackingNo(LogThreadLocal.getTrackingNo());
+        baseQueryOrderRequest.setPartnerId(partnerId);
         QueryRelatedOrderByCodeResp queryOrderByIdResponse;
         queryOrderByIdResponse = orderCenterSdkService.queryRelatedOrderByCode(baseQueryOrderRequest);
         String string = JSONObject.toJSONString(queryOrderByIdResponse);

order-application-service/src/test/java/cn/freemud/service/impl/EncircleOrderServiceImplTest.java

 package cn.freemud.service.impl;
 
 import cn.freemud.adapter.DeliveryAdapter;
-import cn.freemud.entities.dto.QueryOrdersResponseDto;
 import cn.freemud.entities.vo.CreateDeliveryVo;
 import cn.freemud.entities.vo.CreateOrderVo;
 import cn.freemud.entities.vo.encircle.CreateReserveOrderVo;
@@ -16,9 +15,9 @@ import com.freemud.application.sdk.api.storecenter.request.StoreInfoRequest;
 import com.freemud.application.sdk.api.storecenter.response.StoreResponse;
 import com.freemud.application.sdk.api.storecenter.service.StoreCenterService;
 import org.apache.commons.lang.ObjectUtils;
-import org.junit.Test;
-import org.junit.Before;
 import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
@@ -84,22 +83,22 @@ public class EncircleOrderServiceImplTest {
 
     @Test
     public void testd() throws Exception {
-        Map<String, OrderBeanV1> orderBeans = orderService.getOrderBeanByOrderId("18550453673517366500002");
+        Map<String, OrderBeanV1> orderBeans = orderService.getOrderBeanByOrderId("18550453673517366500002", null);
         OrderBeanV1 orderBean = orderBeans.get(OrderBeanType.SAASORDER.getCode());
         //获取门店信息
         StoreResponse storeInfo = storeCenterService.getStoreInfo(new StoreInfoRequest(orderBean.getCompanyId(), orderBean.getShopId()), "");
         if (storeInfo == null || ObjectUtils.notEqual(cn.freemud.management.enums.ResponseResult.SUCCESS.getCode(), storeInfo.getStatusCode().toString()) || storeInfo.getBizVO() == null) {
             //return sendPaySuccessNoticeMessage();
         }
-        CreateDeliveryVo createDeliveryVo = deliveryAdapter.buildDeliveryOrderRequestDto(orderBean, storeInfo, deliveryCallBackUrl,"");
+        CreateDeliveryVo createDeliveryVo = deliveryAdapter.buildDeliveryOrderRequestDto(orderBean, storeInfo, deliveryCallBackUrl, "");
         //创建配送单
         CreateDeliveryOrderResponseDto deliveryResponse = deliveryFeiginClient.deliveryOrderAdd(createDeliveryVo);
         //创建配送单失败，更新订单为异常单
         if (deliveryResponse == null || 100 != deliveryResponse.getCode() || deliveryResponse.getData() == null) {
             String deliveryId = deliveryResponse != null && deliveryResponse.getData() != null ? deliveryResponse.getData().getDeliveryId() : "";
-            String operator =  "系统" ;
+            String operator = "系统";
             //updateDeliveryAbnormal(orderBean.getCompanyId(), orderBean.getOid(), deliveryId, operator);
-           // return sendPaySuccessNoticeMessage();
+            // return sendPaySuccessNoticeMessage();
         }
     }
 
@@ -245,7 +244,7 @@ try {
     }
 
     @Test
-    public void testQueryTableNumberStatus()throws Exception{
+    public void testQueryTableNumberStatus() throws Exception {
 
         EmptyTableNumberVo emptyTableNumberVo = new EmptyTableNumberVo();
         emptyTableNumberVo.setPartnerId("1864");

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

@@ -20,4 +20,5 @@ public class QueryRelatedOrderByCodeReq {
     private String orderCode;
     private String thirdOrderCode;
     private Boolean withOperationHistory;
+    private String partnerId;
 }

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

@@ -16,6 +16,9 @@ import lombok.Data;
  */
 @Data
 public class SdkNewOrderUpdateThirdOrderCodeReq {
+
+    // 商户号
+    protected String partnerId;
     private String orderCode;
     private String thirdOrderCode;
 }

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

@@ -24,4 +24,6 @@ public class BatchQueryByCodesReq {
      */
     private List<String> orderCodes;
 
+    private String partnerId;
+
 }

ordercenter-sdk/src/main/java/com/freemud/application/sdk/api/ordercenter/service/OrderDownLoadSdkService.java

@@ -286,6 +286,7 @@ public class OrderDownLoadSdkService {
             // 查询redis
             BatchQueryByCodesReq batchQueryByCodesReq = new BatchQueryByCodesReq();
             batchQueryByCodesReq.setOrderCodes(orderCodes);
+            batchQueryByCodesReq.setPartnerId(request.getPartnerId());
             OrderBaseResp<List<OrderInfoReqs>> redisResponse = orderSdkService.batchQueryByCodes(batchQueryByCodesReq, LogThreadLocal.getTrackingNo());
             logUtil.info("list 热点数据查询redis, ",batchQueryByCodesReq,redisResponse);
             if (CollectionUtils.isEmpty(redisResponse.getResult())) {
@@ -373,6 +374,7 @@ public class OrderDownLoadSdkService {
                 logUtil.info("进入redis 数据替换 ES 逻辑", LogThreadLocal.getTrackingNo(), null);
                 BatchQueryByCodesReq batchQueryByCodesReq = new BatchQueryByCodesReq();
                 batchQueryByCodesReq.setOrderCodes(Collections.singletonList(infoReqs.getOrderCode()));
+                batchQueryByCodesReq.setPartnerId(partnerId);
                 OrderBaseResp<List<OrderInfoReqs>> redisResponse = orderSdkService.batchQueryByCodes(batchQueryByCodesReq, LogThreadLocal.getTrackingNo());
                 logUtil.info("热点数据查询redis, ",batchQueryByCodesReq,redisResponse);
                 if (CollectionUtils.isEmpty(redisResponse.getResult())) {