优化

lb-module/src/main/java/com/ydd/module/dto/SystemMemberBalanceLogDto.java

@@ -0,0 +1,119 @@
+package com.ydd.module.dto;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableLogic;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.ydd.common.annotation.Excel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * Demo class
+ *
+ * @author 14027
+ * @date 2022/3/31 18:34
+ */
+@Data
+public class SystemMemberBalanceLogDto implements Serializable {
+
+private static final long serialVersionUID=1L;
+
+
+    /** $column.columnComment */
+    @TableId(value = "id")
+    private Long id;
+
+    /** 会员Id */
+    @Excel(name = "会员Id")
+    @ApiModelProperty("会员Id")
+    private Long memberId;
+
+    /** 创建时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @Excel(name = "创建时间", width = 30, dateFormat = "yyyy-MM-dd")
+    @ApiModelProperty("创建时间")
+    private Date createTime;
+
+    @Excel(name = "用户手机号", defaultValue=" -- ")
+    @TableField(exist = false)
+    private String mobile;
+
+    @Excel(name = "流水号", defaultValue=" -- ")
+    @TableField(exist = false)
+    private String orderSn;
+
+    /** 类型 1：增加  2：减少 */
+//    @Excel(name = "类型 1：增加  2：减少")
+    @ApiModelProperty("类型 1：增加  2：减少")
+    private Integer type;
+
+    /** 资金来源：1->充值，2->消费，3->退款 */
+    @Excel(name = "类型", readConverterExp = "1=充值,2=消费,3=退款,4=赠送,5=补贴,6=订单退款")
+    @ApiModelProperty("资金来源：1->充值，2->消费，3->退款")
+    private Integer source;
+
+    /** 描述 */
+    @Excel(name = "原因")
+    @ApiModelProperty("描述")
+    private String remark;
+
+    /** 变动金额 */
+    @Excel(name = "金额")
+    @ApiModelProperty("变动金额")
+    private BigDecimal amount;
+
+    /**
+     * 支付类型：1->支付宝支付 2->微信支付 3->银联支付 4->余额支付 5->三方运力支付
+     */
+    @Excel(name = "支付方式", readConverterExp = "1=支付宝,2=微信支付,3=银联支付,4=余额支付,5=官方平台支付")
+    private Integer paymentType;
+
+    private Long merchantId;
+    private Long orderId;
+
+    /** 更新时间 */
+    @TableField(update = "now()")
+    private Date updateTime;
+
+    /** 删除标识位: 0正常 1删除 */
+    @TableLogic
+    private Integer deleted;
+
+    private Map<String, Object> params = new HashMap<>();
+
+    private Integer agentId;
+
+    private String nickname;
+
+    private Integer memberType;
+
+    private String merchantName;
+
+    private String agentName;
+
+    /** 开始时间 */
+    @TableField(exist = false)
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private String startTime;
+
+    /** 结束时间 */
+    @TableField(exist = false)
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private String endTime;
+
+    private Boolean showOther;
+
+    private String payment;
+
+    private BigDecimal getCommission;
+
+    private List<Long> orderIds;
+}

lb-module/src/main/java/com/ydd/module/mapper/OrderMapper.java

@@ -133,7 +133,14 @@ public interface OrderMapper extends BaseMapper<Order> {
      * @param orderSn
      * @return
      */
-    Order getAllOrderByOrderSn(String orderSn);
+    List<Order> getAllOrderByOrderSn(String orderSn);
+
+    /**
+     * 根据订单id查找订单(包括异常单)
+     * @param orderId
+     * @return
+     */
+    Order getAllOrderByOrderId(Long orderId);
 
     List<DadaOrderListDto> queryDadaPageList(@Param("page") Page page, @Param("params") DadaOrderListQuery orderQuery);
 

lb-module/src/main/java/com/ydd/module/service/IMemberBalanceLogService.java

@@ -9,6 +9,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
 import com.ydd.module.domain.ProfitsMerchant;
 import com.ydd.module.dto.MemberBalanceLogDto;
 import com.ydd.module.dto.ProfitsMerchantDTO;
+import com.ydd.module.dto.SystemMemberBalanceLogDto;
 import com.ydd.module.request.AccountFlowListRequest;
 
 import java.math.BigDecimal;
@@ -28,7 +29,7 @@ public interface IMemberBalanceLogService extends IService<MemberBalanceLog> {
      * @param memberBalanceLog 实体
      * @return 列表
      */
-    List<MemberBalanceLog> queryList(MemberBalanceLog memberBalanceLog);
+    List<MemberBalanceLog> queryList(SystemMemberBalanceLogDto memberBalanceLog);
 
     /**
      * 更新会员余额

lb-module/src/main/java/com/ydd/module/service/IOrderService.java

@@ -185,7 +185,7 @@ public interface IOrderService extends IService<Order> {
      * @param orderSn
      * @return
      */
-    Order getAllOrderByOrderSn(String orderSn);
+    List<Order> getAllOrderByOrderSn(String orderSn);
 
     Boolean orderRefund(SystemOrderDto order);
 

lb-module/src/main/java/com/ydd/module/service/impl/MemberBalanceLogServiceImpl.java

@@ -1,6 +1,7 @@
 package com.ydd.module.service.impl;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.ydd.common.core.domain.entity.SysUser;
 import com.ydd.common.core.page.PageResult;
@@ -9,6 +10,7 @@ import com.ydd.module.domain.*;
 import com.ydd.module.dto.MemberBalanceLogDto;
 import com.ydd.module.dto.ProfitsMerchantDTO;
 import com.ydd.module.dto.RechargeDto;
+import com.ydd.module.dto.SystemMemberBalanceLogDto;
 import com.ydd.module.enums.LogSourceEnum;
 import com.ydd.module.mapper.MemberBalanceLogMapper;
 import com.ydd.module.mapper.MemberMapper;
@@ -53,11 +55,14 @@ public class MemberBalanceLogServiceImpl extends ServiceImpl<MemberBalanceLogMap
     private final IProfitsDetailService iProfitsDetailService;
 
     @Override
-    public List<MemberBalanceLog> queryList(MemberBalanceLog memberBalanceLog) {
+    public List<MemberBalanceLog> queryList(SystemMemberBalanceLogDto memberBalanceLog) {
         LambdaQueryWrapper<MemberBalanceLog> lqw = Wrappers.lambdaQuery();
         if (memberBalanceLog.getOrderId() != null) {
             lqw.eq(MemberBalanceLog::getOrderId, memberBalanceLog.getOrderId());
         }
+        if (CollectionUtils.isNotEmpty(memberBalanceLog.getOrderIds())) {
+            lqw.in(MemberBalanceLog::getOrderId, memberBalanceLog.getOrderIds());
+        }
         if (memberBalanceLog.getMemberId() != null) {
             lqw.eq(MemberBalanceLog::getMemberId, memberBalanceLog.getMemberId());
         }
@@ -93,7 +98,7 @@ public class MemberBalanceLogServiceImpl extends ServiceImpl<MemberBalanceLogMap
         // if (memberBalanceLog.getShowOther()) {
             for (MemberBalanceLog log : logList) {
                 if (log.getOrderId() != null) {
-                    Order order = orderMapper.selectById(log.getOrderId());
+                    Order order = orderMapper.getAllOrderByOrderId(log.getOrderId());
                     if (order != null) {
                         log.setOrderSn(order.getOrderSn());
                     }

lb-module/src/main/java/com/ydd/module/service/impl/OrderServiceImpl.java

@@ -885,7 +885,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
      * @return
      */
     @Override
-    public Order getAllOrderByOrderSn(String orderSn) {
+    public List<Order> getAllOrderByOrderSn(String orderSn) {
         return baseMapper.getAllOrderByOrderSn(orderSn);
     }
 

lb-module/src/main/resources/mapper/module/orderMapper.xml

@@ -1694,7 +1694,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </select>
 
     <select id="getAllOrderByOrderSn" resultType="com.ydd.module.domain.Order">
-        select id,order_sn,delivery_status from lb_order where order_sn = #{orderSn}
+        select id,order_sn,delivery_status from lb_order where order_sn like concat('%', #{orderSn}, '%')
+    </select>
+
+    <select id="getAllOrderByOrderId" resultType="com.ydd.module.domain.Order">
+        select id,order_sn,delivery_status from lb_order where id = #{orderId}
     </select>
 
     <select id="queryDadaPageList" resultType="com.ydd.module.dto.DadaOrderListDto">

lb-web/src/main/java/com/ydd/web/controller/MemberBalanceLogController.java

@@ -1,16 +1,19 @@
 package com.ydd.web.controller;
 
 import java.util.*;
+import java.util.stream.Collectors;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.ydd.common.core.domain.entity.SysUser;
 import com.ydd.common.core.page.PageResult;
 import com.ydd.common.enums.UserTypeEnums;
 import com.ydd.module.domain.Order;
+import com.ydd.module.dto.SystemMemberBalanceLogDto;
 import com.ydd.module.enums.PaymentTypeEnum;
 import com.ydd.module.service.IOrderService;
 import com.ydd.module.service.IRechargeService;
 import lombok.RequiredArgsConstructor;
+import org.apache.commons.collections4.CollectionUtils;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -52,11 +55,12 @@ public class MemberBalanceLogController extends BaseController {
      */
 //    @PreAuthorize("@ss.hasPermi('module:memberBalanceLog:list')")
     @GetMapping("/list")
-    public TableDataInfo list(MemberBalanceLog memberBalanceLog) {
+    public TableDataInfo list(SystemMemberBalanceLogDto memberBalanceLog) {
         if(memberBalanceLog.getOrderSn() != null) {
-          Order order = iOrderService.getAllOrderByOrderSn(memberBalanceLog.getOrderSn());
-          if (order != null) {
-            memberBalanceLog.setOrderId(order.getId());
+          List<Order> orders = iOrderService.getAllOrderByOrderSn(memberBalanceLog.getOrderSn());
+          List<Long> orderIds = orders.stream().map(Order::getId).collect(Collectors.toList());
+          if (CollectionUtils.isNotEmpty(orderIds)) {
+            memberBalanceLog.setOrderIds(orderIds);
           }
         }
         startPage();
@@ -70,7 +74,7 @@ public class MemberBalanceLogController extends BaseController {
 //    @PreAuthorize("@ss.hasPermi('module:memberBalanceLog:export')" )
     @Log(title = "用户账户明细" , businessType = BusinessType.EXPORT)
     @GetMapping("/export" )
-    public Result export(MemberBalanceLog memberBalanceLog) {
+    public Result export(SystemMemberBalanceLogDto memberBalanceLog) {
         List<MemberBalanceLog> list = iMemberBalanceLogService.queryList(memberBalanceLog);
         ExcelUtil<MemberBalanceLog> util = new ExcelUtil<MemberBalanceLog>(MemberBalanceLog.class);
         return util.exportExcel(list, "用户明细" );