Merge branch 'mark' of e.coding.net:rosydev/jx-callback into mark

business/jxstore/tempop/tempop.go

@@ -1511,6 +1511,10 @@ func GetJdUsers(ctx *jxcontext.Context, isAsync, isContinueWhenError bool) (hint
 					vendorStoreIDsMap[v] = jxVendorIDsMap[v]
 				}
 				if len(vendorStoreIDsMap) == 0 {
+					if vv.LoginName == "jd_jxcs1223" || vv.LoginName == "jd_jxgy" {
+						jdStruct := JdUserStruct{vv.LoginName, "管理员", vv.LockStatus}
+						jdUsersStruct.AppendData(jdStruct)
+					}
 					jdStruct := JdUserStruct{vv.LoginName, "", vv.LockStatus}
 					jdUsersStruct.AppendData(jdStruct)
 				} else {

business/jxstore/yonghui/yonghui.go

@@ -138,7 +138,7 @@ var (
 			OrgSkuIdCol:    4,
 			OrgSkuPriceCol: 7,
 			OrgSkuNameCol:  5,
-			SkuRow:         2,
+			SkuRow:         1,
 		}, "水产": &SheetParam{
 			SkuIDCol:       1,
 			SkuPriceCol:    15,
@@ -264,7 +264,7 @@ func LoadExcelBinByYongHui(ctx *jxcontext.Context, reader io.Reader, isAsync, is
 			if errMsg == "" {
 				isExecute = true
 			} else {
-				err = fmt.Errorf(errMsg)
+				return "", fmt.Errorf(errMsg)
 			}
 			if isExecute {
 				isCompare, err = UpdateClassifyAndGetLastClassify()