Procházet zdrojové kódy

feature(结算): 结算明细(未出账单)自动取消时,用户信息完善

likai před 4 roky
rodič
revize
26c0e32779

+ 8 - 5
handler/settle_account_main.go

@@ -90,11 +90,14 @@ func (a *SettleAccountMainController) CancelAccountMain(ctx context.Context, req
 	if err != nil {
 		return err
 	}
-	user, err := micro_srv.GetUserInfo(ctx)
-	if err != nil {
-		user = request.UserInfo{
-			Id: 0,
-			RealName: "系统自动", // 获取不到用户,按自动取消 TODO
+	user := request.UserInfo{
+		Id: 0,
+		RealName: "系统自动取消", // 获取不到用户,自动取消,此时用户为 系统自动取消
+	}
+	if req.IsAuto != "1" {
+		user, err = micro_srv.GetUserInfo(ctx)
+		if err != nil {
+			return err
 		}
 	}
 	g.Log().Info("Received SettleAccountMainController.CancelAccountMain request @ " + tenant)

+ 2 - 1
model/account/settle_account_main.go

@@ -40,5 +40,6 @@ type AccountMainAddReq struct {
 }
 
 type AccountMainCancelReq struct {
-	AppointId  int `json:"appointId"`
+	AppointId  int     `json:"appointId"`
+	IsAuto     string  `json:"is_auto"`
 }