feature(计费): 未出账单确认接口实现

handler/settle_account_bill.go

@@ -19,7 +19,7 @@ func (a *SettleAccountBillController) SettleAccountBillList(ctx context.Context,
 	if err != nil {
 		return err
 	}
-	g.Log().Info("Received Account.SettleAccountBillList request @ " + tenant)
+	g.Log().Info("Received SettleAccountBillController.SettleAccountBillList request @ " + tenant)
 	if req.Current < 0 {
 		req.Current = DefaultPageCurrent
 	}

handler/settle_account_detail.go

@@ -19,7 +19,7 @@ func (a *SettleAccountDetailController) SettleAccountDetailList(ctx context.Cont
 	if err != nil {
 		return err
 	}
-	g.Log().Info("Received Account.SettleAccountDetailList request @ " + tenant)
+	g.Log().Info("Received SettleAccountDetailController.SettleAccountDetailList request @ " + tenant)
 	if req.Current < 0 {
 		req.Current = DefaultPageCurrent
 	}

handler/settle_account_main.go

@@ -7,6 +7,7 @@ import (
 	"dashoo.cn/micro_libary/myerrors"
 	"github.com/gogf/gf/frame/g"
 	"lims_adapter/model"
+	accountModel "lims_adapter/model/account"
 	service "lims_adapter/service/settle_account_main"
 )
 
@@ -19,7 +20,7 @@ func (a *SettleAccountMainController) SettleAccountMainList(ctx context.Context,
 	if err != nil {
 		return err
 	}
-	g.Log().Info("Received Account.SettleAccountMainList request @ " + tenant)
+	g.Log().Info("Received SettleAccountMainController.SettleAccountMainList request @ " + tenant)
 	if req.Current < 0 {
 		req.Current = DefaultPageCurrent
 	}
@@ -34,4 +35,27 @@ func (a *SettleAccountMainController) SettleAccountMainList(ctx context.Context,
 	rsp.Msg = msg
 	rsp.Data = g.Map{"total": total, "list": list}
 	return nil
+}
+
+// 结算明细（未出账单）确认
+func (a *SettleAccountMainController) ConfirmAccountMain(ctx context.Context, req *accountModel.AccountMainConfirmReq, rsp *comm_def.CommonMsg) error {
+	tenant, err := micro_srv.GetTenant(ctx)
+	if err != nil {
+		return err
+	}
+	user, err := micro_srv.GetUserInfo(ctx)
+	if err != nil {
+		return err
+	}
+	g.Log().Info("Received SettleAccountMainController.ConfirmAccountMain request @ " + tenant)
+
+	var errors = service.NewService(tenant).Confirm(*req, user)
+	_, err, code, msg := myerrors.CheckError(errors)
+	if err != nil {
+		return err
+	}
+
+	rsp.Code = code
+	rsp.Msg = msg
+	return nil
 }

model/account/settle_account_main.go

@@ -20,4 +20,8 @@ type SettleAccountMainReq struct {
 	Status      string `json:"status"`
 	SettleStatus      string `json:"settleStatus"`
 	FeeType   string `json:"feeType"`
+}
+
+type AccountMainConfirmReq struct {
+	MainId  int `json:"mainId"`
 }

service/settle_account_main/settle_account_main.go

@@ -1,7 +1,10 @@
 package settle_account_main
 
 import (
+	"dashoo.cn/micro_libary/request"
+	"errors"
 	"fmt"
+	"github.com/gogf/gf/os/gtime"
 	"github.com/gogf/gf/util/gconv"
 	"lims_adapter/dao/account"
 	"lims_adapter/model"
@@ -74,3 +77,12 @@ func (s Service) List(req model.ListReq) ([]accountModel.SettleAccountMain, int,
 
 	return list, total, nil
 }
+
+func (s Service) Confirm(req accountModel.AccountMainConfirmReq, user request.UserInfo) error {
+	if req.MainId == 0 {
+		return errors.New("参数缺失")
+	}
+
+	_, err := s.Dao.M.Update(fmt.Sprintf("SettleStatus='1',SettleUserId='%v',SettleUser='%v',SettleDate='%v'", user.Id, user.RealName, gtime.Now()), fmt.Sprintf("Id='%v'", req.MainId))
+	return err
+}