Commit f0760b42 by hanghang.wang

升级SDK,华莱士开团新增拓展字段配送城市编号

parent e0449b6e
...@@ -38,7 +38,7 @@ ...@@ -38,7 +38,7 @@
<dependency> <dependency>
<groupId>cn.freemud</groupId> <groupId>cn.freemud</groupId>
<artifactId>ordercenter-sdk</artifactId> <artifactId>ordercenter-sdk</artifactId>
<version>1.3.46.RELEASE</version> <version>2.9.11-SNAPSHOT</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.freemud.application.service.sdk</groupId> <groupId>com.freemud.application.service.sdk</groupId>
......
...@@ -149,7 +149,7 @@ public class SpellGroupOrderAdapter { ...@@ -149,7 +149,7 @@ public class SpellGroupOrderAdapter {
} }
public CreatePrepayRequestDto convertToCreatePrepayRequest( public CreatePrepayRequestDto convertToCreatePrepayRequest(
AssortmentCustomerInfoVo userLoginInfoDto, QueryOrdersResponse.DataBean.OrderBean data, String trackingNo AssortmentCustomerInfoVo userLoginInfoDto, QueryOrdersResponse.DataBean.OrderBean data, String trackingNo,String province
) { ) {
CreatePrepayRequestDto requestDto = new CreatePrepayRequestDto(); CreatePrepayRequestDto requestDto = new CreatePrepayRequestDto();
requestDto.setPartnerId(data.getParentCode()); requestDto.setPartnerId(data.getParentCode());
...@@ -159,6 +159,7 @@ public class SpellGroupOrderAdapter { ...@@ -159,6 +159,7 @@ public class SpellGroupOrderAdapter {
requestDto.setCardAmount(0); requestDto.setCardAmount(0);
OrderExtInfoDto orderExtInfoDto = new OrderExtInfoDto(); OrderExtInfoDto orderExtInfoDto = new OrderExtInfoDto();
orderExtInfoDto.setSessionId(userLoginInfoDto.getSessionId()); orderExtInfoDto.setSessionId(userLoginInfoDto.getSessionId());
orderExtInfoDto.setProvince(province);
requestDto.setOrderExtInfoDTO(orderExtInfoDto); requestDto.setOrderExtInfoDTO(orderExtInfoDto);
requestDto.setTransId(data.getOid()); requestDto.setTransId(data.getOid());
requestDto.setOrderClient(OrderClientType.getOrderClientType(Integer.valueOf(data.getOrderClient()))); requestDto.setOrderClient(OrderClientType.getOrderClientType(Integer.valueOf(data.getOrderClient())));
......
...@@ -185,7 +185,7 @@ public class SpellGroupOrderServiceImpl implements SpellGroupOrderService { ...@@ -185,7 +185,7 @@ public class SpellGroupOrderServiceImpl implements SpellGroupOrderService {
return ResponseUtil.error(baseOrderResponse.getErrcode().toString(), baseOrderResponse.getErrmsg(), null); return ResponseUtil.error(baseOrderResponse.getErrcode().toString(), baseOrderResponse.getErrmsg(), null);
} }
/*创建支付*/ /*创建支付*/
CreatePrepayRequestDto createPrepayRequestDto = spellGroupOrderAdapter.convertToCreatePrepayRequest(userLoginInfoDto, createOrderResponse.getData(), trackingNo); CreatePrepayRequestDto createPrepayRequestDto = spellGroupOrderAdapter.convertToCreatePrepayRequest(userLoginInfoDto, createOrderResponse.getData(), trackingNo,createSpellGroupOrderDto.getProvince());
return orderService.createPrepayOrder(createPrepayRequestDto); return orderService.createPrepayOrder(createPrepayRequestDto);
} }
......
...@@ -65,7 +65,7 @@ ...@@ -65,7 +65,7 @@
<dependency> <dependency>
<groupId>cn.freemud</groupId> <groupId>cn.freemud</groupId>
<artifactId>assortment-ordercenter-sdk</artifactId> <artifactId>assortment-ordercenter-sdk</artifactId>
<version>2.1.48-RELEASE</version> <version>2.3.03-SNAPSHOT</version>
<scope>provided</scope> <scope>provided</scope>
</dependency> </dependency>
<dependency> <dependency>
......
...@@ -12,6 +12,7 @@ ...@@ -12,6 +12,7 @@
*/ */
package com.freemud.application.sdk.api.ordercenter.request; package com.freemud.application.sdk.api.ordercenter.request;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data; import lombok.Data;
import java.util.Date; import java.util.Date;
...@@ -200,5 +201,10 @@ public class OrderExtInfoDto { ...@@ -200,5 +201,10 @@ public class OrderExtInfoDto {
*/ */
private String autoReceiveTime; private String autoReceiveTime;
/**
* 城市编号
*/
private String province;
} }
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