diff --git a/src/main/java/com/glxp/api/service/collect/IoCollectOrderBizService.java b/src/main/java/com/glxp/api/service/collect/IoCollectOrderBizService.java index 1d4d6a745..b7042e038 100644 --- a/src/main/java/com/glxp/api/service/collect/IoCollectOrderBizService.java +++ b/src/main/java/com/glxp/api/service/collect/IoCollectOrderBizService.java @@ -13,6 +13,7 @@ import com.glxp.api.entity.collect.IoCollectOrderBiz; import com.glxp.api.req.collect.CollectOrderBizRequest; import com.glxp.api.res.collect.CollectOrderBizResponse; import com.glxp.api.service.basic.UdiProductService; +import com.glxp.api.util.IntUtil; import org.springframework.stereotype.Service; import javax.annotation.Resource; @@ -38,14 +39,14 @@ public class IoCollectOrderBizService extends ServiceImpl data = collectOrderBizMapper.filterList(collectOrderRequest); - if (collectOrderRequest.getIsOrderCheck() == null){ - for (CollectOrderBizResponse collectOrderBizResponse : data){ + if (collectOrderRequest.getIsOrderCheck() == null) { + for (CollectOrderBizResponse collectOrderBizResponse : data) { collectOrderBizResponse.setProductLocation(setProductName(collectOrderBizResponse)); } } //设置 应该扫码数量 shouldCount - if (data.size() > 0){ - for (CollectOrderBizResponse collectOrderBizResponse : data){ + if (data.size() > 0) { + for (CollectOrderBizResponse collectOrderBizResponse : data) { List productList = basicProductsDao.selectList( new LambdaQueryWrapper() .eq(BasicProductsEntity::getYbbm, collectOrderBizResponse.getYbbm()) @@ -53,28 +54,28 @@ public class IoCollectOrderBizService extends ServiceImpl 0) { - sb.append("-"); - } - sb.append(collectOrderBizResponse.getFreightName()); + if (collectOrderBizResponse.getRegionName() != null && !collectOrderBizResponse.getRegionName().isEmpty()) { + sb.append(collectOrderBizResponse.getRegionName()); + } + if (collectOrderBizResponse.getFreightName() != null && !collectOrderBizResponse.getFreightName().isEmpty()) { + if (sb.length() > 0) { + sb.append("-"); } + sb.append(collectOrderBizResponse.getFreightName()); + } if (layer != null && !layer.isEmpty()) { if (sb.length() > 0) { sb.append("-"); } sb.append(layer + "层"); } - return sb.toString(); + return sb.toString(); }