Commit 5a792656 by ping.wu

抖音卖券下单

parent 53af3295
...@@ -83,6 +83,8 @@ public class CreateOrderVo { ...@@ -83,6 +83,8 @@ public class CreateOrderVo {
private String mobile; private String mobile;
private String saleCouponPhone;
/** /**
* 渠道 1 saas 2 支付宝 3. iwc i围餐 5 头条 * 渠道 1 saas 2 支付宝 3. iwc i围餐 5 头条
*/ */
......
...@@ -169,14 +169,12 @@ public class CheckOrder { ...@@ -169,14 +169,12 @@ public class CheckOrder {
} }
public AssortmentCustomerInfoVo checkOrderByMemberNew(String sessionId, String cardCode) { public AssortmentCustomerInfoVo checkOrderByMemberNew(String sessionId) {
// 通过sessionId查询缓存中会员id // 通过sessionId查询缓存中会员id
AssortmentCustomerInfoVo userLoginInfoDto = customerInfoManager.getCustomerInfoByObject(sessionId); AssortmentCustomerInfoVo userLoginInfoDto = customerInfoManager.getCustomerInfoByObject(sessionId);
if (userLoginInfoDto == null || StringUtils.isEmpty(userLoginInfoDto.getMemberId())) { if (userLoginInfoDto == null || StringUtils.isEmpty(userLoginInfoDto.getMemberId())) {
throw new ServiceException(ResponseResult.NOT_LOGIN); throw new ServiceException(ResponseResult.NOT_LOGIN);
} }
//校验会员svc卡信息
// checkCardCode(userLoginInfoDto.getPartnerId(), userLoginInfoDto.getMemberId(), cardCode);
return userLoginInfoDto; return userLoginInfoDto;
} }
......
...@@ -26,6 +26,7 @@ import com.freemud.application.sdk.api.log.LogThreadLocal; ...@@ -26,6 +26,7 @@ import com.freemud.application.sdk.api.log.LogThreadLocal;
import com.freemud.application.sdk.api.ordercenter.config.OrderCenterProperties; import com.freemud.application.sdk.api.ordercenter.config.OrderCenterProperties;
import com.freemud.application.sdk.api.ordercenter.entities.v1.OrderBeanV1; import com.freemud.application.sdk.api.ordercenter.entities.v1.OrderBeanV1;
import com.freemud.application.sdk.api.ordercenter.entities.vo.OrderCallBackRequestVo; import com.freemud.application.sdk.api.ordercenter.entities.vo.OrderCallBackRequestVo;
import com.freemud.application.sdk.api.ordercenter.enums.BizTypeEnum;
import com.freemud.application.sdk.api.ordercenter.response.orderInfo.OrderInfoReqs; import com.freemud.application.sdk.api.ordercenter.response.orderInfo.OrderInfoReqs;
import com.freemud.sdk.api.assortment.order.enums.OrderSourceType; import com.freemud.sdk.api.assortment.order.enums.OrderSourceType;
import com.freemud.sdk.api.assortment.order.util.LockUtils; import com.freemud.sdk.api.assortment.order.util.LockUtils;
...@@ -128,8 +129,11 @@ public class OrderAdapterServiceImpl { ...@@ -128,8 +129,11 @@ public class OrderAdapterServiceImpl {
private SaasOrderHandle saasOrderHandle; private SaasOrderHandle saasOrderHandle;
@Autowired @Autowired
private OrderCallbackClient orderCallbackClient; private OrderCallbackClient orderCallbackClient;
@Autowired
private SellCouponOrderServiceImpl sellCouponOrderServiceImpl;
//获取下单实现对象
private OrderFactoryService getCreateOrderBean(AssortmentCustomerInfoVo assortmentCustomerInfoVo,CreateOrderVo createOrderVo){ private OrderFactoryService getCreateOrderBean(AssortmentCustomerInfoVo assortmentCustomerInfoVo,CreateOrderVo createOrderVo){
// 扩展字段中存储 sessionKey // 扩展字段中存储 sessionKey
createOrderVo.setSessionKey(assortmentCustomerInfoVo.getSessionKey()); createOrderVo.setSessionKey(assortmentCustomerInfoVo.getSessionKey());
...@@ -150,6 +154,11 @@ public class OrderAdapterServiceImpl { ...@@ -150,6 +154,11 @@ public class OrderAdapterServiceImpl {
if (UserLoginChannelEnum.APP.getCode().equals(assortmentCustomerInfoVo.getChannel())) { if (UserLoginChannelEnum.APP.getCode().equals(assortmentCustomerInfoVo.getChannel())) {
return appOrderService; return appOrderService;
} }
//抖音卖券
if (Objects.equals(BizTypeEnum.SALE_COUPON.getBizType(),createOrderVo.getBizType())) {
return sellCouponOrderServiceImpl;
}
return orderService; return orderService;
} }
......
...@@ -1112,4 +1112,14 @@ public class PayServiceImpl { ...@@ -1112,4 +1112,14 @@ public class PayServiceImpl {
} }
/**
* 获取门店支付信息
*
* aggregationType 6-会员、7-微商城、8-一键购买 9:积分商城
*/
public AssortmentOpenPlatformIappWxappStore getIappWxappStoreInfo(String wxAppId, String aggregationType) {
AssortmentOpenPlatformIappWxappStore wxAppStore = assortmentOpenPlatformIappWxappStoreManager.selectIappWxappStoreByWxAppIdAndAggregationType(wxAppId, aggregationType);
return wxAppStore;
}
} }
...@@ -205,4 +205,7 @@ public class OrderExtInfoDto { ...@@ -205,4 +205,7 @@ public class OrderExtInfoDto {
private String province; private String province;
private Long totalScore; private Long totalScore;
//抖音支付卖券手机号
private String saleCouponPhone;
} }
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