| @@ -128,3 +128,6 @@ ADD COLUMN `support_pay` int(1) COMMENT '会员小程序是否支持支付enumY | |||||
| ALTER TABLE `mallink`.`wx_park` | ALTER TABLE `mallink`.`wx_park` | ||||
| ADD COLUMN `paid_call_back` varchar(100) COMMENT '支付完成回调地址'; | ADD COLUMN `paid_call_back` varchar(100) COMMENT '支付完成回调地址'; | ||||
| alter table wx_profit_payment_receiver | |||||
| add column `receiver_params` json COMMENT '其他配置参数'; | |||||
| @@ -19,6 +19,7 @@ import com.iformall.service.park.impl.util.ParkHelper; | |||||
| import com.iformall.service.park.pay.WxParkPayService; | import com.iformall.service.park.pay.WxParkPayService; | ||||
| import com.iformall.service.park.utils.ParkCacheUtils; | import com.iformall.service.park.utils.ParkCacheUtils; | ||||
| import com.iformall.service.pay.service.pay.entity.PayAdapterResult; | import com.iformall.service.pay.service.pay.entity.PayAdapterResult; | ||||
| import com.iformall.utils.Constant; | |||||
| import io.swagger.annotations.Api; | import io.swagger.annotations.Api; | ||||
| import io.swagger.annotations.ApiImplicitParam; | import io.swagger.annotations.ApiImplicitParam; | ||||
| @@ -501,7 +502,7 @@ public class WxCarController extends BaseController { | |||||
| } | } | ||||
| //创建微信支付订单 | //创建微信支付订单 | ||||
| PayAdapterResult wxResult = wxParkPayService.createWxPayOrder(user.getOpenId(), user.getAppId(), receiver.getReceiverAccount(), "停车费支付", attachSb.toString(), uniquePayOrderNo, payOrder.getFee(), | PayAdapterResult wxResult = wxParkPayService.createWxPayOrder(user.getOpenId(), user.getAppId(), receiver.getReceiverAccount(), "停车费支付", attachSb.toString(), uniquePayOrderNo, payOrder.getFee(), | ||||
| "127.0.0.1", park.getPaidCallBack(), payAccount.getApiKey(), new Date()); | |||||
| "127.0.0.1", park.getPaidCallBack(), (String)receiver.getReceiverParamValue(Constant.paymentReceicerParamApiKey), new Date()); | |||||
| return new ResultData(wxResult); | return new ResultData(wxResult); | ||||
| } catch (Exception e) { | } catch (Exception e) { | ||||
| logger.error("park createPayOrder error",e); | logger.error("park createPayOrder error",e); | ||||
| @@ -1,6 +1,7 @@ | |||||
| package com.iformall.domain.po; | package com.iformall.domain.po; | ||||
| import com.alibaba.fastjson.JSON; | import com.alibaba.fastjson.JSON; | ||||
| import com.alibaba.fastjson.JSONObject; | |||||
| import com.baomidou.mybatisplus.annotation.TableField; | import com.baomidou.mybatisplus.annotation.TableField; | ||||
| import com.baomidou.mybatisplus.annotation.TableName; | import com.baomidou.mybatisplus.annotation.TableName; | ||||
| import com.iformall.domain.po.base.TenantEntity; | import com.iformall.domain.po.base.TenantEntity; | ||||
| @@ -30,6 +31,8 @@ public class WxProfitPaymentReceiver extends TenantEntity { | |||||
| private Date createTime; | private Date createTime; | ||||
| @io.swagger.annotations.ApiModelProperty(value="",name="updateTime") | @io.swagger.annotations.ApiModelProperty(value="",name="updateTime") | ||||
| private Date updateTime; | private Date updateTime; | ||||
| @io.swagger.annotations.ApiModelProperty(value="其他配置参数",name="receiverParams") | |||||
| private String receiverParams; | |||||
| @io.swagger.annotations.ApiModelProperty(value="分账接收方状态 0,正常 1,停用",name="status") | @io.swagger.annotations.ApiModelProperty(value="分账接收方状态 0,正常 1,停用",name="status") | ||||
| private Integer status; | private Integer status; | ||||
| @@ -46,6 +49,17 @@ public class WxProfitPaymentReceiver extends TenantEntity { | |||||
| @TableField(exist = false) | @TableField(exist = false) | ||||
| private Integer hzImportStatus; | private Integer hzImportStatus; | ||||
| public Object getReceiverParamValue(String key) { | |||||
| if (StringUtils.isBlank(receiverParams)) { | |||||
| return null; | |||||
| } | |||||
| JSONObject o = JSON.parseObject(receiverParams); | |||||
| if (null == o ) { | |||||
| return null; | |||||
| } | |||||
| return o.get(key); | |||||
| } | |||||
| private QueryMerchantResult getMerchantResult(){ | private QueryMerchantResult getMerchantResult(){ | ||||
| QueryMerchantResult queryMerchantResult = null; | QueryMerchantResult queryMerchantResult = null; | ||||
| try{ | try{ | ||||
| @@ -946,7 +946,7 @@ public class WxMerchantServiceImpl implements WxMerchantService { | |||||
| receiver.setPlat(EnumAppPlat.WX.getCode()); | receiver.setPlat(EnumAppPlat.WX.getCode()); | ||||
| } | } | ||||
| receiver.setReceiverAccount(wxMerchant.getAccount()); | receiver.setReceiverAccount(wxMerchant.getAccount()); | ||||
| receiver.setApiKey(wxMerchant.getApiKey()); | |||||
| receiver.setReceiverParams(new StringBuffer("{").append(Constant.paymentReceicerParamApiKey).append(":").append(wxMerchant.getApiKey()).append("}").toString()); | |||||
| wxProfitPaymentReceiverService.saveOrUpdate(receiver); | wxProfitPaymentReceiverService.saveOrUpdate(receiver); | ||||
| } catch (Exception e) { | } catch (Exception e) { | ||||
| logger.error("db failed: 账号操作失败, e:" + e.getMessage()); | logger.error("db failed: 账号操作失败, e:" + e.getMessage()); | ||||
| @@ -115,5 +115,7 @@ public class Constant { | |||||
| //wiwide系统常量 | //wiwide系统常量 | ||||
| public static final Integer wiwideOldPlat = 0;//老平台 | public static final Integer wiwideOldPlat = 0;//老平台 | ||||
| public static final Integer wiwideNewPlat = 1;//新平台 | public static final Integer wiwideNewPlat = 1;//新平台 | ||||
| public static final String paymentReceicerParamApiKey = "apiKey"; | |||||
| } | } | ||||
| @@ -9,6 +9,7 @@ | |||||
| <result column="receiver_type" jdbcType="INTEGER" property="receiverType" /> | <result column="receiver_type" jdbcType="INTEGER" property="receiverType" /> | ||||
| <result column="receiver_account" jdbcType="VARCHAR" property="receiverAccount" /> | <result column="receiver_account" jdbcType="VARCHAR" property="receiverAccount" /> | ||||
| <result column="receiver_comments" jdbcType="VARCHAR" property="receiverComments" /> | <result column="receiver_comments" jdbcType="VARCHAR" property="receiverComments" /> | ||||
| <result column="receiver_params" jdbcType="VARCHAR" property="receiverParams" /> | |||||
| <result column="create_time" jdbcType="TIMESTAMP" property="createTime" /> | <result column="create_time" jdbcType="TIMESTAMP" property="createTime" /> | ||||
| <result column="update_time" jdbcType="TIMESTAMP" property="updateTime" /> | <result column="update_time" jdbcType="TIMESTAMP" property="updateTime" /> | ||||
| <result column="status" jdbcType="INTEGER" property="status" /> | <result column="status" jdbcType="INTEGER" property="status" /> | ||||
| @@ -21,7 +22,7 @@ | |||||
| <sql id="allColumns"> | <sql id="allColumns"> | ||||
| `id`,`tenant_id`,`parent_tenant_id`,`merchant_id`, | `id`,`tenant_id`,`parent_tenant_id`,`merchant_id`, | ||||
| `receiver_type`,`receiver_account`,`receiver_comments`, | |||||
| `receiver_type`,`receiver_account`,`receiver_comments`,`receiver_params`, | |||||
| `create_time`,`update_time`,`status`,`plat`, | `create_time`,`update_time`,`status`,`plat`, | ||||
| `tt_import_status`,`tt_import_url`,`tt_balance_url` | `tt_import_status`,`tt_import_url`,`tt_balance_url` | ||||
| </sql> | </sql> | ||||