Merge tag '1.0.26' into develop

积分模块

diff --cc payapi-sdk/src/main/java/com/supwisdom/dlpay/paysdk/proxy/UserProxy.java
index 1ab688d,55aa02e..1da07a8
--- 1/payapi-sdk/src/main/java/com/supwisdom/dlpay/paysdk/proxy/UserProxy.java
--- 2/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
@@@ -2,8 -2,12 +2,10 @@@ package com.supwisdom.dlpay.paysdk.prox
  
  import com.supwisdom.dlpay.api.bean.*;
  import org.springframework.cloud.openfeign.FeignClient;
 -import org.springframework.web.bind.annotation.PostMapping;
 -import org.springframework.web.bind.annotation.RequestBody;
 -import org.springframework.web.bind.annotation.RequestParam;
 +import org.springframework.web.bind.annotation.*;
  
+ import java.util.Map;
+ 
  @FeignClient(value = "userProxy", url = "${payapi.url}")
  public interface UserProxy {
    @PostMapping("/api/user/open")
@@@ -24,28 -28,31 +26,46 @@@
    @PostMapping("/api/user/testmsg")
    ApiResponse testmsg();
  
 +  @PostMapping("/api/user/biz_init")
 +  CardBizResponse bizInit(@RequestBody CardBizParam param);
 +
 +  @PostMapping("/api/user/biz_confirm")
 +  CardBizResponse bizConfirm(@RequestBody CardBizParam param);
 +
 +  @PostMapping("/api/user/biz_refund_init")
 +  CardBizResponse bizRefundInit(@RequestBody CardBizRefundParam param);
 +
 +  @PostMapping("/api/user/biz_refund")
 +  CardBizResponse bizRefund(String refno);
 +
 +  @RequestMapping(value = "/api/user/biz_query", method = RequestMethod.GET)
 +  CardBizResponse bizQuery(@RequestParam("refno") String refno);
 +
    @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);
+ 
+   @PostMapping("/api/user/billcount")
+   Map<String, Object> billCount(@RequestParam("userid") String userid,@RequestParam("month") String month);
+ 
+   @PostMapping("/api/user/queryPerson")
+   QueryPersonResponse queryPerson(@RequestParam("userid") String userid);
+ 
+   @PostMapping("/api/user/queryCard")
+   QueryCardResponse queryCard(@RequestBody QueryCardParam param);
+ 
+   @PostMapping("/api/user/updateCardSign")
+   ApiResponse updateCardSign(@RequestParam("cardno") String cardno,@RequestParam("signed") Boolean signed);
+ 
+   @PostMapping("/api/user/updateCardTransStatus")
+   ApiResponse updateCardTransStatus(@RequestParam("cardno") String cardno,@RequestParam("status") String status);
  
  }

diff --cc payapi/src/main/kotlin/com/supwisdom/dlpay/api/controller/user_api_controller.kt
index 6fd04a4,14a7bf8..ce7a15a
--- 1/payapi/src/main/kotlin/com/supwisdom/dlpay/api/controller/user_api_controller.kt
--- 2/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
@@@ -16,13 -10,11 +16,13 @@@ import com.supwisdom.dlpay.framework.ut
  import com.supwisdom.dlpay.framework.util.TradeErrorCode
  import com.supwisdom.dlpay.system.bean.LevelBean
  import com.supwisdom.dlpay.system.service.PointsService
+ import org.apache.commons.beanutils.BeanUtils
  import org.springframework.beans.factory.annotation.Autowired
  import org.springframework.http.ResponseEntity
 +import org.springframework.validation.annotation.Validated
  import org.springframework.web.bind.annotation.*
  import java.net.URLDecoder
- import javax.validation.Valid
 +import kotlin.math.roundToInt
  
  @RestController
  @RequestMapping("/api/user")
@@@ -380,10 -162,13 +380,13 @@@ class UserAPIController 
      @PostMapping("/userTask")
      fun userTask(@RequestBody param: UserTaskParam): ResponseEntity<Any> {
          val ret = pointsService.finishTask(param.userid, param.taskid)
 -        return if(ret.get("code")==200){
 +        return if (ret.get("code") == 200) {
              ResponseEntity.ok(ResponseBodyBuilder.create()
-                     .success("ok"))
-         } else {
+                     .success(ApiResponse().apply {
+                         this.retcode = 0
+                         this.retmsg = "ok"
+                     }, "ok"))
+         }else{
              ResponseEntity.ok(ResponseBodyBuilder.create()
                      .fail(500, ret.get("msg") as String))
          }
@@@ -392,10 -176,10 +395,10 @@@
      @PostMapping("/getTask")
      fun getTPointsTaskNoPage(): ResponseEntity<Any> {
          val ret = pointsService.getTPointsTaskNoPage()
-         return if (ret.get("code") == 200) {
-             ResponseEntity.ok(ResponseBodyBuilder.create().data("ret", ret.get("dataList")!!)
+         return if(ret.get("code")==200){
+             ResponseEntity.ok(ResponseBodyBuilder.create().data("data", ret.get("dataList")!!)
                      .success("ok"))
 -        }else{
 +        } else {
              ResponseEntity.ok(ResponseBodyBuilder.create()
                      .fail(500, ret.get("msg") as String))
          }
@@@ -409,7 -192,75 +412,75 @@@
          lev.pageNo = param.pageNo
          lev.pageSize = param.pageSize
          val ret = pointsService.getTPointsByname(lev);
 -        return  ResponseEntity.ok(ResponseBodyBuilder.create().data("page", ret!!)
 -                    .success("ok"))
 +        return ResponseEntity.ok(ResponseBodyBuilder.create().data("page", ret!!)
 +                .success("ok"))
      }
+ 
+     @PostMapping("/queryPersonDtl")
+     fun queryPersonDtl(@RequestBody param: QueryPersonDtlParam): ResponseEntity<Any> {
+         val page = useService.findPersondtlByUseridAndMonth(param)
+         return  ResponseEntity.ok(ResponseBodyBuilder.create().data("data", page)
+                 .success("ok"))
+     }
+ 
+     @PostMapping("/billcount")
+     fun billCount(userid:String,month:String): ResponseEntity<Any> {
+         val page = useService.findDtlMonthCountByUserid(userid,month)
+         return  ResponseEntity.ok(ResponseBodyBuilder.create().data("data", page!!)
+                 .success("ok"))
+     }
+ 
+     @PostMapping("/queryPerson")
+     fun queryPersonDtl( userid:String ): ResponseEntity<Any> {
+         val person = useService.findPersonByUserid(userid)
+                 ?:return ResponseEntity.ok(ResponseBodyBuilder.create()
+                         .fail(500, "未找到[userid=${userid}]的用户"))
+         return  ResponseEntity.ok(ResponseBodyBuilder.create()
+                 .success(QueryPersonResponse().apply{
+                     this.retcode = 0
+                     this.retmsg = "ok"
+                     val personInfo = QueryPersonInfo()
+                     BeanUtils.copyProperties(personInfo,person)
+                     this.person = personInfo
+                 },"ok"))
+     }
+ 
+     @PostMapping("/queryCard")
+     fun queryCard(@RequestBody param: QueryCardParam): ResponseEntity<Any> {
+         val card = cardService.getCardByCardNoOrUserid(param)
+                 ?:return ResponseEntity.ok(ResponseBodyBuilder.create()
+                         .fail(500, "未找到指定条件的卡片"))
+         return  ResponseEntity.ok(ResponseBodyBuilder.create()
+                 .success(QueryCardResponse().apply {
+                     this.retcode = 0
+                     this.retmsg = "ok"
+                     val cardInfo = QueryCardInfo()
+                     BeanUtils.copyProperties(cardInfo,card)
+                     this.card = cardInfo
+                 },"ok"))
+     }
+ 
+     @PostMapping("/updateCardSign")
+     fun updateCardSign(cardno:String,signed:Boolean):ResponseEntity<Any>{
+         val ret = cardService.updateCardSign(cardno, signed)
+         return if(ret.retcode==0){
+             ResponseEntity.ok(ResponseBodyBuilder.create()
+                     .success(ret,"ok"))
+         }else{
+             ResponseEntity.ok(ResponseBodyBuilder.create()
+                     .fail(ret.retcode, ret.retmsg))
+         }
+     }
+ 
+     @PostMapping("/updateCardTransStatus")
+     fun updateCardTransStatus(cardno:String,status:String):ResponseEntity<Any>{
+         val ret = cardService.updateCardTransStatus(cardno, status)
+         return if(ret.retcode==0){
+             ResponseEntity.ok(ResponseBodyBuilder.create()
+                     .success(ret,"ok"))
+         }else{
+             ResponseEntity.ok(ResponseBodyBuilder.create()
+                     .fail(ret.retcode, ret.retmsg))
+         }
+     }
  }

diff --cc payapi/src/main/kotlin/com/supwisdom/dlpay/api/service/impl/card_service_impl.kt
Simple merge