Commit 1e3e7e3c by 阳浪

积分任务

parent 15249948
......@@ -149,6 +149,7 @@ public class PointActivityController {
@GetMapping("/list")
public Response<Object> activityList(
@RequestParam(name = "activityName",required = false)String activityName,
@RequestParam(name = "code",required = false)String code,
@RequestParam(name = "pageSize", required = false, defaultValue = "10") Integer pageSize,
@RequestParam(name = "pageNo", required = false, defaultValue = "1") Integer pageNo){
Page<PointActivityVo> list = null;
......@@ -166,6 +167,7 @@ public class PointActivityController {
map.put("companyId", companyId);
map.put("siteId", siteId);
map.put("activityName", activityName);
map.put("code", code);
map.put("pageNo", pageNo);
map.put("pageSize", pageSize);
list = pointActivityFeignClients.activityList(map);
......
......@@ -14,8 +14,11 @@ import com.yizhi.calendar.application.vo.CalendarSignViewVO;
import com.yizhi.calendar.application.vo.HeadVO;
import com.yizhi.core.application.context.ContextHolder;
import com.yizhi.core.application.context.RequestContext;
import com.yizhi.point.application.feign.PointActivityFeignClients;
import com.yizhi.point.application.feign.PointListenerClients;
import com.yizhi.point.application.feign.PointRedisFeignClients;
import com.yizhi.point.application.vo.PointParamVO;
import com.yizhi.point.application.vo.domain.PointActivityVo;
import com.yizhi.util.application.constant.ReturnCode;
import com.yizhi.util.application.domain.Response;
import org.slf4j.Logger;
......@@ -43,6 +46,58 @@ public class StudentCalendarController {
@Autowired
private PointRedisFeignClients pointRedisFeignClients;
@Autowired
private PointActivityFeignClients pointActivityFeignClients;
@Autowired
private PointListenerClients pointListenerClients;
@ApiOperation(value = "新增签到")
@GetMapping(value = "/addPoint")
public Response<Map<String, Object>> addPoint(@RequestParam("code") String code) {
RequestContext res = ContextHolder.get();
Long accountId = res.getAccountId();
Long siteId = res.getSiteId();
String accountName = res.getAccountName();
Long companyId = res.getCompanyId();
Long orgId = res.getOrgId();
try {
PointActivityVo vo = pointActivityFeignClients.getActivity(code);
if(vo!=null){
try {
PointParamVO pointParamVO = new PointParamVO();
pointParamVO.setEventName(code); //事件名称
pointParamVO.setActivityType(vo.getActivityType()); //事件类型
pointParamVO.setActivitySource("PC"); //学习活动来源
pointParamVO.setActivityName(vo.getActivityName()); //学习活动名称
pointParamVO.setReleaseCondition("指定积分发放"); //发放条件
pointParamVO.setReleaseRules(vo.getActivityType()+"成功"); //发放规则
pointParamVO.setCreatePointTime(new Date()); //积分创建时间
pointParamVO.setSourceId(vo.getId()); //积分来源ID,(业务ID主键)
pointParamVO.setOperatingPoint(vo.getMultiple()); //积分数量, 正数 加积分, 负数减积分
pointParamVO.setAccountId(accountId); //学员ID
pointParamVO.setAccountName(accountName); //学员名称
pointParamVO.setCompanyId(companyId); //企业ID
pointParamVO.setSiteId(siteId); //站点ID
pointParamVO.setOrgId(orgId); //组织ID
String sitePointId = null;
if (null != vo.getMultiple() && 0 != vo.getMultiple()) {
sitePointId = pointRedisFeignClients.addPointRedis(pointParamVO); //调用积分接口添加积分
}
if (null != sitePointId) {
pointListenerClients.saveHandPoint(sitePointId); //发送积分获取消息
}
} catch (Exception e) {
logger.error("签到打卡积分发放失败:", e);
}
}
return Response.ok();
} catch (Exception e) {
logger.error(accountId + "签到打卡业务处理失败!!!" + e);
return Response.fail(ReturnCode.BIZ_FAIL.getCode(),ReturnCode.BIZ_FAIL.getMsg());
}
}
/*@Autowired
private AmqpTemplate amqpTemplate;*/
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment