- fk

business/jxstore/cms/store.go

@@ -1100,18 +1100,22 @@ func updateOrCreateCourierStore(ctx *jxcontext.Context, storeDetail *dao.StoreDe
 		if storeDetail.CityName == "" {
 			return false, fmt.Errorf("门店的城市码有问题，请检查")
 		}
-		storeDetail = formalizeStore4Courier(storeDetail)
+		formalizeStore4Courier(storeDetail)
 		needUpdate := false
-		if _, err = handlerInfo.Handler.GetStore(ctx, 0, storeDetail.VendorStoreID); err != nil {
+		remoteStoreDetail, err2 := handlerInfo.Handler.GetStore(ctx, 0, storeDetail.VendorStoreID)
+		if err = err2; err != nil {
 			if handlerInfo.Handler.IsErrStoreNotExist(err) {
 				storeDetail.VendorStoreID, storeDetail.AuditStatus, err = handlerInfo.Handler.CreateStore(ctx, storeDetail)
 				if err == nil {
 					isCreated = true
 				} else if handlerInfo.Handler.IsErrStoreExist(err) {
+					storeDetail.AuditStatus = model.StoreAuditStatusCreated
 					err = nil
 				}
 			}
 		} else {
+			storeDetail.CourierStatus = remoteStoreDetail.CourierStatus
+			storeDetail.AuditStatus = remoteStoreDetail.AuditStatus
 			needUpdate = true
 		}
 		if err == nil && needUpdate {
@@ -1161,7 +1165,6 @@ func UpdateOrCreateCourierStores(ctx *jxcontext.Context, storeID int, isForceUpd
 								if isNeedAdd {
 									storeDetail.VendorID = vendorID
 									storeDetail.VendorStoreID = utils.Int2Str(storeDetail.ID)
-									storeDetail.AuditStatus = model.StoreAuditStatusCreated
 								}
 								if _, err = updateOrCreateCourierStore(ctx, storeDetail); err == nil && isNeedAdd {
 									storeCourier := &model.StoreCourierMap{
@@ -1196,14 +1199,12 @@ func UpdateOrCreateCourierStores(ctx *jxcontext.Context, storeID int, isForceUpd
 	return hint, err
 }
 
-func formalizeStore4Courier(storeDetail *dao.StoreDetail2) (newStoreDetail *dao.StoreDetail2) {
-	tmp := *storeDetail
-	newStoreDetail = &tmp
-	newStoreDetail.Name = storeDetail.Name + "-" + storeDetail.VendorStoreID
-	if newStoreDetail.PayeeName == "" {
-		newStoreDetail.PayeeName = "店主"
+func formalizeStore4Courier(storeDetail *dao.StoreDetail2) *dao.StoreDetail2 {
+	storeDetail.Name = storeDetail.Name + "-" + storeDetail.VendorStoreID
+	if storeDetail.PayeeName == "" {
+		storeDetail.PayeeName = "店主"
 	}
-	return newStoreDetail
+	return storeDetail
 }
 
 func ExportShopsHealthInfo(ctx *jxcontext.Context, vendorIDs, storeIDs []int, isAsync, isContinueWhenError bool) (hint string, err error) {