Merge branch 'pre' into 'master'

Pre

See merge request !229

liquidnet-bus-api/liquidnet-service-goblin-api/src/main/java/com/liquidnet/service/goblin/service/IGoblinNftExCodeTaskService.java

 package com.liquidnet.service.goblin.service;
 
+import com.liquidnet.service.base.ResponseDto;
+import com.sun.org.apache.xpath.internal.operations.Bool;
+
 public interface IGoblinNftExCodeTaskService {
 
     /**
      * 定时生成兑换码
      */
-    void generateCode();
+    ResponseDto<String> generateCode();
 }

liquidnet-bus-service/liquidnet-service-platform/liquidnet-service-platform-impl/src/main/java/com/liquidnet/service/platform/controller/goblin/code/task/GoblinNftExCodeTaskController.java

 package com.liquidnet.service.platform.controller.goblin.code.task;
 
 
+import com.liquidnet.service.base.ResponseDto;
 import com.liquidnet.service.goblin.service.IGoblinNftExCodeTaskService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -23,7 +24,7 @@ public class GoblinNftExCodeTaskController {
 
     @PostMapping("generateCode")
     @ApiOperation(value = "定时自动生成兑换码")
-    public void generateCode(){
-        iGoblinNftExCodeTaskService.generateCode();
+    public ResponseDto<String> generateCode(){
+        return iGoblinNftExCodeTaskService.generateCode();
     }
 }

liquidnet-bus-service/liquidnet-service-platform/liquidnet-service-platform-impl/src/main/java/com/liquidnet/service/platform/service/impl/goblin/GoblinNftExCodeTaskServiceImpl.java

@@ -2,6 +2,7 @@ package com.liquidnet.service.platform.service.impl.goblin;
 
 import com.liquidnet.commons.lang.util.IDGenerator;
 import com.liquidnet.commons.lang.util.StringUtil;
+import com.liquidnet.service.base.ResponseDto;
 import com.liquidnet.service.goblin.dto.vo.GoblinNftExCodeVo;
 import com.liquidnet.service.goblin.dto.vo.GoblinNftExSkuVo;
 import com.liquidnet.service.goblin.entity.GoblinNftExCode;
@@ -41,15 +42,15 @@ public class GoblinNftExCodeTaskServiceImpl implements IGoblinNftExCodeTaskServi
 
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public void generateCode() {
+    public ResponseDto<String> generateCode() {
 
         /**
          * 获取所有定时任务列表
          */
         List<GoblinNftExCodeTask> goblinNftExCodeTasks = goblinNftExCodeTaskMapper.selectByActivity();
 
-        if (goblinNftExCodeTasks.size() <= 0) {
-            return;
+        if (goblinNftExCodeTasks == null || goblinNftExCodeTasks.size() <= 0) {
+            return ResponseDto.success("0");
         }
 
 
@@ -226,6 +227,8 @@ public class GoblinNftExCodeTaskServiceImpl implements IGoblinNftExCodeTaskServi
         // 修改定时
         goblinNftExCodeTaskMapper.updateByTaskIds(updTaskIds.toString());
         log.debug("MSQ耗时：ms", System.currentTimeMillis() - startm);
+
+        return ResponseDto.success("操作成功!");
     }
 
     public static void main(String[] args) {