活动参与记录接口新增店铺名称入参和返回

src/main/java/com/sqx/modules/activity/dto/ActivityPartRecordQueryDTO.java

@@ -16,6 +16,9 @@ public class ActivityPartRecordQueryDTO extends PageQuery {
     @ApiModelProperty("订单id")
     private Long orderId;
 
+    @ApiModelProperty("店铺名称")
+    private String shopName;
+
     @ApiModelProperty("订单支付状态; 0未支付 1已支付")
     private String orderPayStatus;
 

src/main/java/com/sqx/modules/activity/vo/ActivityPartRecordVO.java

@@ -25,6 +25,9 @@ public class ActivityPartRecordVO {
     @ApiModelProperty("订单支付状态; 0未支付 1已支付")
     private String orderPayStatus;
 
+    @ApiModelProperty("店铺名称")
+    private String shopName;
+
     @ApiModelProperty("用户id")
     private Long userId;
 

src/main/resources/mapper/activity/ActivityPartRecordDao.xml

@@ -30,12 +30,14 @@
             a.title activityTitle,
             a.image activityImg,
             a.content activityContent,
-            a.type activityType
+            a.type activityType,
+            gh.shop_name
         from
             activity_part_record apr
                 left join activity a on a.id = apr.activity_id
                 left join tb_order o on o.order_id = apr.order_id
                 left join tb_user u on u.user_id = apr.user_id
+                left join goods_shop gh on gh.shop_id = o.shop_id
         <where>
             <if test="queryDTO.orderId != null">
                 and app.order_id = #{queryDTO.orderId}
@@ -52,6 +54,9 @@
             <if test="queryDTO.activityType != null and queryDTO.activityType != ''">
                 and a.type = #{queryDTO.activityType}
             </if>
+            <if test="queryDTO.shopName != null and queryDTO.shopName != ''">
+                and gh.shop_name like concat('%', #{queryDTO.shopName},'%')
+            </if>
         </where>
     </select>
 </mapper>