|
@@ -166,20 +166,24 @@ public class RuleKuaiShouPlanServiceImpl extends ServiceImpl<RuleDatePlanKuaisho
|
|
|
wrapper.eq("unit_id",unitDetail.getLong("unit_id"));
|
|
|
KuaiShouGroup group = kuaiShouGroupService.getOne(wrapper);
|
|
|
if(group!=null){
|
|
|
- unit.setId(unitDetail.getLong("unit_id"));
|
|
|
- unit.setAccountId(accountId);
|
|
|
- unit.setPlanId(unitDetail.getLong("campaign_id"));
|
|
|
- unit.setUnitId(unitDetail.getLong("unit_id"));
|
|
|
- unit.setUnitName(unitDetail.getString("unit_name"));
|
|
|
- unit.setCharge(unitDetail.getBigDecimal("charge"));
|
|
|
- //未知优化目标数据存空
|
|
|
- if(group.getOcpxActionType()!=0){
|
|
|
- unit.setConvertNum(handleConvertNum(group.getOcpxActionType(),unitDetail));
|
|
|
- if(null!=unit.getConvertNum()&&unit.getConvertNum()!=0){
|
|
|
- unit.setConvertCost(unitDetail.getBigDecimal("charge").divide(BigDecimal.valueOf(unit.getConvertNum()), 2, RoundingMode.HALF_UP));
|
|
|
+ Integer status = group.getStatus();
|
|
|
+ Integer putStatus = group.getPutStatus();
|
|
|
+ if((status == 20 || status == 19) && putStatus == 1){
|
|
|
+ unit.setId(unitDetail.getLong("unit_id"));
|
|
|
+ unit.setAccountId(accountId);
|
|
|
+ unit.setPlanId(unitDetail.getLong("campaign_id"));
|
|
|
+ unit.setUnitId(unitDetail.getLong("unit_id"));
|
|
|
+ unit.setUnitName(unitDetail.getString("unit_name"));
|
|
|
+ unit.setCharge(unitDetail.getBigDecimal("charge"));
|
|
|
+ //未知优化目标数据存空
|
|
|
+ if(group.getOcpxActionType()!=0){
|
|
|
+ unit.setConvertNum(handleConvertNum(group.getOcpxActionType(),unitDetail));
|
|
|
+ if(null!=unit.getConvertNum()&&unit.getConvertNum()!=0){
|
|
|
+ unit.setConvertCost(unitDetail.getBigDecimal("charge").divide(BigDecimal.valueOf(unit.getConvertNum()), 2, RoundingMode.HALF_UP));
|
|
|
+ }
|
|
|
}
|
|
|
+ batch.add(unit);
|
|
|
}
|
|
|
- batch.add(unit);
|
|
|
}
|
|
|
|
|
|
});
|