2 Комити 2a10d7e238 ... 365aefd82b

Аутор SHA1 Порука Датум
  hanchaolong 365aefd82b Merge remote-tracking branch 'origin/master' пре 1 недеља
  hanchaolong c9fce04ad4 fix: 运单费用回调缺少费用信息; пре 1 недеља

+ 4 - 0
jd-logistics-modules/jd-logistics-system/src/main/java/com/ruoyi/logistics/callback/JDPushOrderFeeCallback.java

@@ -12,6 +12,7 @@ import com.ruoyi.logistics.service.IBizWaybillOrderService;
 import com.ruoyi.system.api.domain.SysDept;
 import com.ruoyi.system.api.domain.SysDept;
 import com.ruoyi.system.service.ISysDeptService;
 import com.ruoyi.system.service.ISysDeptService;
 import lombok.extern.slf4j.Slf4j;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.collections4.CollectionUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -52,6 +53,9 @@ public class JDPushOrderFeeCallback {
         SysDept sysDept = sysDeptService.selectDeptById(bizWaybillOrder.getDeptId());
         SysDept sysDept = sysDeptService.selectDeptById(bizWaybillOrder.getDeptId());
 
 
         List<BizWaybillCostDetails> details = new ArrayList<>();
         List<BizWaybillCostDetails> details = new ArrayList<>();
+        if (CollectionUtils.isEmpty(request.getCommonActualFeeInfoDetails())) {
+            return AjaxResult.error("费用信息为空");
+        }
         request.getCommonActualFeeInfoDetails().forEach(item -> {
         request.getCommonActualFeeInfoDetails().forEach(item -> {
             BizWaybillCostDetails costDetail = new BizWaybillCostDetails();
             BizWaybillCostDetails costDetail = new BizWaybillCostDetails();
             costDetail.setWaybillId(bizWaybillOrder.getWaybillId());
             costDetail.setWaybillId(bizWaybillOrder.getWaybillId());