parent
f573982fb6
commit
37931a5df6
|
@ -131,7 +131,19 @@ public class BusIntegralConsumeController extends BaseController
|
||||||
busIntegralRecord.setAgentAccount(list);
|
busIntegralRecord.setAgentAccount(list);
|
||||||
}
|
}
|
||||||
// List<BusIntegralRecord> list = busIntegralRecordService.selectBusIntegralRecordList(busIntegralRecord);
|
// List<BusIntegralRecord> list = busIntegralRecordService.selectBusIntegralRecordList(busIntegralRecord);
|
||||||
|
busIntegralRecord.setIntegralType("sms");
|
||||||
List<BusIntegralRecord> list = busIntegralRecordService.selectBusIntegralRecordList1(busIntegralRecord);
|
List<BusIntegralRecord> list = busIntegralRecordService.selectBusIntegralRecordList1(busIntegralRecord);
|
||||||
|
busIntegralRecord.setIntegralType("AI");
|
||||||
|
List<BusIntegralRecord> list2 = busIntegralRecordService.selectBusIntegralRecordList1(busIntegralRecord);
|
||||||
|
list = list.stream().map(bean -> {
|
||||||
|
for(BusIntegralRecord busIntegralRecord1:list2){
|
||||||
|
if(busIntegralRecord1.getAccount().equals(bean.getAccount())){
|
||||||
|
bean.setAiIntegralUpdateNum(busIntegralRecord1.getIntegralUpdateNum());
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return bean;
|
||||||
|
}).collect(Collectors.toList());
|
||||||
ExcelUtil<BusIntegralRecord> util = new ExcelUtil<BusIntegralRecord>(BusIntegralRecord.class);
|
ExcelUtil<BusIntegralRecord> util = new ExcelUtil<BusIntegralRecord>(BusIntegralRecord.class);
|
||||||
util.exportExcel(response, list, "积分变更记录数据");
|
util.exportExcel(response, list, "积分变更记录数据");
|
||||||
}
|
}
|
||||||
|
|
|
@ -23,6 +23,12 @@ public class BusIntegralRecord extends BaseEntity
|
||||||
/** $column.columnComment */
|
/** $column.columnComment */
|
||||||
private Long id;
|
private Long id;
|
||||||
|
|
||||||
|
/** 变更时间 */
|
||||||
|
@JsonFormat(pattern = "yyyy-MM-dd")
|
||||||
|
@Excel(name = "变更时间", width = 30, dateFormat = "yyyy-MM-dd")
|
||||||
|
@JSONField(ordinal = 1)
|
||||||
|
private Date integralUpdateTime;
|
||||||
|
|
||||||
/** 营销账户 */
|
/** 营销账户 */
|
||||||
@Excel(name = "账户")
|
@Excel(name = "账户")
|
||||||
@JSONField(ordinal = 2)
|
@JSONField(ordinal = 2)
|
||||||
|
@ -38,23 +44,18 @@ public class BusIntegralRecord extends BaseEntity
|
||||||
private String updateType;
|
private String updateType;
|
||||||
|
|
||||||
/** 积分变更数值 */
|
/** 积分变更数值 */
|
||||||
@Excel(name = "积分变更数值")
|
@Excel(name = "安全账分消耗")
|
||||||
@JSONField(ordinal = 4)
|
@JSONField(ordinal = 4)
|
||||||
private int integralUpdateNum;
|
private int integralUpdateNum;
|
||||||
|
|
||||||
@Excel(name = "积分变更数值")
|
@Excel(name = "普通账分消耗")
|
||||||
@JSONField(ordinal = 5)
|
@JSONField(ordinal = 5)
|
||||||
private int aiIntegralUpdateNum;
|
private int aiIntegralUpdateNum;
|
||||||
|
|
||||||
@Excel(name = "账分类型")
|
// @Excel(name = "账分类型")
|
||||||
@JSONField(ordinal = 6)
|
// @JSONField(ordinal = 6)
|
||||||
private String integralType;
|
private String integralType;
|
||||||
|
|
||||||
/** 变更时间 */
|
|
||||||
@JsonFormat(pattern = "yyyy-MM-dd")
|
|
||||||
@Excel(name = "变更时间", width = 30, dateFormat = "yyyy-MM-dd")
|
|
||||||
@JSONField(ordinal = 1)
|
|
||||||
private Date integralUpdateTime;
|
|
||||||
|
|
||||||
/** 积分余额 */
|
/** 积分余额 */
|
||||||
// @Excel(name = "积分余额")
|
// @Excel(name = "积分余额")
|
||||||
|
|
|
@ -167,6 +167,9 @@ public class BusAgentInfoServiceImpl implements IBusAgentInfoService
|
||||||
record.setIntegralUpdateNum(busAgentInfo.getAiDurationBalance1());
|
record.setIntegralUpdateNum(busAgentInfo.getAiDurationBalance1());
|
||||||
int oldValue = temp.getAiDurationBalance();
|
int oldValue = temp.getAiDurationBalance();
|
||||||
newValue = busAgentInfo.getAiDurationBalance1();
|
newValue = busAgentInfo.getAiDurationBalance1();
|
||||||
|
if((oldValue+newValue)<0){
|
||||||
|
throw new ServiceException("下级安全账分余额不足!");
|
||||||
|
}
|
||||||
busAgentInfo.setAiDurationBalance((oldValue+newValue));
|
busAgentInfo.setAiDurationBalance((oldValue+newValue));
|
||||||
record.setIntegralBalance((oldValue+newValue));
|
record.setIntegralBalance((oldValue+newValue));
|
||||||
record.setIntegralType("sms");
|
record.setIntegralType("sms");
|
||||||
|
@ -175,6 +178,9 @@ public class BusAgentInfoServiceImpl implements IBusAgentInfoService
|
||||||
record.setIntegralUpdateNum(busAgentInfo.getAiRealTimeNum1());
|
record.setIntegralUpdateNum(busAgentInfo.getAiRealTimeNum1());
|
||||||
int oldValue = temp.getAiRealTimeNum();
|
int oldValue = temp.getAiRealTimeNum();
|
||||||
newValue = busAgentInfo.getAiRealTimeNum1();
|
newValue = busAgentInfo.getAiRealTimeNum1();
|
||||||
|
if((oldValue+newValue)<0){
|
||||||
|
throw new ServiceException("下级普通账分余额不足!");
|
||||||
|
}
|
||||||
busAgentInfo.setAiRealTimeNum((oldValue+newValue));
|
busAgentInfo.setAiRealTimeNum((oldValue+newValue));
|
||||||
record.setAiIntegralBalance((oldValue+newValue));
|
record.setAiIntegralBalance((oldValue+newValue));
|
||||||
record.setIntegralType("AI");
|
record.setIntegralType("AI");
|
||||||
|
@ -198,15 +204,9 @@ public class BusAgentInfoServiceImpl implements IBusAgentInfoService
|
||||||
record1.setCreateUser(busAgentInfo.getAgentAccount());
|
record1.setCreateUser(busAgentInfo.getAgentAccount());
|
||||||
// record1.setIntegralUpdateNum(busAgentInfo.getAiDurationBalance1());
|
// record1.setIntegralUpdateNum(busAgentInfo.getAiDurationBalance1());
|
||||||
if(busAgentInfo.getAiDurationBalance1()!=0){
|
if(busAgentInfo.getAiDurationBalance1()!=0){
|
||||||
if(temp1.getAiDurationBalance()<busAgentInfo.getAiDurationBalance1()){
|
|
||||||
throw new ServiceException("安全账分余额不足!请联系管理员充值。");
|
|
||||||
}
|
|
||||||
record1.setIntegralUpdateNum(busAgentInfo.getAiDurationBalance1());
|
record1.setIntegralUpdateNum(busAgentInfo.getAiDurationBalance1());
|
||||||
record1.setIntegralType("sms");
|
record1.setIntegralType("sms");
|
||||||
}else if(busAgentInfo.getAiRealTimeNum1()!=0){
|
}else if(busAgentInfo.getAiRealTimeNum1()!=0){
|
||||||
if(temp1.getAiRealTimeNum()<busAgentInfo.getAiRealTimeNum1()){
|
|
||||||
throw new ServiceException("普通账分余额不足!请联系管理员充值。");
|
|
||||||
}
|
|
||||||
record1.setIntegralUpdateNum(busAgentInfo.getAiRealTimeNum1());
|
record1.setIntegralUpdateNum(busAgentInfo.getAiRealTimeNum1());
|
||||||
record1.setIntegralType("AI");
|
record1.setIntegralType("AI");
|
||||||
}
|
}
|
||||||
|
@ -217,13 +217,19 @@ public class BusAgentInfoServiceImpl implements IBusAgentInfoService
|
||||||
}
|
}
|
||||||
if(busAgentInfo.getAiDurationBalance1()!=0){
|
if(busAgentInfo.getAiDurationBalance1()!=0){
|
||||||
int oldValue1 = temp1.getAiDurationBalance();
|
int oldValue1 = temp1.getAiDurationBalance();
|
||||||
|
if((oldValue1 - newValue)<0){
|
||||||
|
throw new ServiceException("安全账分余额不足!请联系管理员充值。");
|
||||||
|
}
|
||||||
record1.setIntegralBalance(oldValue1 - newValue);
|
record1.setIntegralBalance(oldValue1 - newValue);
|
||||||
record1.setAiIntegralBalance(temp1.getAiRealTimeNum());
|
record1.setAiIntegralBalance(temp1.getAiRealTimeNum());
|
||||||
temp1.setAiDurationBalance(oldValue1 - newValue);
|
temp1.setAiDurationBalance(oldValue1 - newValue);
|
||||||
}else if(busAgentInfo.getAiRealTimeNum1()!=0){
|
}else if(busAgentInfo.getAiRealTimeNum1()!=0){
|
||||||
int oldValue1 = temp1.getAiRealTimeNum();
|
int oldValue1 = temp1.getAiRealTimeNum();
|
||||||
record1.setAiIntegralBalance(oldValue1 - newValue);
|
if((oldValue1 - newValue)<0){
|
||||||
|
throw new ServiceException("普通账分余额不足!请联系管理员充值。");
|
||||||
|
}
|
||||||
record1.setIntegralBalance(temp1.getAiDurationBalance());
|
record1.setIntegralBalance(temp1.getAiDurationBalance());
|
||||||
|
record1.setAiIntegralBalance(oldValue1 - newValue);
|
||||||
temp1.setAiRealTimeNum(oldValue1 - newValue);
|
temp1.setAiRealTimeNum(oldValue1 - newValue);
|
||||||
}
|
}
|
||||||
// int oldValue1 = temp1.getAiDurationBalance();
|
// int oldValue1 = temp1.getAiDurationBalance();
|
||||||
|
|
Loading…
Reference in New Issue