数据取得从deptId变成liffId

ruoyi-admin/src/main/java/com/ruoyi/web/pcApi/domain/TCommodityManage.java

@@ -141,4 +141,7 @@ public class TCommodityManage extends BaseEntity
     private String couponUser;
     /** 用户是否收藏状态   1-有  0-无*/
     private String collectionUser;
+    /** liff id*/
+    private String liffId;
+    
 }

ruoyi-admin/src/main/java/com/ruoyi/web/pcApi/mapper/TCommodityManageMapper.java

@@ -1,13 +1,12 @@
 package com.ruoyi.web.pcApi.mapper;
 
 import java.util.List;
-import java.util.Map;
 
-import com.ruoyi.web.pcApi.domain.TCommodityManage;
+import org.apache.ibatis.annotations.Param;
+
 import com.ruoyi.web.pcApi.domain.TCommodityJourneyInformation;
+import com.ruoyi.web.pcApi.domain.TCommodityManage;
 import com.ruoyi.web.pcApi.domain.TCommoditySchedul;
-import org.apache.ibatis.annotations.Param;
-import org.springframework.security.core.parameters.P;
 
 /**
  * 商品信息管理Mapper接口
@@ -104,7 +103,7 @@ public interface TCommodityManageMapper
      */
     public int deleteTCommodityJourneyInformationByCommodityId(Long id);
 
-    List<TCommodityManage> selectSameTypeCommodityTop5(@Param("id") Long id, @Param("typeId") Long typeId, @Param("deptId") Long deptId);
+    List<TCommodityManage> selectSameTypeCommodityTop5(@Param("id") Long id, @Param("typeId") Long typeId, @Param("deptId") Long deptId, @Param("liffId") String liffId);
 
     List<TCommodityManage> selectTCommodityManageList4H5(TCommodityManage commodityManage);
 

ruoyi-admin/src/main/java/com/ruoyi/web/pcApi/service/impl/TCommodityManageServiceImpl.java

@@ -1,26 +1,28 @@
 package com.ruoyi.web.pcApi.service.impl;
 
-import java.time.DayOfWeek;
 import java.time.LocalDate;
 import java.time.format.DateTimeFormatter;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Optional;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 
 import com.ruoyi.common.annotation.DataScope;
 import com.ruoyi.common.exception.ServiceException;
 import com.ruoyi.common.utils.DateUtils;
+import com.ruoyi.common.utils.StringUtils;
 import com.ruoyi.web.pcApi.domain.TCommodityCoupon;
+import com.ruoyi.web.pcApi.domain.TCommodityJourneyInformation;
+import com.ruoyi.web.pcApi.domain.TCommodityManage;
 import com.ruoyi.web.pcApi.domain.TCommoditySchedul;
 import com.ruoyi.web.pcApi.mapper.TCommodityCouponMapper;
+import com.ruoyi.web.pcApi.mapper.TCommodityManageMapper;
 import com.ruoyi.web.pcApi.mapper.TCommoditySchedulMapper;
 import com.ruoyi.web.pcApi.mapper.TCommodityTypeMapper;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-import com.ruoyi.common.utils.StringUtils;
-import org.springframework.transaction.annotation.Transactional;
-import com.ruoyi.web.pcApi.domain.TCommodityJourneyInformation;
-import com.ruoyi.web.pcApi.mapper.TCommodityManageMapper;
-import com.ruoyi.web.pcApi.domain.TCommodityManage;
 import com.ruoyi.web.pcApi.service.ITCommodityManageService;
 
 /**
@@ -296,7 +298,7 @@ public class TCommodityManageServiceImpl implements ITCommodityManageService
 
     @Override
     public List<TCommodityManage> selectSameTypeCommodityTop5(Long id,Long typeId,Long deptId) {
-        return tCommodityManageMapper.selectSameTypeCommodityTop5(id,typeId,deptId);
+        return tCommodityManageMapper.selectSameTypeCommodityTop5(id,typeId,deptId,null);
     }
 
     @Override

ruoyi-admin/src/main/resources/mapper/commodity/TCommodityManageMapper.xml

@@ -89,6 +89,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             b.type_name
         FROM
             t_commodity_manage a
+                INNER JOIN sys_dept c on c.dept_id = a.dept_id 
+                <if test="liffId != null "> and c.liff_id = #{liffId}</if>
                 LEFT JOIN t_commodity_type b on a.type_id = b.id
     </sql>
 

ruoyi-admin/src/main/resources/mapper/customerManage/TCustomerManageMapper.xml

@@ -185,7 +185,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             and a.username = #{username}
         </if>
         <if test="id != null">
-            and a.username = #{username}
+            and a.id = #{id}
         </if>
         <if test="deptId != null">
             and a.dept_id = #{deptId}