fix 计费单商品

zhongzheng-system/src/main/java/com/zhongzheng/modules/order/bo/OrderGoodsQueryBo.java

@@ -44,6 +44,9 @@ public class OrderGoodsQueryBo extends BaseEntity {
 	/** 商品id */
 	@ApiModelProperty("商品id")
 	private Long goodsId;
+	/** 商品id */
+	@ApiModelProperty("商品id数组")
+	private List<Long> goodsIds;
 	/** 商品采集数据 */
 	@ApiModelProperty("商品采集数据")
 	private String goodsInputData;

zhongzheng-system/src/main/java/com/zhongzheng/modules/order/vo/OrderListVo.java

@@ -139,4 +139,7 @@ public class OrderListVo {
 	@Excel(name = "支付状态 1未收费 2部分收费 3完全收费")
 	@ApiModelProperty("支付状态 1未收费 2部分收费 3完全收费")
 	private Integer payStatus;
+	/** 订单商品id */
+	@ApiModelProperty("订单商品id")
+	private Long orderGoodsId;
 }

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

@@ -77,7 +77,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="orderSn != null and orderSn != ''">
                 AND og.order_sn =  #{orderSn}
             </if>
-
+            <if test="goodsIds != null and goodsIds.size()!=0 ">
+                AND og.goods_id in
+                <foreach collection="status" item="item" index="index" open="(" close=")" separator=",">
+                    #{item}
+                </foreach>
+            </if>
     </select>
 
     <select id="selectDetail" parameterType="com.zhongzheng.modules.order.bo.OrderGoodsQueryBo" resultMap="OrderGoodsResultVo">

zhongzheng-system/src/main/resources/mapper/modules/order/OrderMapper.xml

@@ -64,6 +64,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="goodsReceived" column="goods_received"/>
         <result property="refundStatus" column="refund_status"/>
         <result property="payStatus" column="pay_status"/>
+        <result property="orderGoodsId" column="order_goods_id"/>
     </resultMap>
 
     <select id="selectList" parameterType="com.zhongzheng.modules.order.bo.OrderQueryBo" resultMap="OrderResultVo">
@@ -73,6 +74,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             g.goods_name,
             g.year,
             og.goods_price,
+            og.order_goods_id,
             og.goods_real_price,
             u.telphone,
             u.realname,