Просмотр исходного кода

// add shar

release_toaliyun_real
xhxu 3 лет назад
Родитель
Сommit
da94e90f86
4 измененных файлов: 28 добавлений и 3 удалений
  1. +1
    -1
      mallinkBApi/src/main/java/com/iformall/controller/WxMerchantMediaUploadController.java
  2. +1
    -1
      mallinkService/src/main/java/com/iformall/domain/po/WxProfitSharingReceiverApply.java
  3. +0
    -1
      mallinkService/src/main/java/com/iformall/service/WxProfitSharingReceiverApplyService.java
  4. +26
    -0
      mallinkService/src/main/java/com/iformall/service/impl/WxProfitSharingReceiverApplyServiceImpl.java

+ 1
- 1
mallinkBApi/src/main/java/com/iformall/controller/WxMerchantMediaUploadController.java Просмотреть файл

@@ -100,7 +100,7 @@ public class WxMerchantMediaUploadController extends BaseController {
} }
Map<String,String> map = new HashMap<>(); Map<String,String> map = new HashMap<>();
map.put("url",url); map.put("url",url);
map.put("mediaId",mediaId);
map.put("media_id",mediaId);
return new ResultData(map); return new ResultData(map);


} catch(MallinkException e){ } catch(MallinkException e){


+ 1
- 1
mallinkService/src/main/java/com/iformall/domain/po/WxProfitSharingReceiverApply.java Просмотреть файл

@@ -116,7 +116,7 @@ public class WxProfitSharingReceiverApply extends TenantEntity {
@io.swagger.annotations.ApiModelProperty(value="是否完成结算帐号",name="finishBankAccount") @io.swagger.annotations.ApiModelProperty(value="是否完成结算帐号",name="finishBankAccount")
@TableField(exist = false) @TableField(exist = false)
private Boolean finishBankAccount; private Boolean finishBankAccount;
@io.swagger.annotations.ApiModelProperty(value="是否完成超级管理员",name="finishBankAccount")
@io.swagger.annotations.ApiModelProperty(value="是否完成超级管理员",name="finishContact")
@TableField(exist = false) @TableField(exist = false)
private Boolean finishContact; private Boolean finishContact;




+ 0
- 1
mallinkService/src/main/java/com/iformall/service/WxProfitSharingReceiverApplyService.java Просмотреть файл

@@ -2,7 +2,6 @@ package com.iformall.service;


import com.github.pagehelper.PageInfo; import com.github.pagehelper.PageInfo;
import com.iformall.common.ResultData; import com.iformall.common.ResultData;
import com.iformall.domain.po.WxMerchant;
import com.iformall.domain.po.WxProfitSharingReceiverApply; import com.iformall.domain.po.WxProfitSharingReceiverApply;
import com.iformall.domain.po.base.TenantEntity; import com.iformall.domain.po.base.TenantEntity;
import com.iformall.enums.EnumAppPlat; import com.iformall.enums.EnumAppPlat;


+ 26
- 0
mallinkService/src/main/java/com/iformall/service/impl/WxProfitSharingReceiverApplyServiceImpl.java Просмотреть файл

@@ -710,12 +710,38 @@ public class WxProfitSharingReceiverApplyServiceImpl implements WxProfitSharingR


return true; return true;
} }
private String getMerchantMediaId(JSONObject obj){
if(obj == null){
return null;
}
String media_id = obj.getString("media_id");
return media_id;
}


private ResultData applyment4subApplyment(WxProfitSharingReceiverApply receiverApply){ private ResultData applyment4subApplyment(WxProfitSharingReceiverApply receiverApply){
WxPayService wxPayService = wxPayAccountService.getWxPayService(receiverApply.getTenantId()); WxPayService wxPayService = wxPayAccountService.getWxPayService(receiverApply.getTenantId());
try { try {
WxPayApplyment4SubCreateRequest request = new WxPayApplyment4SubCreateRequest(); WxPayApplyment4SubCreateRequest request = new WxPayApplyment4SubCreateRequest();
request.setBusinessCode(receiverApply.getOutRequestNo());
WxPayApplyment4SubCreateRequest.SubjectInfo subjectInfo = new WxPayApplyment4SubCreateRequest.SubjectInfo();

request.setSubjectInfo(subjectInfo);
WxPayApplyment4SubCreateRequest.BusinessInfo businessInfo = new WxPayApplyment4SubCreateRequest.BusinessInfo();

request.setBusinessInfo(businessInfo);
WxPayApplyment4SubCreateRequest.SettlementInfo settlementInfo = new WxPayApplyment4SubCreateRequest.SettlementInfo();

request.setSettlementInfo(settlementInfo);
WxPayApplyment4SubCreateRequest.BankAccountInfo bankAccountInfo = new WxPayApplyment4SubCreateRequest.BankAccountInfo();

request.setBankAccountInfo(bankAccountInfo);
WxPayApplyment4SubCreateRequest.ContactInfo contactInfo = new WxPayApplyment4SubCreateRequest.ContactInfo();

request.setContactInfo(contactInfo);
WxPayApplyment4SubCreateRequest.AdditionInfo additionInfo = new WxPayApplyment4SubCreateRequest.AdditionInfo();


request.setAdditionInfo(additionInfo);
WxPayApplymentCreateResult wxPayApplymentCreateResult = wxPayService.getApplyment4SubService().createApply(request); WxPayApplymentCreateResult wxPayApplymentCreateResult = wxPayService.getApplyment4SubService().createApply(request);
return new ResultData(wxPayApplymentCreateResult.getApplymentId()); return new ResultData(wxPayApplymentCreateResult.getApplymentId());
} catch (WxPayException e) { } catch (WxPayException e) {


Загрузка…
Отмена
Сохранить