From 65a4bb77788149b5c814424ad403af99bcb0097b Mon Sep 17 00:00:00 2001 From: paulGao Date: Mon, 6 Jun 2022 10:12:09 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E4=B8=80=E4=B8=AA=E5=8F=AF?= =?UTF-8?q?=E8=83=BD=E5=8F=91=E7=94=9F=E7=9A=84=E8=8E=B7=E5=8F=96=E8=AE=A2?= =?UTF-8?q?=E5=8D=95=E4=BF=A1=E6=81=AF=E6=97=B6=E5=8F=91=E7=94=9F=E7=9A=84?= =?UTF-8?q?=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../order/order/entity/vo/OrderItemVO.java | 34 +++++++++++-- .../order/order/entity/vo/OrderSimpleVO.java | 50 ++++++++++++++----- 2 files changed, 67 insertions(+), 17 deletions(-) diff --git a/framework/src/main/java/cn/lili/modules/order/order/entity/vo/OrderItemVO.java b/framework/src/main/java/cn/lili/modules/order/order/entity/vo/OrderItemVO.java index 6d091159..5ab18dcf 100644 --- a/framework/src/main/java/cn/lili/modules/order/order/entity/vo/OrderItemVO.java +++ b/framework/src/main/java/cn/lili/modules/order/order/entity/vo/OrderItemVO.java @@ -5,6 +5,7 @@ import cn.lili.modules.order.order.entity.enums.OrderComplaintStatusEnum; import cn.lili.modules.order.order.entity.enums.OrderItemAfterSaleStatusEnum; import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import lombok.NoArgsConstructor; /** * 子订单VO @@ -13,6 +14,7 @@ import lombok.Data; * @since 2020-08-17 20:28 */ @Data +@NoArgsConstructor public class OrderItemVO { @ApiModelProperty(value = "编号") @@ -55,17 +57,39 @@ public class OrderItemVO { private String commentStatus; - public OrderItemVO(String sn, String goodsId, String skuId, String num, String image, String name, String afterSaleStatus, String complainStatus, String commentStatus, Double goodsPrice) { + public void setSn(String sn) { this.sn = sn; - this.goodsId = goodsId; + } + + public void setSkuId(String skuId) { this.skuId = skuId; + } + + public void setNum(String num) { this.num = num; + } + + public void setImage(String image) { this.image = image; + } + + public void setName(String name) { this.name = name; - this.afterSaleStatus = afterSaleStatus; - this.complainStatus = complainStatus; - this.commentStatus = commentStatus; + } + + public void setGoodsPrice(Double goodsPrice) { this.goodsPrice = goodsPrice; } + public void setAfterSaleStatus(String afterSaleStatus) { + this.afterSaleStatus = afterSaleStatus; + } + + public void setComplainStatus(String complainStatus) { + this.complainStatus = complainStatus; + } + + public void setCommentStatus(String commentStatus) { + this.commentStatus = commentStatus; + } } diff --git a/framework/src/main/java/cn/lili/modules/order/order/entity/vo/OrderSimpleVO.java b/framework/src/main/java/cn/lili/modules/order/order/entity/vo/OrderSimpleVO.java index f44efa3d..4f58fb0c 100644 --- a/framework/src/main/java/cn/lili/modules/order/order/entity/vo/OrderSimpleVO.java +++ b/framework/src/main/java/cn/lili/modules/order/order/entity/vo/OrderSimpleVO.java @@ -1,7 +1,7 @@ package cn.lili.modules.order.order.entity.vo; +import cn.hutool.core.text.CharSequenceUtil; import cn.lili.common.enums.ClientTypeEnum; -import cn.lili.common.utils.StringUtils; import cn.lili.modules.order.order.entity.enums.*; import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.annotations.ApiModelProperty; @@ -135,28 +135,54 @@ public class OrderSimpleVO { private String deliverStatus; public List getOrderItems() { - if (StringUtils.isEmpty(groupGoodsId)) { + if (CharSequenceUtil.isEmpty(groupGoodsId)) { return new ArrayList<>(); } List orderItemVOS = new ArrayList<>(); - String[] orderItemsSn = groupOrderItemsSn.split(","); + + String[] goodsId = groupGoodsId.split(","); - String[] skuId = groupSkuId.split(","); - String[] num = groupNum.split(","); - String[] image = groupImages.split(","); - String[] name = groupName.split(","); - String[] afterSaleStatus = groupAfterSaleStatus.split(","); - String[] complainStatus = groupComplainStatus.split(","); - String[] commentStatus = groupCommentStatus.split(","); - String[] goodsPrice = groupGoodsPrice.split(","); for (int i = 0; i < goodsId.length; i++) { - orderItemVOS.add(new OrderItemVO(orderItemsSn[i], goodsId[i], skuId[i], num[i], image[i], name[i], afterSaleStatus[i], complainStatus[i], commentStatus[i], Double.parseDouble(goodsPrice[i]))); + orderItemVOS.add(this.getOrderItemVO(i)); } return orderItemVOS; } + private OrderItemVO getOrderItemVO(int i) { + OrderItemVO orderItemVO = new OrderItemVO(); + orderItemVO.setGoodsId(groupGoodsId.split(",")[i]); + if (CharSequenceUtil.isNotEmpty(groupOrderItemsSn)) { + orderItemVO.setSn(groupOrderItemsSn.split(",")[i]); + } + if (CharSequenceUtil.isNotEmpty(groupSkuId)) { + orderItemVO.setSkuId(groupSkuId.split(",")[i]); + } + if (CharSequenceUtil.isNotEmpty(groupName)) { + orderItemVO.setName(groupName.split(",")[i]); + } + if (CharSequenceUtil.isNotEmpty(groupNum) && groupNum.split(",").length == groupGoodsId.split(",").length) { + orderItemVO.setNum(groupNum.split(",")[i]); + } + if (CharSequenceUtil.isNotEmpty(groupImages) && groupImages.split(",").length == groupGoodsId.split(",").length) { + orderItemVO.setImage(groupImages.split(",")[i]); + } + if (CharSequenceUtil.isNotEmpty(groupAfterSaleStatus) && groupAfterSaleStatus.split(",").length == groupGoodsId.split(",").length) { + orderItemVO.setAfterSaleStatus(groupAfterSaleStatus.split(",")[i]); + } + if (CharSequenceUtil.isNotEmpty(groupComplainStatus) && groupComplainStatus.split(",").length == groupGoodsId.split(",").length) { + orderItemVO.setComplainStatus(groupComplainStatus.split(",")[i]); + } + if (CharSequenceUtil.isNotEmpty(groupCommentStatus) && groupCommentStatus.split(",").length == groupGoodsId.split(",").length) { + orderItemVO.setCommentStatus(groupCommentStatus.split(",")[i]); + } + if (CharSequenceUtil.isNotEmpty(groupGoodsPrice) && groupGoodsPrice.split(",").length == groupGoodsId.split(",").length) { + orderItemVO.setGoodsPrice(Double.parseDouble(groupGoodsPrice.split(",")[i])); + } + return orderItemVO; + } + /** * 初始化自身状态 */