Accept Merge Request #79: (yonghui -> mark)

Merge Request: 刷新历史订单结算价返回值修改
Created By: @苏尹岚
Accepted By: @苏尹岚
URL: https://rosydev.coding.net/p/jx-callback/d/jx-callback/git/merge/79

business/jxcallback/orderman/order.go

@@ -727,14 +727,15 @@ func (c *OrderManager) RefreshHistoryOrdersEarningPrice(ctx *jxcontext.Context,
 				return nil, err
 			}
 			dao.Commit(db)
-			retVal = num
+			retVal = []string{utils.Int64ToStr(num)}
 			return retVal, err
 		}, orderList)
 	tasksch.HandleTask(task, nil, true).Run()
 	if !isAsync {
 		resultNum, err2 := task.GetResult(0)
-		err = err2
-		hint = resultNum[0].(string)
+		if err = err2; err == nil {
+			hint = resultNum[0].(string)
+		}
 	} else {
 		hint = task.GetID()
 	}

business/jxstore/cms/store_sku.go

@@ -2381,6 +2381,7 @@ func StoreSkuNamePriceList2Map(ctx *jxcontext.Context, storeSkuNamePriceList []*
 }
 
 func GetCellIntoStruct(rowNum int, row []string, sheetParam *SheetParam, storeSkuNamePrice *model.StoreSkuNamePrice) (errMsg string) {
+	var nameMap = make(map[string]string)
 	for k, cell := range row {
 		if k == sheetParam.OutSkuIDCol {
 			if IsChineseChar(cell) {
@@ -2399,6 +2400,14 @@ func GetCellIntoStruct(rowNum int, row []string, sheetParam *SheetParam, storeSk
 				}
 			}
 			storeSkuNamePrice.NameIDGroup = cellReplace
+			nameIDs := strings.Split(cellReplace, ",")
+			for _, v := range nameIDs {
+				if nameMap[v] != "" {
+					return fmt.Sprintf("Excel中含有重复的nameID！[%v]列,[%v]行，nameID [%v]", k+1, rowNum+1, v)
+				} else {
+					nameMap[v] = v
+				}
+			}
 		}
 		if k == sheetParam.SkuPriceCol {
 			if IsChineseChar(cell) {