liulei/jx-callback
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/jdshop' into jxact

Browse Source
This commit is contained in:
苏尹岚
2020-09-25 11:38:03 +08:00
parent 5f01bc43ae f0a6b1b957
commit d132c796e4
27 changed files with 428 additions and 156 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
business/jxstore/cms/cms.go
View File

@@ -222,6 +222,11 @@ func GetCoordinateDistrictCode(ctx *jxcontext.Context, lng, lat float64) (code i
return api.AutonaviAPI.GetCoordinateDistrictCode(lng, lat), nil
}
func GetCoordinateCityInfo(ctx *jxcontext.Context, lng, lat float64) (name string, err error) {
name, _ = api.AutonaviAPI.GetCoordinateCityInfo(lng, lat)
return name, err
}
func SendMsg2Somebody(ctx *jxcontext.Context, mobileNum, verifyCode, msgType, msgContent string) (err error) {
if needConfirmRequestMap[msgType] == 1 {
if _, err = mobile.AutherObj.VerifySecret(mobileNum, verifyCode); err != nil {

27
business/jxstore/cms/store.go
View File

@@ -3570,6 +3570,19 @@ func CreateStoreAudit(ctx *jxcontext.Context, storeAudit *model.StoreAudit) (err
if len(storeAudits) > 0 {
return fmt.Errorf("您已申请过入驻，请不要重复申请！")
}
if storeAudit.Address == "" {
return fmt.Errorf("门店地址必填！")
}
if storeAudit.Lng == 0 || storeAudit.Lat == 0 {
lng, lat, _ := api.AutonaviAPI.GetCoordinateFromAddressByPage(storeAudit.Address)
if lng != 0 && lat != 0 {
storeAudit.Lng = jxutils.StandardCoordinate2Int(lng)
storeAudit.Lat = jxutils.StandardCoordinate2Int(lat)
} else {
return fmt.Errorf("请填写正确的门店地址！")
}
}
if storeAudit.UserID == "" {
storeAudit.UserID = ctx.GetUserID()
}
@@ -3601,7 +3614,7 @@ func GetStoreAudit(ctx *jxcontext.Context, statuss []int, keyword, applyTimeStar
func StoreAudit(ctx *jxcontext.Context, storeAudits []*model.StoreAudit, status int) (err error) {
db := dao.GetDB()
if status == model.StoreAuditStatusOnline {
if status != model.StoreAuditStatusCreated && status != model.StoreAuditStatusRejected {
return fmt.Errorf("审核标志不正确！")
}
task := tasksch.NewParallelTask("StoreAudit", tasksch.NewParallelConfig().SetParallelCount(5).SetIsContinueWhenError(true), ctx,
@@ -3619,7 +3632,13 @@ func StoreAudit(ctx *jxcontext.Context, storeAudits []*model.StoreAudit, status
storeAudits[0].AuditStatus = model.StoreAuditStatusCreated
//添加门店
storeExt := &StoreExt{}
utils.Map2StructByJson(utils.Struct2MapByJson(&storeAudit), &storeExt, false)
if data, err := json.Marshal(&storeAudits[0]); err == nil {
utils.UnmarshalUseNumber(data, &storeExt)
}
storeExt.ID = 0
storeExt.Store.StoreLevel = "C"
storeExt.FloatLng = jxutils.IntCoordinate2Standard(utils.Float64TwoInt(storeExt.FloatLng))
storeExt.FloatLat = jxutils.IntCoordinate2Standard(utils.Float64TwoInt(storeExt.FloatLat))
storeID, err := CreateStore(ctx, storeExt, ctx.GetUserName())
if err != nil {
return retVal, fmt.Errorf(err.Error())
@@ -3629,13 +3648,13 @@ func StoreAudit(ctx *jxcontext.Context, storeAudits []*model.StoreAudit, status
return retVal, fmt.Errorf(err.Error())
}
} else if status == model.StoreAuditStatusRejected {
storeAudits[0].Status = model.StoreAuditStatusRejected
storeAudits[0].AuditStatus = model.StoreAuditStatusRejected
} else {
return retVal, fmt.Errorf("审核标志不正确！")
}
storeAudits[0].LastOperator = ctx.GetUserName()
storeAudits[0].Remark = storeAudit.Remark
_, err = dao.UpdateEntity(db, storeAudits[0], "UserID", "Status", "Remark")
_, err = dao.UpdateEntity(db, storeAudits[0], "LastOperator", "AuditStatus", "Remark")
//是否推送app消息
if err == nil {

3
business/jxstore/cms/sync2.go
View File

@@ -147,6 +147,9 @@ func SyncSkus(ctx *jxcontext.Context, parentTask tasksch.ITask, vendorIDs []int,
if skuVendorInfo.ExdSkuID != "" {
return nil, err
}
if skuVendorInfo.SkuVendorMapCatID != "" {
skuVendorInfo.VendorVendorCatID = utils.Str2Int64(skuVendorInfo.SkuVendorMapCatID)
}
skuVendorInfo.SkuName = jxutils.ComposeSkuNameSync(skuVendorInfo.Prefix, skuVendorInfo.Name, skuVendorInfo.Comment, skuVendorInfo.Unit, skuVendorInfo.SpecQuality, skuVendorInfo.SpecUnit, 0, skuVendorInfo.ExPrefix, skuVendorInfo.ExPrefixBegin, skuVendorInfo.ExPrefixEnd)
skuVendorInfo.SkuNameOrigin = jxutils.ComposeSkuNameOriginal(skuVendorInfo.Prefix, skuVendorInfo.Name, skuVendorInfo.Comment, skuVendorInfo.Unit, skuVendorInfo.SpecQuality, skuVendorInfo.SpecUnit, 0)
if skuVendorInfo.ImgWatermark != "" {

7
business/jxstore/cms/sync_store_sku.go
View File

@@ -301,9 +301,10 @@ func formalizeStoreSkuList(inSkuList []*dao.StoreSkuSyncInfo) []*dao.StoreSkuSyn
skuItem.SkuName = jxutils.ComposeSkuNameSync(skuItem.Prefix, skuItem.Name, skuItem.Comment, skuItem.Unit, skuItem.SpecQuality, skuItem.SpecUnit, 0, skuItem.ExPrefix, skuItem.ExPrefixBegin, skuItem.ExPrefixEnd)
skuItem.SkuNameOrigin = jxutils.ComposeSkuNameOriginal(skuItem.Prefix, skuItem.Name, skuItem.Comment, skuItem.Unit, skuItem.SpecQuality, skuItem.SpecUnit, 0)
if skuItem.ImgWatermark != "" && model.IsSyncStatusUpdate(skuItem.SkuSyncStatus) && skuItem.VendorID != model.VendorIDJD {
if utils.Time2Date(time.Now().Add(6*time.Hour)).Sub(*skuItem.ExPrefixBegin) >= 0 && utils.Time2Date(time.Now()).Sub(*skuItem.ExPrefixEnd) <= 0 {
downLoad, _ := uploadImgStandard(skuItem.ImgWatermark)
skuItem.ImgMix = jxutils.MixWatermarkImg(downLoad, skuItem.ImgOrigin, skuItem.ExPrefixBegin, skuItem.ExPrefixEnd)
if utils.Time2Date(time.Now().Add(6*time.Hour)).Sub(*skuItem.ExPrefixBegin) == 0 {
// if utils.Time2Date(time.Now().Add(6*time.Hour)).Sub(*skuItem.ExPrefixBegin) >= 0 && utils.Time2Date(time.Now()).Sub(*skuItem.ExPrefixEnd) <= 0 {
// downLoad, _ := uploadImgStandard(skuItem.ImgWatermark)
skuItem.ImgMix = jxutils.MixWatermarkImg(skuItem.ImgWatermark, skuItem.ImgOrigin, skuItem.ExPrefixBegin, skuItem.ExPrefixEnd)
}
if utils.Time2Date(time.Now().Add(6*time.Hour)).Sub(*skuItem.ExPrefixEnd) > 0 {
skuItem.ImgMix = ""