需求

mall-server-api/src/main/java/com/gree/mall/manager/commonmapper/WebsitSalesRetCMapper.java

@@ -47,6 +47,7 @@ public interface WebsitSalesRetCMapper {
     IPage<SettlementWorkerLogicVO> pageV3(Page page,@Param("ex") ZfireParamBean zfireParam,
                                           @Param("companyWechatIds")List<String> companyWechatIds
             ,@Param("orderBaseIds")List<String> orderBaseIds,
-            @Param("value")String value
+            @Param("value")String value,
+            @Param("mName")List<String> mName
                                           );
 }

mall-server-api/src/main/java/com/gree/mall/manager/logic/websit/SettlementOrderLogic.java

@@ -939,7 +939,7 @@ public class SettlementOrderLogic {
         IPage<SettlementWorkerLogicVO> settlementOrderLogicVOIPage = websitSalesRetCMapper.pageV3(new Page(zfireParamBean.getPageNum(),
                         zfireParamBean.getPageSize()),
                 zfireParam
-                , companyWechatIds,orderBaseIds,zfireParamBean.getValue());
+                , companyWechatIds,orderBaseIds,zfireParamBean.getValue(),mName);
 
         return settlementOrderLogicVOIPage;
     }

mall-server-api/src/main/resources/mapper/WebsitSalesCMapper.xml

@@ -222,6 +222,13 @@
             </foreach>
         </if>
 
+        <if test="mName != null and mName.size > 0">
+            AND b.goods_name IN
+            <foreach item="item" index="index" collection="orderBaseIds" open="(" separator="," close=")">
+                #{item}
+            </foreach>
+        </if>
+
         <if test="orderBaseIds != null and orderBaseIds.size > 0">
             AND a.worker_order_id IN
             <foreach item="item" index="index" collection="orderBaseIds" open="(" separator="," close=")">