bugfix

src/main/java/com/huiju/estateagents/common/CommConstant.java

@@ -114,6 +114,11 @@ public class CommConstant {
      */
     public final static String POINTS_CHANGE_DOCUMENT_VERIFY = "document_verify";
 
+    /**
+     * 资料审核
+     */
+    public final static String POINTS_CHANGE_ACTIVITY_CHECKIN = "activity_checkin";
+
 
     /**
      * 小程序默认首页
@@ -285,6 +290,11 @@ public class CommConstant {
      */
     public static final Integer POINTS_RULE_DOCUMENT_VERIFY = 7;
 
+    /**
+     * 普通活动签到送积分规则
+     */
+    public static final Integer POINTS_RULE_ACTIVITY_CHECKIN = 8;
+
     /**
      * 平台积分
      */

src/main/java/com/huiju/estateagents/controller/TaBuildingDynamicController.java

@@ -14,22 +14,21 @@ import com.huiju.estateagents.common.CommConstant;
 import com.huiju.estateagents.common.JWTUtils;
 import com.huiju.estateagents.common.StringUtils;
 import com.huiju.estateagents.entity.*;
+import com.huiju.estateagents.event.EventBus;
 import com.huiju.estateagents.excel.HelpInitiateRecordSucceed;
 import com.huiju.estateagents.excel.TaActivityDynamicEnlistExport;
 import com.huiju.estateagents.excel.handler.CustomCellWriteHandler;
 import com.huiju.estateagents.mapper.TaActivityDynamicEnlistMapper;
 import com.huiju.estateagents.mapper.TaBuildingMapper;
 import com.huiju.estateagents.mapper.TaSharePersonFromMapper;
-import com.huiju.estateagents.service.ITaBuildingDynamicService;
-import com.huiju.estateagents.service.ITaBuildingService;
-import com.huiju.estateagents.service.ITaPersonService;
-import com.huiju.estateagents.service.ITaSaveService;
+import com.huiju.estateagents.service.*;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.propertyeditors.CustomDateEditor;
+import org.springframework.context.ApplicationContext;
 import org.springframework.format.annotation.DateTimeFormat;
 import org.springframework.web.bind.ServletRequestDataBinder;
 import org.springframework.web.bind.annotation.*;
@@ -48,6 +47,8 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
+import static com.huiju.estateagents.event.EventBus.EventType.ActivityCheckin;
+
 /**
  * <p>
  * 项目动态表 前端控制器
@@ -82,6 +83,10 @@ public class TaBuildingDynamicController extends BaseController {
     @Autowired
     private TaSharePersonFromMapper taSharePersonFromMapper;
 
+    @Autowired
+    private ApplicationContext applicationContext;
+
+
     @InitBinder
     protected void initBinder(HttpServletRequest request, ServletRequestDataBinder binder) throws Exception {
         DateFormat df = new SimpleDateFormat("yyyy-MM-dd");
@@ -244,9 +249,13 @@ public class TaBuildingDynamicController extends BaseController {
         enlistQueryWrapper.eq("dynamic_id",dynamicId);
         enlistQueryWrapper.eq("person_id",person.getPersonId());
         enlistQueryWrapper.eq("org_id",orgId);
-        TaActivityDynamicEnlist enlist = taActivityDynamicEnlistMapper.selectOne(enlistQueryWrapper);
+        List <TaActivityDynamicEnlist> enlists = taActivityDynamicEnlistMapper.selectList(enlistQueryWrapper);
         TaBuildingDynamic buildingDynamic = iBuildingDynamicService.getById(dynamicId);
         Map<String,Object>data = new HashMap<>();
+        TaActivityDynamicEnlist enlist = new TaActivityDynamicEnlist();
+        if(enlists.size()>0){
+            enlist=enlists.get(0);
+        }
         data.put("enlist",enlist);
         data.put("dynamic",buildingDynamic);
         data.put("person",person);
@@ -262,7 +271,7 @@ public class TaBuildingDynamicController extends BaseController {
      */
     @ApiOperation(value = "微信端活动签到", notes = "微信端活动签到")
     @ApiImplicitParams({
-            @ApiImplicitParam(dataTypeClass = String.class, name = "enlistId", paramType = "path",value = "活动报名ID")
+            @ApiImplicitParam(dataTypeClass = Integer.class, name = "enlistId", paramType = "path",value = "活动报名ID")
     })
     @RequestMapping(value = "/wx/buildingDynamicCheckin/{enlistId}", method = RequestMethod.PUT)
     public ResponseBean iBuildingDynamicCheckin(@PathVariable(value = "enlistId") String enlistId,
@@ -273,7 +282,8 @@ public class TaBuildingDynamicController extends BaseController {
            if(null != enlist){
                enlist.setIsCheckin(CommConstant.STATUS_NORMAL);
                if(taActivityDynamicEnlistMapper.updateById(enlist)>0){
-                   responseBean.addSuccess("签到成功");
+                   applicationContext.publishEvent(new EventBus(enlist,ActivityCheckin,getOrgId(request)));
+                   responseBean.addSuccess(enlist);
                }else {
                    responseBean.addError("签到失败");
                }

src/main/java/com/huiju/estateagents/entity/TaActivityDynamicEnlist.java

@@ -22,7 +22,7 @@ public class TaActivityDynamicEnlist implements Serializable {
      * 报名ID
      */
     @TableId(value = "enlist_id", type = IdType.AUTO)
-    private Integer enlist_id;
+    private Integer enlistId;
 
     /**
      * 活动ID

src/main/java/com/huiju/estateagents/event/EventBus.java

@@ -39,7 +39,10 @@ public class EventBus extends ApplicationEvent {
 		ActivityVerificationSign(6),
 
 		// 资料审核成功
-		DocumentVerify(6);
+		DocumentVerify(7),
+
+		// 普通活动扫码签到
+		ActivityCheckin(20);
 
 		private Integer type;
 

src/main/java/com/huiju/estateagents/event/EventLisenter.java

@@ -50,11 +50,18 @@ public class EventLisenter {
 			case DocumentVerify:
 				getDocumentVerify((TaDocumentVerify) event.getSource(), event.getOrgId());
 				break;
+			case ActivityCheckin:
+				getActivityCheckin((TaActivityDynamicEnlist) event.getSource(), event.getOrgId());
 			default:
 				break;
 		}
 	}
 
+	// 普通活动扫码签到
+	private void getActivityCheckin(TaActivityDynamicEnlist source, Integer orgId) {
+		taPointsRecordsService.checkinActivityPoints(source,orgId);
+	}
+
 	// 分享赚积分
 	private void getSharePoints(TaShare taShare, Integer orgId) {
 		taPointsRecordsService.sharePoints(taShare, orgId);

src/main/java/com/huiju/estateagents/service/ITaPointsRecordsService.java

@@ -20,6 +20,9 @@ public interface ITaPointsRecordsService extends IService<TaPointsRecords> {
 	// 签到赚积分
 	void checkinPoints(TaPersonSign taPersonSign, Integer orgId);
 
+	// 签到赚积分
+	void checkinActivityPoints(TaActivityDynamicEnlist taActivityDynamicEnlist, Integer orgId);
+
 	// 注册送积分
 	void signUpPoints(TaPerson taPerson, Integer orgId);
 

src/main/java/com/huiju/estateagents/service/impl/TaPointsRecordsServiceImpl.java

@@ -158,6 +158,35 @@ public class TaPointsRecordsServiceImpl extends ServiceImpl<TaPointsRecordsMappe
 		}
 	}
 
+	@Override
+	public void checkinActivityPoints(TaActivityDynamicEnlist taActivityDynamicEnlist, Integer orgId){
+		// 是否开启积分规则
+		Integer pointsAmount = getRulePoints(CommConstant.POINTS_RULE_ACTIVITY_CHECKIN);
+		if (pointsAmount == 0) {
+			return;
+		}
+		String changeType =CommConstant.POINTS_CHANGE_ACTIVITY_CHECKIN;
+		// 已经领取过的不会再次领取
+		List<String> params = new ArrayList<String>() {{
+			add("date="+DateUtils.today());
+			add("user="+taActivityDynamicEnlist.getPersonId());
+		}};
+		String changeParams = String.join("&", params);
+		boolean hasJoined = isPointsRecordsExist(taActivityDynamicEnlist.getPersonId(), changeType, changeParams);
+		if (hasJoined) {
+			return;
+		}
+		// 添加参数
+		params.add("enlistId="+taActivityDynamicEnlist.getEnlistId());
+		changeParams = String.join("&", params);
+
+		// 发放积分
+		TaPerson person = taPersonMapper.selectById(taActivityDynamicEnlist.getPersonId());
+		if (savePoints(person, changeType, changeParams, pointsAmount, orgId)) {
+			taPersonMapper.setFieldIncrement(person.getPersonId(), "points", pointsAmount);
+		}
+	}
+
 	@Override
 	public void signUpPoints(TaPerson taPerson, Integer orgId) {
 		// 是否开启积分规则