Merge remote-tracking branch 'origin/master'

lb-app/src/main/java/com/ydd/app/service/impl/OpenApiOrderValuationServiceImpl.java

@@ -58,6 +58,8 @@ public class OpenApiOrderValuationServiceImpl implements OpenApiOrderValuationSe
 
     private final IShopService iShopService;
 
+    private final IMerchantService iMerchantService;
+
     private final IMemberService iMemberService;
 
     private final IProductService iProductService;
@@ -732,12 +734,19 @@ public class OpenApiOrderValuationServiceImpl implements OpenApiOrderValuationSe
             valuationReq.setSendHouseNumber(shop.getStreet());
             valuationReq.setSendLat(shop.getLat());
             valuationReq.setSendLng(shop.getLng());
+            valuationReq.setSendCityCode(shop.getCityCode());
 
             valuationDto.setShopId(shop.getId());
             valuationDto.setShopName(shop.getName());
             valuationDto.setMerchantId(shop.getMerchantId());
         }
         BeanUtils.copyProperties(valuationReq, valuationDto);
+        if (valuationDto.getMerchantId() != null) {
+            Merchant merchant = iMerchantService.getById(valuationDto.getMerchantId());
+            if (merchant == null) {
+                return ResponseResult.error(ResponseResultCodeEnum.MERCHANT_DISABLE);
+            }
+        }
         return result;
     }