Browse Source

fix 计费单商品

he2802 3 years ago
parent
commit
7f2dd1e0ed

+ 5 - 0
zhongzheng-system/src/main/java/com/zhongzheng/modules/order/domain/OrderGoods.java

@@ -1,12 +1,15 @@
 package com.zhongzheng.modules.order.domain;
 
 import com.baomidou.mybatisplus.annotation.*;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 import lombok.experimental.Accessors;
 import java.io.Serializable;
 import java.util.Date;
 import java.math.BigDecimal;
+import java.util.List;
+
 import com.zhongzheng.common.annotation.Excel;
 
 /**
@@ -70,4 +73,6 @@ private static final long serialVersionUID=1L;
     private String remark;
     /** 班级id */
     private Long classId;
+    /** 商品id */
+    private List<Long> orderGoodsIds;
 }

+ 2 - 2
zhongzheng-system/src/main/resources/mapper/modules/order/OrderGoodsMapper.xml

@@ -77,9 +77,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="orderSn != null and orderSn != ''">
                 AND og.order_sn =  #{orderSn}
             </if>
-            <if test="orderGoodsId != null and orderGoodsId.size()!=0 ">
+            <if test="orderGoodsIds != null and orderGoodsIds.size()!=0 ">
                 AND og.order_goods_id in
-                <foreach collection="status" item="item" index="index" open="(" close=")" separator=",">
+                <foreach collection="orderGoodsIds" item="item" index="index" open="(" close=")" separator=",">
                     #{item}
                 </foreach>
             </if>