Commit 9addf12b by haibo.jiang

增加订单支付类型

parent fd61cca6
...@@ -173,6 +173,7 @@ public class OrderSdkAdapter { ...@@ -173,6 +173,7 @@ public class OrderSdkAdapter {
request.setPayTime(requestVO.getPayTime()); request.setPayTime(requestVO.getPayTime());
request.setThirdStoreId(requestVO.getThirdShopId()); request.setThirdStoreId(requestVO.getThirdShopId());
request.setThirdOrderCode(requestVO.getThirdOrderCode()); request.setThirdOrderCode(requestVO.getThirdOrderCode());
request.setPayChannelType(requestVO.getPayChannelType());
if (requestVO.getOrderStatus() != null) { if (requestVO.getOrderStatus() != null) {
request.setOrderState(getNewOrderStatus(requestVO.getOrderStatus().getCode())); request.setOrderState(getNewOrderStatus(requestVO.getOrderStatus().getCode()));
} }
......
...@@ -159,6 +159,8 @@ public class BaseCreateOrderRequest extends BaseConfig { ...@@ -159,6 +159,8 @@ public class BaseCreateOrderRequest extends BaseConfig {
*/ */
private String region; private String region;
private Byte payChannelType;
@Data @Data
public static class DeliveryTypeInfo { public static class DeliveryTypeInfo {
/** /**
......
...@@ -40,7 +40,7 @@ ...@@ -40,7 +40,7 @@
<dependency> <dependency>
<groupId>cn.freemud</groupId> <groupId>cn.freemud</groupId>
<artifactId>assortment-ordercenter-sdk</artifactId> <artifactId>assortment-ordercenter-sdk</artifactId>
<version>1.4.2.RELEASE</version> <version>1.4.3.RELEASE</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.freemud.application.service.sdk</groupId> <groupId>com.freemud.application.service.sdk</groupId>
......
...@@ -255,6 +255,7 @@ public class OrderAdapter { ...@@ -255,6 +255,7 @@ public class OrderAdapter {
activityUpdateStockRequest.setStock(stocks); activityUpdateStockRequest.setStock(stocks);
createOrderDto.setActivityUpdateStockRequest(activityUpdateStockRequest); createOrderDto.setActivityUpdateStockRequest(activityUpdateStockRequest);
} }
createOrderDto.setPayChannelType(createOrderVo.getPayChannelType());
return createOrderDto; return createOrderDto;
} }
......
...@@ -153,6 +153,11 @@ public class CreateOrderVo { ...@@ -153,6 +153,11 @@ public class CreateOrderVo {
*/ */
public UserDeliveryInfoDto userDeliveryInfoDto; public UserDeliveryInfoDto userDeliveryInfoDto;
/**
* 下单支付渠道类型
*/
private Byte payChannelType;
@Valid @Valid
private PremiumExchangeActivity premiumExchangeActivity; private PremiumExchangeActivity premiumExchangeActivity;
/** /**
...@@ -185,7 +190,7 @@ public class CreateOrderVo { ...@@ -185,7 +190,7 @@ public class CreateOrderVo {
/** /**
* 渠道类型 OrderChannelType * 渠道类型 OrderChannelType
*/ */
private String channelType; private Byte channelType;
/** /**
* 微信配送地址信息 * 微信配送地址信息
......
...@@ -211,4 +211,6 @@ public class CreateOrderRequest extends BaseRequest { ...@@ -211,4 +211,6 @@ public class CreateOrderRequest extends BaseRequest {
//操作人 //操作人
private String operator; private String operator;
private Byte payChannelType;
} }
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