order(update)

src/main/java/com/mmc/oms/entity/order/OrderInfoDO.java

@@ -134,6 +134,8 @@ public class OrderInfoDO implements Serializable {
     private String leaseOrderStatus;
     @ApiModelProperty(value = "用户昵称")
     private String nickName;
+    @ApiModelProperty(value = "商品描述")
+    private String wareDescription;
 
     /**
      * 辅助字段
@@ -184,6 +186,7 @@ public class OrderInfoDO implements Serializable {
                 .waiting(this.waiting)
                 .leaseOrderStatus(this.leaseOrderStatus)
                 .nickName(this.nickName)
+                .wareDescription(this.wareDescription)
                 .build();
     }
 
@@ -218,5 +221,6 @@ public class OrderInfoDO implements Serializable {
         this.couponId = lease.getCouponId();
         this.specsId = lease.getSpecsId();
         this.tranStatus = TranStatusDic.INIT.getStatus();
+        this.wareDescription = lease.getWareDescription();
     }
 }

src/main/java/com/mmc/oms/model/dto/order/OrderInfoDTO.java

@@ -156,6 +156,9 @@ public class OrderInfoDTO implements Serializable {
     @ApiModelProperty(value = "买家微信昵称", example = "昵称")
     private String nickName;
 
+    @ApiModelProperty(value = "商品描述", example = "商品描述")
+    private String wareDescription;
+
     public RepoCashDO buildRepoCashDO() {
         return RepoCashDO.builder()
                 .uid(this.uid)

src/main/resources/mapper/RentalOrdersDao.xml

@@ -42,6 +42,7 @@
         <result property="waiting" column="waiting"/>
         <result property="leaseOrderStatus" column="lease_order_status"/>
         <result property="nickName" column="nick_name"/>
+        <result property="wareDescription" column="ware_description"/>
         <association property="receipt"
                      javaType="com.mmc.oms.entity.order.OrderReceiptDO"
                      resultMap="orderReceiptResultMap"></association>
@@ -157,9 +158,14 @@
                o.ware_info_id,
                o.pay_day,
                o.repo_account_id,
-               o.rcd_company_id
+               o.rcd_company_id,
+               o.ware_description,
+               o.buyer_name,
+               o.buyer_phone,
+               o.uid
         from order_info o
-        where o.order_no = #{orderNo}
+        where o.order_no =
+              #{orderNo}
     </select>
 
     <select id="getNewOrderRefund" resultMap="orderRefundResultMap">
@@ -186,13 +192,14 @@
         (order_no, ware_info_id, ware_no, ware_title, ware_img, sku_info_id, sku_title, repo_account_id,
          uid, buyer_name, buyer_phone, unit_price, ware_num, should_pay, actual_pay, order_type,
          deposit, rent_price, start_date, end_date, pay_day, tran_status, ex_ware, remark, pay_time,
-         send_ware_time, create_time, rcd_company_id, return_time, coupon_id, specs_id, nick_name)
+         send_ware_time, create_time, rcd_company_id, return_time, coupon_id, specs_id, nick_name, ware_description)
         values (#{orderNo}, #{wareInfoId}, #{wareNo}, #{wareTitle}, #{wareImg}, #{skuInfoId}, #{skuTitle},
                 #{repoAccountId},
                 #{uid}, #{buyerName}, #{buyerPhone}, #{unitPrice}, #{wareNum}, #{shouldPay}, #{actualPay}, #{orderType},
                 #{deposit}, #{rentPrice}, #{startDate}, #{endDate}, #{payDay}, #{tranStatus}, #{exWare}, #{remark},
                 #{payTime},
-                #{sendWareTime}, now(), #{rcdCompanyId}, #{returnTime}, #{couponId}, #{specsId}, #{nickName})
+                #{sendWareTime}, now(), #{rcdCompanyId}, #{returnTime}, #{couponId}, #{specsId}, #{nickName},
+                #{wareDescription})
     </insert>
     <insert id="insertOrderReceipt" useGeneratedKeys="true"
             keyProperty="id" parameterType="com.mmc.oms.entity.order.OrderReceiptDO">