submit:退款

zhongzheng-admin/src/main/java/com/zhongzheng/controller/order/OrderGoodsRefundController.java

@@ -59,9 +59,9 @@ public class OrderGoodsRefundController extends BaseController {
      * 查询订单商品退款列表
      */
     @ApiOperation("查询退款订单所有商品信息")
-    @GetMapping("/listAll/{orderSn}")
-    public AjaxResult<List<OrderGoodsRefundVo>> listByOrderSn(@PathVariable("orderSn") String orderSn) {
-        List<OrderGoodsRefundVo> list = iOrderGoodsRefundService.listByOrderSn(orderSn);
+    @GetMapping("/listAll/goods")
+    public AjaxResult<List<OrderGoodsRefundVo>> listByOrderSn(OrderGoodsRefundQueryBo bo) {
+        List<OrderGoodsRefundVo> list = iOrderGoodsRefundService.listByOrderSn(bo);
         return AjaxResult.success(list);
     }
 

zhongzheng-system/src/main/java/com/zhongzheng/modules/order/mapper/OrderGoodsRefundMapper.java

@@ -23,5 +23,5 @@ public interface OrderGoodsRefundMapper extends BaseMapper<OrderGoodsRefund> {
 
     List<OrderGoodsRefundVo> selectListByQuery(OrderGoodsRefundQueryBo bo);
 
-    List<OrderGoodsRefundVo> selectListByOrderSn(@Param("orderSn") String orderSn);
+    List<OrderGoodsRefundVo> selectListByOrderSn(OrderGoodsRefundQueryBo bo);
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/order/service/IOrderGoodsRefundService.java

@@ -65,5 +65,5 @@ public interface IOrderGoodsRefundService extends IService<OrderGoodsRefund> {
 
 	Boolean firstPeriod(List<OrderGoodsRefundEditBo> bos);
 
-	List<OrderGoodsRefundVo> listByOrderSn(String orderSn);
+	List<OrderGoodsRefundVo> listByOrderSn(OrderGoodsRefundQueryBo bo);
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/order/service/impl/OrderGoodsRefundServiceImpl.java

@@ -497,7 +497,10 @@ public class OrderGoodsRefundServiceImpl extends ServiceImpl<OrderGoodsRefundMap
             return new ArrayList<>();
         }
         orderSns.forEach(item -> {
-            List<OrderGoodsRefundVo> orderGoodsRefundVos = baseMapper.selectListByOrderSn(item.getOrderSn());
+            OrderGoodsRefundQueryBo queryBo = new OrderGoodsRefundQueryBo();
+            queryBo.setOrderSn(item.getOrderSn());
+            queryBo.setPeriodStatus(bo.getPeriodStatus());
+            List<OrderGoodsRefundVo> orderGoodsRefundVos = baseMapper.selectListByOrderSn(queryBo);
             OrderGoodsRefundVo vo = orderGoodsRefundVos.stream().findFirst().orElse(null);
             vo.setGoodsNum(orderGoodsRefundVos.size());
             BeanUtil.copyProperties(vo,item);
@@ -650,7 +653,7 @@ public class OrderGoodsRefundServiceImpl extends ServiceImpl<OrderGoodsRefundMap
     }
 
     @Override
-    public List<OrderGoodsRefundVo> listByOrderSn(String orderSn) {
-        return  baseMapper.selectListByOrderSn(orderSn);
+    public List<OrderGoodsRefundVo> listByOrderSn(OrderGoodsRefundQueryBo bo) {
+        return  baseMapper.selectListByOrderSn(bo);
     }
 }

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

@@ -202,6 +202,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         LEFT JOIN order_goods og ON gr.order_goods_id = og.order_goods_id
         WHERE
          gr.order_sn = #{orderSn}
+        <if test="periodStatus != null ">
+            AND gr.period_status in
+            <foreach collection="periodStatus" item="item" index="index" open="(" close=")" separator=",">
+                #{item}
+            </foreach>
+        </if>
     </select>
 
     <select id="selectCountConfirmPeriod" parameterType="map" resultType="Long">