需求

src/main/java/com/gree/mall/manager/bean/coupon/CouponVO.java

@@ -26,13 +26,6 @@ public class CouponVO  {
     @ApiModelProperty(value = "优惠券id")
     private String couponId;
 
-    @ZfireField(hide = true)
-    @ApiModelProperty(value = "企业微信id")
-    private String companyWechatId;
-
-    @ApiModelProperty(value = "商户")
-    private String companyName;
-
     @ApiModelProperty(value = "优惠券名称")
     private String couponName;
 

src/main/java/com/gree/mall/manager/commonmapper/CouponDateMapper.java

@@ -44,5 +44,5 @@ public interface CouponDateMapper {
     List<CouponExportBean> exportSelfCoupon(@Param("companyIds")List<String> companyIds,
                                             @Param("couponName")String couponName, @Param("couponType")String couponType, @Param("flag")String flag);
 
-    IPage<CouponVO> couponList(Page page, @Param("ex") ZfireParamBean zfireParam);
+    IPage<CouponVO> couponList(Page page, @Param("ex") ZfireParamBean zfireParam,@Param("companyIds")List<String> companyIds,@Param("adminWebsitIds")List<String> adminWebsitIds);
 }

src/main/java/com/gree/mall/manager/logic/coupon/CouponLogic.java

@@ -714,9 +714,9 @@ public class CouponLogic {
         AdminUserCom adminUser = commonLogic.getAdminUser();
 
         //1.组装查询条件
-        FieldUtils.supplyParam(zfireParam, CouponVO.class,adminUser);
+        FieldUtils.supplyParam(zfireParam, CouponVO.class);
 
-        IPage<CouponVO> couponVOIPage = couponDateMapper.couponList(page, zfireParam);
+        IPage<CouponVO> couponVOIPage = couponDateMapper.couponList(page, zfireParam,adminUser.getAdminCompanyIds(),(adminUser.getType().equals(2) || adminUser.getType().equals(4))?adminUser.getAdminWebsitIds():null);
         return couponVOIPage;
     }
 }

src/main/resources/mapper/CouponDateMapper.xml

@@ -241,7 +241,21 @@
         SELECT
         ${ex.selected}
         FROM coupon a
+        join coupon_company cc on cc.coupon_id = a.coupon_id
+        left join coupon_websit cw on cw.coupon_id = a.coupon_id
         ${ex.query}
+        <if test="companyIds != null and companyIds.size > 0">
+            and cc.company_id in
+            <foreach item="item" index="index" collection="companyIds" open="(" separator="," close=")">
+                #{item}
+            </foreach>
+        </if>
+        <if test="adminWebsitIds != null and adminWebsitIds.size > 0">
+            and cw.websit_id in
+            <foreach item="item" index="index" collection="adminWebsitIds" open="(" separator="," close=")">
+                #{item}
+            </foreach>
+        </if>
         <if test="ex.orderBy == null or ex.orderBy ==''">
             ORDER BY a.create_time DESC
         </if>