feat : 订单回调CP列表查询重写

game-module/game-manage/src/main/java/com/zanxiang/manage/controller/LogPayCpController.java

@@ -1,41 +0,0 @@
-package com.zanxiang.manage.controller;
-
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.zanxiang.common.domain.ResultVO;
-import com.zanxiang.erp.security.annotation.PreAuthorize;
-import com.zanxiang.manage.domain.params.LogPayCpParam;
-import com.zanxiang.manage.domain.vo.LogPayCpVO;
-import com.zanxiang.manage.service.LogPayCpService;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import io.swagger.annotations.ApiResponse;
-import io.swagger.annotations.ApiResponses;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-/**
- * 通知CP记录表
- *
- * @author xufeng
- * @date 2022-07-05 13:53
- */
-@Api(tags = "通知CP记录")
-@RestController
-@RequestMapping("/log-pay-cp")
-public class LogPayCpController {
-
-    @Autowired
-    private LogPayCpService logPayCpService;
-
-    @ApiOperation(value = "列表")
-    @PostMapping(value = "/list")
-    @PreAuthorize(permissionKey = "sdk:logPayCp:list")
-    @ApiResponses(value = {@ApiResponse(code = 200, message = "成功", response = LogPayCpVO.class, responseContainer = "list")})
-    public ResultVO<IPage<LogPayCpVO>> list(@Validated @RequestBody LogPayCpParam param) {
-        return ResultVO.ok(logPayCpService.list(param));
-    }
-}

game-module/game-manage/src/main/java/com/zanxiang/manage/controller/OrderController.java

@@ -40,7 +40,7 @@ public class OrderController {
     @PostMapping(value = "/list")
     @PreAuthorize(permissionKey = "sdk:order:list")
     @ApiResponses(value = {@ApiResponse(code = 200, message = "成功", response = OrderListVO.class, responseContainer = "list")})
-    public ResultVO<OrderListVO> list(@Validated @RequestBody OrderParam param) {
+    public ResultVO<OrderListVO> orderList(@Validated @RequestBody OrderParam param) {
         return ResultVO.ok(orderService.orderList(param));
     }
 
@@ -48,7 +48,7 @@ public class OrderController {
     @PostMapping(value = "/cp/call/list")
     @PreAuthorize(permissionKey = "sdk:logPayCp:list")
     @ApiResponses(value = {@ApiResponse(code = 200, message = "成功", response = LogPayCpVO.class, responseContainer = "list")})
-    public ResultVO<IPage<LogPayCpVO>> list(@Validated @RequestBody LogPayCpParam param) {
-        return ResultVO.ok(logPayCpService.list(param));
+    public ResultVO<IPage<LogPayCpVO>> callCpList(@Validated @RequestBody LogPayCpParam param) {
+        return ResultVO.ok(logPayCpService.callCpList(param));
     }
 }

game-module/game-manage/src/main/java/com/zanxiang/manage/domain/params/LogPayCpParam.java

@@ -5,9 +5,10 @@ import com.zanxiang.mybatis.entity.LogPayCp;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.AllArgsConstructor;
 import lombok.Data;
+import lombok.EqualsAndHashCode;
 import lombok.NoArgsConstructor;
 
-import java.io.Serializable;
+import javax.validation.constraints.NotBlank;
 
 /**
  * 注释通知CP记录表
@@ -18,34 +19,13 @@ import java.io.Serializable;
 @Data
 @NoArgsConstructor
 @AllArgsConstructor
-public class LogPayCpParam extends BasePage<LogPayCp> implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    @ApiModelProperty(notes = "自增ID")
-    private Long id;
-
-    @ApiModelProperty(notes = "订单号")
+@EqualsAndHashCode(callSuper = true)
+public class LogPayCpParam extends BasePage<LogPayCp> {
+
+    /**
+     * 商户订单号
+     */
+    @NotBlank
+    @ApiModelProperty(notes = "商户订单号")
     private String orderId;
-
-    @ApiModelProperty(notes = "CP订单号")
-    private String cpOrderId;
-
-    @ApiModelProperty(notes = "充值成功标志，1为待处理，2为成功，3为失败")
-    private Integer status;
-
-    @ApiModelProperty(notes = "充值回调标志，1为待处理，2为成功，3为失败")
-    private Integer cpStatus;
-
-    @ApiModelProperty(notes = "CP回调地址")
-    private String cpPaybackUrl;
-
-    @ApiModelProperty(notes = "CP回调参数")
-    private String params;
-
-    @ApiModelProperty(notes = "CP附加参数")
-    private String ext;
-
-    @ApiModelProperty(notes = "通知次数")
-    private Integer notifyCnt;
 }

game-module/game-manage/src/main/java/com/zanxiang/manage/domain/vo/LogPayCpVO.java

@@ -17,7 +17,7 @@ public class LogPayCpVO implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
-    @ApiModelProperty(notes = "自增ID")
+    @ApiModelProperty(notes = "主键id")
     private Long id;
 
     @ApiModelProperty(notes = "订单号")

game-module/game-manage/src/main/java/com/zanxiang/manage/service/Impl/LogPayCpServiceImpl.java

@@ -1,6 +1,6 @@
 package com.zanxiang.manage.service.Impl;
 
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.zanxiang.common.utils.bean.BeanUtils;
@@ -22,13 +22,18 @@ import java.util.Objects;
 @Service
 public class LogPayCpServiceImpl extends ServiceImpl<LogPayCpMapper, LogPayCp> implements LogPayCpService {
 
+    /**
+     * 回调cp列表
+     *
+     * @param param 参数
+     * @return {@link IPage}<{@link LogPayCpVO}>
+     */
     @Override
-    public IPage<LogPayCpVO> list(LogPayCpParam param) {
-        LogPayCp data = BeanUtils.copy(param, LogPayCp.class);
-        return page(param.toPage(), new QueryWrapper<LogPayCp>().setEntity(data)).convert(this::toVo);
+    public IPage<LogPayCpVO> callCpList(LogPayCpParam param) {
+        return page(param.toPage(), new LambdaQueryWrapper<LogPayCp>()
+                .eq(LogPayCp::getOrderId, param.getOrderId())).convert(this::toVo);
     }
 
-
     private LogPayCpVO toVo(LogPayCp logPayCp) {
         if (Objects.isNull(logPayCp)) {
             return null;

game-module/game-manage/src/main/java/com/zanxiang/manage/service/LogPayCpService.java

@@ -13,5 +13,12 @@ import com.zanxiang.mybatis.entity.LogPayCp;
  * @date 2022-07-05 13:53
  */
 public interface LogPayCpService extends IService<LogPayCp> {
-    IPage<LogPayCpVO> list(LogPayCpParam param);
+
+    /**
+     * 回调cp列表
+     *
+     * @param param 参数
+     * @return {@link IPage}<{@link LogPayCpVO}>
+     */
+    IPage<LogPayCpVO> callCpList(LogPayCpParam param);
 }