fix:最近一次更新订单记录

internal/controller/orderHandler.go

@@ -411,6 +411,7 @@ func UpdateOrderHandler(r *ghttp.Request) {
 			}
 			//编辑回退订单或未完成订单
 			upOrder["last_update_time"] = date.NowFormat(date.Date_Full_Layout)
+			upOrder["last_update_person"] = jyutil.GetUserMsgFromCtx(ctx).EntUserName
 			if _, err = g.DB().Ctx(ctx).Update(ctx, "dataexport_order", upOrder, "order_code=? and order_status=0 ", param.OrderCode); err != nil {
 				return gerror.Wrap(err, "修改订单表内容异常")
 			}
@@ -445,8 +446,9 @@ func UpdateOrderHandler(r *ghttp.Request) {
 			}
 			if len(delDetailIds) > 0 { //存在删除的订单
 				g.DB().Ctx(ctx).Update(ctx, "dataexport_order", map[string]interface{}{
-					"status":           -1,
-					"last_update_time": date.NowFormat(date.Date_Full_Layout),
+					"status":             -1,
+					"last_update_time":   date.NowFormat(date.Date_Full_Layout),
+					"last_update_person": jyutil.GetUserMsgFromCtx(ctx).EntUserName,
 				}, fmt.Sprintf(" id in (%s)", strings.Join(delDetailIds, ",")))
 			}
 			return nil

internal/logic/order/cancellation.go

@@ -7,6 +7,7 @@ import (
 	"github.com/gogf/gf/v2/frame/g"
 	"github.com/gogf/gf/v2/util/gconv"
 	"github.com/pkg/errors"
+	"jyOrderManager/internal/jyutil"
 	"jyOrderManager/internal/model"
 	"time"
 )
@@ -59,6 +60,7 @@ func Cancellation(ctx context.Context, param model.OrderDetailParams) error {
 			return errors.New("订单回退记录失败")
 		}
 	}
+	upOrder["last_update_person"] = jyutil.GetUserMsgFromCtx(ctx).EntUserName
 	upOrder["last_update_time"] = date.NowFormat(date.Date_Full_Layout)
 	g.DB().Update(ctx, "dataexport_order", upOrder, map[string]interface{}{
 		"order_code": param.OrderCode,

internal/logic/order/editBatchReturn.go

@@ -171,6 +171,7 @@ func EditBatchReturn(ctx context.Context, param model.OrdersEditBatchReturn) err
 		if gconv.Int(value["order_status"]) == 0 {
 			updateData["order_status"] = 1
 		}
+		updateData["last_update_person"] = jyutil.GetUserMsgFromCtx(ctx).EntUserName
 		updateData["last_update_time"] = date.NowFormat(date.Date_Full_Layout)
 		_, err1 := g.DB().Ctx(ctx).Update(ctx, "dataexport_order", updateData, map[string]interface{}{"id": value["id"]})
 		if err1 != nil {

internal/logic/order/examine.go

@@ -201,6 +201,7 @@ func OrdersExamine(ctx context.Context, param model.OrdersExamine) error {
 	}
 	//更新订单
 	upData["last_update_time"] = date.NowFormat(date.Date_Full_Layout)
+	upData["last_update_person"] = jyutil.GetUserMsgFromCtx(ctx).EntUserName
 	_, err = g.DB().Ctx(ctx).Update(ctx, "dataexport_order", upData, map[string]interface{}{"order_code": param.OrderCode})
 	if err != nil {
 		return err

internal/logic/order/logicalDelOrder.go

@@ -7,6 +7,7 @@ import (
 	"fmt"
 	"github.com/gogf/gf/v2/frame/g"
 	"io/ioutil"
+	"jyOrderManager/internal/jyutil"
 	"jyOrderManager/internal/model"
 	"k8s.io/apimachinery/pkg/util/json"
 	"log"
@@ -18,7 +19,7 @@ import (
 // OrderLogicalDelOrder 删除
 func OrderLogicalDelOrder(ctx context.Context, param model.OrderCopyLinkParams) (interface{}, error) {
 	ok := true
-	_, err := g.DB().Ctx(ctx).Update(ctx, "dataexport_order", map[string]interface{}{"del_status": 1, "del_time": date.NowFormat(date.Date_Full_Layout), "last_update_time": date.NowFormat(date.Date_Full_Layout)}, map[string]interface{}{"id": param.Id})
+	_, err := g.DB().Ctx(ctx).Update(ctx, "dataexport_order", map[string]interface{}{"del_status": 1, "del_time": date.NowFormat(date.Date_Full_Layout), "last_update_person": jyutil.GetUserMsgFromCtx(ctx).EntUserName, "last_update_time": date.NowFormat(date.Date_Full_Layout)}, map[string]interface{}{"id": param.Id})
 	if err == nil {
 		orderData, _ := g.DB().Ctx(ctx).GetOne(ctx, fmt.Sprintf("SELECT * FROM dataexport_order WHERE id =%s", param.Id))
 		if !orderData.IsEmpty() {

internal/logic/order/redPunch.go

@@ -215,6 +215,7 @@ func OperateOrderRedPunch(ctx context.Context, params model.OrderRedPunchParams)
 		}
 	}
 	updateData["last_update_time"] = date.NowFormat(date.Date_Full_Layout)
+	updateData["last_update_person"] = jyutil.GetUserMsgFromCtx(ctx).EntUserName
 	g.DB().Update(ctx, "dataexport_order", updateData, map[string]interface{}{"order_code": params.OrderCode})
 	for _, m := range insertDataArr {
 		g.DB().Insert(ctx, "moneyCorrection", m)

internal/logic/order/refund.go

@@ -24,8 +24,9 @@ func ConfirmRefund(ctx context.Context, param model.OrderRefundParams) error {
 	qMap["order_code"] = orderCode
 	if param.IsOffline == 0 {
 		_, err := g.DB().Update(ctx, "dataexport_order", map[string]interface{}{
-			"refund_status":    param.RefundStatus,
-			"last_update_time": date.NowFormat(date.Date_Full_Layout),
+			"refund_status":      param.RefundStatus,
+			"last_update_person": jyutil.GetUserMsgFromCtx(ctx).EntUserName,
+			"last_update_time":   date.NowFormat(date.Date_Full_Layout),
 			//"order_status":  -2,
 		}, qMap)
 		if err == nil {
@@ -110,9 +111,10 @@ func ConfirmRefund(ctx context.Context, param model.OrderRefundParams) error {
 			returnStatus = 2
 		}
 		_, err := g.DB().Update(ctx, "dataexport_order", map[string]interface{}{
-			"refund_status":    param.RefundStatus,
-			"return_status":    returnStatus,
-			"last_update_time": date.NowFormat(date.Date_Full_Layout),
+			"refund_status":      param.RefundStatus,
+			"return_status":      returnStatus,
+			"last_update_person": jyutil.GetUserMsgFromCtx(ctx).EntUserName,
+			"last_update_time":   date.NowFormat(date.Date_Full_Layout),
 		}, qMap)
 		return err
 

internal/logic/order/saleRecord.go

@@ -434,8 +434,9 @@ func CommonChange(ctx context.Context, orderCode, operationTime string, operatio
 		return err
 	}
 	if _, err := g.DB().Update(ctx, "dataexport_order", g.Map{
-		"sale_time":        affectTime,
-		"last_update_time": date.NowFormat(date.Date_Full_Layout),
+		"sale_time":          affectTime,
+		"last_update_time":   date.NowFormat(date.Date_Full_Layout),
+		"last_update_person": jyutil.GetUserMsgFromCtx(ctx).EntUserName,
 	}, "order_code=?", orderCode); err != nil {
 		log.Printf("TakeEffectSale  %d %s", operationType, err.Error())
 	}

internal/logic/order/serviceOpen.go

@@ -28,8 +28,9 @@ func ServiceOpen(ctx context.Context, param model.OrderOpenServiceParams) error
 	}
 	if gconv.String(orderData.Map()["user_phone"]) != param.Phone {
 		g.DB().Update(ctx, "dataexport_order", map[string]interface{}{
-			"user_phone":       param.Phone,
-			"last_update_time": date.NowFormat(date.Date_Full_Layout),
+			"user_phone":         param.Phone,
+			"last_update_time":   date.NowFormat(date.Date_Full_Layout),
+			"last_update_person": jyutil.GetUserMsgFromCtx(ctx).EntUserName,
 		}, map[string]interface{}{
 			"order_code": param.OrderCode,
 		})

internal/logic/order/transferAccounts.go

@@ -20,9 +20,10 @@ func TransferAccounts(ctx context.Context, param model.TransferAccountsParams) (
 	qMap := map[string]interface{}{}
 	qMap["order_code"] = orderCode
 	_, _ = g.DB().Update(ctx, "dataexport_order", map[string]interface{}{
-		"course_status":    param.CourseStatus,
-		"pay_money":        param.PayMoney,
-		"last_update_time": date.NowFormat(date.Date_Full_Layout),
+		"course_status":      param.CourseStatus,
+		"pay_money":          param.PayMoney,
+		"last_update_person": jyutil.GetUserMsgFromCtx(ctx).EntUserName,
+		"last_update_time":   date.NowFormat(date.Date_Full_Layout),
 	}, qMap)
 
 	if param.CourseStatus == 4 {

internal/logic/order/uploadContractFile.go

@@ -8,6 +8,7 @@ import (
 	"fmt"
 	"github.com/gogf/gf/v2/database/gdb"
 	"github.com/gogf/gf/v2/frame/g"
+	"jyOrderManager/internal/jyutil"
 	"jyOrderManager/internal/model"
 	"log"
 )
@@ -46,7 +47,7 @@ func UploadContractFile(ctx context.Context, param model.UploadContract) error {
 			return err
 		}
 		if isCommonChange {
-			g.DB().Update(ctx, "dataexport_order", map[string]interface{}{"order_status": 1, "last_update_time": date.NowFormat(date.Date_Full_Layout)}, map[string]interface{}{
+			g.DB().Update(ctx, "dataexport_order", map[string]interface{}{"order_status": 1, "last_update_person": jyutil.GetUserMsgFromCtx(ctx).EntUserName, "last_update_time": date.NowFormat(date.Date_Full_Layout)}, map[string]interface{}{
 				"order_code": param.OrderCode,
 			})
 		}

internal/logic/product/otherProduct/saveUpdate.go

@@ -10,6 +10,7 @@ import (
 	"github.com/gogf/gf/v2/util/gconv"
 	"github.com/pkg/errors"
 	"jyOrderManager/internal/consts"
+	"jyOrderManager/internal/jyutil"
 	"jyOrderManager/internal/logic/product"
 	"jyOrderManager/internal/model"
 	"jyOrderManager/utility"
@@ -105,8 +106,9 @@ func (p jyOtherProduct) SaveUpdate(ctx context.Context, masterKey string) error
 			}
 			filterStr, _ := json.Marshal(filterMap)
 			g.DB().Update(ctx, "dataexport_order", map[string]interface{}{
-				"filter":           gconv.String(filterStr),
-				"last_update_time": date.NowFormat(date.Date_Full_Layout),
+				"filter":             gconv.String(filterStr),
+				"last_update_time":   date.NowFormat(date.Date_Full_Layout),
+				"last_update_person": jyutil.GetUserMsgFromCtx(ctx).EntUserName,
 			}, map[string]interface{}{
 				"order_code": p.CycleClassOrderDetail.OrderCode,
 			})

internal/logic/timedTask/automaticPayment.go

@@ -1,7 +1,6 @@
 package timedTask
 
 import (
-	"app.yhyue.com/moapp/jybase/date"
 	"app.yhyue.com/moapp/jybase/redis"
 	"context"
 	"encoding/json"
@@ -141,7 +140,6 @@ WHERE
 							}
 							if returnId > 0 {
 								log.Println("自动回款创建回款记录成功", id, orderCode)
-								updateData["last_update_time"] = date.NowFormat(date.Date_Full_Layout)
 								g.DB().Update(ctx, "dataexport_order", updateData, map[string]interface{}{"order_code": orderCode})
 								g.DB("cbs").Update(ctx, "transaction", map[string]interface{}{"ISRELATION": 1, "return_id": fmt.Sprint(returnId)}, map[string]interface{}{"id": id})
 								log.Println("自动回款开通权益", orderCode, gconv.Int(o["return_status"]), updateData["return_status"], returned_money, returnMoney, money)

internal/logic/timedTask/onlineReturnMoney.go

@@ -1,7 +1,6 @@
 package timedTask
 
 import (
-	"app.yhyue.com/moapp/jybase/date"
 	"context"
 	"fmt"
 	"github.com/gogf/gf/v2/database/gdb"
@@ -73,7 +72,6 @@ func OnlineReturnMoney() {
 				} else {
 					orderUpdate["return_status"] = 2
 				}
-				orderUpdate["last_update_time"] = date.NowFormat(date.Date_Full_Layout)
 				if _, err := g.DB().Update(ctx, "dataexport_order", orderUpdate, map[string]interface{}{"order_code": orderCode}); err != nil {
 					return err
 				}