1

business/dao/print_temp_utils.go

@@ -91,43 +91,7 @@ func MakePrintMsgOnTemp(param map[string]string, userId string) (string, error)
 		} else {
 			userTemp = SystemTempObj[model.SystemTempSizeBig]
 		}
-		//// 需要打印数据
+	}
-		//printMsg := ""
-		//printValue := make([]interface{}, 0, 0)
-		//for _, v := range strings.Split(userTemp.TempRank, ",") {
-		//	switch v {
-		//	case "skuName", "skuNumber", "skuPrice", "skuAllPrice", "allSkuTypeCount", "allSkuCount":
-		//		continue
-		//	case "goodsListDetail":
-		//		printMsg += model.TempTag[v]
-		//		skuList := make([]*model.SkuListPrintOrder, 0, 0)
-		//		if err := json.Unmarshal([]byte(param[v]), skuList); err != nil {
-		//			return "", err
-		//		}
-		//		for i := 0; i < len(skuList); i++ {
-		//			printMsg += model.TempTag["skuName"]
-		//			printMsg += model.TempTag["skuNumber"]
-		//			printMsg += model.TempTag["skuPrice"]
-		//			printMsg += model.TempTag["skuAllPrice"]
-		//			printValue = append(printValue, skuList[i].SkuName, skuList[i].SkuName, skuList[i].SalePrice, skuList[i].TotalCountPrice)
-		//			if skuList[i].Upc != "" {
-		//				printMsg += model.TempTag["sku"]
-		//				printValue = append(printValue, skuList[i].Upc)
-		//			}
-		//
-		//		}
-		//	case "businessType":
-		//		if param[v] == "2" { // 是预订单
-		//			printMsg += model.TempTag[v]
-		//		}
-		//	default:
-		//		printMsg += model.TempTag[v]
-		//		printValue = append(printValue, param[v])
-		//	}
-		//
-		//}
-		//return strings.Replace(fmt.Sprintf(strings.Replace(printMsg, "\n", "", -1), printValue...), "\\n", "\r\n", -1), nil
-	} //else {
 	// 需要打印数据
 	printMsg := ""
 	printValue := make([]interface{}, 0, 0)
@@ -278,10 +242,14 @@ func PrinterOrderVoice(param map[string]string, setting *model.PrintSettingObj,
 		}
 		// 订单设置
 		if setting.PrintSetting.ApplyUserCancelOrder == model.SettingOpen { // 申请取消打印
-			textMsg, err = MakePrintMsgOnTemp(param, userId)
+			rejection := ``
-			if err != nil {
+			rejectionValue := make([]interface{}, 0, 0)
-				return "", err
+			rejection += `<center><b>客户申请取消订单:</b></center><br>`
-			}
+			rejection += `<center><b>订单号: %s</b></center><br>`
+			rejection += `<center><b>订单来源: %s # %s</b></center><br>`
+			rejection += `<center><b>取消时间: %s</b></center><br>`
+			rejectionValue = append(rejectionValue, param[model.OrderNoPrint], param[model.VendorNamePrint], param[model.VendorOrderNoPrint], utils.Time2DateStr(time.Now()))
+			textMsg = strings.Replace(fmt.Sprintf(strings.Replace(rejection, "\n", "", -1), rejectionValue...), "\\n", "\r\n", -1)
 		}
 		if setting.VoiceSetting.ApplyUserOrderCancelVoice == model.SettingOpen { // 申请取消语音
 			printVoiceMsg += `<sound>%d</sound>`