diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/car/WxCarController.java b/mallinkAdmin/src/main/java/com/iformall/controller/car/WxCarController.java
index 2c4c39971..b76095a95 100644
--- a/mallinkAdmin/src/main/java/com/iformall/controller/car/WxCarController.java
+++ b/mallinkAdmin/src/main/java/com/iformall/controller/car/WxCarController.java
@@ -83,6 +83,7 @@ public class WxCarController extends BaseController {
WxPark park = getCurrentPark(getTenantInfo());
Map map = new HashMap();
map.put("vendor", park.getVendorType());
+ map.put("vendorConfig", park.getCouponParams());
return new ResultData(map);
}
diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxPark.java b/mallinkService/src/main/java/com/iformall/domain/po/WxPark.java
index cbafa1075..e7e67eef4 100644
--- a/mallinkService/src/main/java/com/iformall/domain/po/WxPark.java
+++ b/mallinkService/src/main/java/com/iformall/domain/po/WxPark.java
@@ -36,6 +36,7 @@ public class WxPark extends TenantEntity {
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")
private String vendorParams;
-
+ @io.swagger.annotations.ApiModelProperty(value="优惠券配置参数",name="couponParams")
+ private String couponParams;
}
diff --git a/mallinkService/src/main/resources/mapper/WxParkMapper.xml b/mallinkService/src/main/resources/mapper/WxParkMapper.xml
index fd897295b..38db61121 100644
--- a/mallinkService/src/main/resources/mapper/WxParkMapper.xml
+++ b/mallinkService/src/main/resources/mapper/WxParkMapper.xml
@@ -16,10 +16,11 @@
+
- `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`