解决空指针bug
This commit is contained in:
parent
59dd29f226
commit
f98891b616
|
|
@ -1,15 +1,14 @@
|
|||
package com.sqx.modules.orders.controller;
|
||||
|
||||
import cn.hutool.core.date.DateTime;
|
||||
import cn.hutool.core.convert.Convert;
|
||||
import cn.hutool.core.date.DateUtil;
|
||||
import cn.hutool.core.util.NumberUtil;
|
||||
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
|
||||
import com.sqx.common.utils.DateUtils;
|
||||
import com.sqx.common.utils.Result;
|
||||
import com.sqx.modules.course.entity.CourseCollect;
|
||||
import com.sqx.modules.orders.service.OrdersService;
|
||||
import com.sqx.modules.pay.dao.CashOutDao;
|
||||
import com.sqx.modules.pay.entity.CashOut;
|
||||
import com.sqx.modules.pay.service.CashOutService;
|
||||
import com.sqx.modules.sys.controller.AbstractController;
|
||||
import io.swagger.annotations.Api;
|
||||
import io.swagger.annotations.ApiOperation;
|
||||
|
|
@ -21,8 +20,6 @@ import org.springframework.web.bind.annotation.RestController;
|
|||
|
||||
import java.text.ParseException;
|
||||
import java.text.SimpleDateFormat;
|
||||
import java.time.LocalDateTime;
|
||||
import java.time.format.DateTimeFormatter;
|
||||
import java.util.*;
|
||||
|
||||
@RestController
|
||||
|
|
@ -153,10 +150,13 @@ public class OrdersController extends AbstractController {
|
|||
//总分销
|
||||
// Double sumMoney = ordersService.selectFenXiaoMoney(4, sysUserId, flag, time);
|
||||
Map<String, Object> result = new HashMap<>();
|
||||
result.put("oneMoney", oneMoney);
|
||||
result.put("twoMoney", twoMoney);
|
||||
result.put("qdMoney", qdMoney);
|
||||
result.put("sumMoney", oneMoney + twoMoney + qdMoney);
|
||||
Double one = Convert.toDouble(oneMoney, 0.00d);
|
||||
Double two = Convert.toDouble(twoMoney, 0.00d);
|
||||
Double qd = Convert.toDouble(qdMoney, 0.00d);
|
||||
result.put("oneMoney", one);
|
||||
result.put("twoMoney", two);
|
||||
result.put("qdMoney", qd);
|
||||
result.put("sumMoney", NumberUtil.add(one, two, qd));
|
||||
return Result.success().put("data", result);
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue