change 4 жил өмнө
parent
commit
09f0edd9c1

+ 1 - 1
zhongzheng-api/src/main/java/com/zhongzheng/controller/activity/ActivityConfigurationController.java

@@ -82,7 +82,7 @@ public class ActivityConfigurationController extends BaseController {
      */
     @ApiOperation("領取活動發送請求")
     @PostMapping("/receive")
-    public AjaxResult<Void> receive(ActivityConfigurationUseAddBo bo) {
+    public AjaxResult<Void> receive(@RequestBody ActivityConfigurationUseAddBo bo) {
         ClientLoginUser loginUser = WxTokenService.getLoginUser(ServletUtils.getRequest());
         bo.setUserId(loginUser.getUser().getUserId());
         return toAjax(activityConfigurationUseServiceImpl.receive(bo) ? 1 : 0);

+ 4 - 0
zhongzheng-system/src/main/java/com/zhongzheng/modules/activity/vo/ActivityConfigurationVo.java

@@ -63,6 +63,10 @@ public class ActivityConfigurationVo {
 	@ApiModelProperty("参与人数")
 	private Integer userNumber;
 
+	@Excel(name = "是否参与过活动")
+	@ApiModelProperty("是否参与过活动")
+	private String useStatus;
+
 	/** 直播内容(适用直播) */
 	@Excel(name = "直播内容" , readConverterExp = "适=用直播")
 	@ApiModelProperty("直播内容(适用直播)")

+ 1 - 0
zhongzheng-system/src/main/resources/mapper/modules/activity/ActivityConfigurationMapper.xml

@@ -78,6 +78,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="activityLogo" column="sactivity_logo"/>
         <result property="activityUrl" column="sactivity_url"/>
         <result property="userNumber" column="userNum"/>
+        <result property="useStatus" column="useStatus"/>
         <result property="status" column="sstatus"/>
         <result property="couponEnd" column="scoupon_end"/>
         <association property="courseList" javaType="java.util.List" resultMap="courses" />