Merge branch 'develop' of https://gitee.com/fusenpack/fusenapi into feature/auth

utils/basic/basic.go

@@ -56,14 +56,18 @@ var (
 	CodeSafeValueRangeErr = &StatusResponse{5040, "value not in range"}    // 值不在范围内
 	CodeTemplateErr       = &StatusResponse{5040, "template parsed error"} // 模板解析错误
 
-	CodeOrderNotFoundErr      = &StatusResponse{5030, "order not found"}                   //未找到订单
-	CodeCloudOrderNotFoundErr = &StatusResponse{5031, "cloud order not found"}             //未找到云仓订单
-	CodeOrderNotCancelledErr  = &StatusResponse{5032, "current order cannot be cancelled"} // 当前订单无法取消
+	CodeOrderNotFoundErr      = &StatusResponse{5030, "order not found"}                    //未找到订单
+	CodeCloudOrderNotFoundErr = &StatusResponse{5031, "cloud order not found"}              //未找到云仓订单
+	CodeOrderNotCancelledErr  = &StatusResponse{5032, "current order cannot be cancelled"}  // 当前订单无法取消
+	CodeOrderCancelledNotOk   = &StatusResponse{5033, "current order cancelled failed"}     // 当前订单取消失败
+	CodeOrderCancelledOk      = &StatusResponse{5034, "current order cancelled successful"} // 当前订单取消成功
 
 	CodePayNotFoundErr = &StatusResponse{5020, "pay info not found"}      // 支付信息无法查询
 	CodePayCancelOk    = &StatusResponse{5021, "cancellation successful"} // 支付取消成功
 	CodePayCancelNotOk = &StatusResponse{5022, "cancellation failed"}     // 支付取消失败
 
+	CodePaybackNotOk = &StatusResponse{5023, "pay back failed"} // 支付回调处理失败
+
 	CodeGuestDupErr = &StatusResponse{5010, "user is already guest and does not need to reapply"} // 用户已经是访客用户,无需重复申请
 	CodeGuestGenErr = &StatusResponse{5011, "serialization failed for guest ID"}                  // 访客ID序列化失败
 
@@ -77,8 +81,8 @@ var (
 	CodeAesCbcEncryptionErr = &StatusResponse{5106, "encryption data err"} // 加密数据失败
 	CodeAesCbcDecryptionErr = &StatusResponse{5107, "decryption data err"} // 解密数据失败
 
-	CodeSharedStateErr       = &StatusResponse{5201, "shared state server  err"} // 状态机错误
-	CodeEmailConfirmationErr = &StatusResponse{5202, "email confirmation   err"} // email 验证错误
+	CodeFileUploadErr     = &StatusResponse{5110, "file upload  err"} // 文件上传失败
+	CodeFileUploadLogoErr = &StatusResponse{5111, "logo upload  err"} // 用户上传LOGO失败
 )
 
 type Response struct {