|
@@ -40,12 +40,10 @@ import com.qs.mp.user.mapper.UserTicketOrderMapper;
|
|
|
import com.qs.mp.user.service.IUserCouponService;
|
|
|
import com.qs.mp.user.service.IUserTicketOrderItemService;
|
|
|
import com.qs.mp.user.service.IUserTicketOrderService;
|
|
|
-import com.sun.tools.internal.xjc.reader.xmlschema.bindinfo.BIConversion.User;
|
|
|
import java.math.BigDecimal;
|
|
|
import java.util.Arrays;
|
|
|
import java.util.Date;
|
|
|
import java.util.List;
|
|
|
-import org.apache.pulsar.client.api.PulsarClient;
|
|
|
import org.apache.pulsar.client.api.PulsarClientException;
|
|
|
import org.slf4j.Logger;
|
|
|
import org.slf4j.LoggerFactory;
|
|
@@ -157,7 +155,6 @@ public class UserTicketOrderServiceImpl extends
|
|
|
userTicketOrder.setChannelId(null == channelUserRel ? null : channelUserRel.getChannelId());
|
|
|
save(userTicketOrder);
|
|
|
|
|
|
-
|
|
|
for (int i = 0; i < orderSettleVO.getOrderNum(); i++) {
|
|
|
UserTicketOrderItem orderItem = new UserTicketOrderItem();
|
|
|
orderItem.setItemId(bizIdGenerator.newId());
|
|
@@ -197,16 +194,17 @@ public class UserTicketOrderServiceImpl extends
|
|
|
ticketOrder.setCommStatus(CommStatusEnum.YES); // 无需结佣,直接置为已结佣
|
|
|
}
|
|
|
// 查询用户的所属经销商,线下票根据票包查询
|
|
|
- ChannelOrderDetail channelOrderDetail = channelOrderDetailService.getOne(new LambdaQueryWrapper<ChannelOrderDetail>()
|
|
|
- .eq(ChannelOrderDetail::getPkgId, ticket.getPkgId()));
|
|
|
+ ChannelOrderDetail channelOrderDetail = channelOrderDetailService.getOne(
|
|
|
+ new LambdaQueryWrapper<ChannelOrderDetail>()
|
|
|
+ .eq(ChannelOrderDetail::getPkgId, ticket.getPkgId()));
|
|
|
if (null == channelOrderDetail) {
|
|
|
- LogUtil.error(logger, "线下票,根据票包ID查询购买渠道为空。ticketId:{0}, pkgId{1}", new Object[]{ticket.getTicketId(), ticket.getPkgId()});
|
|
|
+ LogUtil.error(logger, "线下票,根据票包ID查询购买渠道为空。ticketId:{0}, pkgId{1}",
|
|
|
+ ticket.getTicketId(), ticket.getPkgId());
|
|
|
} else {
|
|
|
ticketOrder.setChannelId(channelOrderDetail.getChannelId());
|
|
|
}
|
|
|
save(ticketOrder);
|
|
|
|
|
|
-
|
|
|
UserTicketOrderItem orderItem = new UserTicketOrderItem();
|
|
|
orderItem.setItemId(bizIdGenerator.newId());
|
|
|
orderItem.setOrderId(ticketOrder.getOrderId());
|
|
@@ -325,32 +323,35 @@ public class UserTicketOrderServiceImpl extends
|
|
|
@Transactional
|
|
|
public boolean commToChannel(String orderId) {
|
|
|
UserTicketOrder ticketOrder = getById(orderId);
|
|
|
- Assert.isTrue(ticketOrder.getCommStatus() == CommStatusEnum.DOING, "结佣处理,结佣状态异常,不是结佣中。orderId=" + orderId);
|
|
|
-
|
|
|
- if (null != ticketOrder.getChannelId()) {
|
|
|
- // 线下购票,优先给当前票的经销商渠道分润
|
|
|
- TicketBox ticketBox = ticketBoxService.getById(ticketOrder.getBoxId());
|
|
|
- Channel channel = channelService.getById(ticketOrder.getChannelId());
|
|
|
- ChannelCommission channelCommission = new ChannelCommission();
|
|
|
- channelCommission.setChannelId(channel.getChannelId());
|
|
|
- channelCommission.setOrderId(ticketOrder.getOrderId());
|
|
|
- channelCommission.setBoxId(ticketOrder.getBoxId());
|
|
|
- channelCommission.setSaleAmt(ticketOrder.getPayAmt());
|
|
|
- channelCommission.setSaleCommRate(ticketBox.getSaleCommRate());
|
|
|
- channelCommission.setSaleCommAmt(new BigDecimal(channelCommission.getSaleAmt()).multiply(channelCommission.getSaleCommRate()).intValue());
|
|
|
- channelCommission.setCommRate(channel.getCommRate());
|
|
|
- channelCommission.setCommAmt(new BigDecimal(channelCommission.getSaleCommAmt()).multiply(channelCommission.getCommRate()).intValue());
|
|
|
- channelCommissionService.save(channelCommission);
|
|
|
- // 经销商账户余额增加
|
|
|
-
|
|
|
- // 渠道分润
|
|
|
-
|
|
|
- // 线下票如果用户没被绑定,则保存经销商用户绑定关系
|
|
|
+ Assert.isTrue(ticketOrder.getCommStatus() == CommStatusEnum.DOING,
|
|
|
+ "结佣处理,结佣状态异常,不是结佣中。orderId=" + orderId);
|
|
|
+
|
|
|
+ if (null != ticketOrder.getChannelId()) {
|
|
|
+ // 线下购票,优先给当前票的经销商渠道分润
|
|
|
+ TicketBox ticketBox = ticketBoxService.getById(ticketOrder.getBoxId());
|
|
|
+ Channel channel = channelService.getById(ticketOrder.getChannelId());
|
|
|
+ ChannelCommission channelCommission = new ChannelCommission();
|
|
|
+ channelCommission.setChannelId(channel.getChannelId());
|
|
|
+ channelCommission.setOrderId(ticketOrder.getOrderId());
|
|
|
+ channelCommission.setBoxId(ticketOrder.getBoxId());
|
|
|
+ channelCommission.setSaleAmt(ticketOrder.getPayAmt());
|
|
|
+ channelCommission.setSaleCommRate(ticketBox.getSaleCommRate());
|
|
|
+ channelCommission.setSaleCommAmt(new BigDecimal(channelCommission.getSaleAmt()).multiply(
|
|
|
+ channelCommission.getSaleCommRate()).intValue());
|
|
|
+ channelCommission.setCommRate(channel.getCommRate());
|
|
|
+ channelCommission.setCommAmt(new BigDecimal(channelCommission.getSaleCommAmt()).multiply(
|
|
|
+ channelCommission.getCommRate()).intValue());
|
|
|
+ channelCommissionService.save(channelCommission);
|
|
|
+ // 经销商账户余额增加
|
|
|
+
|
|
|
+ // 渠道分润
|
|
|
+
|
|
|
+ // 线下票如果用户没被绑定,则保存经销商用户绑定关系
|
|
|
|
|
|
- } else {
|
|
|
- LogUtil.info(logger, "渠道结佣时,订单对应的渠道不存在,无需结佣。itemId:{0}",
|
|
|
- new Object[]{ticketOrder.getOrderId()});
|
|
|
- }
|
|
|
+ } else {
|
|
|
+ LogUtil.info(logger, "渠道结佣时,订单对应的渠道不存在,无需结佣。itemId:{0}",
|
|
|
+ ticketOrder.getOrderId());
|
|
|
+ }
|
|
|
|
|
|
return false;
|
|
|
}
|