Merge branch 'dev/lanpingxiong' into 'master'

Dev/lanpingxiong

See merge request hewei/Jumeirah!67

api-merchant/src/main/java/com/jumeirah/api/merchant/entity/param/McStrokeDiscountAddParam.java

@@ -44,9 +44,6 @@ public class McStrokeDiscountAddParam extends BaseEntity {
     @ApiModelProperty("飞机型号ID")
     private Long plainTypeId;
 
-    @ApiModelProperty("飞机型号名称")
-    private String plainTypeName;
-
     @ApiModelProperty("价格")
     private BigDecimal money;
 

common/src/main/resources/mapper/StrokeDiscountMapper.xml

@@ -4,29 +4,33 @@
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id,
-        city_outset_id,
-        city_outset_name,
-        city_arrive_id,
-        city_arrive_name,
-        seat_num,
-        plain_type_id,
-        plain_type_name,
-        outset_time,
-        return_time,
-        status,
-        create_time,
-        update_time,
-        remarks,
-        money,
-        mc_id,
-        type
+        sd.id,
+        sd.city_outset_id,
+        sd.city_arrive_id,
+        sd.seat_num,
+        sd.plain_type_id,
+        sd.outset_time,
+        sd.return_time,
+        sd.status,
+        sd.create_time,
+        sd.update_time,
+        sd.remarks,
+        sd.money,
+        sd.mc_id,
+        sd.type
     </sql>
 
     <select id="getStrokeDiscountById" resultType="com.jumeirah.common.vo.StrokeDiscountQueryVo">
         select
-        <include refid="Base_Column_List"/>
-        from stroke_discount where id = #{id}
+            ctco.city_name_cn as city_outset_name,
+            ctca.city_name_cn as city_arrive_name,
+            pt.name as plain_type_name,
+            <include refid="Base_Column_List"/>
+        from stroke_discount sd
+            INNER JOIN city_three_code ctco ON ctco.id = sd.city_outset_id
+            INNER JOIN city_three_code ctca ON ctca.id = sd.city_arrive_id
+            INNER JOIN plain_type pt ON pt.id = sd.plain_type_id
+        where sd.id = #{id}
     </select>
 
     <select id="getStrokeDiscountPageList" parameterType="com.jumeirah.common.param.StrokeDiscountPageParam"
@@ -34,10 +38,12 @@
         select
             ctco.city_name_cn as city_outset_name,
             ctca.city_name_cn as city_arrive_name,
-            sd.*
+            pt.name as plain_type_name,
+            <include refid="Base_Column_List"/>
         from stroke_discount sd
         INNER JOIN city_three_code ctco ON ctco.id = sd.city_outset_id
         INNER JOIN city_three_code ctca ON ctca.id = sd.city_arrive_id
+        INNER JOIN plain_type pt ON pt.id = sd.plain_type_id
         where sd.mc_id = #{mcId}
     </select>