## 支付回调处理188;
This commit is contained in:
parent
138d258dc0
commit
11bfb6fa5f
|
@ -290,6 +290,9 @@ public class OrderParam implements Serializable {
|
||||||
|
|
||||||
private List<BuyTicketParam> ticketParamList;
|
private List<BuyTicketParam> ticketParamList;
|
||||||
|
|
||||||
|
// 订单扩展类型
|
||||||
|
private Integer orderTypeExtend;
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 验证保存的必输字段
|
* 验证保存的必输字段
|
||||||
|
|
|
@ -977,9 +977,10 @@ public class SaOrderServiceImpl extends ServiceImpl<SaOrderMapper, SaOrder> impl
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
* 封装整个订单
|
||||||
|
*
|
||||||
* @param orderParam 参数
|
* @param orderParam 参数
|
||||||
* @param cuMember 会员
|
* @param cuMember 会员
|
||||||
* 封装整个订单
|
|
||||||
*/
|
*/
|
||||||
private SaOrderExt packageWholeSaOrder(OrderParam orderParam, CuMember cuMember) {
|
private SaOrderExt packageWholeSaOrder(OrderParam orderParam, CuMember cuMember) {
|
||||||
// 获取订单编号
|
// 获取订单编号
|
||||||
|
@ -989,6 +990,10 @@ public class SaOrderServiceImpl extends ServiceImpl<SaOrderMapper, SaOrder> impl
|
||||||
}
|
}
|
||||||
// 封装订单信息
|
// 封装订单信息
|
||||||
SaOrderExt saOrderExt = saOrderHandle.packageSaveSaOrder(orderParam, cuMember, orderCode);
|
SaOrderExt saOrderExt = saOrderHandle.packageSaveSaOrder(orderParam, cuMember, orderCode);
|
||||||
|
if (null != orderParam.getOrderTypeExtend() && EOrderTypeExtend.REG_REP.getValue() == orderParam.getOrderTypeExtend()) {
|
||||||
|
saOrderExt.setOrderType(EOrderType.REPURCHASE_ORDER.getValue());
|
||||||
|
saOrderExt.setOrderTypeExtend(orderParam.getOrderTypeExtend());
|
||||||
|
}
|
||||||
// 封装订单明细 -- 处理邮费
|
// 封装订单明细 -- 处理邮费
|
||||||
saOrderHandle.packSaOrderItems(cuMember, saOrderExt, orderParam);
|
saOrderHandle.packSaOrderItems(cuMember, saOrderExt, orderParam);
|
||||||
// 第二次封装订单,根据明细表计算订单主表金额、业绩,处理明细仓库
|
// 第二次封装订单,根据明细表计算订单主表金额、业绩,处理明细仓库
|
||||||
|
@ -1893,9 +1898,11 @@ public class SaOrderServiceImpl extends ServiceImpl<SaOrderMapper, SaOrder> impl
|
||||||
// 其他订单
|
// 其他订单
|
||||||
if (EOrderType.REPURCHASE_ORDER.getValue() == saOrderExt.getOrderType()
|
if (EOrderType.REPURCHASE_ORDER.getValue() == saOrderExt.getOrderType()
|
||||||
&& EOrderTypeExtend.REG_REP.getValue() == saOrderExt.getOrderTypeExtend()) {
|
&& EOrderTypeExtend.REG_REP.getValue() == saOrderExt.getOrderTypeExtend()) {
|
||||||
|
log.info("==========注册转复购==========");
|
||||||
// 188分享订单,复购订单 扩展类型为 注册转复购
|
// 188分享订单,复购订单 扩展类型为 注册转复购
|
||||||
OrderParam orderParam = redisService.getCacheObject(CacheConstants.TEMP_PARAM + pkMember + orderCode);
|
OrderParam orderParam = redisService.getCacheObject(CacheConstants.TEMP_PARAM + pkMember + orderCode);
|
||||||
orderParam.setIsHaiFun(Boolean.TRUE);
|
orderParam.setIsHaiFun(Boolean.TRUE);
|
||||||
|
orderParam.setOrderTypeExtend(saOrderExt.getOrderTypeExtend());
|
||||||
|
|
||||||
newCuMember = packageCuMember(orderParam);
|
newCuMember = packageCuMember(orderParam);
|
||||||
// 会员ID已经提前生成,此处直接使用
|
// 会员ID已经提前生成,此处直接使用
|
||||||
|
|
Loading…
Reference in New Issue