Merge remote-tracking branch 'origin/feature_installment_v1' into feature_installment_v1

src/main/java/com/uas/platform/b2c/fa/payment/model/Installment.java

@@ -71,7 +71,7 @@ public class Installment {
     /**
      * 分期明细
      */
-    @OneToMany(mappedBy = "installment", cascade = { CascadeType.ALL }, fetch = FetchType.LAZY)
+    @OneToMany(mappedBy = "installment", cascade = { CascadeType.PERSIST, CascadeType.REFRESH, CascadeType.MERGE, CascadeType.DETACH }, fetch = FetchType.EAGER)
     @OrderBy("detno")
     private List<InstallmentDetail> installmentDetails;
 

src/main/java/com/uas/platform/b2c/fa/payment/model/InstallmentDetail.java

@@ -31,7 +31,7 @@ public class InstallmentDetail {
     /**
      * 分期信息
      */
-    @ManyToOne(cascade = CascadeType.REFRESH)
+    @ManyToOne(cascade = {CascadeType.REFRESH})
     @JoinColumn(name = "insd_installmentid", insertable = false, updatable = false)
     private Installment installment;
 

src/main/java/com/uas/platform/b2c/fa/payment/service/impl/InstallmentServiceImpl.java

@@ -99,6 +99,13 @@ public class InstallmentServiceImpl implements InstallmentService{
         // 保存分期信息
         installment = installmentDao.save(installment);
 
+        for (InstallmentDetail installmentDetail : installmentDetails) {
+            installmentDetail.setInstallment(installment);
+            installmentDetail.setInstallmentId(installment.getId());
+        }
+
+        installmentDetailDao.save(installmentDetails);
+
         // 订单、采购单保存分期id
         purchase.setInstallmentId(installment.getId());
         order.setInstallmentId(installment.getId());