|
@@ -348,7 +348,7 @@ public class StudentPaymentOrderDetailServiceImpl extends BaseServiceImpl<Long,
|
|
kitGroupPurchaseType = spod.getKitGroupPurchaseType();
|
|
kitGroupPurchaseType = spod.getKitGroupPurchaseType();
|
|
goodsId = spod.getGoodsIdList();
|
|
goodsId = spod.getGoodsIdList();
|
|
}else if(spod.getType() == OrderDetailTypeEnum.ACCESSORIES){
|
|
}else if(spod.getType() == OrderDetailTypeEnum.ACCESSORIES){
|
|
- accessoriesId = spod.getGoodsIdList();
|
|
|
|
|
|
+ accessoriesId = spod.getGoodsIdList() + ",";
|
|
}else{
|
|
}else{
|
|
withoutMusicalTotalAmount = withoutMusicalTotalAmount.add(spod.getPrice().subtract(spod.getRemitFee()));
|
|
withoutMusicalTotalAmount = withoutMusicalTotalAmount.add(spod.getPrice().subtract(spod.getRemitFee()));
|
|
}
|
|
}
|
|
@@ -390,6 +390,7 @@ public class StudentPaymentOrderDetailServiceImpl extends BaseServiceImpl<Long,
|
|
}else{
|
|
}else{
|
|
|
|
|
|
if(StringUtils.isNoneBlank(accessoriesId)){
|
|
if(StringUtils.isNoneBlank(accessoriesId)){
|
|
|
|
+ accessoriesId = StringUtils.removeEnd(accessoriesId, ",");
|
|
dto.setAccessoriesName(goodsService.findGoodsByIds(accessoriesId).stream().map(Goods::getName).collect(Collectors.joining(",")));
|
|
dto.setAccessoriesName(goodsService.findGoodsByIds(accessoriesId).stream().map(Goods::getName).collect(Collectors.joining(",")));
|
|
}
|
|
}
|
|
|
|
|