refundBatch detail list

liquidnet-bus-do/liquidnet-service-kylin-do/src/main/java/com/liquidnet/service/kylin/dao/OrderRefundBatchDao.java

+package com.liquidnet.service.kylin.dao;
+
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.time.LocalDateTime;
+
+@Data
+public class OrderRefundBatchDao implements Serializable {
+
+    private String refundBatchId;
+
+    private String targetId;
+
+    private Integer status;
+
+    private LocalDateTime executorAt;
+
+    private LocalDateTime createdAt;
+
+    private LocalDateTime updatedAt;
+}

liquidnet-bus-do/liquidnet-service-kylin-do/src/main/java/com/liquidnet/service/kylin/entity/KylinOrderRefundBatches.java

@@ -35,121 +35,11 @@ public class KylinOrderRefundBatches implements Serializable {
      */
     private String targetId;
 
-    /**
-     * 目标名称 target_type=1为演出名称
-     */
-    private String targetTitle;
-
-    /**
-     * 目标类型 1演出
-     */
-    private Integer targetType;
-
     /**
      * 批量退款状态 1申请退款 2取消退款 3运营驳回审核 4运营通过审核 5财务驳回审核 6财务通过审核
      */
     private Integer status;
 
-    /**
-     * 批量退款总金额
-     */
-    private BigDecimal totalPrice;
-
-    /**
-     * 实际批量退款总金额
-     */
-    private BigDecimal realTotalPrice;
-
-    /**
-     * 批量退款总数量
-     */
-    private Integer totalNum;
-
-    /**
-     * 实际批量退款总数量
-     */
-    private Integer realTotalNum;
-
-    /**
-     * 申请时支付宝需退款总金额
-     */
-    private BigDecimal totalRefundAlipay;
-
-    /**
-     * 申请时微信需退款总金额
-     */
-    private BigDecimal totalRefundWepay;
-
-    /**
-     * 快递费总金额支付宝
-     */
-    private BigDecimal totalPriceExpressAlipay;
-
-    /**
-     * 快递费总金额微信
-     */
-    private BigDecimal totalPriceExpressWepay;
-
-    /**
-     * 批量退款原因
-     */
-    private String reason;
-
-    /**
-     * 批量退款备注
-     */
-    private String remark;
-
-    /**
-     * 驳回原因
-     */
-    private String reject;
-
-    /**
-     * 回绝原因
-     */
-    private String refuse;
-
-    /**
-     * 批量申请人id
-     */
-    private Integer applicantId;
-
-    /**
-     * 批量申请人名称
-     */
-    private String applicantName;
-
-    /**
-     * 批量申请时间
-     */
-    private LocalDateTime applicantAt;
-
-    /**
-     * 批量审核人id
-     */
-    private Integer auditorId;
-
-    /**
-     * 批量审核人名称
-     */
-    private String auditorName;
-
-    /**
-     * 批量审核时间
-     */
-    private LocalDateTime auditorAt;
-
-    /**
-     * 批量执行人id
-     */
-    private Integer executorId;
-
-    /**
-     * 批量执行人名称
-     */
-    private String executorName;
-
     /**
      * 批量执行时间
      */

liquidnet-bus-do/liquidnet-service-kylin-do/src/main/java/com/liquidnet/service/kylin/mapper/KylinOrderRefundBatchesMapper.java

 package com.liquidnet.service.kylin.mapper;
 
+import com.liquidnet.service.kylin.dao.OrderRefundBatchDao;
 import com.liquidnet.service.kylin.entity.KylinOrderRefundBatches;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 
+import java.util.List;
+
 /**
  * <p>
  * 批量退款表 Mapper 接口
@@ -13,4 +16,5 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  */
 public interface KylinOrderRefundBatchesMapper extends BaseMapper<KylinOrderRefundBatches> {
 
+    List<OrderRefundBatchDao> misRefundBatchList();
 }

liquidnet-bus-do/liquidnet-service-kylin-do/src/main/resources/com.liquidnet.service.kylin.mapper/KylinOrderRefundBatchesMapper.xml

@@ -2,4 +2,8 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.liquidnet.service.kylin.mapper.KylinOrderRefundBatchesMapper">
 
+    <select id="misRefundBatchList" resultType="com.liquidnet.service.kylin.dao.OrderRefundBatchDao">
+        SELECT *
+        FROM kylin_order_refund_batches
+    </select>
 </mapper>

liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-impl/src/main/java/com/liquidnet/service/kylin/controller/admin/KylinOrderRefundAdminController.java

 package com.liquidnet.service.kylin.controller.admin;
 
-import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
-import com.liquidnet.commons.lang.util.BeanUtil;
-import com.liquidnet.service.adam.dto.vo.AdamCollectVo;
 import com.liquidnet.service.base.ResponseDto;
 import com.liquidnet.service.kylin.constant.KylinTableStatusConst;
-import com.github.pagehelper.PageInfo;
 import com.liquidnet.service.kylin.dao.OrderRefundDao;
-import com.liquidnet.service.kylin.dao.PerformanceAdminListDao;
 import com.liquidnet.service.kylin.dto.vo.KylinOrderRefundsVo;
 import com.liquidnet.service.kylin.service.impl.admin.KylinOrderRefundsServiceImpl;
 import io.swagger.annotations.Api;

liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-impl/src/main/java/com/liquidnet/service/kylin/controller/admin/KylinOrderRefundBatchAdminController.java

 package com.liquidnet.service.kylin.controller.admin;
 
+import com.github.pagehelper.PageInfo;
 import com.liquidnet.service.base.ResponseDto;
-import com.liquidnet.service.kylin.dao.BannerDetailsListDao;
-import com.liquidnet.service.kylin.dto.param.BannersSearchParam;
-import com.liquidnet.service.kylin.dto.vo.KylinPagerVo;
+import com.liquidnet.service.kylin.dao.OrderRefundBatchDao;
+import com.liquidnet.service.kylin.dto.vo.KylinOrderRefundBatchesVo;
 import com.liquidnet.service.kylin.service.impl.admin.KylinRefundPerformancesAdminServiceImpl;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
@@ -13,7 +13,6 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
 import java.util.HashMap;
-import java.util.List;
 
 /**
  * <p>
@@ -33,54 +32,37 @@ public class KylinOrderRefundBatchAdminController {
     @Autowired
     private KylinRefundPerformancesAdminServiceImpl kylinRefundPerformancesAdminServiceImpl;
 
-    /*@GetMapping("{bannersId}")
-    @ApiOperation("banner详情")
-    @ApiImplicitParam(type = "path", dataType = "String", name = "bannersId", value = "banner主键id", required = true)
-    public ResponseDto<KylinBannersVo> detail(@PathVariable("bannersId") String bannersId) {
-        KylinBannersVo result = null;
-        result = kylinBannersServiceImpl.detail(bannersId);
+    @GetMapping("{refundBatchId}")
+    @ApiOperation("详情")
+    @ApiImplicitParam(type = "path", dataType = "String", name = "refundBatchId", value = "主键id", required = true)
+    public ResponseDto<KylinOrderRefundBatchesVo> detail(@PathVariable("refundBatchId") String refundBatchId) {
+        KylinOrderRefundBatchesVo result = null;
+        result = kylinRefundPerformancesAdminServiceImpl.detail(refundBatchId);
         if (null != result) {
             return ResponseDto.success(result);
         } else {
-            return ResponseDto.failure("获取banner详情失败");
+            return ResponseDto.failure("获取详情失败");
         }
     }
 
     @GetMapping("list")
-    @ApiOperation("banner列表")
+    @ApiOperation("列表")
     @ApiImplicitParams({
-            @ApiImplicitParam(type = "query", dataType = "String", name = "bannersName", value = "banner标题"),
-            @ApiImplicitParam(type = "query", dataType = "Integer", name = "isOnline", value = "0下线 1上线"),
-            @ApiImplicitParam(type = "query", dataType = "Integer", name = "promotionType", value = "推广类型 1全国 2省份"),
             @ApiImplicitParam(type = "query", dataType = "Integer", name = "page", value = "页码"),
             @ApiImplicitParam(type = "query", dataType = "Integer", name = "size", value = "每页数量")
     })
-    public ResponseDto<KylinPagerVo<BannerDetailsListDao>> bannerList(
-            @RequestParam(defaultValue = "") String bannersName,
-            @RequestParam(defaultValue = "1") Integer isOnline,
-            @RequestParam(defaultValue = "") Integer promotionType,
+    public ResponseDto<PageInfo<OrderRefundBatchDao>> bannerList(
             @RequestParam(defaultValue = "1") Integer page,
             @RequestParam(defaultValue = "10") Integer size
     ) {
-        BannersSearchParam bannersSearchParam = new BannersSearchParam();
-        bannersSearchParam.setBannersName(bannersName);
-        bannersSearchParam.setIsOnline(isOnline);
-        bannersSearchParam.setPromotionType(promotionType);
-        bannersSearchParam.setPage(page);
-        bannersSearchParam.setSize(size);
-        List<BannerDetailsListDao> result = kylinBannersServiceImpl.bannerList(bannersSearchParam);
-        Long total = kylinBannersServiceImpl.bannerListCount(bannersSearchParam);
-
-        KylinPagerVo<BannerDetailsListDao> kylinPagerVo = new KylinPagerVo();
-        kylinPagerVo.setRows(result);
-        kylinPagerVo.setTotal(total);
-
-        if (kylinPagerVo.getRows().size() > 0) {
-            return ResponseDto.success(kylinPagerVo);
+        PageInfo<OrderRefundBatchDao> result = null;
+        result = kylinRefundPerformancesAdminServiceImpl.refundList(page, size);
+        if (null != result) {
+            return ResponseDto.success(result);
         } else {
             return ResponseDto.failure("获取列表失败");
         }
-    }*/
+    }
 
     @PostMapping("apply")
     @ApiOperation("申请演出退款")

liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-impl/src/main/java/com/liquidnet/service/kylin/service/impl/admin/KylinOrderRefundsServiceImpl.java

@@ -2,19 +2,11 @@ package com.liquidnet.service.kylin.service.impl.admin;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
-import com.fasterxml.jackson.databind.JsonNode;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
-import com.liquidnet.commons.lang.util.BeanUtil;
 import com.liquidnet.service.kylin.constant.KylinTableStatusConst;
-import com.liquidnet.service.kylin.dao.BannerDetailsListDao;
 import com.liquidnet.service.kylin.dao.OrderRefundDao;
-import com.liquidnet.service.kylin.dao.PerformanceAdminListDao;
-import com.liquidnet.service.kylin.dto.param.BannersSearchParam;
-import com.liquidnet.service.kylin.dto.param.PerformanceAdminListParam;
-import com.liquidnet.service.kylin.dto.vo.KylinBannersVo;
 import com.liquidnet.service.kylin.dto.vo.KylinOrderRefundsVo;
-import com.liquidnet.service.kylin.entity.KylinBanners;
 import com.liquidnet.service.kylin.entity.KylinOrderRefunds;
 import com.liquidnet.service.kylin.entity.KylinOrderTickets;
 import com.liquidnet.service.kylin.mapper.KylinOrderRefundsMapper;
@@ -25,7 +17,6 @@ import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
-import java.util.ArrayList;
 import java.util.List;
 
 /**

liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-impl/src/main/java/com/liquidnet/service/kylin/service/impl/admin/KylinRefundPerformancesAdminServiceImpl.java

 package com.liquidnet.service.kylin.service.impl.admin;
 
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
+import com.github.pagehelper.PageHelper;
+import com.github.pagehelper.PageInfo;
 import com.liquidnet.common.cache.redis.util.RedisUtil;
 import com.liquidnet.commons.lang.util.IDGenerator;
 import com.liquidnet.service.kylin.constant.KylinRedisConst;
 import com.liquidnet.service.kylin.constant.KylinTableStatusConst;
+import com.liquidnet.service.kylin.dao.OrderRefundBatchDao;
+import com.liquidnet.service.kylin.dao.OrderRefundDao;
+import com.liquidnet.service.kylin.dto.vo.KylinOrderRefundBatchesVo;
+import com.liquidnet.service.kylin.dto.vo.KylinOrderRefundsVo;
 import com.liquidnet.service.kylin.dto.vo.KylinPerformanceVo;
 import com.liquidnet.service.kylin.entity.KylinOrderRefundBatches;
+import com.liquidnet.service.kylin.entity.KylinOrderRefunds;
 import com.liquidnet.service.kylin.mapper.KylinOrderTicketsMapper;
 import com.liquidnet.service.kylin.mapper.KylinOrderRefundBatchesMapper;
+import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.math.BigDecimal;
 import java.time.LocalDateTime;
 import java.util.HashMap;
+import java.util.List;
 
 /**
  * <p>
@@ -66,17 +75,7 @@ public class KylinRefundPerformancesAdminServiceImpl {
 
             KylinOrderRefundBatches createData = new KylinOrderRefundBatches();
             createData.setRefundBatchId(refundBatchId);
-            createData.setTargetTitle(performancesInfo.getTitle());
-            createData.setTotalPrice(BigDecimal.valueOf(totalPrice));
-            createData.setTotalNum(totalNum);
-            createData.setTotalRefundAlipay(BigDecimal.valueOf(totalRefundAlipay));
-            createData.setTotalRefundWepay(BigDecimal.valueOf(totalRefundWepay));
-            createData.setTotalPriceExpressAlipay(BigDecimal.valueOf(totalPriceExpressAlipay));
-            createData.setTotalPriceExpressWepay(BigDecimal.valueOf(totalPriceExpressWepay));
-            createData.setApplicantId(authId);
-            createData.setApplicantName(authName);
             createData.setStatus(KylinTableStatusConst.STATUS_APPLY);
-            createData.setApplicantAt(LocalDateTime.now());
 
             int resNum = kylinOrderRefundBatchesMapper.insert(createData);
             if (resNum > 0) {
@@ -103,7 +102,6 @@ public class KylinRefundPerformancesAdminServiceImpl {
 
             KylinOrderRefundBatches params = new KylinOrderRefundBatches();
             params.setStatus(KylinTableStatusConst.STATUS_APPLY);
-            params.setRemark(remark);
             kylinOrderRefundBatchesMapper.update(params, new UpdateWrapper<KylinOrderRefundBatches>().eq("refund_batch_id", refundBatchId));
 
             return true;
@@ -152,10 +150,6 @@ public class KylinRefundPerformancesAdminServiceImpl {
 
             KylinOrderRefundBatches params = new KylinOrderRefundBatches();
             params.setStatus(batchStatus);
-            params.setReject((String) otherParam.get("reject"));
-            params.setAuditorId(2);
-            params.setAuditorName("2222");
-            params.setAuditorAt(LocalDateTime.now());
             kylinOrderRefundBatchesMapper.update(params, new UpdateWrapper<KylinOrderRefundBatches>().eq("refund_batch_id", refundBatchId));
 
             return true;
@@ -184,9 +178,6 @@ public class KylinRefundPerformancesAdminServiceImpl {
 
             KylinOrderRefundBatches params = new KylinOrderRefundBatches();
             params.setStatus(batchStatus);
-            params.setRefuse((String) otherParam.get("refuse"));
-            params.setExecutorId(2);
-            params.setExecutorName("2222");
             params.setExecutorAt(LocalDateTime.now());
             kylinOrderRefundBatchesMapper.update(params, new UpdateWrapper<KylinOrderRefundBatches>().eq("refund_batch_id", refundBatchId));
 
@@ -196,4 +187,27 @@ public class KylinRefundPerformancesAdminServiceImpl {
         }
     }
 
+    public KylinOrderRefundBatchesVo detail(String orderRefundId) {
+        KylinOrderRefundBatches data = kylinOrderRefundBatchesMapper.selectOne(
+                new UpdateWrapper<KylinOrderRefundBatches>()
+                        .eq("order_refunds_id", orderRefundId)
+        );
+        KylinOrderRefundBatchesVo kylinOrderRefundBatchesVo = new KylinOrderRefundBatchesVo();
+        BeanUtils.copyProperties(data, kylinOrderRefundBatchesVo);
+
+        return kylinOrderRefundBatchesVo;
+    }
+
+    public PageInfo<OrderRefundBatchDao> refundList(Integer page, Integer size) {
+        PageInfo<OrderRefundBatchDao> pageInfoTmp = null;
+        try {
+            PageHelper.startPage(page, size);
+            List<OrderRefundBatchDao> voList = kylinOrderRefundBatchesMapper.misRefundBatchList();
+            pageInfoTmp = new PageInfo(voList);
+        } catch (Exception e) {
+            return null;
+        }
+        return pageInfoTmp;
+    }
+
 }