|
|
|
@@ -478,6 +478,7 @@ public class WxCarController extends BaseController { |
|
|
|
String receiverAccount = null; |
|
|
|
boolean isIsv = false; |
|
|
|
String apiKey = null; |
|
|
|
EnumCarPayAmountType amountType = null; |
|
|
|
WxAppinfo cAppInfo = wxAppinfoService.getCAppInfoFromRedis(park.getTenantId(), EnumPayWay.PAY_WAY_WECHAT.getPlat()); |
|
|
|
if(cAppInfo == null){ |
|
|
|
throw new MallinkException(ErrorCode.APP_ID_NOT_FOUND.getCode(),"未查询到C端小程序"); |
|
|
|
@@ -492,6 +493,7 @@ public class WxCarController extends BaseController { |
|
|
|
//查找小程序收款账户 |
|
|
|
receiverAccount = payAccount.getSubMchId(); |
|
|
|
isIsv = true; |
|
|
|
amountType = EnumCarPayAmountType.PAY_ACCOUNT; |
|
|
|
//查询商官商户 |
|
|
|
// WxMerchant adminMerchant = wxMerchantService.findAdmin(park); |
|
|
|
// if (null == adminMerchant) { |
|
|
|
@@ -506,15 +508,19 @@ public class WxCarController extends BaseController { |
|
|
|
Integer isvModel = (Integer)receiver.getReceiverParamValue(Constant.paymentReceiverParamIsv); |
|
|
|
if (EnumYesOrNo.YES.getCode() == isvModel) { |
|
|
|
isIsv = true; |
|
|
|
amountType = EnumCarPayAmountType.CAR_ISV_MERCHANT; |
|
|
|
}else { |
|
|
|
amountType = EnumCarPayAmountType.CAR_OWN_MERCHANT; |
|
|
|
} |
|
|
|
apiKey = (String)receiver.getReceiverParamValue(Constant.paymentReceicerParamApiKey); |
|
|
|
} |
|
|
|
int rlength = receiverAccount.length(); |
|
|
|
//最大128 cuserId,cuserPhone,carNumber,merchantId,merchantAccount,parkOrderNo |
|
|
|
//最大128 cuserId,cuserPhone,carNumber,amountType,merchantAccount,parkOrderNo |
|
|
|
StringBuffer attachSb = new StringBuffer() |
|
|
|
.append(user.getUserId()).append(",") |
|
|
|
.append(user.getPhone()).append(",") |
|
|
|
.append(carNumber).append(","); |
|
|
|
.append(carNumber).append(",") |
|
|
|
.append(amountType.getCode()); |
|
|
|
if (rlength > 4) { |
|
|
|
attachSb.append(receiverAccount.substring(rlength-4,rlength)).append(","); |
|
|
|
}else { |
|
|
|
|