完成状态中英文切换

order-application-service/src/main/java/cn/freemud/entities/dto/CreateSpellGroupOrderDto.java

 package cn.freemud.entities.dto;
 
 import cn.freemud.entities.vo.CreateSpellGroupOrderReq;
+import com.freemud.application.sdk.api.ordercenter.request.create.DeliveryContactInfoCreateReq;
 import lombok.Data;
 
+import java.util.List;
+
 /**
  * @author freemud
  * @title: CreateSpellGroupOrderDto
@@ -22,5 +25,7 @@ public class CreateSpellGroupOrderDto extends CreateSpellGroupOrderReq {
 
     private String mobile;
 
+    List<DeliveryContactInfoCreateReq> deliveryContactInfoCreateReqList;
+
 
 }

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

@@ -52,6 +52,7 @@ import com.freemud.application.sdk.api.membercenter.response.QueryReceiveAddress
 import com.freemud.application.sdk.api.membercenter.service.MemberCenterService;
 import com.freemud.application.sdk.api.membercenter.service.MemberPropertyService;
 import com.freemud.application.sdk.api.ordercenter.enums.PayChannelType;
+import com.freemud.application.sdk.api.ordercenter.request.create.DeliveryContactInfoCreateReq;
 import com.freemud.application.sdk.api.paymentcenter.client.request.SVCCardAmountRequest;
 import com.freemud.application.sdk.api.paymentcenter.client.response.SVCCardAmountResponse;
 import com.freemud.application.sdk.api.paymentcenter.client.service.PaymentNewService;
@@ -917,7 +918,7 @@ public class CheckOrder {
     }
 
     /**
-     * 校验收货地址是否可配送
+     * 校验拼团订单收货地址
      */
     public void checkSpellGroupOrderReceiveAddress(String receiveId,String partnerId , String trackingNo,CreateSpellGroupOrderDto createSpellGroupOrderDto) {
         //校验收货地址是否可配送
@@ -927,26 +928,19 @@ public class CheckOrder {
             throw new ServiceException(ResponseResult.USER_GETRECEIVEADDRESS_ERROR);
         }
         QueryReceiveAddressResponse receiveAddressResult = queryReceiveAddressResponse.getData();
-        UserDeliveryInfoDto userDeliveryInfoDto = storeService.getUserDeliveryInfo(null, receiveAddressResult.getLongitude(),
-                receiveAddressResult.getLatitude());
-        if (!userDeliveryInfoDto.getUserEnableTakeaway()) {
-            throw new ServiceException(ResponseResult.ORDER_TAKE_OUT_ADDRESS_NOT_DELIVERY);
-        }
+        DeliveryContactInfoCreateReq deliveryContactInfoCreateReq = new DeliveryContactInfoCreateReq();
+        deliveryContactInfoCreateReq.setRelateObjectType(1);
+        deliveryContactInfoCreateReq.setAddressDetail(receiveAddressResult.getReceiveAddress());
+        deliveryContactInfoCreateReq.setInfoType(1);
+        deliveryContactInfoCreateReq.setLatitude(new BigDecimal(receiveAddressResult.getLatitude()));
+        deliveryContactInfoCreateReq.setLongitude(new BigDecimal(receiveAddressResult.getLongitude()));
+        deliveryContactInfoCreateReq.setMobile(StringUtils.isEmpty(receiveAddressResult.getMobile()) ? receiveAddressResult.getReceiveMobile() : receiveAddressResult.getMobile());
+        deliveryContactInfoCreateReq.setContactsName(receiveAddressResult.getReceiveName());
 
-        userDeliveryInfoDto.setReceiveUserName(receiveAddressResult.getReceiveName());
-        userDeliveryInfoDto.setReceiveMobile(StringUtils.isEmpty(receiveAddressResult.getMobile()) ? receiveAddressResult.getReceiveMobile() : receiveAddressResult.getMobile());
-        String receiveAddress = receiveAddressResult.getReceiveAddress();
-        if (StringUtils.isNotBlank(receiveAddress)) {
-            userDeliveryInfoDto.setReceiveAddress(receiveAddress);
-            if (receiveAddress.contains("officeName") && receiveAddress.contains("address")) {
-                JSONObject jsonObject = JSONObject.parseObject(receiveAddress);
-                userDeliveryInfoDto.setReceiveOfficeName(jsonObject.getString("officeName"));
-                userDeliveryInfoDto.setReceiveAddress(jsonObject.getString("address"));
-            }
-        }
         createSpellGroupOrderDto.setUserName(receiveAddressResult.getReceiveName());
         createSpellGroupOrderDto.setMobile(StringUtils.isEmpty(receiveAddressResult.getMobile()) ? receiveAddressResult.getReceiveMobile() : receiveAddressResult.getMobile());
-        createSpellGroupOrderDto.setUserDeliveryInfoDto(userDeliveryInfoDto);
+        createSpellGroupOrderDto.getDeliveryContactInfoCreateReqList().add(deliveryContactInfoCreateReq);
+
     }
 
 

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

@@ -406,9 +406,10 @@ public class OrderServiceImpl implements Orderservice {
 
 
         //查询配送地址等信息
-//        checkReceiveAddress
         checkOrder.checkSpellGroupOrderReceiveAddress(createSpellGroupOrderReq.getReceiveId(),createSpellGroupOrderReq.getPartnerId(),trackingNo,createSpellGroupOrderDto);
 
+        //查询商品信息
+
 
         // 查询小程序自提外卖配置信息 校验当前订单类型的下单参数 校验外卖是否满足起送条件
         Integer pushOrderTime = checkOrder.checkOrderByOrderType(createOrderVo, userLoginInfoDto, storeResponseDto, shoppingCartGoodsDto, trackingNo);