Commit b20da039 by zhiheng.zhang

卖券订单添加支付渠道

parent b5bb3ae0
...@@ -59,10 +59,6 @@ public class SellCouponCreateOrderVo { ...@@ -59,10 +59,6 @@ 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围餐 * 渠道 1 saas 2 img 爱马哥 默认saas 3. iwc i围餐
......
...@@ -2200,7 +2200,8 @@ public class OrderServiceImpl implements Orderservice { ...@@ -2200,7 +2200,8 @@ public class OrderServiceImpl implements Orderservice {
orderClient = OrderClientType.APP; orderClient = OrderClientType.APP;
} }
//抖音小程序 //抖音小程序
if(PayChannelType.TIKTOKPAY.getIndex().equals(createOrderVo.getPayChannelType()) && "5".equalsIgnoreCase(createOrderVo.getChannel())) { if("5".equalsIgnoreCase(createOrderVo.getChannel())) {
createOrderVo.setPayChannelType(PayChannelType.TIKTOKPAY.getIndex());
orderClient = OrderClientType.TIKTOKPAY; orderClient = OrderClientType.TIKTOKPAY;
} }
long totalAmount = 0; long totalAmount = 0;
......
...@@ -295,7 +295,8 @@ public class SellCouponOrderServiceImpl { ...@@ -295,7 +295,8 @@ public class SellCouponOrderServiceImpl {
orderClient = OrderClientType.APP.getIndex(); orderClient = OrderClientType.APP.getIndex();
} }
//抖音小程序 //抖音小程序
if(PayChannelType.TIKTOKPAY.getIndex().equals(requestVo.getPayChannelType()) && "5".equalsIgnoreCase(requestVo.getChannel())) { if("5".equalsIgnoreCase(requestVo.getChannel())) {
request.setPayChannel(PayChannelType.TIKTOKPAY.getIndex().toString());
orderClient = OrderClientType.TIKTOKPAY.getIndex(); orderClient = OrderClientType.TIKTOKPAY.getIndex();
} }
String partnerId = userLoginInfoDto.getPartnerId(); String partnerId = userLoginInfoDto.getPartnerId();
...@@ -382,7 +383,9 @@ public class SellCouponOrderServiceImpl { ...@@ -382,7 +383,9 @@ 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()); if("5".equalsIgnoreCase(requestVo.getChannel().toString())){
request.setPayChannelType(PayChannelType.TIKTOKPAY.getIndex());
}
request.setPayChannel(requestVo.getChannel()); 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