冲突处理

business/jxstore/cms/cms.go

@@ -141,6 +141,8 @@ func InitServiceInfo(version string, buildTime time.Time, gitCommit string) {
 			"autoReplyTypeName":      model.AutoReplyTypeName,
 			"complaintReasons":       model.ComplaintReasons,
 			"supplementType":         model.SupplementTypeName,
+			"operateType":            model.OperateTypeName,
+			"thingType":              model.ThingTypeName,
 		},
 	}
 }

business/jxstore/cms/store_sku.go

@@ -1089,7 +1089,7 @@ func updateStoresSkusWithoutSync(ctx *jxcontext.Context, db *dao.DaoDB, storeIDs
 									setStoreSkuBindStatus(skuBind, model.SyncFlagSaleMask)
 									updateFieldMap[model.FieldStatus] = 1
 								}
-								if skuBindInfo.UnitPrice != 0 && isCanChangePrice { // 这里是否需要加此条件限制
+								if skuBindInfo.UnitPrice != 0 && skuBind.UnitPrice != unitPrice && isCanChangePrice { // 这里是否需要加此条件限制
 									skuBind.UnitPrice = unitPrice
 									skuBind.Price = jxutils.CaculateSkuPrice(unitPrice, v.SpecQuality, v.SpecUnit, v.SkuNameUnit)
 									skuBind.JxPrice = jxutils.CaculatePriceByPricePack(storeDetail.PricePercentagePackObj, int(storeDetail.PricePercentage), skuBind.Price)

business/jxstore/event/event.go

@@ -1,11 +1,54 @@
 package event
 
-import "git.rosy.net.cn/jx-callback/business/jxutils/jxcontext"
+import (
+	"strings"
+	"time"
 
-func AddOperateEvent(ctx *jxcontext.Context) {
+	"git.rosy.net.cn/jx-callback/business/model/dao"
 
+	"git.rosy.net.cn/jx-callback/business/model"
+
+	"git.rosy.net.cn/jx-callback/business/jxutils/jxcontext"
+)
+
+func AddOperateEvent(ctx *jxcontext.Context, accessUUID string) (err error) {
+	var (
+		apiFunction string
+		db          = dao.GetDB()
+	)
+	url := ctx.GetRequest().URL.Path
+	if url != "" {
+		apiFunction = url[strings.LastIndex(url, "/")+1 : len(url)]
+	}
+	event := &model.OperateEvent{
+		CreatedAt:    time.Now(),
+		LastOperator: ctx.GetUserName(),
+		APIFunction:  apiFunction,
+		UserID:       ctx.GetUserID(),
+		AccessUUID:   accessUUID,
+	}
+	dao.Begin(db)
+	defer func() {
+		if r := recover(); r != nil {
+			dao.Rollback(db)
+			panic(r)
+		}
+	}()
+	err = dao.CreateEntity(db, event)
+	dao.Commit(db)
+	return err
 }
 
-func AddOperateEventDetail(ctx *jxcontext.Context) {
-
+func AddOperateEventDetail(operateEventDetail *model.OperateEventDetail) (err error) {
+	db := dao.GetDB()
+	dao.Begin(db)
+	defer func() {
+		if r := recover(); r != nil {
+			dao.Rollback(db)
+			panic(r)
+		}
+	}()
+	err = dao.CreateEntity(db, operateEventDetail)
+	dao.Commit(db)
+	return err
 }