diff --git a/business/partner/purchase/jd/store.go b/business/partner/purchase/jd/store.go index 940d52720..0d5aa3894 100644 --- a/business/partner/purchase/jd/store.go +++ b/business/partner/purchase/jd/store.go @@ -396,36 +396,39 @@ func (c *PurchaseHandler) SyncQualify(ctx *jxcontext.Context, storeDetail *dao.S EconKind: licenceDetail.EconKind, Scope: licenceDetail.Scope, }) + + idFrondURL, err := c.storeUploadImgByURL(storeDetail.IDCardFront) + if err != nil { + return err + } // 个体经营,个体工商户 if storeDetail.LicenceType == 0 { // 个人 - idFrondURL, err := c.storeUploadImgByURL(storeDetail.IDCardFront) - if err != nil { - return err - } personQualify := &jdapi.QualifyItem{ - QualifyType: jdapi.QualifyTypePerson, - QualifyURL: idFrondURL, - QualifyExpireStart: utils.Time2Str(utils.Str2Time(storeDetail.IDValid)), - QualifyNumber: storeDetail.IDCode, - QualifyOwner: storeDetail.LicenceOwnerName, + QualifyType: jdapi.QualifyTypePerson, + QualifyURL: idFrondURL, + QualifyExpireStart: utils.Time2Str(utils.Str2Time(storeDetail.IDValid)), + QualifyExpireForever: 0, + + QualifyNumber: storeDetail.IDCode, + QualifyOwner: storeDetail.LicenceOwnerName, } - if storeDetail.IDExpire == "" { - personQualify.QualifyExpireForever = 0 - } else { + if storeDetail.IDExpire != "" { personQualify.QualifyExpireForever = 1 personQualify.QualifyExpireEnd = utils.Time2Str(utils.Str2Time(storeDetail.IDExpire)) } qualifyList = append(qualifyList, personQualify) } else { - idFrondURL, err := c.storeUploadImgByURL(storeDetail.IDCardFront) - if err != nil { - return err - } - qualifyList = append(qualifyList, &jdapi.QualifyItem{ + addInfo := &jdapi.QualifyItem{ QualifyType: jdapi.QualifyTypeAddInfo, QualifyURL: idFrondURL, - QualifyExpireForever: 1, - }) + QualifyExpireStart: utils.Time2Str(utils.Str2Time(storeDetail.IDValid)), + QualifyExpireForever: 0, + } + if storeDetail.IDExpire != "" { + addInfo.QualifyExpireForever = 1 + addInfo.QualifyExpireEnd = utils.Time2Str(utils.Str2Time(storeDetail.IDExpire)) + } + qualifyList = append(qualifyList, addInfo) } if storeDetail.IDExpire == "" { idBackURL, err := c.storeUploadImgByURL(storeDetail.IDCardBack) @@ -435,7 +438,8 @@ func (c *PurchaseHandler) SyncQualify(ctx *jxcontext.Context, storeDetail *dao.S qualifyList = append(qualifyList, &jdapi.QualifyItem{ QualifyType: jdapi.QualifyTypeAddInfo, QualifyURL: idBackURL, - QualifyExpireForever: 1, + QualifyExpireStart: utils.Time2Str(utils.Str2Time(storeDetail.IDValid)), + QualifyExpireForever: 0, }) } globals.SugarLogger.Debug(utils.Format4Output(qualifyList, false))