Browse Source

[优化账单][修改][优化账单周期]

release_toaliyun_real
luozukai 7 years ago
parent
commit
797ffd9aaa
2 changed files with 9 additions and 4 deletions
  1. +0
    -3
      mallinkAdmin/src/main/java/com/iformall/controller/WxTopicController.java
  2. +9
    -1
      mallinkCApi/src/main/java/com/iformall/controller/WxTopicController.java

+ 0
- 3
mallinkAdmin/src/main/java/com/iformall/controller/WxTopicController.java View File

@@ -48,9 +48,6 @@ public class WxTopicController extends BaseController {
String tenantId = getTenantId();
wxTopic.setTenantId(tenantId);
WxTopic queryTopic = wxTopicService.findById(wxTopic);
if (queryTopic!=null && queryTopic.getEndTime()!=null && new Date().getTime() > queryTopic.getEndTime().getTime()) {
queryTopic.setStatus(EnumWxTopicStatus.INVAILD.getCode());
}
return new ResultData(queryTopic);
}



+ 9
- 1
mallinkCApi/src/main/java/com/iformall/controller/WxTopicController.java View File

@@ -9,6 +9,7 @@ import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;


@RestController
@RequestMapping("/api/topic")
@Api(description = "专题相关接口")
@@ -26,5 +27,12 @@ public class WxTopicController extends BaseController {
return new ResultData(wxTopicService.show(wxTopic));
}


@GetMapping("findById")
public ResultData findById(WxTopic wxTopic) {
logger.debug("[" + getIpAddr() + "] WxTopicController::findById");
String tenantId = getTenantId();
wxTopic.setTenantId(tenantId);
WxTopic queryTopic = wxTopicService.findById(wxTopic);
return new ResultData(queryTopic);
}
}

Loading…
Cancel
Save