YOHOBUY / yohobuy-union · Commits

Go to a project

Authored by mingdan.ge
Commit e8fd5c8beac83080458b95c6bdc2c7e745fc6620 1 parent f72e5935

cps活动返利金额

Inline Side-by-side
Showing 1 changed file with 8 additions and 4 deletions
... ... @@ -825,7 +825,7 @@ public class UnionShareServiceImpl implements IUnionShareService,IBusinessExport
//获取数据库
List<UnionShareOrders> unionShareOrdersList = unionShareOrdersMapper.selectRecentlyOrderLimitTen(uid);
//处理订单列表数据
dealShareOrderList(unionShareOrdersList);
dealShareOrderList(unionShareOrdersList,1);
UnionShareOrdersListBO unionShareOrdersListBO = new UnionShareOrdersListBO();
unionShareOrdersListBO.setList(unionShareOrdersList);
//设置缓存
... ... @@ -833,7 +833,7 @@ public class UnionShareServiceImpl implements IUnionShareService,IBusinessExport
return unionShareOrdersList;
}
private void dealShareOrderList(List<UnionShareOrders> unionShareOrdersList) {
private void dealShareOrderList(List<UnionShareOrders> unionShareOrdersList,int type) {
if (CollectionUtils.isNotEmpty(unionShareOrdersList)){
DecimalFormat df1 = new DecimalFormat("0.00");
for (UnionShareOrders unionShareOrders : unionShareOrdersList){
... ... @@ -844,7 +844,11 @@ public class UnionShareServiceImpl implements IUnionShareService,IBusinessExport
if (Integer.valueOf(unionShareOrders.getStatus()) > 90){
unionShareOrders.setAmountStr("+0");
}else {
unionShareOrders.setAmountStr("+"+df1.format(unionShareOrders.getOrderAmount()));//给前台的订单列表只显示订单原本返利（剔除活动返利）
if (type == 1) {
unionShareOrders.setAmountStr("+" + df1.format(unionShareOrders.getOrderAmount()));//给前台的订单列表只显示订单原本返利（剔除活动返利）
} else {
unionShareOrders.setAmountStr("+"+df1.format(unionShareOrders.getExtraAmount()));//给前台的订单列表只显示活动返利（剔除订单原本返利）
}
}
}
}
... ... @@ -1020,7 +1024,7 @@ public class UnionShareServiceImpl implements IUnionShareService,IBusinessExport
unionShareOrderReqBO.setStart((unionShareOrderReqBO.getPage()-1)*unionShareOrderReqBO.getSize());
List<UnionShareOrders> unionShareOrdersList = unionShareOrdersMapper.selectOrderList(unionShareOrderReqBO);
//处理订单列表数据
dealShareOrderList(unionShareOrdersList);
dealShareOrderList(unionShareOrdersList,unionShareOrderReqBO.getType());
response.setSize(unionShareOrderReqBO.getSize());
response.setPage(unionShareOrderReqBO.getPage());
response.setTotal(count);
... ...