Authored by mingdan.ge

cps提现mq兼容老版本

... ... @@ -2098,7 +2098,7 @@ public class UnionShareServiceImpl implements IUnionShareService,IBusinessExport
settlementLog.warn("relateSettlementAndOrder end,uid is {},settlementCode is {},totalAmount is {},insert nothing.",uid,settlementCode,totalAmount);
}
// Set<String> orderCodes = new HashSet<>();
Set<String> orderCodes = new HashSet<>();
List<UnionShareOrdersBo> orderList = new ArrayList<>();//该提现对应的订单
int size = 1000;
int page = count % size > 0 ? (count / size) + 1 : count / size;
... ... @@ -2108,11 +2108,11 @@ public class UnionShareServiceImpl implements IUnionShareService,IBusinessExport
if (CollectionUtils.isEmpty(periodOrders) || periodOrders.get(0) == null) {
break;
}
// orderCodes.addAll(periodOrders);
periodOrders.forEach(o->{
UnionShareOrdersBo b = new UnionShareOrdersBo();
BeanUtils.copyProperties(o,b);
orderList.add(b);
orderCodes.add(b.getOrderCode());
});
}
//查询活动额外返的返利单
... ... @@ -2138,7 +2138,7 @@ public class UnionShareServiceImpl implements IUnionShareService,IBusinessExport
// 发送取现mq给erp SETTLEMENT_TOPIC
ShareSettlementBo bo = new ShareSettlementBo();
BeanUtils.copyProperties(insertReq,bo);
// bo.setOrderCodes(orderCodes);
bo.setOrderCodes(orderCodes);
bo.setOrderList(orderList);
bo.setActivities(activityBos);
System.out.println(JsonUtil.objectToJSON(bo));
... ...