美团抖音商品id维护

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)

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)

ruoyi-admin/src/main/resources/mapper/operation/CompanyStoreMapper.xml

@@ -57,14 +57,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="extend3"    column="extend3"    />
         <result property="extend4"    column="extend4"    />
         <result property="extend5"    column="extend5"    />
+        <result property="mtToken"    column="mt_token"    />
     </resultMap>
 
     <sql id="selectCompanyStoreVo">
-        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
     </sql>
 
     <select id="selectCompanyStoreList" parameterType="CompanyStore" resultMap="CompanyStoreResult">
-        select cs.id, cs.name, cs.contact_person, cs.phone, cs.province_id, cs.province_name, cs.city_id, cs.city_name, cs.area_id, cs.area_name, cs.address, cs.detailed_address, cs.image, cs.latitude, cs.longitude, cs.contract_date, cs.day_time, cs.start_time, cs.end_time, cs.is_show, cs.is_del, cs.zuche_ratio, cs.zudian_ratio, cs.daishou_ratio, cs.label, cs.operating_company_id, cs.operating_nature, cs.introduction, cs.bank_account, cs.store_number, cs.business_license_img, cs.audit_status, cs.audit_time, cs.auditor_id, cs.user_id, cs.is_return_allowed, cs.meal_deposit_price, cs.order_num_limit, cs.create_by, cs.create_time, cs.update_by, cs.update_time, cs.del_flag, cs.status, cs.extend1, cs.extend2, cs.extend3, cs.extend4, cs.extend5
+        select cs.id, cs.name, cs.contact_person, cs.phone, cs.province_id, cs.province_name, cs.city_id, cs.city_name, cs.area_id, cs.area_name, cs.address, cs.detailed_address, cs.image, cs.latitude, cs.longitude, cs.contract_date, cs.day_time, cs.start_time, cs.end_time, cs.is_show, cs.is_del, cs.zuche_ratio, cs.zudian_ratio, cs.daishou_ratio, cs.label, cs.operating_company_id, cs.operating_nature, cs.introduction, cs.bank_account, cs.store_number, cs.business_license_img, cs.audit_status, cs.audit_time, cs.auditor_id, cs.user_id, cs.is_return_allowed, cs.meal_deposit_price, cs.order_num_limit, cs.create_by, cs.create_time, cs.update_by, cs.update_time, cs.del_flag, cs.status, cs.extend1, cs.extend2, cs.extend3, cs.extend4, cs.extend5, cs.mt_token
         ,c.company_name as operating_company_name
         from zc_company_store cs
         left join zc_company c on c.id = cs.operating_company_id
@@ -112,6 +113,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="extend3 != null  and extend3 != ''"> and cs.extend3 = #{extend3}</if>
             <if test="extend4 != null  and extend4 != ''"> and cs.extend4 = #{extend4}</if>
             <if test="extend5 != null  and extend5 != ''"> and cs.extend5 = #{extend5}</if>
+            <if test="mtToken != null  and mtToken != ''"> and cs.mt_token = #{mtToken}</if>
         </where>
         order by cs.create_time desc
     </select>
@@ -290,6 +292,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="extend3 != null">extend3 = #{extend3},</if>
             <if test="extend4 != null">extend4 = #{extend4},</if>
             <if test="extend5 != null">extend5 = #{extend5},</if>
+            <if test="mtToken != null">mt_token = #{mtToken},</if>
         </trim>
         where id = #{id}
     </update>

ruoyi-admin/src/main/resources/mapper/operation/ZcCarModelPackageMapper.xml

@@ -15,29 +15,51 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="updateBy"    column="update_by"    />
         <result property="updateTime"    column="update_time"    />
         <result property="remark"    column="remark"    />
+        <result property="mtProductId"    column="mt_product_id"    />
+        <result property="dyProductId"    column="dy_product_id"    />
+        <result property="brandName"    column="brand_name"    />
+        <result property="modelName"    column="model_name"    />
+        <result property="ruleName"    column="rule_name"    />
+        <result property="ruleCode"    column="rule_code"    />
     </resultMap>
 
     <sql id="selectZcCarModelPackageVo">
-        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
     </sql>
 
     <select id="selectZcCarModelPackageList" parameterType="ZcCarModelPackage" resultMap="ZcCarModelPackageResult">
-        <include refid="selectZcCarModelPackageVo"/>
+        select mp.id, mp.car_model_id, mp.car_rule_id, mp.sort_order, mp.del_flag, mp.create_by, mp.create_time, mp.mt_product_id, mp.dy_product_id,
+        m.brand_name as 'brand_name',m.model_name as 'model_name',
+        r.rule_name as 'rule_name',r.rule_code as 'rule_code'
+        from zc_car_model_package mp
+        left join zc_car_model m on mp.car_model_id = m.id
+        left join zc_rent_car_rule r on mp.car_rule_id = r.id
         <where>
-            <if test="id != null">id=#{id}</if>
+            <if test="id != null">mp.id=#{id}</if>
-            <if test="carModelId != null">car_model_id = #{carModelId}</if>
+            <if test="carModelId != null">mp.car_model_id = #{carModelId}</if>
-            <if test="carRuleId != null">car_rule_id = #{carRuleId}</if>
+            <if test="carRuleId != null">mp.car_rule_id = #{carRuleId}</if>
+            <if test="brandName != null  and brandName != ''"> and m.brand_name like concat('%', #{brandName}, '%')</if>
+            <if test="modelName != null  and modelName != ''"> and m.model_name like concat('%', #{modelName}, '%')</if>
+            <if test="ruleName != null  and ruleName != ''"> and r.rule_name like concat('%', #{ruleName}, '%')</if>
+            <if test="ruleCode != null  and ruleCode != ''"> and r.rule_code like concat('%', #{ruleCode}, '%')</if>
         </where>
     </select>
     
     <select id="selectZcCarModelPackageById" parameterType="Long" resultMap="ZcCarModelPackageResult">
-        <include refid="selectZcCarModelPackageVo"/>
+        select mp.id, mp.car_model_id, mp.car_rule_id, mp.sort_order, mp.del_flag, mp.create_by, mp.create_time, mp.mt_product_id, mp.dy_product_id,
-        where id = #{id}
+               m.brand_name as 'brand_name',m.model_name as 'model_name',
+                r.rule_name as 'rule_name',r.rule_code as 'rule_code'
+        from zc_car_model_package mp
+        left join zc_car_model m on mp.car_model_id = m.id
+        left join zc_rent_car_rule r on mp.car_rule_id = r.id
+        where mp.id = #{id}
     </select>
     <select id="selectZcCarModelPackageNotPush" resultType="com.ruoyi.orders.dto.PushItemRequest">
         select mp.id,
                mp.car_model_id as 'carModelId',
                mp.car_rule_id as 'carRuleId',
+               mp.mt_product_id as 'mtProductId',
+               mp.dy_product_id as 'dyProductId',
                m.brand_id as 'brandId',
                rb.battery_rule_id as 'batteryRuleId'
         from zc_car_model_package mp
@@ -90,6 +112,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="updateBy != null">update_by = #{updateBy},</if>
             <if test="updateTime != null">update_time = #{updateTime},</if>
             <if test="remark != null">remark = #{remark},</if>
+            <if test="mtProductId != null and mtProductId != ''">mt_product_id = #{mtProductId},</if>
+            <if test="dyProductId != null and dyProductId != ''">dy_product_id = #{dyProductId},</if>
         </trim>
         where id = #{id}
     </update>

ruoyi-admin/src/main/resources/templates/operation/carModelPackage/add.html

@@ -0,0 +1,55 @@
+<!DOCTYPE html>
+<html lang="zh" xmlns:th="http://www.thymeleaf.org" >
+<head>
+    <th:block th:include="include :: header('新增车型与租车规则关联')" />
+</head>
+<body class="white-bg">
+    <div class="wrapper wrapper-content animated fadeInRight ibox-content">
+        <form class="form-horizontal m" id="form-carModelPackage-add">
+            <div class="form-group">    
+                <label class="col-sm-3 control-label is-required">：</label>
+                <div class="col-sm-8">
+                    <input name="carModelId" class="form-control" type="text" required>
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label is-required">：</label>
+                <div class="col-sm-8">
+                    <input name="carRuleId" class="form-control" type="text" required>
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">：</label>
+                <div class="col-sm-8">
+                    <input name="sortOrder" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">删除标志：</label>
+                <div class="col-sm-8">
+                    <input name="delFlag" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">
+                <label class="col-sm-3 control-label">备注：</label>
+                <div class="col-sm-8">
+                    <textarea name="remark" class="form-control"></textarea>
+                </div>
+            </div>
+        </form>
+    </div>
+    <th:block th:include="include :: footer" />
+    <script th:inline="javascript">
+        var prefix = ctx + "operation/carModelPackage"
+        $("#form-carModelPackage-add").validate({
+            focusCleanup: true
+        });
+
+        function submitHandler() {
+            if ($.validate.form()) {
+                $.operate.save(prefix + "/add", $('#form-carModelPackage-add').serialize());
+            }
+        }
+    </script>
+</body>
+</html>

ruoyi-admin/src/main/resources/templates/operation/carModelPackage/carModelPackage.html

@@ -0,0 +1,105 @@
+<!DOCTYPE html>
+<html lang="zh" xmlns:th="http://www.thymeleaf.org" xmlns:shiro="http://www.pollix.at/thymeleaf/shiro">
+<head>
+    <th:block th:include="include :: header('美团、抖音团购商品ID维护')" />
+</head>
+<body class="gray-bg">
+     <div class="container-div">
+        <div class="row">
+            <div class="col-sm-12 search-collapse">
+                <form id="formId">
+                    <div class="select-list">
+                        <ul>
+                            <li>
+                                <label>套餐编码：</label>
+                                <input type="text" name="ruleCode"/>
+                            </li>
+                            <li>
+                                <label>套餐名称：</label>
+                                <input type="text" name="ruleName"/>
+                            </li>
+                            <li>
+                                <label>品牌名称：</label>
+                                <input type="text" name="brandName"/>
+                            </li>
+                            <li>
+                                <label>车型名称：</label>
+                                <input type="text" name="modelName"/>
+                            </li>
+                            <li>
+                                <a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i class="fa fa-search"></i>&nbsp;搜索</a>
+                                <a class="btn btn-warning btn-rounded btn-sm" onclick="$.form.reset()"><i class="fa fa-refresh"></i>&nbsp;重置</a>
+                            </li>
+                        </ul>
+                    </div>
+                </form>
+            </div>
+
+            <div class="btn-group-sm" id="toolbar" role="group">
+            </div>
+            <div class="col-sm-12 select-table table-striped">
+                <table id="bootstrap-table"></table>
+            </div>
+        </div>
+    </div>
+    <th:block th:include="include :: footer" />
+    <script th:inline="javascript">
+        var editFlag = [[${@permission.hasPermi('operation:carModelPackage:edit')}]];
+        var removeFlag = [[${@permission.hasPermi('operation:carModelPackage:remove')}]];
+        var prefix = ctx + "operation/carModelPackage";
+
+        $(function() {
+            var options = {
+                url: prefix + "/list",
+                createUrl: prefix + "/add",
+                updateUrl: prefix + "/edit/{id}",
+                removeUrl: prefix + "/remove",
+                exportUrl: prefix + "/export",
+                modalName: "美团、抖音团购商品ID维护",
+                columns: [{
+                    checkbox: true
+                },
+                {
+                    field: 'id',
+                    title: '规则ID',
+                    visible: false
+                },
+                {
+                    field: 'ruleCode',
+                    title: '套餐编号'
+                },
+                {
+                    field: 'ruleName',
+                    title: '套餐名称'
+                },
+                {
+                    field: 'brandName',
+                    title: '车辆品牌'
+                },
+                {
+                    field: 'modelName',
+                    title: '车辆型号'
+                },
+                {
+                    field: 'mtProductId',
+                    title: '美团商品ID'
+                },
+                {
+                    field: 'dyProductId',
+                    title: '抖音商品ID'
+                },
+                {
+                    title: '操作',
+                    align: 'center',
+                    formatter: function(value, row, index) {
+                        var actions = [];
+                        actions.push('<a class="btn btn-success btn-xs ' + editFlag + '" href="javascript:void(0)" onclick="$.operate.edit(\'' + row.id + '\')"><i class="fa fa-edit"></i>商品ID维护</a> ');
+                        return actions.join('');
+                    }
+                }]
+            };
+            $.table.init(options);
+        });
+    </script>
+</body>
+</html>

ruoyi-admin/src/main/resources/templates/operation/carModelPackage/edit.html

@@ -0,0 +1,62 @@
+<!DOCTYPE html>
+<html lang="zh" xmlns:th="http://www.thymeleaf.org" >
+<head>
+    <th:block th:include="include :: header('修改车型与租车规则关联')" />
+</head>
+<body class="white-bg">
+    <div class="wrapper wrapper-content animated fadeInRight ibox-content">
+        <form class="form-horizontal m" id="form-carModelPackage-edit" th:object="${zcCarModelPackage}">
+            <input name="id" th:field="*{id}" type="hidden">
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">套餐编码：</label>
+                <div class="col-sm-8">
+                    <input name="ruleCode" th:field="*{ruleCode}" readonly class="form-control" type="text" >
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">套餐名称：</label>
+                <div class="col-sm-8">
+                    <input name="ruleName" th:field="*{ruleName}" readonly class="form-control" type="text" >
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">车辆品牌：</label>
+                <div class="col-sm-8">
+                    <input name="brandName" th:field="*{brandName}" readonly class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">
+                <label class="col-sm-3 control-label">车辆型号：</label>
+                <div class="col-sm-8">
+                    <input name="modelName" th:field="*{modelName}" readonly class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">
+                <label class="col-sm-3 control-label">美团商品ID：</label>
+                <div class="col-sm-8">
+                    <input name="mtProductId" th:field="*{mtProductId}"  class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">
+                <label class="col-sm-3 control-label">抖音商品ID：</label>
+                <div class="col-sm-8">
+                    <input name="dyProductId" th:field="*{dyProductId}"  class="form-control" type="text">
+                </div>
+            </div>
+        </form>
+    </div>
+    <th:block th:include="include :: footer" />
+    <script th:inline="javascript">
+        var prefix = ctx + "operation/carModelPackage";
+        $("#form-carModelPackage-edit").validate({
+            focusCleanup: true
+        });
+
+        function submitHandler() {
+            if ($.validate.form()) {
+                $.operate.save(prefix + "/edit", $('#form-carModelPackage-edit').serialize());
+            }
+        }
+    </script>
+</body>
+</html>

ruoyi-admin/src/main/resources/templates/operation/store/store.html

@@ -190,6 +190,13 @@
                         return $.table.selectDictLabel(keyCompanyStatus, value);
                     }
                 },
+                {
+                    field: 'mtToken',
+                    title: '美团授权状态',
+                    formatter: function(value, row, index) {
+                        return value ? "已授权" : "未授权";
+                    }
+                },
                 {
                     title: '操作',
                     align: 'center',