Merge branch 'ka-传基础服务增加商户号'

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

@@ -67,7 +67,7 @@ public class OrderSdkAdapter {
      * 接单request
      * @param operator
      * @param orderBean
-     * @param dispatchType 派单模式(0-系统自动派单;1-手动派单)  null表示方法重载使用,无需关注该参数
+     * @param otherParamDTO
      * @return
      */
     public BaseQueryOrderRequest getOrderConfirmRequest(String operator, OrderBeanV1 orderBean, OtherParamDTO otherParamDTO) {
@@ -2727,6 +2727,7 @@ public class OrderSdkAdapter {
         codeReq.setOrderCode(assortmentSdkUpdateDownstreamThirdOrderCodeRequest.getOrderCode());
         codeReq.setDownstreamPosCode(assortmentSdkUpdateDownstreamThirdOrderCodeRequest.getDownstreamPosCode());
         codeReq.setDownstreamThirdOrderCode(assortmentSdkUpdateDownstreamThirdOrderCodeRequest.getDownstreamThirdOrderCode());
+        codeReq.setPartnerId(assortmentSdkUpdateDownstreamThirdOrderCodeRequest.getPartnerId());
         return codeReq;
     }
 

assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/config/BaseConfig.java

@@ -7,5 +7,6 @@ public class BaseConfig {
 
     private String trackingNo;
 
-
+    // 商户号
+    protected String partnerId;
 }

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

@@ -9,7 +9,6 @@ import java.util.List;
 @Data
 public class OrderEditRequest extends BaseConfig {
 
-
     /**
      * 订单ID
      */
@@ -23,9 +22,10 @@ public class OrderEditRequest extends BaseConfig {
     private String payChannelName;
     private Byte payChannelType;
     private List<OrderPayItemResp> orderPayItem;
-    public OrderEditRequest(String orderId, String extInfo) {
+    public OrderEditRequest(String orderId, String extInfo, String partnerId) {
         this.orderId = orderId;
         this.extInfo = extInfo;
+        this.partnerId = partnerId;
     }
 
 }

assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/service/order/OrderCenterSdkServiceImpl.java

@@ -349,6 +349,7 @@ public class OrderCenterSdkServiceImpl implements OrderCenterSdkService {
     @Override
     public PayAccessResponse payAccess(ConfirmOrderRequest confirmOrderRequest) {
         PaySuccessReq request = new PaySuccessReq();
+        request.setPartnerId(confirmOrderRequest.getPartnerId());
         request.setPayRequestNo(confirmOrderRequest.getPayVoucher());
         request.setCompleteOrderCode(confirmOrderRequest.getCompleteOrderCode());
         request.setOrderCode(confirmOrderRequest.getOrderId());
@@ -415,6 +416,7 @@ public class OrderCenterSdkServiceImpl implements OrderCenterSdkService {
     @Override
     public PayAccessResponse payAccessMCCafe(ConfirmOrderRequest confirmOrderRequest) {
         PaySuccessReq request = new PaySuccessReq();
+        request.setPartnerId(confirmOrderRequest.getPartnerId());
         request.setPayRequestNo(confirmOrderRequest.getPayVoucher());
         request.setCompleteOrderCode(confirmOrderRequest.getCompleteOrderCode());
         request.setOrderCode(confirmOrderRequest.getOrderId());
@@ -559,6 +561,7 @@ public class OrderCenterSdkServiceImpl implements OrderCenterSdkService {
         OrderDeleteReq request = new OrderDeleteReq();
         request.setOrderCode(deleteOrderRequest.getOrderId());
         request.setOperator(deleteOrderRequest.getOperator());
+        request.setPartnerId(deleteOrderRequest.getPartnerId());
         com.freemud.application.sdk.api.ordercenter.response.OrderBaseResp response = orderSdkService.deleteOrder(request, deleteOrderRequest.getTrackingNo());
         return orderSdkAdapter.convent2BaseOrderResponse(response);
     }
@@ -837,6 +840,7 @@ public class OrderCenterSdkServiceImpl implements OrderCenterSdkService {
     public BaseOrderResponse orderEdit(OrderEditRequest orderEdit) {
         UpdateOrderReq request = new UpdateOrderReq();
         request.setOrderCode(orderEdit.getOrderId());
+        request.setPartnerId(orderEdit.getPartnerId());
         request.setExtInfo(orderEdit.getExtInfo());
         request.setOrderClient(OrderClientType.SAAS.getIndex());
         request.setOrderPayItem(orderEdit.getOrderPayItem());
@@ -1247,6 +1251,7 @@ public class OrderCenterSdkServiceImpl implements OrderCenterSdkService {
     @Override
     public OrderBaseResponse updateDeliveryInfoById(UpdateDeliveryInfoByIdRequest request) {
         OrderExpressReq expressReq = new OrderExpressReq();
+        expressReq.setPartnerId(request.getPartnerId());
         expressReq.setExpressChannelCode(request.getExpressChannelCode());
         expressReq.setExpressChannelName(request.getExpressChannelName());
         expressReq.setOperator(request.getOperator());
@@ -1414,6 +1419,7 @@ public class OrderCenterSdkServiceImpl implements OrderCenterSdkService {
         updateDeliveryInfoByIdRequest.setOrderId(request.getOrderCode());
         //7,"运单异常"
         updateDeliveryInfoByIdRequest.setOrderSubState(7);
+        updateAbnormalStateRequest.setPartnerId(request.getPartnerId());
         return updateDeliveryInfoById(updateDeliveryInfoByIdRequest);
     }
 

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

@@ -119,7 +119,7 @@ public class OrderBusinessServiceImpl implements OrderBusinessService {
         request.setPickUpGoodsNo(confirmOrderRequest.getPickUpGoodsNo());
         // 引入门店基础服务 查询自动制作完成配置时间，预约单单独超时任务设置
         request.setTimeout(this.getPaySuccessTimeout(confirmOrderRequest, request));
-
+        request.setPartnerId(confirmOrderRequest.getPartnerId());
         if (!org.springframework.util.CollectionUtils.isEmpty(confirmOrderRequest.getOrderSettlements())) {
             List<OrderSettlementCreateReq> orderSettlementCreateReqs = new ArrayList<>();
             int size = confirmOrderRequest.getOrderSettlements().size();

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

@@ -78,24 +78,6 @@ public class PlatformCouponRelationServiceImpl implements CouponRelationService
         // fisherman  【01测16灰18全，【华莱士】【疑难专项】一个订单多张优惠券使用场景】 https://www.tapd.cn/43862731/prong/stories/view/1143862731001037477
         BaseResponse baseResponse = this.batchCouponHandle(orderBean, couponReqType);
         return baseResponse;
-//        // 需要判断 accountList 里面 是都 同时包含  配送券+ other券
-//        boolean isDoubleCoupon = checkAccountList(accountList);
-//        if (isDoubleCoupon) {
-//            Integer code = OrderAccountType.FREIGHT_COUPON.getCode();
-//            // 运费券 塞进 核销接口里面,  这里真的是贼恶心 逻辑不敢动
-//            AccountBeanV1 freightCouponAccountBean = accountList.stream().filter(accountBean -> code.equals(accountBean.getType())).findFirst().orElse(null);
-//            CouponCodeVerificationTransDto couponCodeVerificationTransDto = null;
-//            if (!Objects.isNull(freightCouponAccountBean)) {
-//                couponCodeVerificationTransDto = new CouponCodeVerificationTransDto();
-//                couponCodeVerificationTransDto.setCode(freightCouponAccountBean.getAccountId());
-//                couponCodeVerificationTransDto.setTotalAmount(freightCouponAccountBean.getPrice().intValue());
-//            }
-//            // 过滤出配送券
-//            List<AccountBeanV1> collect = accountList.stream().filter(accountBean -> !code.equals(accountBean.getType())).collect(Collectors.toList());
-//            return commonMethodVerification(couponCodeVerificationTransDto, collect, orderBean, couponReqType);
-//        } else {
-//            return commonMethodVerification(null, accountList, orderBean, couponReqType);
-//        }
     }
 
     /**

order-application-service/src/main/java/cn/freemud/service/delivery/ThirdDeliveryServiceImpl.java

@@ -136,6 +136,7 @@ public class ThirdDeliveryServiceImpl implements ThirdDeliveryService {
         if (StringUtils.isNotBlank(request.getRemark())) {
             requestDto.setRemark("配送:" + request.getRemark());
         }
+        requestDto.setPartnerId(partnerId);
         OrderBaseResponse orderBaseResponseDto = orderCenterSdkService.updateDeliveryInfoById(requestDto);
         //订单服务修改配送单信息失败
         if (!SUCCESS_RESPONSE_CODE.equals(orderBaseResponseDto.getErrcode())) {
@@ -283,6 +284,7 @@ public class ThirdDeliveryServiceImpl implements ThirdDeliveryService {
         if (StringUtils.isNotBlank(request.getRiderName())) {
             updateDeliveryInfoByIdRequest.setCourierName(request.getRiderName());
         }
+        updateDeliveryInfoByIdRequest.setPartnerId(request.getPartnerId());
         return orderCenterSdkService.updateDeliveryInfoById(updateDeliveryInfoByIdRequest);
     }
 

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

@@ -271,7 +271,7 @@ public class AppOrderServiceImpl implements AppOrderService {
      * 更新订单扩展信息
      */
     private BaseResponse updateOrderExtInfo(OrderBeanV1 orderBean, OrderExtInfoDto orderExtInfo, String trackingNo) {
-        OrderEditRequest orderEditRequest = new OrderEditRequest(orderBean.getOid(), JSONObject.toJSONString(orderExtInfo));
+        OrderEditRequest orderEditRequest = new OrderEditRequest(orderBean.getOid(), JSONObject.toJSONString(orderExtInfo), orderBean.getCompanyId());
         orderEditRequest.setTrackingNo(trackingNo);
         BaseOrderResponse baseOrderResponse = orderCenterSdkService.orderEdit(orderEditRequest);
         if (!ObjectUtils.equals(ResponseCodeConstant.RESPONSE_SUCCESS, baseOrderResponse.getErrcode())) {

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

@@ -187,6 +187,7 @@ public class CashierOrderServiceImpl implements CashierOrderService {
         request.setOrderCode(orderBean.getOid());
         request.setOrderState(NewOrderStatus.COMPLETE.getIndex());
         request.setOperator(orderBean.getUserName());
+        request.setPartnerId(orderBean.getCompanyId());
         request.setRemark("已完成");
         orderSdkService.updateOrderState(request, LogThreadLocal.getTrackingNo());
         Map<String, Object> map = Maps.newTreeMap();

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

@@ -908,7 +908,7 @@ public class MCCafeOrderServiceImpl implements MCCafeOrderService {
         orderExtInfo.setPrepayId(prepayId);
 
         OrderEditRequest orderEditRequest = new OrderEditRequest(orderPayResponse.getPayTransId(),
-                JSONObject.toJSONString(orderExtInfo));
+                JSONObject.toJSONString(orderExtInfo), orderBean.getCompanyId());
         orderEditRequest.setOrderId(orderBean.getOid());
         orderEditRequest.setTrackingNo(trackingNo);
         BaseOrderResponse baseOrderResponse = orderCenterSdkService.orderEdit(orderEditRequest);
@@ -988,6 +988,7 @@ public class MCCafeOrderServiceImpl implements MCCafeOrderService {
             //调用基础订单接口更新信息
             UpdateDownstreamOrderCodeReq updateDownstreamOrderCodeReq = new UpdateDownstreamOrderCodeReq();
             updateDownstreamOrderCodeReq.setOrderCode(orderBean.getOid());
+            updateDownstreamOrderCodeReq.setPartnerId(orderBean.getCompanyId());
             OrderBaseResp baseResponse = orderSdkService.updateDownstreamThirdOrderCode(updateDownstreamOrderCodeReq, LogThreadLocal.getTrackingNo());
 
             LinkedHashMap<String, String> linkedHashMap = (LinkedHashMap) baseResponse.getResult();
@@ -1086,7 +1087,7 @@ public class MCCafeOrderServiceImpl implements MCCafeOrderService {
                 emailAlertService.sendEmailAlert("创建配送单失败", String.format("request:%s \r\nresponse:%s", JSONObject.toJSONString(createDeliveryVo), JSONObject.toJSONString(deliveryResponse)));
                 return sendPaySuccessNoticeMessage();
             } else {
-                orderBaseService.updateDeliverySuccess(orderBean.getOid(), deliveryResponse.getData().getDeliveryId(), "系统");
+                orderBaseService.updateDeliverySuccess(orderBean.getOid(), deliveryResponse.getData().getDeliveryId(), "系统", partnerId);
             }
         }
 

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

@@ -3,7 +3,6 @@ package cn.freemud.service.impl;
 import cn.freemud.adapter.DeliveryAdapter;
 import cn.freemud.adapter.LightApplicationConvertToAssortmentSdkAdapter;
 import cn.freemud.adapter.OrderAdapter;
-import cn.freemud.amqp.MQService;
 import cn.freemud.base.entity.BaseResponse;
 import cn.freemud.base.util.DateUtil;
 import cn.freemud.constant.RedisKeyConstant;
@@ -39,16 +38,13 @@ import cn.freemud.service.thirdparty.ShoppingCartClient;
 import cn.freemud.utils.AppLogUtil;
 import cn.freemud.utils.RedisUtil;
 import cn.freemud.utils.ResponseUtil;
-import cn.freemud.utils.ValidationCode;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
-import com.freemud.api.assortment.datamanager.entity.db.AssortmentOpenPlatformWxapp;
 import com.freemud.api.assortment.datamanager.entity.vo.AssortmentCustomerInfoVo;
 import com.freemud.api.assortment.datamanager.manager.AssortmentOpenPlatformWxappManager;
 import com.freemud.api.assortment.datamanager.manager.customer.AssortmentCustomerInfoManager;
 import com.freemud.application.sdk.api.constant.ResponseConstant;
-import com.freemud.application.sdk.api.constant.ResponseResultEnum;
 import com.freemud.application.sdk.api.deliverycenter.dto.ArriveDeliveryRequestDto;
 import com.freemud.application.sdk.api.deliverycenter.dto.CreateDeliveryOrderRequestDto;
 import com.freemud.application.sdk.api.deliverycenter.response.CreateDeliveryOrderResponseDto;
@@ -221,6 +217,7 @@ public class MallOrderServiceImpl implements MallOrderService {
             updateDeliveryInfoByIdRequest.setOrderId(orderBean.getOid());
             updateDeliveryInfoByIdRequest.setOrderSubState(DeliveryStatus.DELIVERYARRIVED.getCode());
             updateDeliveryInfoByIdRequest.setBizType(BizTypeEnum.MALL.getBizType());
+            updateDeliveryInfoByIdRequest.setPartnerId(orderBean.getCompanyId());
             orderCenterSdkService.updateDeliveryInfoById(updateDeliveryInfoByIdRequest);
         }
 
@@ -229,6 +226,7 @@ public class MallOrderServiceImpl implements MallOrderService {
          */
         POSOrderOperationBaseReq prepareCompleteDeliveryReq = new POSOrderOperationBaseReq();
         prepareCompleteDeliveryReq.setOrderCode(orderBean.getOid());
+        prepareCompleteDeliveryReq.setPartnerId(orderBean.getCompanyId());
         orderSdkService.prepareCompleteDelivery(prepareCompleteDeliveryReq, trackingNo);
 
         /**
@@ -494,7 +492,7 @@ public class MallOrderServiceImpl implements MallOrderService {
             orderExtInfoDto.setPayDate(DateUtil.convert2String(new Date(), "yyyy-MM-dd HH:mm:ss"));
             orderExtInfoDto.setPayTransId(message.getOut_trade_no());
             OrderEditDto orderEditDto = new OrderEditDto(orderBean.getOid(), gson.toJson(orderExtInfoDto));
-            OrderEditRequest orderEditRequest = new OrderEditRequest(orderEditDto.getOrderId(), orderEditDto.getExtInfo());
+            OrderEditRequest orderEditRequest = new OrderEditRequest(orderEditDto.getOrderId(), orderEditDto.getExtInfo(), orderBean.getCompanyId());
             orderEditRequest.setTrackingNo(LogThreadLocal.getTrackingNo());
             orderCenterSdkService.orderEdit(orderEditRequest);
         }
@@ -523,6 +521,7 @@ public class MallOrderServiceImpl implements MallOrderService {
             POSOrderOperationBaseReq acceptOrderReq = new POSOrderOperationBaseReq();
             for(String orderId : orderIds){
                 acceptOrderReq.setOrderCode(orderId);
+                acceptOrderReq.setPartnerId(partnerId);
                 try {
                     OrderBaseResp baseResponse = orderSdkService.acceptOrder(acceptOrderReq, LogThreadLocal.getTrackingNo());
                     if(baseResponse == null || !ResponseCodeConstant.RESPONSE_SUCCESS_STR.equals(baseResponse.getCode())) {
@@ -737,6 +736,7 @@ public class MallOrderServiceImpl implements MallOrderService {
             updateDeliveryInfoByIdRequest.setExpressNo(deliveryInfoDto.getChannelDeliveryId());
             updateDeliveryInfoByIdRequest.setOrderSubState(DeliveryStatus.RIDERSTARTDELIVERY.getCode());
             updateDeliveryInfoByIdRequest.setBizType(BizTypeEnum.MALL.getBizType());
+            updateDeliveryInfoByIdRequest.setPartnerId(orderBean.getCompanyId());
             orderCenterSdkService.updateDeliveryInfoById(updateDeliveryInfoByIdRequest);
 
             /**
@@ -744,6 +744,7 @@ public class MallOrderServiceImpl implements MallOrderService {
              */
             POSOrderOperationBaseReq directDeliveryReq = new POSOrderOperationBaseReq();
             directDeliveryReq.setOrderCode(orderBean.getOid());
+            directDeliveryReq.setPartnerId(orderBean.getCompanyId());
             orderSdkService.directDelivery(directDeliveryReq, trackingNo);
             return true;
         } catch (Exception e) {
@@ -980,6 +981,7 @@ public class MallOrderServiceImpl implements MallOrderService {
             request.setOrderCode(baseQueryOrderRequest.getOrderId());
             request.setOrderState(NewOrderStatus.COMPLETE.getIndex());
             request.setOperator(assortmentCustomerInfoVo.getNickName());
+            request.setPartnerId(orderBean.getCompanyId());
             request.setTaskType(Arrays.asList((byte) 5));
             request.setRemark("已完成");
             orderSdkService.updateOrderState(request, baseQueryOrderRequest.getTrackingNo());

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

@@ -417,7 +417,7 @@ public class OrderServiceImpl implements Orderservice {
                         });
                     });
                     // 更新订单信息
-                    OrderEditRequest editReq = new OrderEditRequest(orderBean.getOid(), orderBean.getExtInfo());
+                    OrderEditRequest editReq = new OrderEditRequest(orderBean.getOid(), orderBean.getExtInfo(), orderBean.getCompanyId());
                     editReq.setPayChannel(PayChannelType.COMB.getEbcode());
                     editReq.setPayChannelName(PayChannelType.COMB.getName());
                     editReq.setPayChannelType(PayChannelType.COMB.getIndex());

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

@@ -21,15 +21,18 @@ import cn.freemud.entities.vo.CreateOrderResponseVo;
 import cn.freemud.entities.vo.PaysuccessNoticeMessage;
 import cn.freemud.entities.vo.order.CreateOrderUnionPayCardVo;
 import cn.freemud.entities.vo.order.PlugInParameter;
-import cn.freemud.enums.*;
+import cn.freemud.enums.PayChannel;
+import cn.freemud.enums.PaySuccessSource;
+import cn.freemud.enums.ResponseResult;
+import cn.freemud.enums.TradeState;
 import cn.freemud.interceptor.ServiceException;
 import cn.freemud.management.entities.dto.request.BatchOrderRefundV2Request;
 import cn.freemud.management.entities.dto.request.pay.PayRefundRequestDto;
 import cn.freemud.management.entities.dto.request.pay.PaymentQueryOrderRequestDto;
-import cn.freemud.management.entities.dto.response.pay.*;
-import cn.freemud.management.entities.dto.response.pay.PaymentQueryOrderResponseDto;
-import cn.freemud.management.entities.dto.response.pay.PayRefundResponseDto;
+import cn.freemud.management.entities.dto.response.pay.OrderRefundResponse;
+import cn.freemud.management.entities.dto.response.pay.PayBatchRefundResponse;
 import cn.freemud.management.entities.dto.response.pay.PayRefundData;
+import cn.freemud.management.entities.dto.response.pay.PaymentQueryOrderResponseDto;
 import cn.freemud.management.enums.PaymentRefundStatus;
 import cn.freemud.management.thirdparty.MulitiPaymentClient;
 import cn.freemud.management.thirdparty.OMSPaymentClient;
@@ -367,6 +370,7 @@ public class PayServiceImpl {
         orderExtInfoDto.setPhone(assortmentCustomerInfoVo.getMobile());
         orderExtInfoDto.setAppid(wxAppId);
         UpdateOrderReq updateOrderReq = new UpdateOrderReq();
+        updateOrderReq.setPartnerId(orderBean.getCompanyId());
         updateOrderReq.setOrderCode(orderBean.getOid());
         updateOrderReq.setExtInfo(JSONObject.toJSONString(orderExtInfoDto));
         com.freemud.application.sdk.api.ordercenter.response.OrderBaseResp response = orderSdkService.editOrder(updateOrderReq, LogThreadLocal.getTrackingNo());
@@ -985,7 +989,7 @@ public class PayServiceImpl {
         orderExtInfo.setPrepayId(prepayId);
 
         OrderEditRequest orderEditRequest = new OrderEditRequest(orderPayResponse.getPayTransId(),
-                JSONObject.toJSONString(orderExtInfo));
+                JSONObject.toJSONString(orderExtInfo), orderBean.getCompanyId());
         orderEditRequest.setOrderId(orderBean.getOid());
         orderEditRequest.setTrackingNo(trackingNo);
         if (orderPayResponse.getPayChannelType() != null) {
@@ -1004,6 +1008,7 @@ public class PayServiceImpl {
         }
 
         UpdateOrderReq updateOrderReq = new UpdateOrderReq();
+        updateOrderReq.setPartnerId(orderBean.getCompanyId());
         updateOrderReq.setOrderCode(orderEditRequest.getOrderId());
         updateOrderReq.setExtInfo(orderEditRequest.getExtInfo());
         updateOrderReq.setOrderPayItem(orderEditRequest.getOrderPayItem());

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

@@ -272,6 +272,7 @@ public class PointsMallOrderServiceImpl implements PointsMallOrderService {
             }
             UpdateOrderReq request = new UpdateOrderReq();
             request.setOrderCode(orderCode);
+            request.setPartnerId(partnerId);
 //        request.setExtInfo(orderEdit.getExtInfo());
             request.setOrderPayItem(orderPayItemList);
 //        request.setPayChannel(orderEdit.getPayChannel());
@@ -553,6 +554,7 @@ public class PointsMallOrderServiceImpl implements PointsMallOrderService {
             request.setOrderCode(orderCode);
             request.setPayState(2);
             request.setOperator(nickName);
+            request.setPartnerId(partnerId);
             updateOrderStateResp = orderSdkService.orderAffirm(request, LogThreadLocal.getTrackingNo());
             if (Objects.equals(ResponseCodeConstant.RESPONSE_SUCCESS_STR, updateOrderStateResp.getCode())) {
                 //发券mq
@@ -562,6 +564,7 @@ public class PointsMallOrderServiceImpl implements PointsMallOrderService {
             PaySuccessReq request = new PaySuccessReq();
             request.setOrderCode(orderCode);
             request.setOperator(nickName);
+            request.setPartnerId(partnerId);
             updateOrderStateResp = orderSdkService.paySuccess(request, LogThreadLocal.getTrackingNo());
         }
         if (!Objects.equals(ResponseCodeConstant.RESPONSE_SUCCESS_STR, updateOrderStateResp.getCode())) {

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

@@ -37,7 +37,6 @@ import cn.freemud.service.CouponService;
 import cn.freemud.service.OrderFactoryService;
 import cn.freemud.service.business.OrderBusinessService;
 import cn.freemud.service.thirdparty.CouponOnlineClient;
-import cn.freemud.service.thirdparty.PaymentNewClient;
 import cn.freemud.service.thirdparty.PromotionDiscountClient;
 import cn.freemud.service.thirdparty.StoreItemClient;
 import cn.freemud.utils.AppLogUtil;
@@ -53,7 +52,6 @@ import com.freemud.application.sdk.api.log.ThirdPartyLog;
 import com.freemud.application.sdk.api.ordercenter.entities.v1.OrderBeanV1;
 import com.freemud.application.sdk.api.ordercenter.entities.v1.ProductBeanV1;
 import com.freemud.application.sdk.api.ordercenter.enums.CreateOrderSceneEnum;
-import com.freemud.application.sdk.api.ordercenter.enums.OrderType;
 import com.freemud.application.sdk.api.ordercenter.enums.*;
 import com.freemud.application.sdk.api.ordercenter.request.OrderChangeStateReq;
 import com.freemud.application.sdk.api.ordercenter.request.OrderExtInfoDto;
@@ -91,6 +89,7 @@ import org.springframework.stereotype.Service;
 import java.util.*;
 import java.util.concurrent.TimeUnit;
 
+import static com.freemud.application.sdk.api.ordercenter.enums.OrderType.*;
 import static com.freemud.sdk.api.assortment.order.domain.ResponseCodeConstant.RESPONSE_SUCCESS_STR;
 
 /**
@@ -856,7 +855,7 @@ public class SellCouponOrderServiceImpl implements OrderFactoryService {
         //实际支付现金金额，扣除支付自生优惠，单位分`
         request.setActualPayAmount(productBean.getFinalPrice());
         request.setOriginalAmount(productBean.getOriginalPrice());
-        request.setOrderType(OrderType.GENERAL_DINE_IN.getIndex());
+        request.setOrderType(GENERAL_DINE_IN.getIndex());
         //商品信息转换
         List<OrderItemCreateReq> orderItemList = new ArrayList<>();
         OrderItemCreateReq orderItemCreateReq = new OrderItemCreateReq();
@@ -983,7 +982,7 @@ public class SellCouponOrderServiceImpl implements OrderFactoryService {
         //实际支付现金金额，扣除支付自生优惠，单位分`
         request.setActualPayAmount(active.getSalePrice().longValue());
         request.setOriginalAmount(active.getVoucherFaceValue().longValue());
-        request.setOrderType(OrderType.GENERAL_DINE_IN.getIndex());
+        request.setOrderType(GENERAL_DINE_IN.getIndex());
         //商品信息转换
         List<OrderItemCreateReq> orderItemList = new ArrayList<>();
         OrderItemCreateReq orderItemCreateReq = new OrderItemCreateReq();
@@ -1073,6 +1072,7 @@ public class SellCouponOrderServiceImpl implements OrderFactoryService {
         request.setOrderCode(orderBean.getOid());
         request.setOrderState(NewOrderStatus.COMPLETE.getIndex());
         request.setOperator(orderBean.getUserName());
+        request.setPartnerId(orderBean.getCompanyId());
         request.setRemark("已完成");
         OrderBaseResp updateOrderStateResp = orderSdkService.updateOrderState(request, LogThreadLocal.getTrackingNo());
         orderSdkAdapter.convent2BaseOrderResponse(updateOrderStateResp);

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

 package cn.freemud.service.universal;
 
 import cn.freemud.adapter.CreateOrderAdapter;
-import cn.freemud.amqp.Header;
-import cn.freemud.amqp.MQAction;
-import cn.freemud.amqp.MQMessage;
 import cn.freemud.amqp.MQService;
 import cn.freemud.base.entity.BaseResponse;
 import cn.freemud.base.util.DateUtil;
@@ -39,7 +36,6 @@ import cn.freemud.utils.AppLogUtil;
 import cn.freemud.utils.BeanUtil;
 import cn.freemud.utils.ResponseUtil;
 import cn.freemud.utils.ValidationCode;
-import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.freemud.api.assortment.datamanager.entity.db.AssortmentOpenPlatformIappWxappStore;
 import com.freemud.api.assortment.datamanager.entity.db.AssortmentOpenPlatformPartner;
@@ -60,7 +56,6 @@ import com.freemud.application.sdk.api.membercenter.request.UserScoreRequest;
 import com.freemud.application.sdk.api.membercenter.service.MemberScoreService;
 import com.freemud.application.sdk.api.ordercenter.entities.v1.OrderBeanV1;
 import com.freemud.application.sdk.api.ordercenter.enums.AfterSalesType;
-import com.freemud.application.sdk.api.ordercenter.enums.MarketTypeEnum;
 import com.freemud.application.sdk.api.ordercenter.enums.OrderClientType;
 import com.freemud.application.sdk.api.ordercenter.enums.PayChannelType;
 import com.freemud.application.sdk.api.ordercenter.request.OrderCancelReq;
@@ -80,7 +75,9 @@ import com.freemud.sdk.api.assortment.order.adapter.OrderSdkAdapter;
 import com.freemud.sdk.api.assortment.order.entities.promption.ActivityUpdateStockRequest;
 import com.freemud.sdk.api.assortment.order.enums.AutoOrderConfigTime;
 import com.freemud.sdk.api.assortment.order.enums.StockChangeType;
-import com.freemud.sdk.api.assortment.order.request.order.*;
+import com.freemud.sdk.api.assortment.order.request.order.CancelOrderRequest;
+import com.freemud.sdk.api.assortment.order.request.order.OrderEditRequest;
+import com.freemud.sdk.api.assortment.order.request.order.PaymentRequest;
 import com.freemud.sdk.api.assortment.order.response.order.BaseOrderResponse;
 import com.freemud.sdk.api.assortment.order.response.order.CreateOrderResponse;
 import com.freemud.sdk.api.assortment.order.service.OrderCenterSdkService;
@@ -758,7 +755,7 @@ public abstract class UniversalOrderService {
         orderExtInfo.setPrepayId(prepayId);
 
         OrderEditRequest orderEditRequest = new OrderEditRequest(orderPayResponse.getPayTransId(),
-                JSONObject.toJSONString(orderExtInfo));
+                JSONObject.toJSONString(orderExtInfo), orderBean.getCompanyId());
         orderEditRequest.setOrderId(orderBean.getOid());
         orderEditRequest.setTrackingNo(trackingNo);
         if (orderPayResponse.getPayChannelType() != null) {

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

@@ -120,7 +120,7 @@ public class AppOrderService extends UniversalOrderService {
 
 
     private BaseResponse updateOrderExtInfo(OrderBeanV1 orderBean, OrderExtInfoDto orderExtInfo, String trackingNo) {
-        OrderEditRequest orderEditRequest = new OrderEditRequest(orderBean.getOid(), JSONObject.toJSONString(orderExtInfo));
+        OrderEditRequest orderEditRequest = new OrderEditRequest(orderBean.getOid(), JSONObject.toJSONString(orderExtInfo), orderBean.getCompanyId());
         orderEditRequest.setTrackingNo(trackingNo);
         BaseOrderResponse baseOrderResponse = orderCenterSdkService.orderEdit(orderEditRequest);
         if (!ObjectUtils.equals(ResponseCodeConstant.RESPONSE_SUCCESS, baseOrderResponse.getErrcode())) {

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

@@ -352,7 +352,7 @@ public class SaasMallOrderService extends UniversalOrderService {
         orderExtInfo.setPrepayId(prepayId);
 
         OrderEditRequest orderEditRequest = new OrderEditRequest(orderPayResponse.getPayTransId(),
-                JSONObject.toJSONString(orderExtInfo));
+                JSONObject.toJSONString(orderExtInfo), orderBean.getCompanyId());
         orderEditRequest.setOrderId(orderBean.getOid());
         orderEditRequest.setTrackingNo(trackingNo);
         BaseOrderResponse baseOrderResponse = orderCenterSdkService.orderEdit(orderEditRequest);

order-management/src/main/java/cn/freemud/management/service/OrderBaseService.java

@@ -109,7 +109,7 @@ public class OrderBaseService {
      * @param orderCode
      * @param deliveryId
      */
-    public void updateDeliverySuccess(String orderCode, String deliveryId, String operator) {
+    public void updateDeliverySuccess(String orderCode, String deliveryId, String operator, String partnerId) {
         // 创建配送单成功
         UpdateDeliveryInfoByIdRequest updateDeliveryInfoByIdRequest = new UpdateDeliveryInfoByIdRequest();
         updateDeliveryInfoByIdRequest.setDeliveryId(deliveryId);
@@ -118,6 +118,7 @@ public class OrderBaseService {
         operator = StringUtils.isNotBlank(operator) ? operator : "sys";
         updateDeliveryInfoByIdRequest.setOperator(operator);
         updateDeliveryInfoByIdRequest.setRemark("创建运单成功");
+        updateDeliveryInfoByIdRequest.setPartnerId(partnerId);
         orderCenterSdkService.updateDeliveryInfoById(updateDeliveryInfoByIdRequest);
     }
 }

order-management/src/main/java/cn/freemud/management/service/adapter/OrderManagerAdapter.java

@@ -142,7 +142,7 @@ public class OrderManagerAdapter {
         }
         //订单接单参数校验
         BaseResponse verifyResponse;
-        if(BizTypeEnum.MALL.getBizType()==orderBean.getBizType()){
+        if(BizTypeEnum.MALL.getBizType().compareTo(orderBean.getBizType()) == 0){
             verifyResponse = orderVerifyHandle.mallOrderRejectVerify(orderBean, request);
         }else {
             if (!macCafePartnerId.equals(orderBean.getCompanyId())) {

order-management/src/main/java/cn/freemud/management/service/handle/DeliveryHandle.java

@@ -109,7 +109,7 @@ public class DeliveryHandle {
             return ResponseUtil.error(deliveryResponse == null ? "调用配送服务失败" : deliveryResponse.getMsg());
         }
         // 创建配送单成功
-        orderBaseService.updateDeliverySuccess(orderBean.getOid(), deliveryResponse.getData().getDeliveryId(), operator);
+        orderBaseService.updateDeliverySuccess(orderBean.getOid(), deliveryResponse.getData().getDeliveryId(), operator, orderBean.getCompanyId());
         return ResponseUtil.success();
     }
 

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

@@ -12,14 +12,14 @@
  */
 package com.freemud.application.sdk.api.ordercenter.request;
 
-import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.math.BigDecimal;
 
 @Data
 public class OrderAffirmReq {
-
+    // 商户号
+    private String partnerId;
     /**
      * 实际支付金额
      */

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

@@ -20,6 +20,8 @@ import java.util.List;
 
 @Data
 public class PaySuccessReq {
+    // 商户号
+    private String partnerId;
 
     //订单编号
     private  String orderCode;

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

@@ -10,6 +10,8 @@ import lombok.Data;
 @Data
 public class UpdateDownstreamOrderCodeReq {
 
+    private String partnerId;
+
     private String orderCode;
 
     private String downstreamPosCode;

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

@@ -19,7 +19,8 @@ import java.util.List;
 
 @Data
 public class UpdateOrderReq {
-
+    // 商户号
+    private String partnerId;
     //订单编号
     private String orderCode;
 

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

@@ -629,6 +629,7 @@ public class OrderSdkService {
      * @param trackingNo
      * @return
      */
+    @Deprecated
     public OrderBaseResp updateThirdOrderCode(SdkNewOrderUpdateThirdOrderCodeReq sdkNewOrderUpdateThirdOrderCodeReq, String trackingNo) {
         OrderBaseResp responseDTO = RequestThirdPartyUtils.httpJsonReqComplexNew(restTemplate, InterfaceAddressConstant.UPDATE_THIRD_ORDER_CODE,
                 createBaseRequest(sdkNewOrderUpdateThirdOrderCodeReq, trackingNo), new ParameterizedTypeReference<OrderBaseResp>() {