美团到店自取单

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

@@ -325,12 +325,16 @@ public class ApiWaimaiServiceImpl implements ApiWaimaiService {
             if (waimaiOrder.getPickType() == null) {
                 waimaiOrder.setPickType(0);
             }
-            ResObject<String> res = meituanClient.getRealRecipientAddress(shopWaimai.getAuthToken(), orderVo.getOrderId());
+            String recipientAddressDesensitization = orderVo.getRecipientAddressDesensitization();
             String recipientAddress = orderVo.getRecipientAddress();
-            if (res.getCode() == 0) {
-                recipientAddress = res.getData();
+            if(!recipientAddressDesensitization.contains("到店自取")){
+                ResObject<String> res = meituanClient.getRealRecipientAddress(shopWaimai.getAuthToken(), orderVo.getOrderId());
+                if (res.getCode() == 0) {
+                    recipientAddress = res.getData();
+                }
+            }else{
+                waimaiOrder.setPickType(1);
             }
-            String recipientAddressDesensitization = orderVo.getRecipientAddressDesensitization();
             if (recipientAddress.contains("@#")) {
                 recipientAddress = recipientAddress.substring(0, recipientAddress.indexOf("@#"));
             }