|
@@ -438,7 +438,7 @@ public class MaterialStareServiceImpl implements MaterialStareService {
|
|
|
Map<String,String> lastTime = DateUtils.getStartEndTime(startTime,endTime);
|
|
|
long lastTimeStart = Long.valueOf(DateUtils.getDateInteger(lastTime.get("lastTimeStart")));
|
|
|
long lastTimeEnd = Long.valueOf(DateUtils.getDateInteger(lastTime.get("lastTimeEnd")));
|
|
|
- Integer daysBetween = Integer.valueOf(lastTime.get("daysBetween"));
|
|
|
+ Integer daysBetween = Integer.valueOf(lastTime.get("daysBetween"))+1;
|
|
|
|
|
|
//计算同比 时间值 只支持7天
|
|
|
long startEqually = new Long("0");
|
|
@@ -512,7 +512,7 @@ public class MaterialStareServiceImpl implements MaterialStareService {
|
|
|
Map<String,String> lastTime = DateUtils.getStartEndTime(startTime,endTime);
|
|
|
long lastTimeStart = Long.valueOf(DateUtils.getDateInteger(lastTime.get("lastTimeStart")));
|
|
|
long lastTimeEnd = Long.valueOf(DateUtils.getDateInteger(lastTime.get("lastTimeEnd")));
|
|
|
- Integer daysBetween = Integer.valueOf(lastTime.get("daysBetween"));
|
|
|
+ Integer daysBetween = Integer.valueOf(lastTime.get("daysBetween"))+1;
|
|
|
|
|
|
//计算同比 时间值 只支持7天
|
|
|
long startEqually = new Long("0");
|
|
@@ -573,10 +573,8 @@ public class MaterialStareServiceImpl implements MaterialStareService {
|
|
|
// ==>> 20220202
|
|
|
String now = sdf.format(new Date());
|
|
|
long nowDate = Long.valueOf(now);
|
|
|
-
|
|
|
//当前月份第一天
|
|
|
long monthFirstDay = Long.valueOf(DateUtils.getFirstDayByMonth());
|
|
|
-
|
|
|
//账户余额
|
|
|
JSONObject balance = materialStareMapper.getKuaiShouAccountBalance(accountId);
|
|
|
resultMap.put("balance",Check.isNull(balance) ? "0" : balance.getString("balance"));
|
|
@@ -593,7 +591,6 @@ public class MaterialStareServiceImpl implements MaterialStareService {
|
|
|
//月消耗
|
|
|
JSONObject monthCost = materialStareMapper.getKuaiShouAccountCostMonth(accountId, monthFirstDay,nowDate);
|
|
|
resultMap.put("monthCost",Check.isNull(monthCost) ? "0" : monthCost.getString("cost"));
|
|
|
-
|
|
|
return Result.successMsg("账户查询成功",resultMap);
|
|
|
}
|
|
|
|