zouxuan 1 год назад
Родитель
Сommit
72c877a5a6

+ 1 - 1
mec-biz/src/main/java/com/ym/mec/biz/service/impl/SellOrderServiceImpl.java

@@ -279,7 +279,7 @@ public class SellOrderServiceImpl extends BaseServiceImpl<Integer, SellOrder> im
         } else {
             mallOrder.setPayType(1);
         }
-        mallOrder.setMemberId(studentPaymentOrder.getUserId().longValue());
+        mallOrder.setMemberId(studentPaymentOrder.getUserId()==null?0L:studentPaymentOrder.getUserId().longValue());
         mallOrder.setPlatformType("STUDENT");
         mallOrder.setSourceType(1);
 

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

@@ -1968,7 +1968,7 @@ public class StudentPaymentOrderServiceImpl extends BaseServiceImpl<Long, Studen
                         row.setMusicalFee(row.getActualAmount());
                     } else if (row.getGroupType().equals(GroupType.GOODS_SELL)) {
                         row.setRetailGoodsFee(row.getActualAmount());
-                    } else {
+                    }else {
                         List<StudentPaymentOrderExportDto> exportDtoList = feeByTypeMap.get(row.getId());
                         if (!org.springframework.util.CollectionUtils.isEmpty(exportDtoList)) {
                             StudentPaymentOrderExportDto feeByType = exportDtoList.get(0);