Merge branch 'master-count-vehicle' into dev

xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/biz/BaseOrderBiz.java

@@ -5,7 +5,6 @@ import cn.hutool.core.bean.copier.CopyOptions;
 import cn.hutool.core.util.StrUtil;
 import cn.hutool.json.JSONUtil;
 import com.alibaba.fastjson.JSONArray;
-import com.alibaba.fastjson.JSONObject;
 import com.github.wxiaoqi.security.admin.dto.UserMemberDTO;
 import com.github.wxiaoqi.security.admin.feign.UserFeign;
 import com.github.wxiaoqi.security.admin.feign.dto.AppUserDTO;
@@ -17,17 +16,15 @@ import com.github.wxiaoqi.security.common.exception.BaseException;
 import com.github.wxiaoqi.security.common.msg.ObjectRestResponse;
 import com.github.wxiaoqi.security.common.util.Query;
 import com.github.wxiaoqi.security.common.util.process.ResultCode;
-import com.github.wxiaoqi.security.common.vo.PageDataVO;
 import com.google.common.collect.Lists;
-import com.google.gson.JsonObject;
 import com.xxfc.platform.activity.feign.ActivityFeign;
 import com.xxfc.platform.order.biz.inner.OrderCalculateBiz;
 import com.xxfc.platform.order.biz.inner.OrderMsgBiz;
 import com.xxfc.platform.order.contant.enumerate.*;
 import com.xxfc.platform.order.entity.*;
 import com.xxfc.platform.order.mapper.BaseOrderMapper;
-import com.xxfc.platform.order.pojo.account.OrderAccountDetail;
 import com.xxfc.platform.order.pojo.DedDetailDTO;
+import com.xxfc.platform.order.pojo.account.OrderAccountDetail;
 import com.xxfc.platform.order.pojo.calculate.InProgressVO;
 import com.xxfc.platform.order.pojo.mq.OrderMQDTO;
 import com.xxfc.platform.order.pojo.order.OrderListVo;
@@ -59,15 +56,14 @@ import org.joda.time.format.DateTimeFormatter;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
-import tk.mybatis.mapper.entity.Example;
 
-import java.awt.geom.Point2D;
 import java.math.BigDecimal;
 import java.util.*;
 import java.util.stream.Collectors;
 
 import static com.github.wxiaoqi.security.common.config.rabbit.RabbitConstant.*;
-import static com.github.wxiaoqi.security.common.constant.CommonConstants.*;
+import static com.github.wxiaoqi.security.common.constant.CommonConstants.SYS_FALSE;
+import static com.github.wxiaoqi.security.common.constant.CommonConstants.SYS_TRUE;
 import static com.xxfc.platform.universal.constant.DictionaryKey.APP_ORDER;
 import static com.xxfc.platform.universal.constant.DictionaryKey.ILLEGAL_TYPE;
 
@@ -320,7 +316,7 @@ public class BaseOrderBiz extends BaseBiz<BaseOrderMapper, BaseOrder> implements
             }
         }
         JSONArray jsonArray = new JSONArray();
-        if (dedDetailDTO.getCost().intValue() != 0 || dedDetailDTO.getExcessCost().intValue() != 0) {
+        if ((dedDetailDTO.getCost() != null && dedDetailDTO.getCost().intValue() != 0) || (dedDetailDTO.getExcessCost()!=null && dedDetailDTO.getExcessCost().intValue() != 0)) {
             jsonArray.add(dedDetailDTO);
         }
         DedDetailDTO dedDetailDTO1 = new DedDetailDTO();