Merge branch 'bugfix_3/17' into fms_2.5

controller/contract/register.go

@@ -460,6 +460,23 @@ func (rg *RegisterController) Add(c *gin.Context) {
 			resp.FailMsg("删除预登记失败", "Err:"+e.Error(), c)
 			return
 		}
+
+		for i := 0; i < len(serviceAmountList); i++ {
+			// 合同服务
+			t := serviceAmountList[i]
+			tmp := &fms.ContractServiceAmount{
+				ContractRegisterId: ob.ContractRegisterId,
+				ProductId:          t.ProductId,
+				ServiceAmount:      t.ServiceAmount,
+				CurrencyUnit:       t.CurrencyUnit,
+			}
+
+			if e := tmp.Create(); e != nil {
+				resp.FailData("日期格式有误", "Err:"+e.Error(), c)
+				return
+			}
+		}
+
 		// 校验金额-是否修改状态
 		go fmsService.CheckContractRegisterAmount(ob.ContractRegisterId)
 
@@ -1663,7 +1680,7 @@ func (rg *RegisterController) Export(c *gin.Context) {
 		dataRow.AddCell().SetString(v.RaiSellerName)
 
 		// 大套餐
-		k += 1
+		k += 2
 		col4Name := row3Title[k]
 		svList := serviceMap[v.ContractRegisterId]
 		col4 := ""
@@ -1724,9 +1741,15 @@ func (rg *RegisterController) Export(c *gin.Context) {
 		dataRow.AddCell().SetString(v.CurrencyUnit)                                      // 货币单位
 		if ficcAmount != nil {
 			dataRow.AddCell().SetString(fmt.Sprint("￥", ficcAmount.ServiceAmount)) // FICC套餐总金额
+			dataRow.AddCell().SetString("") // 权益套餐总金额
 		}
 		if raiAmount != nil {
-			dataRow.AddCell().SetString(fmt.Sprint("￥", raiAmount.ServiceAmount)) // 权益套餐总金额
+			dataRow.AddCell().SetString("") // 权益套餐总金额
+			dataRow.AddCell().SetString(fmt.Sprint("￥", raiAmount.ServiceAmount)) // FICC套餐总金额
+		}
+		if ficcAmount == nil && raiAmount == nil {
+			dataRow.AddCell().SetString("") // FICC套餐总金额
+			dataRow.AddCell().SetString("") // 权益套餐总金额
 		}
 		dataRow.AddCell().SetString(v.AgreedPayTime)                                    // 约定付款时间
 		dataRow.AddCell().SetString(utils.TimeTransferString("2006/01/02", v.SignDate)) // 签订日