submit

zhongzheng-system/src/main/java/com/zhongzheng/modules/top/goods/service/impl/TopOldOrderServiceImpl.java

@@ -4521,7 +4521,7 @@ public class TopOldOrderServiceImpl extends ServiceImpl<TopOldOrderMapper, TopOl
         if (CollectionUtils.isEmpty(orderGoods)) {
             throw new CustomException("订单学员课程信息获取有误");
         }
-        if (orderGoods.stream().allMatch(x -> x.getRefundStatus() != 0 && x.getRefundStatus() != 3)) {
+        if (orderGoods.stream().allMatch(x -> x.getRefundStatus() != 0 && x.getRefundStatus() != 3 && x.getRefundStatus() != 4)) {
             throw new CustomException("订单申请退款学员有误，请检查");
         }
 
@@ -4651,6 +4651,7 @@ public class TopOldOrderServiceImpl extends ServiceImpl<TopOldOrderMapper, TopOl
         vo.setOrderSn(orderVo.getOrderSn());
         vo.setOrderUncollected(orderVo.getOrderUncollected());
         vo.setOrderReceived(orderVo.getOrderReceived());
+        vo.setPayType(orderVo.getPayType());
         BigDecimal decimal = orderVo.getPretaxBrokerage();
         if (ObjectUtils.isNotNull(decimal) && count > 0){
             decimal = orderVo.getPretaxBrokerage().divide(new BigDecimal(count), 2, RoundingMode.HALF_UP);