优化代码

java110-bean/src/main/java/com/java110/dto/reserveGoodsConfirmOrder/ReserveGoodsConfirmOrderDto.java

@@ -1,6 +1,7 @@
 package com.java110.dto.reserveGoodsConfirmOrder;
 
 import com.java110.dto.PageDto;
+
 import java.io.Serializable;
 import java.util.Date;
 
@@ -15,14 +16,25 @@ import java.util.Date;
 public class ReserveGoodsConfirmOrderDto extends PageDto implements Serializable {
 
     private String timeId;
-private String orderId;
-private String goodsId;
-private String coId;
-private String remark;
-private String type;
-private String communityId;
+    private String orderId;
+    private String goodsId;
+    private String coId;
+    private String remark;
+    private String type;
+    private String communityId;
+
+    private String goodsName;
+
+    private String imgUrl;
 
+    private String appointmentTime;
 
+    private String hours;
+    private String quantity;
+
+    private String personName;
+
+    private String personTel;
     private Date createTime;
 
     private String statusCd = "0";
@@ -31,43 +43,56 @@ private String communityId;
     public String getTimeId() {
         return timeId;
     }
-public void setTimeId(String timeId) {
+
+    public void setTimeId(String timeId) {
         this.timeId = timeId;
     }
-public String getOrderId() {
+
+    public String getOrderId() {
         return orderId;
     }
-public void setOrderId(String orderId) {
+
+    public void setOrderId(String orderId) {
         this.orderId = orderId;
     }
-public String getGoodsId() {
+
+    public String getGoodsId() {
         return goodsId;
     }
-public void setGoodsId(String goodsId) {
+
+    public void setGoodsId(String goodsId) {
         this.goodsId = goodsId;
     }
-public String getCoId() {
+
+    public String getCoId() {
         return coId;
     }
-public void setCoId(String coId) {
+
+    public void setCoId(String coId) {
         this.coId = coId;
     }
-public String getRemark() {
+
+    public String getRemark() {
         return remark;
     }
-public void setRemark(String remark) {
+
+    public void setRemark(String remark) {
         this.remark = remark;
     }
-public String getType() {
+
+    public String getType() {
         return type;
     }
-public void setType(String type) {
+
+    public void setType(String type) {
         this.type = type;
     }
-public String getCommunityId() {
+
+    public String getCommunityId() {
         return communityId;
     }
-public void setCommunityId(String communityId) {
+
+    public void setCommunityId(String communityId) {
         this.communityId = communityId;
     }
 
@@ -87,4 +112,60 @@ public void setCommunityId(String communityId) {
     public void setStatusCd(String statusCd) {
         this.statusCd = statusCd;
     }
+
+    public String getGoodsName() {
+        return goodsName;
+    }
+
+    public void setGoodsName(String goodsName) {
+        this.goodsName = goodsName;
+    }
+
+    public String getAppointmentTime() {
+        return appointmentTime;
+    }
+
+    public void setAppointmentTime(String appointmentTime) {
+        this.appointmentTime = appointmentTime;
+    }
+
+    public String getHours() {
+        return hours;
+    }
+
+    public void setHours(String hours) {
+        this.hours = hours;
+    }
+
+    public String getQuantity() {
+        return quantity;
+    }
+
+    public void setQuantity(String quantity) {
+        this.quantity = quantity;
+    }
+
+    public String getPersonName() {
+        return personName;
+    }
+
+    public void setPersonName(String personName) {
+        this.personName = personName;
+    }
+
+    public String getPersonTel() {
+        return personTel;
+    }
+
+    public void setPersonTel(String personTel) {
+        this.personTel = personTel;
+    }
+
+    public String getImgUrl() {
+        return imgUrl;
+    }
+
+    public void setImgUrl(String imgUrl) {
+        this.imgUrl = imgUrl;
+    }
 }

java110-db/src/main/resources/mapper/store/ReserveGoodsConfirmOrderV1ServiceDaoImplMapper.xml

@@ -5,120 +5,121 @@
 <mapper namespace="reserveGoodsConfirmOrderV1ServiceDaoImpl">
 
 
-
-
-
     <!-- 保存预约订单时间信息 add by wuxw 2018-07-03 -->
     <insert id="saveReserveGoodsConfirmOrderInfo" parameterType="Map">
         insert into reserve_goods_confirm_order(
-time_id,order_id,goods_id,co_id,remark,type,community_id
-) values (
-#{timeId},#{orderId},#{goodsId},#{coId},#{remark},#{type},#{communityId}
-)
+        time_id,order_id,goods_id,co_id,remark,type,community_id
+        ) values (
+        #{timeId},#{orderId},#{goodsId},#{coId},#{remark},#{type},#{communityId}
+        )
     </insert>
 
 
-
     <!-- 查询预约订单时间信息 add by wuxw 2018-07-03 -->
     <select id="getReserveGoodsConfirmOrderInfo" parameterType="Map" resultType="Map">
-        select  t.time_id,t.time_id timeId,t.order_id,t.order_id orderId,t.goods_id,t.goods_id goodsId,t.co_id,t.co_id coId,t.remark,t.status_cd,t.status_cd statusCd,t.type,t.community_id,t.community_id communityId 
-from reserve_goods_confirm_order t 
-where 1 =1 
-<if test="timeId !=null and timeId != ''">
-   and t.time_id= #{timeId}
-</if> 
-<if test="orderId !=null and orderId != ''">
-   and t.order_id= #{orderId}
-</if> 
-<if test="goodsId !=null and goodsId != ''">
-   and t.goods_id= #{goodsId}
-</if> 
-<if test="coId !=null and coId != ''">
-   and t.co_id= #{coId}
-</if> 
-<if test="remark !=null and remark != ''">
-   and t.remark= #{remark}
-</if> 
-<if test="statusCd !=null and statusCd != ''">
-   and t.status_cd= #{statusCd}
-</if> 
-<if test="type !=null and type != ''">
-   and t.type= #{type}
-</if> 
-<if test="communityId !=null and communityId != ''">
-   and t.community_id= #{communityId}
-</if> 
-order by t.create_time desc
-<if test="page != -1 and page != null ">
-   limit #{page}, #{row}
-</if> 
+        select t.time_id,t.time_id timeId,t.order_id,t.order_id orderId,t.goods_id,t.goods_id goodsId,t.co_id,t.co_id
+        coId,t.remark,t.status_cd,t.status_cd statusCd,t.type,t.community_id,t.community_id communityId,
+        rgo.person_name personName,rgo.person_tel personTel,rgo.appointment_time appointmentTime,rgco.hours,rgco.quantity,
+        rg.goods_name goodsName,rg.img_url imgUrl,t.create_time createTime
+        from reserve_goods_confirm_order t
+        left join reserve_goods_order rgo on t.order_id = rgo.order_id and t.goods_id = rgo.goods_id and rgo.status_cd = '0'
+        left join reserve_goods_order_time rgco on t.time_id = rgco.time_id and rgco.order_id = rgo.order_id and rgco.status_cd = '0'
+        left join reserve_goods rg on t.goods_id = rg.goods_id and rg.status_cd = '0'
+        where 1 =1
+        <if test="timeId !=null and timeId != ''">
+            and t.time_id= #{timeId}
+        </if>
+        <if test="orderId !=null and orderId != ''">
+            and t.order_id= #{orderId}
+        </if>
+        <if test="goodsId !=null and goodsId != ''">
+            and t.goods_id= #{goodsId}
+        </if>
+        <if test="coId !=null and coId != ''">
+            and t.co_id= #{coId}
+        </if>
+        <if test="remark !=null and remark != ''">
+            and t.remark= #{remark}
+        </if>
+        <if test="statusCd !=null and statusCd != ''">
+            and t.status_cd= #{statusCd}
+        </if>
+        <if test="type !=null and type != ''">
+            and t.type= #{type}
+        </if>
+        <if test="communityId !=null and communityId != ''">
+            and t.community_id= #{communityId}
+        </if>
+        order by t.create_time desc
+        <if test="page != -1 and page != null ">
+            limit #{page}, #{row}
+        </if>
 
     </select>
 
 
-
-
     <!-- 修改预约订单时间信息 add by wuxw 2018-07-03 -->
     <update id="updateReserveGoodsConfirmOrderInfo" parameterType="Map">
-        update  reserve_goods_confirm_order t set t.status_cd = #{statusCd}
-<if test="newBId != null and newBId != ''">
-,t.b_id = #{newBId}
-</if> 
-<if test="timeId !=null and timeId != ''">
-, t.time_id= #{timeId}
-</if> 
-<if test="orderId !=null and orderId != ''">
-, t.order_id= #{orderId}
-</if> 
-<if test="goodsId !=null and goodsId != ''">
-, t.goods_id= #{goodsId}
-</if> 
-<if test="remark !=null and remark != ''">
-, t.remark= #{remark}
-</if> 
-<if test="type !=null and type != ''">
-, t.type= #{type}
-</if> 
-<if test="communityId !=null and communityId != ''">
-, t.community_id= #{communityId}
-</if> 
- where 1=1 <if test="coId !=null and coId != ''">
-and t.co_id= #{coId}
-</if> 
+        update reserve_goods_confirm_order t set t.status_cd = #{statusCd}
+        <if test="newBId != null and newBId != ''">
+            ,t.b_id = #{newBId}
+        </if>
+        <if test="timeId !=null and timeId != ''">
+            , t.time_id= #{timeId}
+        </if>
+        <if test="orderId !=null and orderId != ''">
+            , t.order_id= #{orderId}
+        </if>
+        <if test="goodsId !=null and goodsId != ''">
+            , t.goods_id= #{goodsId}
+        </if>
+        <if test="remark !=null and remark != ''">
+            , t.remark= #{remark}
+        </if>
+        <if test="type !=null and type != ''">
+            , t.type= #{type}
+        </if>
+        <if test="communityId !=null and communityId != ''">
+            , t.community_id= #{communityId}
+        </if>
+        where 1=1
+        <if test="coId !=null and coId != ''">
+            and t.co_id= #{coId}
+        </if>
 
     </update>
 
     <!-- 查询预约订单时间数量 add by wuxw 2018-07-03 -->
-     <select id="queryReserveGoodsConfirmOrdersCount" parameterType="Map" resultType="Map">
-        select  count(1) count 
-from reserve_goods_confirm_order t 
-where 1 =1 
-<if test="timeId !=null and timeId != ''">
-   and t.time_id= #{timeId}
-</if> 
-<if test="orderId !=null and orderId != ''">
-   and t.order_id= #{orderId}
-</if> 
-<if test="goodsId !=null and goodsId != ''">
-   and t.goods_id= #{goodsId}
-</if> 
-<if test="coId !=null and coId != ''">
-   and t.co_id= #{coId}
-</if> 
-<if test="remark !=null and remark != ''">
-   and t.remark= #{remark}
-</if> 
-<if test="statusCd !=null and statusCd != ''">
-   and t.status_cd= #{statusCd}
-</if> 
-<if test="type !=null and type != ''">
-   and t.type= #{type}
-</if> 
-<if test="communityId !=null and communityId != ''">
-   and t.community_id= #{communityId}
-</if> 
+    <select id="queryReserveGoodsConfirmOrdersCount" parameterType="Map" resultType="Map">
+        select count(1) count
+        from reserve_goods_confirm_order t
+        where 1 =1
+        <if test="timeId !=null and timeId != ''">
+            and t.time_id= #{timeId}
+        </if>
+        <if test="orderId !=null and orderId != ''">
+            and t.order_id= #{orderId}
+        </if>
+        <if test="goodsId !=null and goodsId != ''">
+            and t.goods_id= #{goodsId}
+        </if>
+        <if test="coId !=null and coId != ''">
+            and t.co_id= #{coId}
+        </if>
+        <if test="remark !=null and remark != ''">
+            and t.remark= #{remark}
+        </if>
+        <if test="statusCd !=null and statusCd != ''">
+            and t.status_cd= #{statusCd}
+        </if>
+        <if test="type !=null and type != ''">
+            and t.type= #{type}
+        </if>
+        <if test="communityId !=null and communityId != ''">
+            and t.community_id= #{communityId}
+        </if>
 
 
-     </select>
+    </select>
 
 </mapper>