diff --git a/yudao-module-haoka/yudao-module-haoka-biz/src/main/java/cn/iocoder/yudao/module/haoka/controller/admin/ordersource/vo/OrderSourceSaveReqVO.java b/yudao-module-haoka/yudao-module-haoka-biz/src/main/java/cn/iocoder/yudao/module/haoka/controller/admin/ordersource/vo/OrderSourceSaveReqVO.java
index aff5d430c1..43ab9ba062 100644
--- a/yudao-module-haoka/yudao-module-haoka-biz/src/main/java/cn/iocoder/yudao/module/haoka/controller/admin/ordersource/vo/OrderSourceSaveReqVO.java
+++ b/yudao-module-haoka/yudao-module-haoka-biz/src/main/java/cn/iocoder/yudao/module/haoka/controller/admin/ordersource/vo/OrderSourceSaveReqVO.java
@@ -19,5 +19,8 @@ public class OrderSourceSaveReqVO {
     @Schema(description = "渠道ID", requiredMode = Schema.RequiredMode.REQUIRED)
     @NotNull(message = "渠道ID不能为空")
     private Long channel;
+    @Schema(description = "店铺ID", requiredMode = Schema.RequiredMode.REQUIRED)
+    @NotNull(message = "店铺ID不能为空")
+    private Long shopId;
 
 }
\ No newline at end of file
diff --git a/yudao-module-haoka/yudao-module-haoka-biz/src/main/java/cn/iocoder/yudao/module/haoka/service/orderCatch/DouDianOrderCatchServiceImpl.java b/yudao-module-haoka/yudao-module-haoka-biz/src/main/java/cn/iocoder/yudao/module/haoka/service/orderCatch/DouDianOrderCatchServiceImpl.java
index fa39394928..4dba2cf6b7 100644
--- a/yudao-module-haoka/yudao-module-haoka-biz/src/main/java/cn/iocoder/yudao/module/haoka/service/orderCatch/DouDianOrderCatchServiceImpl.java
+++ b/yudao-module-haoka/yudao-module-haoka-biz/src/main/java/cn/iocoder/yudao/module/haoka/service/orderCatch/DouDianOrderCatchServiceImpl.java
@@ -381,7 +381,7 @@ public class DouDianOrderCatchServiceImpl implements OrderCatchService {
             ordersSaveReqVO.setSellerMemo("《已抓单》");
             ordersService.createOrders(ordersSaveReqVO);
             OrderAddOrderRemarkParam param = new OrderAddOrderRemarkParam();
-            param.setOrderId(ordersDO.getUpstreamOrderId());
+            param.setOrderId(ordersDO.getRealSourceId());
             param.setRemark("《已抓单》");
             addOrderRemark(param);
         }
@@ -581,7 +581,7 @@ public class DouDianOrderCatchServiceImpl implements OrderCatchService {
                 ordersSaveReqVO.setSellerMemo("《已抓单》");
                 ordersService.createOrders(ordersSaveReqVO);
                 OrderAddOrderRemarkParam param = new OrderAddOrderRemarkParam();
-                param.setOrderId(ordersDO.getUpstreamOrderId());
+                param.setOrderId(ordersDO.getRealSourceId());
                 param.setRemark("《已抓单》");
                 addOrderRemark(param);
             }
@@ -759,24 +759,28 @@ public class DouDianOrderCatchServiceImpl implements OrderCatchService {
      * 给订单返回备注
      */
     public void addOrderRemark(OrderAddOrderRemarkParam param){
-        OrderAddOrderRemarkRequest request = new OrderAddOrderRemarkRequest();
+        try {
+            OrderAddOrderRemarkRequest request = new OrderAddOrderRemarkRequest();
 //        OrderAddOrderRemarkParam param = request.getParam();
 //        param.setOrderId("6496679971677798670");
 //        param.setRemark("这是具体的备注内容");
 //        param.setIsAddStar("true");
 //        param.setStar("2");
-        request.setParam(param);
-        GlobalConfig.initAppKey(SYNC_APP_KEY);
-        GlobalConfig.initAppSecret(SYNC_APP_SECRET);
+            request.setParam(param);
+            GlobalConfig.initAppKey(SYNC_APP_KEY);
+            GlobalConfig.initAppSecret(SYNC_APP_SECRET);
 //入参为code
-        AccessToken accessToken= AccessTokenBuilder.build(SYNC_SHOP_ID);
-        OrderAddOrderRemarkResponse response = request.execute(accessToken);
-        if("10000".equals(response.getCode())){
-// 加入备注成功
-            log.error("加入备注成功,{}",response.getMsg());
-        }else {
-//            加入备注失败
-            log.error("加入备注失败,{}",response.getMsg());
+            AccessToken accessToken= AccessTokenBuilder.build(SYNC_SHOP_ID);
+            OrderAddOrderRemarkResponse response = request.execute(accessToken);
+            if("10000".equals(response.getCode())){
+    // 加入备注成功
+                log.error("加入备注成功,{}",response.getMsg());
+            }else {
+    //            加入备注失败
+                log.error("加入备注失败,{}",response.getMsg());
+            }
+        } catch (Exception e) {
+            log.error("执行加入备注失败,{}",e.getMessage());
         }
     }
 
diff --git a/yudao-module-haoka/yudao-module-haoka-biz/src/main/java/cn/iocoder/yudao/module/haoka/service/orders/OrdersServiceImpl.java b/yudao-module-haoka/yudao-module-haoka-biz/src/main/java/cn/iocoder/yudao/module/haoka/service/orders/OrdersServiceImpl.java
index 3fc6eab03d..920bd746f8 100644
--- a/yudao-module-haoka/yudao-module-haoka-biz/src/main/java/cn/iocoder/yudao/module/haoka/service/orders/OrdersServiceImpl.java
+++ b/yudao-module-haoka/yudao-module-haoka-biz/src/main/java/cn/iocoder/yudao/module/haoka/service/orders/OrdersServiceImpl.java
@@ -370,7 +370,7 @@ public class OrdersServiceImpl extends ServiceImpl<OrdersMapper, OrdersDO> imple
             String sellerMemo1 = updateObj.getSellerMemo();
             if(StringUtils.isNotBlank(sellerMemo) && StringUtils.isNotBlank(sellerMemo1) && !sellerMemo.equals(sellerMemo1)){
                 OrderAddOrderRemarkParam param = new OrderAddOrderRemarkParam();
-                param.setOrderId(oldOrderDo.getUpstreamOrderId());
+                param.setOrderId(oldOrderDo.getRealSourceId());
                 param.setRemark(sellerMemo1);
                 Long flag = updateObj.getFlag();
                 if(null != flag){