Kaynağa Gözat

fix cashout

release_toaliyun_real
xiaohanzi 5 yıl önce
ebeveyn
işleme
b38274a359
4 değiştirilmiş dosya ile 10 ekleme ve 8 silme
  1. +1
    -0
      mallinkBApi/src/main/java/com/iformall/controller/WxCashOutController.java
  2. +1
    -1
      mallinkService/src/main/java/com/iformall/service/impl/WxCashOutServiceImpl.java
  3. +7
    -7
      mallinkVideo/src/main/java/com/iformall/video/aliyun/AliyunVedioUploadHelper.java
  4. +1
    -0
      mallinkVideo/src/main/java/com/iformall/video/aliyun/AliyunVideoExcutor.java

+ 1
- 0
mallinkBApi/src/main/java/com/iformall/controller/WxCashOutController.java Dosyayı Görüntüle

@@ -183,6 +183,7 @@ public class WxCashOutController extends BaseController {
wxCashOut.setReciveOpenId(mUser.getOpenId()); wxCashOut.setReciveOpenId(mUser.getOpenId());
wxCashOut.setReciveNickName(mUser.getNickName()); wxCashOut.setReciveNickName(mUser.getNickName());
wxCashOut.setWxBOpenHeadImg(mUser.getAvatarUrl()); wxCashOut.setWxBOpenHeadImg(mUser.getAvatarUrl());
wxCashOut.setPhone(mUser.getPhone());
}catch(Exception e) { }catch(Exception e) {
return new ResultData(Result.ERROR,buser.getPhone()+"匹配C端用户失败,该情况可能是存在多个微信对应统一手机号,请联系管理员处理, 。"); return new ResultData(Result.ERROR,buser.getPhone()+"匹配C端用户失败,该情况可能是存在多个微信对应统一手机号,请联系管理员处理, 。");
} }


+ 1
- 1
mallinkService/src/main/java/com/iformall/service/impl/WxCashOutServiceImpl.java Dosyayı Görüntüle

@@ -146,7 +146,7 @@ public class WxCashOutServiceImpl implements WxCashOutService {
cashout.setMerchantName(merchant.getName()); cashout.setMerchantName(merchant.getName());
cashout.setReciveOpenId(record.getReciveOpenId()); cashout.setReciveOpenId(record.getReciveOpenId());
cashout.setReciveNickName(record.getReciveNickName()); cashout.setReciveNickName(record.getReciveNickName());
cashout.setPhone(buser.getPhone());
cashout.setPhone(record.getPhone());
cashout.setWxBOpenHeadImg(record.getWxBOpenHeadImg()); cashout.setWxBOpenHeadImg(record.getWxBOpenHeadImg());
cashout.updateTenantInfo(buser); cashout.updateTenantInfo(buser);
wxCashOutMapper.insert(cashout); wxCashOutMapper.insert(cashout);


+ 7
- 7
mallinkVideo/src/main/java/com/iformall/video/aliyun/AliyunVedioUploadHelper.java Dosyayı Görüntüle

@@ -158,7 +158,7 @@ public class AliyunVedioUploadHelper {
* @param title * @param title
* @param fileName * @param fileName
*/ */
private static void uploadVideo(String accessKeyId, String accessKeySecret, String title, String fileName) {
public static void uploadVideo(String accessKeyId, String accessKeySecret, String title, String fileName) {
UploadVideoRequest request = new UploadVideoRequest(accessKeyId, accessKeySecret, title, fileName); UploadVideoRequest request = new UploadVideoRequest(accessKeyId, accessKeySecret, title, fileName);
/* 可指定分片上传时每个分片的大小,默认为2M字节 */ /* 可指定分片上传时每个分片的大小,默认为2M字节 */
request.setPartSize(2 * 1024 * 1024L); request.setPartSize(2 * 1024 * 1024L);
@@ -224,7 +224,7 @@ public class AliyunVedioUploadHelper {
* @param fileName * @param fileName
* @param url * @param url
*/ */
private static void uploadURLStream(String accessKeyId, String accessKeySecret, String title, String url, String fileExtension) {
public static void uploadURLStream(String accessKeyId, String accessKeySecret, String title, String url, String fileExtension) {
UploadURLStreamRequest request = new UploadURLStreamRequest(accessKeyId, accessKeySecret, title, url); UploadURLStreamRequest request = new UploadURLStreamRequest(accessKeyId, accessKeySecret, title, url);


/* 文件扩展名*/ /* 文件扩展名*/
@@ -284,7 +284,7 @@ public class AliyunVedioUploadHelper {
* @param title * @param title
* @param fileName * @param fileName
*/ */
private static void uploadFileStream(String accessKeyId, String accessKeySecret, String title, String fileName) {
public static void uploadFileStream(String accessKeyId, String accessKeySecret, String title, String fileName) {
UploadFileStreamRequest request = new UploadFileStreamRequest(accessKeyId, accessKeySecret, title, fileName); UploadFileStreamRequest request = new UploadFileStreamRequest(accessKeyId, accessKeySecret, title, fileName);
/* 是否使用默认水印(可选),指定模板组ID时,根据模板组配置确定是否使用默认水印*/ /* 是否使用默认水印(可选),指定模板组ID时,根据模板组配置确定是否使用默认水印*/
//request.setShowWaterMark(true); //request.setShowWaterMark(true);
@@ -336,7 +336,7 @@ public class AliyunVedioUploadHelper {
* @param fileName * @param fileName
* @param inputStream * @param inputStream
*/ */
private static void uploadStream(String accessKeyId, String accessKeySecret, String title, String fileName, InputStream inputStream) {
public static void uploadStream(String accessKeyId, String accessKeySecret, String title, String fileName, InputStream inputStream) {
UploadStreamRequest request = new UploadStreamRequest(accessKeyId, accessKeySecret, title, fileName, inputStream); UploadStreamRequest request = new UploadStreamRequest(accessKeyId, accessKeySecret, title, fileName, inputStream);
/* 是否使用默认水印(可选),指定模板组ID时,根据模板组配置确定是否使用默认水印*/ /* 是否使用默认水印(可选),指定模板组ID时,根据模板组配置确定是否使用默认水印*/
//request.setShowWaterMark(true); //request.setShowWaterMark(true);
@@ -385,7 +385,7 @@ public class AliyunVedioUploadHelper {
* @param accessKeyId * @param accessKeyId
* @param accessKeySecret * @param accessKeySecret
*/ */
private static void uploadImageLocalFile(String accessKeyId, String accessKeySecret) {
public static void uploadImageLocalFile(String accessKeyId, String accessKeySecret) {
/* 图片类型(必选)取值范围:default(默认),cover(封面),watermark(水印)*/ /* 图片类型(必选)取值范围:default(默认),cover(封面),watermark(水印)*/
String imageType = "cover"; String imageType = "cover";
UploadImageRequest request = new UploadImageRequest(accessKeyId, accessKeySecret, imageType); UploadImageRequest request = new UploadImageRequest(accessKeyId, accessKeySecret, imageType);
@@ -429,7 +429,7 @@ public class AliyunVedioUploadHelper {
* @param accessKeyId * @param accessKeyId
* @param accessKeySecret * @param accessKeySecret
*/ */
private static void uploadImageStream(String accessKeyId, String accessKeySecret) {
public static void uploadImageStream(String accessKeyId, String accessKeySecret) {
/* 图片类型(必选)取值范围:default(默认),cover(封面),watermark(水印)*/ /* 图片类型(必选)取值范围:default(默认),cover(封面),watermark(水印)*/
String imageType = "cover"; String imageType = "cover";
UploadImageRequest request = new UploadImageRequest(accessKeyId, accessKeySecret, imageType); UploadImageRequest request = new UploadImageRequest(accessKeyId, accessKeySecret, imageType);
@@ -482,7 +482,7 @@ public class AliyunVedioUploadHelper {
* m3u8Filename: 本地m3u8索引文件的绝对路径,且m3u8文件的分片信息必须是相对路径,不能含有URL或本地绝对路径 * m3u8Filename: 本地m3u8索引文件的绝对路径,且m3u8文件的分片信息必须是相对路径,不能含有URL或本地绝对路径
* sliceFilenames: ts分片文件的绝对路径列表,如指定则以此为准,若不指定,则自动解析 m3u8Filename 里的m3u8文件 * sliceFilenames: ts分片文件的绝对路径列表,如指定则以此为准,若不指定,则自动解析 m3u8Filename 里的m3u8文件
*/ */
private static void uploadLocalM3u8(String accessKeyId, String accessKeySecret) {
public static void uploadLocalM3u8(String accessKeyId, String accessKeySecret) {
String title = "test_upload_local_m3u8"; String title = "test_upload_local_m3u8";
String m3u8Filename = "/Users/test/0e9ecfc6da934d1887ed7bdfc925ecf5/cc38da35c7b24de0abe58619cdd7a8-6479a12446b994719838e0307f6458-ld.m3u8"; String m3u8Filename = "/Users/test/0e9ecfc6da934d1887ed7bdfc925ecf5/cc38da35c7b24de0abe58619cdd7a8-6479a12446b994719838e0307f6458-ld.m3u8";
UploadLocalM3u8Request request = new UploadLocalM3u8Request(accessKeyId, accessKeySecret, title, m3u8Filename); UploadLocalM3u8Request request = new UploadLocalM3u8Request(accessKeyId, accessKeySecret, title, m3u8Filename);


+ 1
- 0
mallinkVideo/src/main/java/com/iformall/video/aliyun/AliyunVideoExcutor.java Dosyayı Görüntüle

@@ -17,6 +17,7 @@ public class AliyunVideoExcutor implements VideoExcutor {
@Override @Override
public VideUploadResult uploadLocalVideo(String title,String localFile) { public VideUploadResult uploadLocalVideo(String title,String localFile) {
//AliyunVedioUploadHelper.
return null; return null;
} }




Yükleniyor…
İptal
Kaydet