|
|
|
@@ -148,7 +148,7 @@ public class WxProfitSharingReceiverServiceImpl implements WxProfitSharingReceiv |
|
|
|
receiver.setCreateTime(date); |
|
|
|
receiver.setUpdateTime(date); |
|
|
|
receiver.setStatus(EnumProfitSharingReceiverStatus.PROFIT_SHARING_RECEIVER_STATUS_VALID.getCode()); |
|
|
|
receiver.setIsUse(EnumProfitSharingUse.APPLY.getCode()); |
|
|
|
// receiver.setIsUse(EnumProfitSharingUse.APPLY.getCode()); |
|
|
|
receiver.setPlat(payWay.getPlat().getCode()); |
|
|
|
//passed from uplevel |
|
|
|
//receiver.setReceiverAccount(receiverParam.getReceiverAccount()); |
|
|
|
@@ -320,7 +320,7 @@ public class WxProfitSharingReceiverServiceImpl implements WxProfitSharingReceiv |
|
|
|
wxProfitSharingReceiver = oldReceiver; |
|
|
|
wxProfitSharingReceiver.setReceiverType(EnumProfitSharingReceiverType.PROFIT_SHARING_RECEIVER_MERCHANT_ID.getCode()); |
|
|
|
wxProfitSharingReceiver.setReceiverAccount("0"); |
|
|
|
wxProfitSharingReceiver.setIsUse(EnumProfitSharingUse.APPLY.getCode()); |
|
|
|
// wxProfitSharingReceiver.setIsUse(EnumProfitSharingUse.APPLY.getCode()); |
|
|
|
wxProfitSharingReceiver.setStatus(EnumProfitSharingReceiverStatus.PROFIT_SHARING_RECEIVER_STATUS_VALID.getCode()); |
|
|
|
this.saveOrUpdate(wxProfitSharingReceiver); |
|
|
|
} |
|
|
|
@@ -343,13 +343,14 @@ public class WxProfitSharingReceiverServiceImpl implements WxProfitSharingReceiv |
|
|
|
} |
|
|
|
QueryMerchantResult queryMerchantResult = DouYinPayHelper.queryMerchantStatus(appId, payAccountKey, wxProfitSharingReceiver.getReceiverAccount(), wxProfitSharingReceiver.getMerchantId().toString(), null); |
|
|
|
if(queryMerchantResult != null){ |
|
|
|
if(queryMerchantResult.getWx().intValue() != 1){ |
|
|
|
return new ResultData(ErrorCode.SYS_PARAMETER_ERROR.getCode(),"微信渠道未进件成功!"); |
|
|
|
} |
|
|
|
// if(queryMerchantResult.getWx().intValue() != 1){ |
|
|
|
// return new ResultData(ErrorCode.SYS_PARAMETER_ERROR.getCode(),"微信渠道未进件成功!"); |
|
|
|
// } |
|
|
|
// if(queryMerchantResult.getAlipay().intValue() != 1){ |
|
|
|
// return new ResultData(ErrorCode.SYS_PARAMETER_ERROR.getCode(),"支付宝渠道未进件成功!"); |
|
|
|
// } |
|
|
|
wxProfitSharingReceiver.setIsUse(EnumProfitSharingUse.YES.getCode()); |
|
|
|
// wxProfitSharingReceiver.setIsUse(EnumProfitSharingUse.YES.getCode()); |
|
|
|
wxProfitSharingReceiver.setTtImportStatus(JSON.toJSONString(queryMerchantResult)); |
|
|
|
this.saveOrUpdate(wxProfitSharingReceiver); |
|
|
|
return new ResultData(); |
|
|
|
}else{ |
|
|
|
|