diff --git a/mallinkBApi/src/main/java/com/iformall/controller/WxMerchantMediaUploadController.java b/mallinkBApi/src/main/java/com/iformall/controller/WxMerchantMediaUploadController.java index 01e5c05bb..e6d9707ce 100644 --- a/mallinkBApi/src/main/java/com/iformall/controller/WxMerchantMediaUploadController.java +++ b/mallinkBApi/src/main/java/com/iformall/controller/WxMerchantMediaUploadController.java @@ -100,7 +100,7 @@ public class WxMerchantMediaUploadController extends BaseController { } Map map = new HashMap<>(); map.put("url",url); - map.put("mediaId",mediaId); + map.put("media_id",mediaId); return new ResultData(map); } catch(MallinkException e){ diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxProfitSharingReceiverApply.java b/mallinkService/src/main/java/com/iformall/domain/po/WxProfitSharingReceiverApply.java index f21f97382..0a4e4943d 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxProfitSharingReceiverApply.java +++ b/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") @TableField(exist = false) private Boolean finishBankAccount; - @io.swagger.annotations.ApiModelProperty(value="是否完成超级管理员",name="finishBankAccount") + @io.swagger.annotations.ApiModelProperty(value="是否完成超级管理员",name="finishContact") @TableField(exist = false) private Boolean finishContact; diff --git a/mallinkService/src/main/java/com/iformall/service/WxProfitSharingReceiverApplyService.java b/mallinkService/src/main/java/com/iformall/service/WxProfitSharingReceiverApplyService.java index 6fdff4aeb..3fccba588 100644 --- a/mallinkService/src/main/java/com/iformall/service/WxProfitSharingReceiverApplyService.java +++ b/mallinkService/src/main/java/com/iformall/service/WxProfitSharingReceiverApplyService.java @@ -2,7 +2,6 @@ package com.iformall.service; import com.github.pagehelper.PageInfo; import com.iformall.common.ResultData; -import com.iformall.domain.po.WxMerchant; import com.iformall.domain.po.WxProfitSharingReceiverApply; import com.iformall.domain.po.base.TenantEntity; import com.iformall.enums.EnumAppPlat; diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxProfitSharingReceiverApplyServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxProfitSharingReceiverApplyServiceImpl.java index f63a6ba32..0e0451953 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxProfitSharingReceiverApplyServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxProfitSharingReceiverApplyServiceImpl.java @@ -710,12 +710,38 @@ public class WxProfitSharingReceiverApplyServiceImpl implements WxProfitSharingR 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){ WxPayService wxPayService = wxPayAccountService.getWxPayService(receiverApply.getTenantId()); try { 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); return new ResultData(wxPayApplymentCreateResult.getApplymentId()); } catch (WxPayException e) {