1
This commit is contained in:
@@ -11,7 +11,7 @@ func TestGetUsers(t *testing.T) {
|
|||||||
|
|
||||||
conte := make(map[string]string, 0)
|
conte := make(map[string]string, 0)
|
||||||
|
|
||||||
if err := json.Unmarshal([]byte(aa), conte); err != nil {
|
if err := json.Unmarshal([]byte(aa), &conte); err != nil {
|
||||||
t.Fatal(err)
|
t.Fatal(err)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -142,7 +142,7 @@ func MakePrintMsgOnTemp(param map[string]string, userId string) (string, error)
|
|||||||
printMsg := ""
|
printMsg := ""
|
||||||
printValue := make([]interface{}, 0, 0)
|
printValue := make([]interface{}, 0, 0)
|
||||||
userTempMap := make(map[string]string, 0)
|
userTempMap := make(map[string]string, 0)
|
||||||
if err := json.Unmarshal([]byte(userTemp.Temp), userTempMap); err != nil {
|
if err := json.Unmarshal([]byte(userTemp.Temp), &userTempMap); err != nil {
|
||||||
globals.SugarLogger.Debug("err Unmarshal userTemp.Temp", err)
|
globals.SugarLogger.Debug("err Unmarshal userTemp.Temp", err)
|
||||||
return "", err
|
return "", err
|
||||||
}
|
}
|
||||||
@@ -154,7 +154,7 @@ func MakePrintMsgOnTemp(param map[string]string, userId string) (string, error)
|
|||||||
case "goodsListDetail":
|
case "goodsListDetail":
|
||||||
printMsg += model.TempTag[v]
|
printMsg += model.TempTag[v]
|
||||||
skuList := make([]*model.SkuListPrintOrder, 0, 0)
|
skuList := make([]*model.SkuListPrintOrder, 0, 0)
|
||||||
if err := json.Unmarshal([]byte(param[v]), skuList); err != nil {
|
if err := json.Unmarshal([]byte(param[v]), &skuList); err != nil {
|
||||||
globals.SugarLogger.Debug("err Unmarshal userTemp.skuList", err)
|
globals.SugarLogger.Debug("err Unmarshal userTemp.skuList", err)
|
||||||
return "", err
|
return "", err
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -116,27 +116,27 @@ func UnMarshalString2Json(param *PrintSetting) (*PrintSettingObj, error) {
|
|||||||
PickingSetting: nil,
|
PickingSetting: nil,
|
||||||
}
|
}
|
||||||
|
|
||||||
if err := json.Unmarshal([]byte(param.PrintVoiceSetting), printVoiceSetting); err != nil {
|
if err := json.Unmarshal([]byte(param.PrintVoiceSetting), &printVoiceSetting); err != nil {
|
||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
result.PrintVoiceSetting = printVoiceSetting
|
result.PrintVoiceSetting = printVoiceSetting
|
||||||
|
|
||||||
if err := json.Unmarshal([]byte(param.OrderVoiceSetting), orderVoiceSetting); err != nil {
|
if err := json.Unmarshal([]byte(param.OrderVoiceSetting), &orderVoiceSetting); err != nil {
|
||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
result.OrderVoiceSetting = orderVoiceSetting
|
result.OrderVoiceSetting = orderVoiceSetting
|
||||||
|
|
||||||
if err := json.Unmarshal([]byte(param.RiderVoiceSetting), riderVoiceSetting); err != nil {
|
if err := json.Unmarshal([]byte(param.RiderVoiceSetting), &riderVoiceSetting); err != nil {
|
||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
result.RiderVoiceSetting = riderVoiceSetting
|
result.RiderVoiceSetting = riderVoiceSetting
|
||||||
|
|
||||||
if err := json.Unmarshal([]byte(param.CustomerVoiceSetting), customerVoiceSetting); err != nil {
|
if err := json.Unmarshal([]byte(param.CustomerVoiceSetting), &customerVoiceSetting); err != nil {
|
||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
result.CustomerVoiceSetting = customerVoiceSetting
|
result.CustomerVoiceSetting = customerVoiceSetting
|
||||||
|
|
||||||
if err := json.Unmarshal([]byte(param.PickingSetting), pickingSetting); err != nil {
|
if err := json.Unmarshal([]byte(param.PickingSetting), &pickingSetting); err != nil {
|
||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
result.PickingSetting = pickingSetting
|
result.PickingSetting = pickingSetting
|
||||||
|
|||||||
Reference in New Issue
Block a user