Merge branch 'hotfix_buyercancel_tips_20191118' into gray

@@ -402,10 +402,11 @@ public abstract class AbstractAlipayService extends AbstractPayService {
 					//收集来的错误码
 					//TODO 错误码需要不断完善
 					if (Objects.nonNull(abtee =AlipayBatchTransferErrorEnum.getByCode(errorCode))) {
+						String desc = formatErrorDesc(abtee, transferOrderCode);
 						return TransferResult.builder()
 								.code(501)
 								.payErrorCode(errorCode)
-								.msg(abtee.getDesc())
+								.msg(desc)
 								.build();
 
 					} else {
@@ -428,6 +429,14 @@ public abstract class AbstractAlipayService extends AbstractPayService {
 
     }
 
+    private static String formatErrorDesc(AlipayBatchTransferErrorEnum abtee, String transferOrderCode){
+		String desc = abtee.getDesc();
+		if (abtee.equals(AlipayBatchTransferErrorEnum.TRANS_NO_NOT_UNIQUE)){
+			desc = String.format(desc, transferOrderCode);
+		}
+		return desc;
+	}
+
 	public PayQueryBo transferQuery(String buyerOrderCode) {
 		JSONObject result = transferQueryAsOriginalResult(buyerOrderCode);
 		// 查询结果转换成 共通的对象