增加查询详情时返回值的优化

mec-biz/src/main/java/com/ym/mec/biz/dal/vo/StudentPaymentOrderVo.java

@@ -3,6 +3,7 @@ package com.ym.mec.biz.dal.vo;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.ym.mec.biz.dal.enums.OrderDetailTypeEnum;
 import com.ym.mec.biz.dal.enums.OrderTypeEnum;
+import org.apache.commons.lang3.StringUtils;
 
 import java.math.BigDecimal;
 import java.util.Date;
@@ -80,7 +81,7 @@ public class StudentPaymentOrderVo {
         }
 
         public void setGoodsName(String goodsName) {
-            this.goodsName = OrderDetailTypeEnum.valueOf(goodsName).getMsg();
+            this.goodsName = StringUtils.isBlank(goodsName) ? null : OrderDetailTypeEnum.valueOf(goodsName).getMsg();
         }
 
         public BigDecimal getPrice() {

mec-biz/src/main/java/com/ym/mec/biz/service/impl/StudentPaymentOrderServiceImpl.java

@@ -30,6 +30,7 @@ import com.ym.mec.thirdparty.adapay.Payment;
 import com.ym.mec.thirdparty.yqpay.*;
 import com.ym.mec.util.collection.MapUtil;
 import com.ym.mec.util.date.DateUtil;
+import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -826,7 +827,18 @@ public class StudentPaymentOrderServiceImpl extends BaseServiceImpl<Long, Studen
         Optional.ofNullable(orderNo)
                 .map(this::findOrderByOrderNo)
                 .orElseThrow(() -> new BizException("未查询到该订单数据!"));
-        return studentPaymentOrderDao.queryOrderDetail(orderNo);
+        StudentPaymentOrderVo voList = studentPaymentOrderDao.queryOrderDetail(orderNo);
+        if (Objects.nonNull(voList) && CollectionUtils.isNotEmpty(voList.getList())) {
+            List<StudentPaymentOrderVo.StudentPaymentDetailVo> collect = voList.getList().stream()
+                    .filter(d -> Objects.nonNull(d.getGoodsName()))
+                    .collect(Collectors.toList());
+            if (CollectionUtils.isEmpty(collect)) {
+                voList.setList(null);
+            } else {
+                voList.setList(collect);
+            }
+        }
+        return voList;
     }
 
 

mec-biz/src/main/resources/config/mybatis/StudentPaymentOrderMapper.xml

@@ -1054,7 +1054,7 @@
         from student_payment_order as a
                  left join
              student_payment_order_detail as b on a.id_ = b.payment_order_id_
-        where order_no_ = #{orderNo};
+        where order_no_ = #{orderNo}
     </select>