|
|
@@ -159,6 +159,9 @@ public class EquipmentDistributeServiceImpl implements EquipmentDistributeServic
|
|
|
//是否有配置车票权益
|
|
|
SysConfig config = sysConfigService.getOne(Wrappers.lambdaQuery(SysConfig.class)
|
|
|
.eq(SysConfig::getSysKey, Constant.EQUIPMENT_DISTRIBUTE_KEY).last("limit 1"));
|
|
|
+ if (config == null) {
|
|
|
+ return false;
|
|
|
+ }
|
|
|
String sysValue = config.getSysValue();
|
|
|
//未配置权益
|
|
|
if (StrUtil.isEmpty(sysValue)) {
|
|
|
@@ -166,8 +169,12 @@ public class EquipmentDistributeServiceImpl implements EquipmentDistributeServic
|
|
|
}
|
|
|
try {
|
|
|
EquipmentConfigDto equipmentConfigDto = Jsons.parseObject(sysValue, EquipmentConfigDto.class);
|
|
|
+ if (equipmentConfigDto == null) {
|
|
|
+ return false;
|
|
|
+ }
|
|
|
+ //已配置余额 实物发货 发送余额
|
|
|
if (equipmentConfigDto.getBalance() != null && equipmentConfigDto.getBalance().compareTo(BigDecimal.ZERO) > 0) {
|
|
|
- //已配置余额 实物发货 发送余额
|
|
|
+ log.info("分销人:{}记录分享有礼实物订单:{}余额权益,待发货后发送", sharId, orderId);
|
|
|
EquipmentUserDistributeTransportBenefits transportBenefits = new EquipmentUserDistributeTransportBenefits();
|
|
|
transportBenefits.setShareId(sharId);
|
|
|
transportBenefits.setOrderId(orderId);
|
|
|
@@ -175,10 +182,11 @@ public class EquipmentDistributeServiceImpl implements EquipmentDistributeServic
|
|
|
transportBenefitsMapper.insert(transportBenefits);
|
|
|
}
|
|
|
//未配置车票权益
|
|
|
- if (equipmentConfigDto == null || CollUtil.isEmpty(equipmentConfigDto.getSkuList())) {
|
|
|
+ if (CollUtil.isEmpty(equipmentConfigDto.getSkuList())) {
|
|
|
return false;
|
|
|
}
|
|
|
} catch (Exception e) {
|
|
|
+ return false;
|
|
|
}
|
|
|
}
|
|
|
if (status == EquipmentUserChanceRecord.Status.refund) {
|
zoujiajian