Commit b5bb3ae0 by zhiheng.zhang

卖券订单添加支付渠道

parent 99cceb48
...@@ -59,4 +59,14 @@ public class SellCouponCreateOrderVo { ...@@ -59,4 +59,14 @@ public class SellCouponCreateOrderVo {
// @NotEmpty(message = "version 版本号不能为空") // @NotEmpty(message = "version 版本号不能为空")
private String version; private String version;
/**
* 下单支付渠道类型
*/
private Byte payChannelType;
/**
* 渠道 1 saas 2 img 爱马哥 默认saas 3. iwc i围餐
*/
private String channel;
} }
...@@ -33,6 +33,7 @@ import com.freemud.application.sdk.api.log.LogThreadLocal; ...@@ -33,6 +33,7 @@ import com.freemud.application.sdk.api.log.LogThreadLocal;
import com.freemud.application.sdk.api.ordercenter.enums.NewOrderStatus; import com.freemud.application.sdk.api.ordercenter.enums.NewOrderStatus;
import com.freemud.application.sdk.api.ordercenter.enums.OrderClientType; import com.freemud.application.sdk.api.ordercenter.enums.OrderClientType;
import com.freemud.application.sdk.api.ordercenter.enums.OrderType; import com.freemud.application.sdk.api.ordercenter.enums.OrderType;
import com.freemud.application.sdk.api.ordercenter.enums.PayChannelType;
import com.freemud.application.sdk.api.ordercenter.request.OrderChangeStateReq; import com.freemud.application.sdk.api.ordercenter.request.OrderChangeStateReq;
import com.freemud.application.sdk.api.ordercenter.request.OrderExtInfoDto; import com.freemud.application.sdk.api.ordercenter.request.OrderExtInfoDto;
import com.freemud.application.sdk.api.ordercenter.request.create.*; import com.freemud.application.sdk.api.ordercenter.request.create.*;
...@@ -293,6 +294,10 @@ public class SellCouponOrderServiceImpl { ...@@ -293,6 +294,10 @@ public class SellCouponOrderServiceImpl {
if(UserLoginChannelEnum.APP.getCode().equals(userLoginInfoDto.getChannel())){ if(UserLoginChannelEnum.APP.getCode().equals(userLoginInfoDto.getChannel())){
orderClient = OrderClientType.APP.getIndex(); orderClient = OrderClientType.APP.getIndex();
} }
//抖音小程序
if(PayChannelType.TIKTOKPAY.getIndex().equals(requestVo.getPayChannelType()) && "5".equalsIgnoreCase(requestVo.getChannel())) {
orderClient = OrderClientType.TIKTOKPAY.getIndex();
}
String partnerId = userLoginInfoDto.getPartnerId(); String partnerId = userLoginInfoDto.getPartnerId();
request.setOrderClient(orderClient); request.setOrderClient(orderClient);
request.setPartnerId(partnerId); request.setPartnerId(partnerId);
...@@ -377,6 +382,8 @@ public class SellCouponOrderServiceImpl { ...@@ -377,6 +382,8 @@ public class SellCouponOrderServiceImpl {
request.setOrderExtended(orderAdapter.saveStoreInfo(storeInfo)); request.setOrderExtended(orderAdapter.saveStoreInfo(storeInfo));
request.setOperator(userLoginInfoDto.getNickName()); request.setOperator(userLoginInfoDto.getNickName());
request.setAppId(userLoginInfoDto.getWxAppId()); request.setAppId(userLoginInfoDto.getWxAppId());
request.setPayChannelType(requestVo.getPayChannelType());
request.setPayChannel(requestVo.getChannel());
return request; return request;
} }
......
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