|
|
@@ -65,7 +65,7 @@ public class UserBusinessFrontServiceImpl implements UserBusinessFrontService {
|
|
|
boolean isSuccess = redisService.setNx(RedisService.key.BUSINESS_FIRST_ORDER_USER_KEY.getNameFormat(order.getUserId()), businessId, RedisService.key.BUSINESS_FIRST_ORDER_USER_KEY.getTimeout());
|
|
|
if (isSuccess) {
|
|
|
//首单虚物规格 提成
|
|
|
- saveBusinessTakeMoneyRecord(order, businessId, sharedId, businessRate.getFirstOrderRate(), null);
|
|
|
+ record = saveBusinessTakeMoneyRecord(order, businessId, sharedId, businessRate.getFirstOrderRate(), null);
|
|
|
businessOrderDonRecordMapper.insert(record);
|
|
|
log.info("开始给商务人员:{}分配分销人:{}分销的用户:{}首单:{}提成", businessId, sharedId, order.getUserId(), order.getId());
|
|
|
}
|
|
|
@@ -91,7 +91,7 @@ public class UserBusinessFrontServiceImpl implements UserBusinessFrontService {
|
|
|
if (relationId.equals(preRelationId)) {
|
|
|
try {
|
|
|
//分配首单续费提成
|
|
|
- saveBusinessTakeMoneyRecord(order, businessId, sharedId, null, businessRate.getRenewOrderRate());
|
|
|
+ record = saveBusinessTakeMoneyRecord(order, businessId, sharedId, null, businessRate.getRenewOrderRate());
|
|
|
businessOrderDonRecordMapper.insert(record);
|
|
|
log.info("开始给商务人员:{}分配分销人:{}分销的用户:{}续费首单:{}提成", businessId, sharedId, order.getUserId(), order.getId());
|
|
|
} catch (DuplicateKeyException e) {
|
|
|
@@ -105,7 +105,7 @@ public class UserBusinessFrontServiceImpl implements UserBusinessFrontService {
|
|
|
if (renewChangeTicketRecord != null && renewChangeTicketRecord.getPreRelationId().equals(preRelationId)) {
|
|
|
try {
|
|
|
//分配首单续费更换车位后提成
|
|
|
- saveBusinessTakeMoneyRecord(order, businessId, sharedId, null, businessRate.getRenewOrderRate());
|
|
|
+ record = saveBusinessTakeMoneyRecord(order, businessId, sharedId, null, businessRate.getRenewOrderRate());
|
|
|
businessOrderDonRecordMapper.insert(record);
|
|
|
log.info("开始给商务人员:{}分配分销人:{}分销的用户:{}续费首单:{}更换后车位提成", businessId, sharedId, order.getUserId(), order.getId());
|
|
|
} catch (DuplicateKeyException e) {
|
|
|
@@ -121,14 +121,14 @@ public class UserBusinessFrontServiceImpl implements UserBusinessFrontService {
|
|
|
|
|
|
|
|
|
/**
|
|
|
- * 保存商户分配提成记录
|
|
|
+ * 保存商务分配提成记录
|
|
|
*/
|
|
|
public UserDistributeBusinessOrderDonRecord saveBusinessTakeMoneyRecord(OrderDon order, Long businessId, Long sharedId, Integer firstOrderRate, Integer renewOrderRate) {
|
|
|
UserDistributeBusinessOrderDonRecord record = new UserDistributeBusinessOrderDonRecord();
|
|
|
record.setBusinessId(businessId);
|
|
|
record.setUserId(order.getUserId());
|
|
|
record.setSharedId(sharedId);
|
|
|
- record.setOrderType(1);
|
|
|
+ record.setOrderType(order.getOrderType());
|
|
|
record.setOrderCreatedTime(order.getCreatedTime());
|
|
|
record.setOrderId(order.getId());
|
|
|
record.setPreRelationId(order.getRelationId());
|