Merge branch 'feature/2.0.9-外卖拒单-lcf'

order-management/src/main/java/cn/freemud/management/adapter/WaimaiSdkAdapter.java

@@ -81,7 +81,7 @@ public class WaimaiSdkAdapter {
         cancelRequest.setOperator(request.getOperator());
         cancelRequest.setType(request.getReason_code() == null ? 11 : request.getReason_code());
         cancelRequest.setReason(request.getReason());
-        cancelRequest.setShopId(request.getStoreId());
+        cancelRequest.setShopId(orderBean.getShopId());
         cancelRequest.setOrderId(request.getOrderId());
         cancelRequest.setChannel(orderBean.getSource());
         cancelRequest.setCompanyId(request.getPartnerId());
@@ -102,7 +102,7 @@ public class WaimaiSdkAdapter {
         agreeOrderRequest.setChannel( orderBean.getSource() );
         agreeOrderRequest.setCompanyId(request.getPartnerId());
         agreeOrderRequest.setOrderId(orderBean.getOid());
-        agreeOrderRequest.setShopId(request.getStoreId());
+        agreeOrderRequest.setShopId(orderBean.getShopId());
         agreeOrderRequest.setOperator(request.getOperator());
         agreeOrderRequest.setReason(request.getReason());
         agreeOrderRequest.setAfterSalesCode(orderBean.getRefundList().get(0).getRid());