|
@@ -504,9 +504,9 @@ public class OrderDonServiceImpl extends ServiceImpl<OrderDonMapper, OrderDon> i
|
|
|
|
|
|
|
|
order.setPayTime(DateUtil.parse(map.get("time_end"), "yyyyMMddHHmmss"));
|
|
order.setPayTime(DateUtil.parse(map.get("time_end"), "yyyyMMddHHmmss"));
|
|
|
order.setShopId(appId);
|
|
order.setShopId(appId);
|
|
|
-
|
|
|
|
|
|
|
+ Long goodsId = order.getGoodsId();
|
|
|
if (order.getIsNoLogin()) {
|
|
if (order.getIsNoLogin()) {
|
|
|
- order.setExCode(exchangeCodeService.getExCode(order.getGoodsId(), order.getSkuId(), 1));
|
|
|
|
|
|
|
+ order.setExCode(exchangeCodeService.getExCode(goodsId, order.getSkuId(), 1));
|
|
|
}
|
|
}
|
|
|
if (StringUtils.isBlank(order.getOpenId())) {
|
|
if (StringUtils.isBlank(order.getOpenId())) {
|
|
|
order.setOpenId(map.get("openid"));
|
|
order.setOpenId(map.get("openid"));
|
|
@@ -550,6 +550,10 @@ public class OrderDonServiceImpl extends ServiceImpl<OrderDonMapper, OrderDon> i
|
|
|
}
|
|
}
|
|
|
this.updateById(order);
|
|
this.updateById(order);
|
|
|
|
|
|
|
|
|
|
+ //购买Midjourney课程 赠送Midjourney车票
|
|
|
|
|
+ if (goodsId != null && goodsId.equals(27l)) {
|
|
|
|
|
+ sendMidjourneyTicketIfCourse(order.getUserId());
|
|
|
|
|
+ }
|
|
|
//配置了特定奖池,增加抽奖机会
|
|
//配置了特定奖池,增加抽奖机会
|
|
|
TASK_POOL.execute(() -> {
|
|
TASK_POOL.execute(() -> {
|
|
|
try {
|
|
try {
|
|
@@ -836,8 +840,9 @@ public class OrderDonServiceImpl extends ServiceImpl<OrderDonMapper, OrderDon> i
|
|
|
log.info("支付宝已回调,重复修改状态 id:{}", orderDon.getId());
|
|
log.info("支付宝已回调,重复修改状态 id:{}", orderDon.getId());
|
|
|
return;
|
|
return;
|
|
|
}
|
|
}
|
|
|
|
|
+ Long goodsId = orderDon.getGoodsId();
|
|
|
if (orderDon.getIsNoLogin()) {
|
|
if (orderDon.getIsNoLogin()) {
|
|
|
- orderDon.setExCode(exchangeCodeService.getExCode(orderDon.getGoodsId(), orderDon.getSkuId(), 1));
|
|
|
|
|
|
|
+ orderDon.setExCode(exchangeCodeService.getExCode(goodsId, orderDon.getSkuId(), 1));
|
|
|
}
|
|
}
|
|
|
GoodsDonSku sku = goodsDonSkuMapper.selectById(orderDon.getSkuId());
|
|
GoodsDonSku sku = goodsDonSkuMapper.selectById(orderDon.getSkuId());
|
|
|
GoodsDon goodsDon = goodsDonMapper.selectById(sku.getGoodsId());
|
|
GoodsDon goodsDon = goodsDonMapper.selectById(sku.getGoodsId());
|
|
@@ -888,6 +893,11 @@ public class OrderDonServiceImpl extends ServiceImpl<OrderDonMapper, OrderDon> i
|
|
|
}
|
|
}
|
|
|
this.updateById(orderDon);
|
|
this.updateById(orderDon);
|
|
|
|
|
|
|
|
|
|
+ //购买Midjourney课程 赠送Midjourney车票
|
|
|
|
|
+ if (goodsId != null && goodsId.equals(27l)) {
|
|
|
|
|
+ sendMidjourneyTicketIfCourse(orderDon.getUserId());
|
|
|
|
|
+ }
|
|
|
|
|
+
|
|
|
//配置了特定奖池,增加抽奖机会
|
|
//配置了特定奖池,增加抽奖机会
|
|
|
TASK_POOL.execute(() -> {
|
|
TASK_POOL.execute(() -> {
|
|
|
try {
|
|
try {
|
|
@@ -2144,4 +2154,12 @@ public class OrderDonServiceImpl extends ServiceImpl<OrderDonMapper, OrderDon> i
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|
|
|
|
|
+
|
|
|
|
|
+ /**
|
|
|
|
|
+ * 购买Midjourney课程 赠送Midjourney车票
|
|
|
|
|
+ */
|
|
|
|
|
+ private void sendMidjourneyTicketIfCourse(Long userId) {
|
|
|
|
|
+ Optional.ofNullable(goodsDonSkuMapper.selectById(185))
|
|
|
|
|
+ .ifPresent(sku -> exchangeCodeService.getRelationNoOrder(sku, userId));
|
|
|
|
|
+ }
|
|
|
}
|
|
}
|