diff --git a/ruoyi-admin/src/main/java/com/ruoyi/operation/domain/CompanyStore.java b/ruoyi-admin/src/main/java/com/ruoyi/operation/domain/CompanyStore.java
index 2dbeaa4..976348a 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/operation/domain/CompanyStore.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/operation/domain/CompanyStore.java
@@ -188,6 +188,9 @@ public class CompanyStore extends BaseEntity
/** */
private String extend5;
+ /** 美团token */
+ private String mtToken;
+
@Transient
private String operatingCompanyName;
@@ -622,6 +625,14 @@ public class CompanyStore extends BaseEntity
this.operatingCompanyName = operatingCompanyName;
}
+ public String getMtToken() {
+ return mtToken;
+ }
+
+ public void setMtToken(String mtToken) {
+ this.mtToken = mtToken;
+ }
+
@Override
public String toString() {
return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/operation/domain/ZcCarModelPackage.java b/ruoyi-admin/src/main/java/com/ruoyi/operation/domain/ZcCarModelPackage.java
index 3a82351..bc9864d 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/operation/domain/ZcCarModelPackage.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/operation/domain/ZcCarModelPackage.java
@@ -4,6 +4,7 @@ import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle;
import com.ruoyi.common.annotation.Excel;
import com.ruoyi.common.core.domain.BaseEntity;
+import org.springframework.data.annotation.Transient;
/**
* 车型与租车规则关联对象 zc_car_model_package
@@ -32,6 +33,19 @@ public class ZcCarModelPackage extends BaseEntity
/** 删除标志（0代表存在 2代表删除） */
private String delFlag;
+ /** 美团商品id */
+ private String mtProductId;
+ /** 抖音商品id */
+ private String dyProductId;
+
+ @Transient
+ private String brandName;
+ @Transient
+ private String modelName;
+ @Transient
+ private String ruleName;
+ @Transient
+ private String ruleCode;
public void setId(Long id)
{
@@ -79,6 +93,54 @@ public class ZcCarModelPackage extends BaseEntity
return delFlag;
}
+ public String getMtProductId() {
+ return mtProductId;
+ }
+
+ public void setMtProductId(String mtProductId) {
+ this.mtProductId = mtProductId;
+ }
+
+ public String getDyProductId() {
+ return dyProductId;
+ }
+
+ public void setDyProductId(String dyProductId) {
+ this.dyProductId = dyProductId;
+ }
+
+ public String getBrandName() {
+ return brandName;
+ }
+
+ public void setBrandName(String brandName) {
+ this.brandName = brandName;
+ }
+
+ public String getModelName() {
+ return modelName;
+ }
+
+ public void setModelName(String modelName) {
+ this.modelName = modelName;
+ }
+
+ public String getRuleName() {
+ return ruleName;
+ }
+
+ public void setRuleName(String ruleName) {
+ this.ruleName = ruleName;
+ }
+
+ public String getRuleCode() {
+ return ruleCode;
+ }
+
+ public void setRuleCode(String ruleCode) {
+ this.ruleCode = ruleCode;
+ }
+
@Override
public String toString() {
return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
diff --git a/ruoyi-admin/src/main/resources/mapper/operation/CompanyStoreMapper.xml b/ruoyi-admin/src/main/resources/mapper/operation/CompanyStoreMapper.xml
index 0fb18bc..b52253a 100644
--- a/ruoyi-admin/src/main/resources/mapper/operation/CompanyStoreMapper.xml
+++ b/ruoyi-admin/src/main/resources/mapper/operation/CompanyStoreMapper.xml
@@ -57,14 +57,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+
- select id, name, contact_person, phone, province_id, province_name, city_id, city_name, area_id, area_name, address, detailed_address, image, latitude, longitude, contract_date, day_time, start_time, end_time, is_show, is_del, zuche_ratio, zudian_ratio, daishou_ratio, label, operating_company_id, operating_nature, introduction, bank_account, store_number, business_license_img, audit_status, audit_time, auditor_id, user_id, is_return_allowed, meal_deposit_price, order_num_limit, create_by, create_time, update_by, update_time, del_flag, status, extend1, extend2, extend3, extend4, extend5 from zc_company_store
+ select id, name, contact_person, phone, province_id, province_name, city_id, city_name, area_id, area_name, address, detailed_address, image, latitude, longitude, contract_date, day_time, start_time, end_time, is_show, is_del, zuche_ratio, zudian_ratio, daishou_ratio, label, operating_company_id, operating_nature, introduction, bank_account, store_number, business_license_img, audit_status, audit_time, auditor_id, user_id, is_return_allowed, meal_deposit_price, order_num_limit, create_by, create_time, update_by, update_time, del_flag, status, extend1, extend2, extend3, extend4, extend5, mt_token from zc_company_store
@@ -290,6 +292,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
extend3 = #{extend3},
extend4 = #{extend4},
extend5 = #{extend5},
+ mt_token = #{mtToken},
where id = #{id}
diff --git a/ruoyi-admin/src/main/resources/mapper/operation/ZcCarModelPackageMapper.xml b/ruoyi-admin/src/main/resources/mapper/operation/ZcCarModelPackageMapper.xml
index 36f6818..5f4b424 100644
--- a/ruoyi-admin/src/main/resources/mapper/operation/ZcCarModelPackageMapper.xml
+++ b/ruoyi-admin/src/main/resources/mapper/operation/ZcCarModelPackageMapper.xml
@@ -15,29 +15,51 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+
+
+
+
+
+
- select id, car_model_id, car_rule_id, sort_order, del_flag, create_by, create_time, update_by, update_time, remark from zc_car_model_package
+ select id, car_model_id, car_rule_id, sort_order, del_flag, create_by, create_time, update_by, update_time, remark, mt_product_id, dy_product_id from zc_car_model_package