Commit 14e32a14 by xiaoer.li@freemud.com

debug

parent b6f253cc
...@@ -73,6 +73,7 @@ import com.freemud.sdk.api.assortment.payment.response.UnifiedOrderResponse; ...@@ -73,6 +73,7 @@ import com.freemud.sdk.api.assortment.payment.response.UnifiedOrderResponse;
import com.google.common.collect.Lists; import com.google.common.collect.Lists;
import com.google.common.collect.Maps; import com.google.common.collect.Maps;
import com.google.gson.Gson; import com.google.gson.Gson;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.collections4.CollectionUtils;
import org.apache.commons.lang.ObjectUtils; import org.apache.commons.lang.ObjectUtils;
import org.apache.commons.lang.StringUtils; import org.apache.commons.lang.StringUtils;
...@@ -94,6 +95,7 @@ import java.util.stream.Collectors; ...@@ -94,6 +95,7 @@ import java.util.stream.Collectors;
import static cn.freemud.constant.OrderRefundConstant.ALLOW_REFUND; import static cn.freemud.constant.OrderRefundConstant.ALLOW_REFUND;
@Component @Component
@Slf4j
public class OrderAdapter { public class OrderAdapter {
private static FastDateFormat yyyyMMddHHmmss = FastDateFormat.getInstance("yyyy-MM-dd HH:mm:ss", Locale.CHINA); private static FastDateFormat yyyyMMddHHmmss = FastDateFormat.getInstance("yyyy-MM-dd HH:mm:ss", Locale.CHINA);
...@@ -607,16 +609,10 @@ public class OrderAdapter { ...@@ -607,16 +609,10 @@ public class OrderAdapter {
*/ */
public BaseCreateOrderRequest getCreateOrderDto(CreateOrderVo createOrderVo) { public BaseCreateOrderRequest getCreateOrderDto(CreateOrderVo createOrderVo) {
UserDeliveryInfoDto userDeliveryInfoDto = createOrderVo.getUserDeliveryInfoDto(); UserDeliveryInfoDto userDeliveryInfoDto = createOrderVo.getUserDeliveryInfoDto();
String deliveryType = ""; String deliveryType = userDeliveryInfoDto != null && userDeliveryInfoDto.getStoreDeliveryInfoDto() != null
if (userDeliveryInfoDto!=null) { ? userDeliveryInfoDto.getStoreDeliveryInfoDto().getDeliveryType() : "";
deliveryType = userDeliveryInfoDto != null && userDeliveryInfoDto.getStoreDeliveryInfoDto() != null createOrderVo.setUserDeliveryInfoDto(userDeliveryInfoDto);
? userDeliveryInfoDto.getStoreDeliveryInfoDto().getDeliveryType() : ""; log.info("getCreateOrderDto sessionId:{},createOrderVo:{}",createOrderVo.getSessionId(),JSON.toJSONString(createOrderVo));
}
else {
deliveryType = userDeliveryInfoDto.getStoreDeliveryInfoDto() != null
? userDeliveryInfoDto.getStoreDeliveryInfoDto().getDeliveryType() : "";
}
Integer orderType; Integer orderType;
String receiveAddress = createOrderVo.getStoreAddress(); String receiveAddress = createOrderVo.getStoreAddress();
if (Objects.equals(createOrderVo.getOrderType(), CreateOrderType.TAKE_OUT.getCode())) { if (Objects.equals(createOrderVo.getOrderType(), CreateOrderType.TAKE_OUT.getCode())) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment