|
|
@@ -278,6 +278,11 @@ public class StudentPaymentOrderDetailServiceImpl extends BaseServiceImpl<Long,
|
|
|
if (StringUtils.isNotEmpty(s)) {
|
|
|
e.setKitGroupPurchaseTypeEnum(KitGroupPurchaseTypeEnum.valueOf(purchaseTypeMap.get(e.getPaymentOrderId())));
|
|
|
}
|
|
|
+ SubjectChange studentLastChange = subjectChangeDao.getStudentLastChange(e.getUserId(), musicGroupId);
|
|
|
+ if(studentLastChange != null){
|
|
|
+ studentLastChange.setOriginalKitGroupPurchaseType(studentLastChange.getKitGroupPurchaseType());
|
|
|
+ }
|
|
|
+
|
|
|
List<Goods> accessories = new ArrayList<>();
|
|
|
for (StudentPaymentOrderDetail detail : details) {
|
|
|
if (!e.getPaymentOrderId().equals(detail.getPaymentOrderId())) continue;
|