From 8c3fe5439cf49bc5428adbbf3176a07a6f5d8b44 Mon Sep 17 00:00:00 2001
From: "sijun.li" <sijun.li@supwisdom.com>
Date: Wed, 16 Sep 2020 15:16:09 +0800
Subject: [PATCH] =?utf8?q?=E4=BF=AE=E6=94=B9=E7=A7=AF=E5=88=86=E6=8E=A5?=
 =?utf8?q?=E5=8F=A3=E8=BF=94=E5=9B=9E=E5=80=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

---
 .../java/com/supwisdom/dlpay/api/bean/QueryCardParam.java  | 2 +-
 .../java/com/supwisdom/dlpay/paysdk/proxy/UserProxy.java   | 6 +++---
 .../supwisdom/dlpay/api/controller/user_api_controller.kt  | 7 +++++--
 3 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/payapi-common/src/main/java/com/supwisdom/dlpay/api/bean/QueryCardParam.java b/payapi-common/src/main/java/com/supwisdom/dlpay/api/bean/QueryCardParam.java
index f9c6c033..934946b4 100644
--- a/payapi-common/src/main/java/com/supwisdom/dlpay/api/bean/QueryCardParam.java
+++ b/payapi-common/src/main/java/com/supwisdom/dlpay/api/bean/QueryCardParam.java
@@ -22,7 +22,7 @@ public class QueryCardParam extends APIRequestParam {
 
   @Override
   public boolean checkParam() throws RequestParamCheckException {
-    if (StringUtils.isEmpty(cardno) && StringUtils.isEmpty(cardno)) {
+    if (StringUtils.isEmpty(cardno) && StringUtils.isEmpty(userid)) {
       throw new RequestParamCheckException("卡号或用户ID不能全为空");
     }
     return true;
diff --git a/payapi-sdk/src/main/java/com/supwisdom/dlpay/paysdk/proxy/UserProxy.java b/payapi-sdk/src/main/java/com/supwisdom/dlpay/paysdk/proxy/UserProxy.java
index 45ea8310..55aa02e7 100644
--- a/payapi-sdk/src/main/java/com/supwisdom/dlpay/paysdk/proxy/UserProxy.java
+++ b/payapi-sdk/src/main/java/com/supwisdom/dlpay/paysdk/proxy/UserProxy.java
@@ -29,13 +29,13 @@ public interface UserProxy {
   ApiResponse testmsg();
 
   @PostMapping("/api/user/userTask")
-  ApiResponse userTask();
+  ApiResponse userTask(@RequestBody UserTaskParam param);
 
   @PostMapping("/api/user/getTask")
-  ApiResponse getTPointsTaskNoPage();
+  Map<String, Object> getTPointsTaskNoPage();
 
   @PostMapping("/api/user/getUserPoints")
-  ApiResponse getUserPoints(@RequestBody UserPointsParam param);
+  Map<String, Object> getUserPoints(@RequestBody UserPointsParam param);
 
   @PostMapping("/api/user/queryPersonDtl")
   Map<String, Object> queryPersonDtl(@RequestBody QueryPersonDtlParam param);
diff --git a/payapi/src/main/kotlin/com/supwisdom/dlpay/api/controller/user_api_controller.kt b/payapi/src/main/kotlin/com/supwisdom/dlpay/api/controller/user_api_controller.kt
index e0100f29..14a7bf82 100644
--- a/payapi/src/main/kotlin/com/supwisdom/dlpay/api/controller/user_api_controller.kt
+++ b/payapi/src/main/kotlin/com/supwisdom/dlpay/api/controller/user_api_controller.kt
@@ -164,7 +164,10 @@ class UserAPIController {
         val ret = pointsService.finishTask(param.userid, param.taskid)
         return if(ret.get("code")==200){
             ResponseEntity.ok(ResponseBodyBuilder.create()
-                    .success("ok"))
+                    .success(ApiResponse().apply {
+                        this.retcode = 0
+                        this.retmsg = "ok"
+                    }, "ok"))
         }else{
             ResponseEntity.ok(ResponseBodyBuilder.create()
                     .fail(500, ret.get("msg") as String))
@@ -174,7 +177,7 @@ class UserAPIController {
     fun getTPointsTaskNoPage(): ResponseEntity<Any> {
         val ret = pointsService.getTPointsTaskNoPage()
         return if(ret.get("code")==200){
-            ResponseEntity.ok(ResponseBodyBuilder.create().data("ret", ret.get("dataList")!!)
+            ResponseEntity.ok(ResponseBodyBuilder.create().data("data", ret.get("dataList")!!)
                     .success("ok"))
         }else{
             ResponseEntity.ok(ResponseBodyBuilder.create()
-- 
2.17.1