| @@ -83,6 +83,7 @@ public class WxCarController extends BaseController { | |||||
| WxPark park = getCurrentPark(getTenantInfo()); | WxPark park = getCurrentPark(getTenantInfo()); | ||||
| Map map = new HashMap(); | Map map = new HashMap(); | ||||
| map.put("vendor", park.getVendorType()); | map.put("vendor", park.getVendorType()); | ||||
| map.put("vendorConfig", park.getCouponParams()); | |||||
| return new ResultData(map); | return new ResultData(map); | ||||
| } | } | ||||
| @@ -36,6 +36,7 @@ public class WxPark extends TenantEntity { | |||||
| private Integer vendorType; | private Integer vendorType; | ||||
| @io.swagger.annotations.ApiModelProperty(value="厂商参数etcp{\"url\":\"http://mapi.test.etcp.cn\",\"appId\":\"FMLK\",\"merchantNo\":\"C7AEAF80BA8C44ADB42F3DB3CBC7D18A\",\"merchantKey\":\"C292FFC7DCFB46AFB02792CD43F6DCC7\",\"version\": \"1.0.0\",\"parkId\":\"Wj7YdvqyiYM=\"},TJD{\"url\":\"http://prep.tingjiandan.com/openapi/gateway\",\"partner\":\"7dbc8ec9037d403b822cb60addfdc681\",\"key\":\"f356cb1bf5a74fb7a564e86128d2c49f\",\"version\":\"1.0\"}",name="vendorParams") | @io.swagger.annotations.ApiModelProperty(value="厂商参数etcp{\"url\":\"http://mapi.test.etcp.cn\",\"appId\":\"FMLK\",\"merchantNo\":\"C7AEAF80BA8C44ADB42F3DB3CBC7D18A\",\"merchantKey\":\"C292FFC7DCFB46AFB02792CD43F6DCC7\",\"version\": \"1.0.0\",\"parkId\":\"Wj7YdvqyiYM=\"},TJD{\"url\":\"http://prep.tingjiandan.com/openapi/gateway\",\"partner\":\"7dbc8ec9037d403b822cb60addfdc681\",\"key\":\"f356cb1bf5a74fb7a564e86128d2c49f\",\"version\":\"1.0\"}",name="vendorParams") | ||||
| private String vendorParams; | private String vendorParams; | ||||
| @io.swagger.annotations.ApiModelProperty(value="优惠券配置参数",name="couponParams") | |||||
| private String couponParams; | |||||
| } | } | ||||
| @@ -16,10 +16,11 @@ | |||||
| <result column="parking_id" jdbcType="VARCHAR" property="parkingId"/> | <result column="parking_id" jdbcType="VARCHAR" property="parkingId"/> | ||||
| <result column="vendor_type" jdbcType="INTEGER" property="vendorType"/> | <result column="vendor_type" jdbcType="INTEGER" property="vendorType"/> | ||||
| <result column="vendor_params" jdbcType="VARCHAR" property="vendorParams"/> | <result column="vendor_params" jdbcType="VARCHAR" property="vendorParams"/> | ||||
| <result column="coupon_params" jdbcType="VARCHAR" property="couponParams"/> | |||||
| </resultMap> | </resultMap> | ||||
| <sql id="allColumns"> | <sql id="allColumns"> | ||||
| `id`,`tenant_id`,`parent_tenant_id`,`img_url`,`addr`,`number`,`entry_exit`,`stop_fee`,`create_date`,`update_date`,`park_id`,`parking_id`,`vendor_type`,`vendor_params` | |||||
| `id`,`tenant_id`,`parent_tenant_id`,`img_url`,`addr`,`number`,`entry_exit`,`stop_fee`,`create_date`,`update_date`,`park_id`,`parking_id`,`vendor_type`,`vendor_params`,`coupon_params` | |||||
| </sql> | </sql> | ||||
| <sql id="dynamicWhereConditions"> | <sql id="dynamicWhereConditions"> | ||||