|
@@ -413,8 +413,18 @@ public class ExchangeCodeServiceImpl extends ServiceImpl<ExchangeCodeMapper, Exc
|
|
|
});
|
|
});
|
|
|
}
|
|
}
|
|
|
relation.setOrderId(orderDon.getId());
|
|
relation.setOrderId(orderDon.getId());
|
|
|
|
|
+ //设置代充信息
|
|
|
|
|
+ setRelationInfoIfRecharge(relation, goodsDon, sku);
|
|
|
|
|
+ return relation;
|
|
|
|
|
+ }
|
|
|
|
|
+
|
|
|
|
|
+ private void setRelationInfoIfRecharge(GroupsRelation relation, GoodsDon goodsDon, GoodsDonSku sku) {
|
|
|
//邀请制代充平台
|
|
//邀请制代充平台
|
|
|
if ((goodsDon.getSpecialType() != null && goodsDon.getSpecialType() == GoodsDon.SpecialType.recharge) || Constant.RECHARGE_INVITE_GOODS_IDS.contains(goodsDon.getId())) {
|
|
if ((goodsDon.getSpecialType() != null && goodsDon.getSpecialType() == GoodsDon.SpecialType.recharge) || Constant.RECHARGE_INVITE_GOODS_IDS.contains(goodsDon.getId())) {
|
|
|
|
|
+ //多邻国个人规格
|
|
|
|
|
+ if (goodsDon.getId() == Constant.DLG_GID && !ObjectUtil.equal(Constant.DLG_DX_SKU_ID, sku.getId())) {
|
|
|
|
|
+ return;
|
|
|
|
|
+ }
|
|
|
relation.setStartTime(null);
|
|
relation.setStartTime(null);
|
|
|
relation.setExpiryTime(null);
|
|
relation.setExpiryTime(null);
|
|
|
relation.setRechargeStatus(GroupsRelation.RechargeStatus.waiting);
|
|
relation.setRechargeStatus(GroupsRelation.RechargeStatus.waiting);
|
|
@@ -427,7 +437,6 @@ public class ExchangeCodeServiceImpl extends ServiceImpl<ExchangeCodeMapper, Exc
|
|
|
}
|
|
}
|
|
|
groupsRelationMapper.updateById(relation);
|
|
groupsRelationMapper.updateById(relation);
|
|
|
}
|
|
}
|
|
|
- return relation;
|
|
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
@Override
|
|
@Override
|