feat : 接口对接修改

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

@@ -41,7 +41,7 @@ public class PayApplicationController {
     @PreAuthorize(permissionKey = "manage:payApplication:list")
     @ApiResponses(value = {@ApiResponse(code = 200, message = "成功", response = PayApplicationVO.class)})
     public ResultVO<IPage<PayApplicationVO>> list(@Validated @RequestBody PayApplicationListParam param) {
-        return new ResultVO<>(payApplicationService.list(param));
+        return new ResultVO<>(payApplicationService.pageList(param));
     }
 
     @ApiOperation(value = "应用删除")

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

@@ -2,13 +2,9 @@ package com.zanxiang.manage.controller;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.zanxiang.common.domain.ResultVO;
-import com.zanxiang.common.utils.bean.BeanUtils;
 import com.zanxiang.erp.security.annotation.PreAuthorize;
-import com.zanxiang.manage.domain.bo.PayMerchantBO;
-import com.zanxiang.manage.domain.params.PayMerchantListNoPageParam;
 import com.zanxiang.manage.domain.params.PayMerchantListParam;
-import com.zanxiang.manage.domain.params.PayMerchantParam;
-import com.zanxiang.manage.domain.vo.PayMerchantListNoPageVO;
+import com.zanxiang.manage.domain.vo.PayApplicationVO;
 import com.zanxiang.manage.domain.vo.PayMerchantListVO;
 import com.zanxiang.manage.service.IPayMerchantService;
 import io.swagger.annotations.Api;
@@ -22,8 +18,6 @@ import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
-import java.util.List;
-
 /**
  * 游戏支付商户配置表 前端控制器
  *
@@ -32,38 +26,17 @@ import java.util.List;
  */
 @Api(tags = "商户号管理")
 @RestController
-@RequestMapping("/pay-merchant")
+@RequestMapping("/pay/merchant")
 public class PayMerchantController {
 
     @Autowired
     private IPayMerchantService payMerchantService;
 
-    @ApiOperation(value = "商户号-新增/编辑/删除(payWayId/merchantNo/merchantName 必传)")
-    @PostMapping(value = "/save")
-    @PreAuthorize(permissionKey = "sdk:payMerchant:save")
-    public ResultVO<Boolean> save(@Validated @RequestBody PayMerchantParam param) {
-        Boolean result = payMerchantService.saveOrUpdate(BeanUtils.copy(param, PayMerchantBO.class));
-        if (result) {
-            return ResultVO.ok(true);
-        }
-        return ResultVO.ok(false);
-    }
-
-    @ApiOperation(value = "商户号-列表")
+    @ApiOperation(value = "商户列表查询")
     @PostMapping(value = "/list")
-    @PreAuthorize(permissionKey = "sdk:payMerchant:list")
-    @ApiResponses(value = {@ApiResponse(code = 200, message = "成功", response = PayMerchantListVO.class, responseContainer = "list")})
+    @PreAuthorize(permissionKey = "manage:payMerchant:list")
+    @ApiResponses(value = {@ApiResponse(code = 200, message = "成功", response = PayApplicationVO.class)})
     public ResultVO<IPage<PayMerchantListVO>> list(@Validated @RequestBody PayMerchantListParam param) {
-        IPage<PayMerchantListVO> result = payMerchantService.list(param);
-        return ResultVO.ok(result);
+        return new ResultVO<>(payMerchantService.pageList(param));
     }
-
-    @ApiOperation(value = "列表(无分页)")
-    @PostMapping(value = "/listNoPage")
-    @PreAuthorize(permissionKey = "sdk:payMerchant:listNoPage")
-    @ApiResponses(value = {@ApiResponse(code = 200, message = "成功", response = PayMerchantListNoPageVO.class, responseContainer = "list")})
-    public ResultVO<List<PayMerchantListNoPageVO>> listNoPage(@Validated @RequestBody PayMerchantListNoPageParam param) {
-        return ResultVO.ok(payMerchantService.listNoPage(param));
-    }
-
 }

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

@@ -1,27 +0,0 @@
-package com.zanxiang.manage.domain.params;
-
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-/**
- * @author xufeng
- * @date 2022/6/16 19:14
- */
-@Data
-public class PayMerchantListNoPageParam {
-
-
-    @ApiModelProperty(notes = "支付方式id")
-    private Integer payWayId;
-
-    @ApiModelProperty(notes = "商户号")
-    private String merchantNo;
-
-
-    @ApiModelProperty(notes = "商户名称")
-    private String merchantName;
-
-    @ApiModelProperty(notes = "状态 1 不可用 0 可用")
-    private Integer status;
-
-}

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

@@ -14,18 +14,28 @@ import lombok.EqualsAndHashCode;
 @EqualsAndHashCode(callSuper = true)
 public class PayMerchantListParam extends BasePage<PayMerchant> {
 
-
-    @ApiModelProperty(notes = "支付方式id")
-    private Integer payWayId;
-
+    /**
+     * 商户号
+     */
     @ApiModelProperty(notes = "商户号")
     private String merchantNo;
 
-
-    @ApiModelProperty(notes = "商户名称")
+    /**
+     * 商户主体
+     */
+    @ApiModelProperty(notes = "商户主体")
     private String merchantName;
 
-    @ApiModelProperty(notes = "状态 1 不可用 0 可用")
+    /**
+     * 商户平台id
+     */
+    @ApiModelProperty(notes = "商户平台id")
+    private String payWayId;
+
+    /**
+     * 状态, 0 : 正常, 1 : 不可用
+     */
+    @ApiModelProperty(notes = "状态, 0 : 正常, 1 : 不可用")
     private Integer status;
 
 }

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

@@ -1,62 +0,0 @@
-package com.zanxiang.manage.domain.vo;
-
-import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-import java.io.Serializable;
-
-/**
- * @author xufeng
- * @date 2022/6/16 19:14
- */
-@Data
-@NoArgsConstructor
-@ApiModel
-public class PayMerchantListNoPageVO implements Serializable {
-
-    @JsonSerialize(using = ToStringSerializer.class)
-
-    private Long id;
-    /**
-     * 支付方式id
-     */
-    @ApiModelProperty(notes = "支付方式id")
-    private Integer payWayId;
-
-    @ApiModelProperty(notes = "支付方式")
-    private String payWayName;
-
-    /**
-     * 商户号
-     */
-    @ApiModelProperty(notes = "商户号")
-    private String merchantNo;
-
-    /**
-     * 商户名称
-     */
-    @ApiModelProperty(notes = "商户名称")
-    private String merchantName;
-
-    /**
-     * 支持支付方式（pc/h5/app/）
-     */
-    @ApiModelProperty(notes = "商户类型")
-    private String payDevice;
-
-    /**
-     * 支持支付方式（pc/h5/app/）
-     */
-    @ApiModelProperty(notes = "商户名称")
-    private String payDeviceName;
-
-    /**
-     * 商户号登录账号
-     */
-    @ApiModelProperty(notes = "商户名称")
-    private String loginName;
-}

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

@@ -1,36 +1,28 @@
 package com.zanxiang.manage.domain.vo;
 
-import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
-import java.io.Serializable;
 import java.math.BigDecimal;
-import java.util.Date;
+import java.util.List;
 
 /**
- * @author xufeng
- * @date 2022/6/16 19:14
+ * @author : lingfeng
+ * @time : 2022-06-06
+ * @description : 商户列表
  */
 @Data
 @NoArgsConstructor
 @ApiModel
-public class PayMerchantListVO implements Serializable {
+public class PayMerchantListVO {
 
-    @JsonSerialize(using = ToStringSerializer.class)
-
-    private Long id;
     /**
-     * 支付方式id
+     * 商户id
      */
-    @ApiModelProperty(notes = "支付方式id")
-    private Long payWayId;
-
-    @ApiModelProperty(notes = "支付方式")
-    private String payWayName;
+    @ApiModelProperty(notes = "商户id")
+    private Long id;
 
     /**
      * 商户号
@@ -39,124 +31,74 @@ public class PayMerchantListVO implements Serializable {
     private String merchantNo;
 
     /**
-     * 商户名称
+     * 商户主体
      */
-    @ApiModelProperty(notes = "商户名称")
+    @ApiModelProperty(notes = "商户主体")
     private String merchantName;
 
     /**
-     * 支持支付方式（pc/h5/app/）
+     * 商户平台
      */
-    @ApiModelProperty(notes = "商户类型")
-    private String payDevice;
-
-    /**
-     * 支持支付方式（pc/h5/app/）
-     */
-    @ApiModelProperty(notes = "商户名称")
-    private String payDeviceName;
-
-    /**
-     * 商户号登录账号
-     */
-    @ApiModelProperty(notes = "商户名称")
-    private String loginName;
-
-    /**
-     * 商户号登录密码
-     */
-    @ApiModelProperty(notes = "商户号登录密码")
-    private String loginPassword;
-
-    /**
-     * 管理员
-     */
-    @ApiModelProperty(notes = "管理员")
-    private String managePerson;
-
-    /**
-     * 绑定手机号
-     */
-    @ApiModelProperty(notes = "绑定手机号")
-    private String mobile;
-
-    /**
-     * 绑定邮箱
-     */
-    @ApiModelProperty(notes = "绑定邮箱")
-    private String email;
-
-    @ApiModelProperty(notes = "状态 1 不可用 0 可用")
-    private Integer status;
-
-    /**
-     * 支付配置json (存储根据payway设置后，配置的具体商户号信息)
-     */
-    @ApiModelProperty(notes = "支付配置json")
-    private String payConfig;
+    @ApiModelProperty(notes = "商户平台名称")
+    private String payWayName;
 
     /**
-     * 最大支付额度锁 0 正常 1 锁定
+     * 支付类型列表
      */
-    @ApiModelProperty(notes = "最大支付额度锁 0 正常 1 锁定")
-    private Integer maxPayLock;
+    @ApiModelProperty(notes = "支付类型列表")
+    private List<String> payDeviceNameList;
 
     /**
-     * 最大支付额度
+     * 商户号总收款
      */
-    @ApiModelProperty(notes = "最大支付额度")
-    private BigDecimal maxPayAmount;
-
-    @ApiModelProperty(notes = "总支付金额")
+    @ApiModelProperty(notes = "商户号总收款")
     private BigDecimal totalPayAmount;
 
     /**
-     * 月已用支付额度
+     * 商户号本月收款
      */
-    @ApiModelProperty(notes = "月已用支付额度")
+    @ApiModelProperty(notes = "商户号本月收款")
     private BigDecimal mouthPayAmount;
 
     /**
-     * 月更新日期
-     */
-    @ApiModelProperty(notes = "月更新日期")
-    private Date mouthUpdateDate;
-
-    /**
-     * 周已用额度
+     * 商户号本周收款
      */
-    @ApiModelProperty(notes = "周已用额度")
+    @ApiModelProperty(notes = "商户号本周收款")
     private BigDecimal weakerPayAmount;
 
     /**
-     * 周更新日期
+     * 商户号今日收款
      */
-    private Date weakerUpdateDate;
+    @ApiModelProperty(notes = "商户号今日收款")
+    private BigDecimal dayPayAmount;
 
     /**
-     * 日已用额度
+     * 登录账号
      */
-    private BigDecimal dayPayAmount;
+    @ApiModelProperty(notes = "登录账号")
+    private String account;
 
     /**
-     * 日更新日期
+     * 管理员
      */
-    private Date dayUpdateDate;
+    @ApiModelProperty(notes = "管理员")
+    private String manage;
 
     /**
-     * 备注
+     * 绑定手机号
      */
-    @ApiModelProperty(notes = "备注")
-    private String remark;
+    @ApiModelProperty(notes = "绑定手机号")
+    private String mobile;
 
     /**
-     * 是否已删除 1 已删除 2 正常
+     * 联系邮箱
      */
-    @ApiModelProperty(notes = "是否已删除 1 已删除 0 正常")
-    private Integer isDelete;
+    @ApiModelProperty(notes = "联系邮箱")
+    private String email;
+
     /**
-     * 删除时间
+     * 状态, 0 : 正常, 1 : 不可用
      */
-    @ApiModelProperty(notes = "删除时间")
-    private Date deleteTime;
+    @ApiModelProperty(notes = "状态, 0 : 正常, 1 : 不可用")
+    private Integer status;
 }

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

@@ -68,7 +68,7 @@ public interface IPayApplicationService extends IService<PayApplication> {
      * @param bo : 参数
      * @return {@link IPage}<{@link PayApplicationVO}>
      */
-    IPage<PayApplicationVO> list(PayApplicationListParam bo);
+    IPage<PayApplicationVO> pageList(PayApplicationListParam bo);
 
     /**
      * 获取游戏应用二维码图片地址

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

@@ -2,12 +2,8 @@ package com.zanxiang.manage.service;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.zanxiang.manage.domain.bo.PayMerchantBO;
-import com.zanxiang.manage.domain.dto.PayMerchantDTO;
-import com.zanxiang.manage.domain.params.PayMerchantListNoPageParam;
 import com.zanxiang.manage.domain.params.PayMerchantListParam;
 import com.zanxiang.manage.domain.vo.PayMerchantChoiceVO;
-import com.zanxiang.manage.domain.vo.PayMerchantListNoPageVO;
 import com.zanxiang.manage.domain.vo.PayMerchantListVO;
 import com.zanxiang.mybatis.entity.PayMerchant;
 
@@ -28,37 +24,11 @@ public interface IPayMerchantService extends IService<PayMerchant> {
      */
     List<PayMerchantChoiceVO> payMerchantChoiceList();
 
-    /**
-     * 信息
-     *
-     * @param id id
-     * @return {@link PayMerchantDTO}
-     */
-    PayMerchantDTO info(Long id);
-
-    /**
-     * 保存或更新
-     *
-     * @param bo 薄
-     * @return {@link Boolean}
-     */
-    Boolean saveOrUpdate(PayMerchantBO bo);
-
     /**
      * 列表
      *
-     * @param bo 薄
+     * @param param 参数
      * @return {@link IPage}<{@link PayMerchantListVO}>
      */
-    IPage<PayMerchantListVO> list(PayMerchantListParam bo);
-
-    /**
-     * 没有页面列表
-     *
-     * @param bo 薄
-     * @return {@link List}<{@link PayMerchantListNoPageVO}>
-     */
-    List<PayMerchantListNoPageVO> listNoPage(PayMerchantListNoPageParam bo);
-
-//    Boolean config(PayMerchantBO bo);
+    IPage<PayMerchantListVO> pageList(PayMerchantListParam param);
 }

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

@@ -53,7 +53,7 @@ public class PayApplicationServiceImpl extends ServiceImpl<PayApplicationMapper,
     }
 
     @Override
-    public IPage<PayApplicationVO> list(PayApplicationListParam param) {
+    public IPage<PayApplicationVO> pageList(PayApplicationListParam param) {
         return page(param.toPage(), new LambdaQueryWrapper<PayApplication>()
                 .like(Strings.isNotBlank(param.getName()), PayApplication::getAppName, param.getName())
                 .eq(param.getType() != null, PayApplication::getType, param.getType())

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

@@ -1,33 +1,25 @@
 package com.zanxiang.manage.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.zanxiang.common.enums.DeleteEnum;
 import com.zanxiang.common.enums.PayDeviceEnum;
-import com.zanxiang.common.enums.StatusEnum;
+import com.zanxiang.common.enums.PayWayEnum;
 import com.zanxiang.common.utils.bean.BeanUtils;
-import com.zanxiang.manage.domain.bo.PayMerchantBO;
-import com.zanxiang.manage.domain.dto.PayMerchantDTO;
-import com.zanxiang.manage.domain.params.PayMerchantListNoPageParam;
 import com.zanxiang.manage.domain.params.PayMerchantListParam;
 import com.zanxiang.manage.domain.vo.PayMerchantChoiceVO;
-import com.zanxiang.manage.domain.vo.PayMerchantListNoPageVO;
 import com.zanxiang.manage.domain.vo.PayMerchantListVO;
 import com.zanxiang.manage.service.IPayMerchantService;
 import com.zanxiang.manage.service.IPayWayService;
 import com.zanxiang.mybatis.entity.PayMerchant;
-import com.zanxiang.mybatis.entity.PayWay;
 import com.zanxiang.mybatis.mapper.PayMerchantMapper;
 import org.apache.logging.log4j.util.Strings;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.ArrayList;
 import java.util.List;
-import java.util.Map;
 import java.util.Objects;
-import java.util.stream.Collectors;
 
 /**
  * 游戏支付商户配置表 服务实现类
@@ -49,65 +41,37 @@ public class PayMerchantServiceImpl extends ServiceImpl<PayMerchantMapper, PayMe
     }
 
     @Override
-    public PayMerchantDTO info(Long id) {
-        PayMerchant data = getOne(new LambdaQueryWrapper<PayMerchant>().eq(PayMerchant::getId, id).eq(PayMerchant::getIsDelete, DeleteEnum.NO.getCode()));
-        if (data == null) {
-            return null;
-        }
-        return BeanUtils.copy(data, PayMerchantDTO.class);
-    }
-
-    @Override
-    public Boolean saveOrUpdate(PayMerchantBO bo) {
-        PayMerchant data = BeanUtils.copy(bo, PayMerchant.class);
-        //删除时候增加删除时间
-        if (data.getIsDelete() != null && data.getIsDelete() == DeleteEnum.YES.getCode()) {
-            data.setIsDelete(DeleteEnum.YES.getCode());
-//            data.setDeleteTime(LocalDateTime.now());
-            return removeById(bo.getId());
-        }
-//        if (!StringUtils.isEmpty(data.getPayDevice())) {
-//            data.setPayDevice("," + data.getPayDevice().trim() + ",");
-//        }
-        return saveOrUpdate(BeanUtils.copy(data, PayMerchant.class));
+    public IPage<PayMerchantListVO> pageList(PayMerchantListParam param) {
+        return page(param.toPage(), new LambdaQueryWrapper<PayMerchant>()
+                .eq(param.getMerchantNo() != null, PayMerchant::getMerchantNo, param.getMerchantNo())
+                .eq(param.getPayWayId() != null, PayMerchant::getPayWayId, param.getPayWayId())
+                .eq(param.getStatus() != null, PayMerchant::getStatus, param.getStatus())
+                .like(Strings.isNotBlank(param.getMerchantName()), PayMerchant::getMerchantName, param.getMerchantName())
+                .orderByDesc(PayMerchant::getCreateTime))
+                .convert(this::toVo);
     }
 
-    @Override
-    public IPage<PayMerchantListVO> list(PayMerchantListParam bo) {
-        PayMerchant app = BeanUtils.copy(bo, PayMerchant.class);
-        IPage<PayMerchantListVO> convert = page(bo.toPage(), new QueryWrapper<PayMerchant>().lambda().setEntity(app)).convert(this::toVo);
-        if (convert == null) {
+    private PayMerchantListVO toVo(PayMerchant payMerchant) {
+        PayMerchantListVO payMerchantListVO = BeanUtils.copy(payMerchant, PayMerchantListVO.class);
+        if (payMerchantListVO == null) {
             return null;
         }
-        List<PayWay> list = payWayService.list(new LambdaQueryWrapper<PayWay>()
-//                .eq(PayWay::getParentId, 0)
-        );
-        Map<Long, PayWay> payWayMap = list.stream().collect(Collectors.toMap(PayWay::getId, PayWay -> PayWay));
-        convert.getRecords().forEach(t -> {
-            PayWay payWayInfo = payWayMap.get(t.getPayWayId());
-            if (t.getPayWayId() == null || payWayInfo == null) {
-                return;
-            }
-//            t.setPayWayName(payWayInfo.getPayName());
-            t.setPayDeviceName(PayDeviceEnum.getDesc(t.getPayDevice()));
-        });
-        return convert;
+        List<String> payDeviceNameList = new ArrayList<>();
+        if (Objects.equals(payMerchant.getPayWayId().intValue(), PayWayEnum.ALI_PAY.getPayWayId())) {
+            payDeviceNameList.add(PayDeviceEnum.PC_PAY.getPayDeviceName());
+            payDeviceNameList.add(PayDeviceEnum.H5_PAY.getPayDeviceName());
+            payDeviceNameList.add(PayDeviceEnum.APP_PAY.getPayDeviceName());
+        }
+        if (Objects.equals(payMerchant.getPayWayId().intValue(), PayWayEnum.WX_PAY.getPayWayId())) {
+            payDeviceNameList.add(PayDeviceEnum.PC_PAY.getPayDeviceName());
+            payDeviceNameList.add(PayDeviceEnum.H5_PAY.getPayDeviceName());
+            payDeviceNameList.add(PayDeviceEnum.APPLET_PAY.getPayDeviceName());
+            payDeviceNameList.add(PayDeviceEnum.MI_PAY.getPayDeviceName());
+            payDeviceNameList.add(PayDeviceEnum.CUSTOM_PAY.getPayDeviceName());
+        }
+        payMerchantListVO.setPayDeviceNameList(payDeviceNameList);
+        return payMerchantListVO;
     }
 
-    @Override
-    public List<PayMerchantListNoPageVO> listNoPage(PayMerchantListNoPageParam bo) {
-        List<PayMerchant> list = this.list(new LambdaQueryWrapper<PayMerchant>()
-                .eq(Strings.isNotBlank(bo.getMerchantNo()), PayMerchant::getMerchantNo, bo.getMerchantNo())
-                .eq(Strings.isNotBlank(bo.getMerchantName()), PayMerchant::getMerchantName, bo.getMerchantName())
-                .eq(PayMerchant::getStatus, StatusEnum.YES.getCode())
-        );
-        return BeanUtils.copyList(list, PayMerchantListNoPageVO.class);
-    }
 
-    private PayMerchantListVO toVo(PayMerchant payMerchant) {
-        if (Objects.isNull(payMerchant)) {
-            return null;
-        }
-        return BeanUtils.copy(payMerchant, PayMerchantListVO.class);
-    }
 }