From 4f526b034a6e13a521ad71dcbdbea97043d6ea19 Mon Sep 17 00:00:00 2001
From: zhangqian <zhangqian@123.com>
Date: 星期三, 20 三月 2024 19:21:20 +0800
Subject: [PATCH] 发货信息字段完善

---
 api/v1/serviceCollectionPlan.go |    9 +++++----
 1 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/api/v1/serviceCollectionPlan.go b/api/v1/serviceCollectionPlan.go
index 346aec8..3a32ccf 100644
--- a/api/v1/serviceCollectionPlan.go
+++ b/api/v1/serviceCollectionPlan.go
@@ -31,13 +31,14 @@
 		if plan.SourceType == 0 ||
 			plan.SourceId == 0 ||
 			plan.CollectionType == 0 ||
-			plan.CollectionDate.IsZero() ||
+			plan.CollectionDate == "" ||
 			plan.Amount.IsZero() ||
 			plan.Percent.IsZero() ||
 			plan.PrincipalId == 0 {
 			ctx.Fail(ecode.ParamsErr)
 			return
 		}
+		plan.AmountTotal = plan.AmountReceivable
 		plan.Status = constvar.CollectionStatusUnCollected
 	}
 
@@ -104,9 +105,9 @@
 // @Tags		鏀舵璁″垝绠＄悊
 // @Summary	鑾峰彇鏀舵璁″垝鍒楄〃
 // @Produce	application/json
-// @Param		object	query		request.GetServiceCollectionPlanList	true	"鍙傛暟"
+// @Param		object	body		request.GetServiceCollectionPlanList	true	"鍙傛暟"
 // @Success	200	{object}	response.ListResponse{data=[]model.ServiceCollectionPlan}
-// @Router		/api/serviceCollectionPlan/list [get]
+// @Router		/api/serviceCollectionPlan/list [post]
 func (s *ServiceCollectionPlanApi) List(c *gin.Context) {
 	var params request.GetServiceCollectionPlanList
 	ctx, ok := contextx.NewContext(c, &params)
@@ -114,7 +115,7 @@
 		return
 	}
 
-	serviceCollectionPlan, total, errCode := service.NewServiceCollectionPlanService().GetServiceCollectionPlanList(params.ServiceContractId)
+	serviceCollectionPlan, total, errCode := service.NewServiceCollectionPlanService().GetServiceCollectionPlanList(params.SourceType, params.SourceId)
 	if errCode != ecode.OK {
 		ctx.Fail(errCode)
 		return

--
Gitblit v1.8.0