浏览代码

售后列表统计

liangpeile 1 年之前
父节点
当前提交
94715f91d1

+ 1 - 0
crmeb-front/src/main/java/com/zbkj/front/service/impl/FrontOrderServiceImpl.java

@@ -1539,6 +1539,7 @@ public class FrontOrderServiceImpl implements FrontOrderService {
     @Override
     @Override
     public PageInfo<OrderDetail> getAfterSaleApplyList(String orderNo, PageParamRequest pageParamRequest) {
     public PageInfo<OrderDetail> getAfterSaleApplyList(String orderNo, PageParamRequest pageParamRequest) {
         Integer uid = userService.getUserIdException();
         Integer uid = userService.getUserIdException();
+
         PageInfo<OrderDetail> pageInfo = orderDetailService.findAfterSaleApplyList(uid, orderNo, pageParamRequest);
         PageInfo<OrderDetail> pageInfo = orderDetailService.findAfterSaleApplyList(uid, orderNo, pageParamRequest);
         List<OrderDetail> orderDetailList = pageInfo.getList();
         List<OrderDetail> orderDetailList = pageInfo.getList();
         if (CollUtil.isEmpty(orderDetailList)) {
         if (CollUtil.isEmpty(orderDetailList)) {

+ 1 - 1
crmeb-service/src/main/java/com/zbkj/service/dao/OrderDetailDao.java

@@ -31,7 +31,7 @@ public interface OrderDetailDao extends BaseMapper<OrderDetail> {
      * @param uid 用户id
      * @param uid 用户id
      * @param orderNo 订单号
      * @param orderNo 订单号
      */
      */
-    List<OrderDetail> findAfterSaleApplyList(@Param("uid") Integer uid, @Param("orderNo") String orderNo);
+    List<OrderDetail> findAfterSaleApplyList(@Param("uid") Integer uid, @Param("orderNo") String orderNo,@Param("isEnterpriseUser") Integer isEnterpriseUser);
 
 
     /**
     /**
      * 根据时间、商品id获取销售件数
      * 根据时间、商品id获取销售件数

+ 3 - 1
crmeb-service/src/main/java/com/zbkj/service/service/impl/OrderDetailServiceImpl.java

@@ -97,7 +97,9 @@ public class OrderDetailServiceImpl extends ServiceImpl<OrderDetailDao, OrderDet
     @Override
     @Override
     public PageInfo<OrderDetail> findAfterSaleApplyList(Integer uid, String orderNo, PageParamRequest pageParamRequest) {
     public PageInfo<OrderDetail> findAfterSaleApplyList(Integer uid, String orderNo, PageParamRequest pageParamRequest) {
         Page<OrderDetail> page = PageHelper.startPage(pageParamRequest.getPage(), pageParamRequest.getLimit());
         Page<OrderDetail> page = PageHelper.startPage(pageParamRequest.getPage(), pageParamRequest.getLimit());
-        List<OrderDetail> orderDetailList = dao.findAfterSaleApplyList(uid, orderNo);
+        User user = userService.getById(uid);
+        Integer isEnterpriseUser = user.getIsEnterpriseUser();
+        List<OrderDetail> orderDetailList = dao.findAfterSaleApplyList(uid, orderNo,isEnterpriseUser);
         return CommonPage.copyPageInfo(page, orderDetailList);
         return CommonPage.copyPageInfo(page, orderDetailList);
     }
     }
 
 

+ 1 - 0
crmeb-service/src/main/resources/mapper/order/OrderDetailMapper.xml

@@ -22,6 +22,7 @@
         and o.status not in (0,6,9)
         and o.status not in (0,6,9)
         and o.is_user_del = 0 and o.level = 1
         and o.is_user_del = 0 and o.level = 1
         and o.refund_status &lt; 3
         and o.refund_status &lt; 3
+        and o.is_enterprise_user=#{isEnterpriseUser}
         and (od.apply_refund_num + od.refund_num) &lt; od.pay_num
         and (od.apply_refund_num + od.refund_num) &lt; od.pay_num
         <if test="orderNo != '' and orderNo != null ">
         <if test="orderNo != '' and orderNo != null ">
             and od.order_no = #{orderNo}
             and od.order_no = #{orderNo}