修改更新第三方订单号位置

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

@@ -826,17 +826,6 @@ public class MCCafeOrderServiceImpl implements MCCafeOrderService {
             return sendPaySuccessNoticeMessage();
         }
 
-        String downstreamThirdOrderCode = "";
-        if(OldOrderType.TAKE_OUT.getCode().equals(orderBean.getType())) {
-            //调用基础订单接口更新信息
-            UpdateDownstreamOrderCodeReq updateDownstreamOrderCodeReq = new UpdateDownstreamOrderCodeReq();
-            updateDownstreamOrderCodeReq.setOrderCode(orderBean.getOid());
-            com.freemud.application.sdk.api.ordercenter.response.BaseResponse baseResponse = orderSdkService.updateDownstreamThirdOrderCode(updateDownstreamOrderCodeReq, LogThreadLocal.getTrackingNo());
-
-            LinkedHashMap<String, String> linkedHashMap = (LinkedHashMap) baseResponse.getResult();
-            downstreamThirdOrderCode = linkedHashMap.get("downstreamThirdOrderCode");
-        }
-
         // 如果是到店，则冻结优惠券
         // 如果是外卖，则核销优惠券
         // 失败重试三次
@@ -879,6 +868,19 @@ public class MCCafeOrderServiceImpl implements MCCafeOrderService {
         }
         // 订单支付成功
         com.freemud.sdk.api.assortment.order.response.order.PayAccessResponse payAccessRes = orderCenterSdkService.payAccessMCCafe(var1);
+
+        //调用基础服务生成第三方订单号
+        String downstreamThirdOrderCode = "";
+        if(OldOrderType.TAKE_OUT.getCode().equals(orderBean.getType())) {
+            //调用基础订单接口更新信息
+            UpdateDownstreamOrderCodeReq updateDownstreamOrderCodeReq = new UpdateDownstreamOrderCodeReq();
+            updateDownstreamOrderCodeReq.setOrderCode(orderBean.getOid());
+            com.freemud.application.sdk.api.ordercenter.response.BaseResponse baseResponse = orderSdkService.updateDownstreamThirdOrderCode(updateDownstreamOrderCodeReq, LogThreadLocal.getTrackingNo());
+
+            LinkedHashMap<String, String> linkedHashMap = (LinkedHashMap) baseResponse.getResult();
+            downstreamThirdOrderCode = linkedHashMap.get("downstreamThirdOrderCode");
+        }
+
         String string2 = JSONObject.toJSONString(payAccessRes);
         JSONObject jsonObject2 = JSONObject.parseObject(string2);
         payAccessResponse = jsonObject2.toJavaObject(PayAccessResponse.class);