Merge remote-tracking branch 'origin/mark' into yonghui

business/jxstore/act/act.go

@@ -81,6 +81,8 @@ func getVendorPriceFromStoreSkuBind(bind *model.StoreSkuBind, vendorID int) (ven
 		vendorPrice = bind.MtwmPrice
 	case model.VendorIDEBAI:
 		vendorPrice = bind.EbaiPrice
+	case model.VendorIDJX:
+		vendorPrice = bind.JxPrice
 	}
 	return vendorPrice
 }
@@ -158,7 +160,9 @@ func ActStoreSkuParam2Model(ctx *jxcontext.Context, db *dao.DaoDB, act *model.Ac
 									wrongSkuList = append(wrongSkuList, v)
 									continue
 								}
-								actSkuMap.SyncStatus = model.SyncFlagNewMask
+								if !(vendorID == model.VendorIDJX || act.Type == model.ActSkuFake) {
+									actSkuMap.SyncStatus = model.SyncFlagNewMask
+								}
 								if v.ActPrice != 0 {
 									actSkuMap.ActualActPrice = v.ActPrice
 								} else {
@@ -428,11 +432,9 @@ func CreateAct(ctx *jxcontext.Context, act *model.Act, vendorIDs []int, actRules
 		actMap := &model.ActMap{
 			ActID:    act.ID,
 			VendorID: vendorID,
-
-			SyncStatus: model.SyncFlagNewMask,
 		}
-		if act.Type == model.ActSkuFake {
-			actMap.SyncStatus = 0
+		if !(vendorID == model.VendorIDJX || act.Type == model.ActSkuFake) {
+			actMap.SyncStatus = model.SyncFlagNewMask
 		}
 		dao.WrapAddIDCULDEntity(actMap, ctx.GetUserName())
 		actMapList = append(actMapList, actMap)