Преглед изворни кода

test

release_toaliyun_real
xhxu пре 5 година
родитељ
комит
8c664cfc6e
2 измењених фајлова са 7 додато и 21 уклоњено
  1. +5
    -1
      mallinkAdmin/src/main/java/com/iformall/controller/market/WxActivityJoinController.java
  2. +2
    -20
      mallinkService/src/main/java/com/iformall/service/impl/WxActivityJoinServiceImpl.java

+ 5
- 1
mallinkAdmin/src/main/java/com/iformall/controller/market/WxActivityJoinController.java Прегледај датотеку

@@ -65,7 +65,11 @@ public class WxActivityJoinController extends BaseController {
if (wxActivityJoin.getStatus() == null) { if (wxActivityJoin.getStatus() == null) {
return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(), "status不能为空"); return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(), "status不能为空");
} }
return wxActivityJoinService.modifyStatus(wxActivityJoin);
try {
return wxActivityJoinService.modifyStatus(wxActivityJoin);
} catch (MallinkException e) {
return new ResultData(e.getErrorCode(), e.getMessage());
}
} }


@ApiOperation("导出报名表") @ApiOperation("导出报名表")


+ 2
- 20
mallinkService/src/main/java/com/iformall/service/impl/WxActivityJoinServiceImpl.java Прегледај датотеку

@@ -84,7 +84,7 @@ public class WxActivityJoinServiceImpl implements WxActivityJoinService {
return new ResultData(ErrorCode.ACTIVITY_JOIN_NOT_FOND); return new ResultData(ErrorCode.ACTIVITY_JOIN_NOT_FOND);
} }
if (wxActivityJoin.getStatus().equals(EnumActivityJoinStatus.CONFIRMED.getCode())) { if (wxActivityJoin.getStatus().equals(EnumActivityJoinStatus.CONFIRMED.getCode())) {
testIn();
activityJoinRedisLock(wxActivityJoin.getActivityId()); activityJoinRedisLock(wxActivityJoin.getActivityId());
}else{ }else{
if(wxActivityJoin1.getSignIn().equals(EnumActivityJoinSignStatus.YES.getCode())){ if(wxActivityJoin1.getSignIn().equals(EnumActivityJoinSignStatus.YES.getCode())){
@@ -205,7 +205,7 @@ public class WxActivityJoinServiceImpl implements WxActivityJoinService {
if(wxActivity.getSignupExamine().equals(EnumDelFlag.YES.getCode())){ if(wxActivity.getSignupExamine().equals(EnumDelFlag.YES.getCode())){
wxActivityJoin.setStatus(EnumActivityJoinStatus.NOT_CONFIRMED.getCode()); wxActivityJoin.setStatus(EnumActivityJoinStatus.NOT_CONFIRMED.getCode());
}else{ }else{
testIn();
activityJoinRedisLock(wxActivityJoin.getActivityId()); activityJoinRedisLock(wxActivityJoin.getActivityId());
wxActivityJoin.setStatus(EnumActivityJoinStatus.CONFIRMED.getCode()); wxActivityJoin.setStatus(EnumActivityJoinStatus.CONFIRMED.getCode());
} }
@@ -335,22 +335,4 @@ public class WxActivityJoinServiceImpl implements WxActivityJoinService {


} }


private void testIn(){
final IdWorker idWorker = IdWorker.get();
WxActivityJoin join = new WxActivityJoin();
join.setId(idWorker.nextId());
join.setTenantId("789");
join.setUserId(1111111111l);
join.setActivityId(1111111111l);
join.setName("工具人");
join.setNickName("工具人");
join.setBirthday(new Date());
join.setPhone("1111111111");
join.setSex(1);
join.setCreateTime(new Date());
join.setUpdateTime(new Date());
wxActivityJoinMapper.insert(join);
}


} }

Loading…
Откажи
Сачувај