Browse Source

fix 增加商户回调

周箭河 5 years ago
parent
commit
d3a0d113b6

+ 2 - 1
mec-biz/src/main/java/com/ym/mec/biz/dal/enums/KitGroupPurchaseTypeEnum.java

@@ -6,7 +6,8 @@ import com.ym.mec.common.enums.BaseEnum;
 public enum  KitGroupPurchaseTypeEnum implements BaseEnum<String,KitGroupPurchaseTypeEnum> {
 public enum  KitGroupPurchaseTypeEnum implements BaseEnum<String,KitGroupPurchaseTypeEnum> {
     FREE("FREE","免费"),
     FREE("FREE","免费"),
     GROUP("GROUP","团购"),
     GROUP("GROUP","团购"),
-    LEASE("LEASE","租赁");
+    LEASE("LEASE","租赁"),
+    OWNED("OWNED", "自备");
     private String code;
     private String code;
 
 
     private String msg;
     private String msg;

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

@@ -317,7 +317,7 @@ public class StudentPaymentOrderDetailServiceImpl extends BaseServiceImpl<Long,
                 }
                 }
                 musicalListDetailDto.setMusicalAmount(studentGoods.getChangeMusicalPrice());
                 musicalListDetailDto.setMusicalAmount(studentGoods.getChangeMusicalPrice());
                 musicalListDetailDto.setAccessoriesAmount(studentGoods.getChangeAccessoriesPrice());
                 musicalListDetailDto.setAccessoriesAmount(studentGoods.getChangeAccessoriesPrice());
-                musicalListDetailDto.setCourseAmount(studentGoods.getChangeCourseFee());
+                musicalListDetailDto.setKitGroupPurchaseTypeEnum(musicalListDetailDto.getKitGroupPurchaseTypeEnum());
             }
             }
             for (SubjectChange margin : margins) {
             for (SubjectChange margin : margins) {
                 if (!musicalListDetailDto.getUserId().equals(margin.getStudentId())) continue;
                 if (!musicalListDetailDto.getUserId().equals(margin.getStudentId())) continue;