权益列表，关联权益订单

src/main/java/com/fdkankan/manage/service/IIncrementOrderMgService.java

@@ -18,4 +18,6 @@ public interface IIncrementOrderMgService extends IService<IncrementOrderMg> {
     IncrementOrderMg addOrder(UserIncrementParam param, IncrementType incrementType);
 
     IncrementOrderMg getByOrderSn(String orderSn);
+
+    IncrementOrderMg getByIncrementId(Long id);
 }

src/main/java/com/fdkankan/manage/service/impl/IncrementOrderMgServiceImpl.java

@@ -1,6 +1,7 @@
 package com.fdkankan.manage.service.impl;
 import java.math.BigDecimal;
 import java.util.Date;
+import java.util.List;
 
 import cn.hutool.core.bean.BeanUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
@@ -11,6 +12,7 @@ import com.fdkankan.manage.service.IIncrementOrderMgService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.fdkankan.manage.util.Dateutils;
 import com.fdkankan.manage.vo.request.UserIncrementParam;
+import org.apache.commons.lang3.ObjectUtils;
 import org.springframework.stereotype.Service;
 
 /**
@@ -49,4 +51,15 @@ public class IncrementOrderMgServiceImpl extends ServiceImpl<IIncrementOrderMgMa
         wrapper.eq(IncrementOrderMg::getOrderSn,orderSn);
         return this.getOne(wrapper);
     }
+
+    @Override
+    public IncrementOrderMg getByIncrementId(Long id) {
+        LambdaQueryWrapper<IncrementOrderMg> wrapper = new LambdaQueryWrapper<>();
+        wrapper.eq(IncrementOrderMg::getIncrementId,id);
+        List<IncrementOrderMg> list = this.list(wrapper);
+        if(ObjectUtils.isEmpty(list)){
+            return null;
+        }
+        return list.get(0);
+    }
 }

src/main/java/com/fdkankan/manage/service/impl/UserIncrementServiceImpl.java

@@ -105,6 +105,9 @@ public class UserIncrementServiceImpl extends ServiceImpl<IUserIncrementMapper,
             }
             if(!StringUtils.isEmpty(record.getOrderSn()) && !record.getOrderSn().contains("O")){
                 IncrementOrderMg incrementOrderMg = iIncrementOrderMgService.getByOrderSn(record.getOrderSn());
+                if(incrementOrderMg == null){
+                    incrementOrderMg = iIncrementOrderMgService.getByIncrementId(record.getId());
+                }
                 if(incrementOrderMg != null){
                     vo.setCustomerName(incrementOrderMg.getCustomerName());
                     vo.setCustomerType(incrementOrderMg.getCustomerType());
@@ -114,7 +117,6 @@ public class UserIncrementServiceImpl extends ServiceImpl<IUserIncrementMapper,
                     vo.setProjectNum(incrementOrderMg.getProjectNum());
                     vo.setRemark(incrementOrderMg.getRemark());
                 }
-
             }
             voList.add(vo);
         }