|
|
@@ -449,6 +449,9 @@ public class StoreIncomeDetailsRecordServiceImpl extends ServiceImpl<StoreIncome
|
|
|
storeIncomeDetailsRecord.setMoneyStr(new BigDecimal(vo.getMoney()).divide(new BigDecimal(100), 2, RoundingMode.HALF_UP).toString());
|
|
|
String format = df.format(storeIncomeDetailsRecord.getCreatedTime());
|
|
|
storeIncomeDetailsRecord.setDate(format);
|
|
|
+ storeIncomeDetailsRecord.setCommissionRate(storeInfo.getCommissionRate());
|
|
|
+ storeIncomeDetailsRecord.setIncomeMoney(new BigDecimal(vo.getMoney()).add(new BigDecimal(vo.getCommission())).divide(new BigDecimal(100), 2, RoundingMode.HALF_UP).toString());
|
|
|
+ storeIncomeDetailsRecord.setCommissionStr(new BigDecimal(vo.getCommission()).divide(new BigDecimal(100), 2, RoundingMode.HALF_UP).toString());
|
|
|
vo.setCommissionRate(storeInfo.getCommissionRate());
|
|
|
}
|
|
|
jsonObject.put("data", ListToPage.setPage(list, page, size));
|