caojiahao/dev_caojiahao
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

!180 修复一个可能发生的获取订单信息时发生的错误

Browse Source 
Merge pull request !180 from OceansDeep/feature/pg
This commit is contained in:
OceansDeep 2022-06-06 02:13:39 +00:00 committed by Gitee
commit 922d7222cd
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
2 changed files with 67 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
framework/src/main/java/cn/lili/modules/order/order/entity/vo/OrderItemVO.java
View File

@ -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;
}
}

50
framework/src/main/java/cn/lili/modules/order/order/entity/vo/OrderSimpleVO.java
View File

@ -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<OrderItemVO> getOrderItems() {
if (StringUtils.isEmpty(groupGoodsId)) {
if (CharSequenceUtil.isEmpty(groupGoodsId)) {
return new ArrayList<>();
}
List<OrderItemVO> 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;
}
/**
* 初始化自身状态
*/