Commit c6e35a53 by zhiheng.zhang

周四版本有售后单的不显示按钮

parent 3d6b0c74
......@@ -249,7 +249,7 @@ public class OrderSdkAdapter {
deliveryContactInfoCreateReq.setRelateObjectType(1);
//联系方式类型 1:取件 2:收件
deliveryContactInfoCreateReq.setInfoType(1);
deliveryContactInfoCreateReq.setContactsName(requestVO.getUserName());
deliveryContactInfoCreateReq.setContactsName(requestVO.getContactsName());
deliveryContactInfoCreateReq.setMobile(requestVO.getPhone());
deliveryContactInfoCreateReq.setLatitude(StringUtils.isBlank(requestVO.getLatitude()) ? null : new BigDecimal(requestVO.getLatitude()));
deliveryContactInfoCreateReq.setLongitude(StringUtils.isBlank(requestVO.getLongitude()) ? null : new BigDecimal(requestVO.getLongitude()));
......
......@@ -42,6 +42,10 @@ public class BaseCreateOrderRequest extends BaseConfig {
*/
private String userName;
/**
* 收货名姓名
*/
private String contactsName;
/**
* 三方单号
*/
private String thirdOrderCode;
......
......@@ -675,7 +675,7 @@ public class OrderAdapter {
orderType = OrderType.MALL.getCode();
receiveAddress = (userDeliveryInfoDto != null ? userDeliveryInfoDto.getReceiveProvince()+userDeliveryInfoDto.getReceiveCity()+userDeliveryInfoDto.getReceiveRegion()+ userDeliveryInfoDto.getReceiveAddress() : "");
createOrderVo.setMobile(userDeliveryInfoDto.getReceiveMobile());
createOrderVo.setUserName(userDeliveryInfoDto.getReceiveUserName());
createOrderVo.setContactsName(userDeliveryInfoDto.getReceiveUserName());
} else {
throw new ServiceException(ResponseResult.PARAMETER_MISSING, "非法的订单类型");
}
......
......@@ -447,4 +447,9 @@ public class CreateOrderVo {
* 使用户省份code 100010 这是微信选择地址传过来的,用户查询配送费用的, 并不是北京市这种给是
*/
private String province;
/**
* 收货名姓名
*/
private String contactsName;
}
......@@ -117,8 +117,6 @@ public class MallOrderServiceImpl implements MallOrderService {
@Autowired
private OrderAdapter orderAdapter;
@Autowired
private OrderAdapter mallOrderAdapter;
@Autowired
private ItemServiceImpl itemService;
@Autowired
private ShoppingCartClient shoppingCartClient;
......@@ -271,7 +269,7 @@ public class MallOrderServiceImpl implements MallOrderService {
OrderExtendedReq orderExtendedReq = orderAdapter.saveStoreInfo(storeResponseDto);
//创建普通订单
Function<Object, CreateOrderResponse> createOrder = (var -> {
BaseCreateOrderRequest baseCreateOrderRequest = mallOrderAdapter.convent2CreateOrderDto(createOrderVo, shoppingCartGoodsDto,storeResponseDto);
BaseCreateOrderRequest baseCreateOrderRequest = orderAdapter.convent2CreateOrderDto(createOrderVo, shoppingCartGoodsDto,storeResponseDto);
//查询第三方商品编号
baseCreateOrderRequest = getProductCustomerCode(baseCreateOrderRequest);
//保存门店渠道信息
......@@ -284,6 +282,7 @@ public class MallOrderServiceImpl implements MallOrderService {
mqMessageRequest.setBackOrdersNotifyActivityExchange(backOrdersNotifyActivityExchange);
mqMessageRequest.setBackOrdersNotifyActivityQueue(backOrdersChangeOrderStatusConsumerQueue);
createOrderRequest.setMqMessageRequest(mqMessageRequest);
createOrderRequest.getBaseCreateOrderRequest().setUserName(userLoginInfoDto.getNickName());
createOrderRequest.setTrackingNo(LogThreadLocal.getTrackingNo());
return orderCenterSdkService.createOrderFlow(createOrderRequest);
});
......
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