hanchaolong недель назад: 2
Родитель
Сommit
8dc6d12e49

+ 3 - 3
jd-logistics-modules/jd-logistics-system/src/main/java/com/ruoyi/logistics/service/impl/BizWaybillOrderServiceImpl.java

@@ -611,13 +611,13 @@ public class BizWaybillOrderServiceImpl implements IBizWaybillOrderService
         }
 
         // 校验附加服务
-        if (!"是".equals(dto.getIsPack()) && !"否".equals(dto.getIsPack())) {
+        if (null != dto.getIsPack() && !"是".equals(dto.getIsPack()) && !"否".equals(dto.getIsPack())) {
             errorMsg.append("包装服务参数有误;");
         }
-        if (!"是".equals(dto.getIsReceiptCollect()) && !"否".equals(dto.getIsReceiptCollect())) {
+        if (null != dto.getIsReceiptCollect() && !"是".equals(dto.getIsReceiptCollect()) && !"否".equals(dto.getIsReceiptCollect())) {
             errorMsg.append("签单返还参数有误;");
         }
-        if (null != dto.getGuaranteeMoney()&& dto.getGuaranteeMoney().compareTo(new BigDecimal("0")) <= 0) {
+        if (null != dto.getGuaranteeMoney() && dto.getGuaranteeMoney().compareTo(new BigDecimal("0")) <= 0) {
             errorMsg.append("保价金额不能小于等于0;");
         }
         dto.setAddedService(getAddedService(dto));