代码优化

bnyer-api/bnyer-api-img/src/main/java/com/bnyer/img/api/dto/QueryUserVipDto.java

@@ -1,23 +0,0 @@
-package com.bnyer.img.api.dto;
-
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Getter;
-import lombok.Setter;
-
-/**
- * @author :WXC
- * @Date :2023/03/31
- * @description :
- */
-@Getter
-@Setter
-@ApiModel("会员vip查询类")
-public class QueryUserVipDto {
-    @ApiModelProperty(value="主键Id")
-    private Long id;
-
-    @ApiModelProperty(value="vip客户端类型：10用户-抖音 20用户-快手 30用户-微信 40艺术家-微信")
-    private Integer userClientType;
-
-}

bnyer-api/bnyer-api-img/src/main/java/com/bnyer/img/api/factory/RemoteWxMiniFallbackFactory.java

@@ -1,33 +1,30 @@
 package com.bnyer.img.api.factory;
 
 import com.bnyer.common.core.domain.R;
-import com.bnyer.img.api.dto.QueryUserVipDto;
-import com.bnyer.img.api.remote.RemoteWxMiniService;
-import com.bnyer.img.api.vo.UserVipInfoVo;
+import com.bnyer.img.api.remote.RemoteUserVipService;
+import com.bnyer.img.api.vo.UserVipVo;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.cloud.openfeign.FallbackFactory;
 import org.springframework.stereotype.Component;
 
-import java.util.List;
-
 /**
  * 图文服务降级处理
  *
  * @author penny
  */
 @Component
-public class RemoteWxMiniFallbackFactory implements FallbackFactory<RemoteWxMiniService>
+public class RemoteWxMiniFallbackFactory implements FallbackFactory<RemoteUserVipService>
 {
     private static final Logger log = LoggerFactory.getLogger(RemoteWxMiniFallbackFactory.class);
 
 
     @Override
-    public RemoteWxMiniService create(Throwable throwable) {
+    public RemoteUserVipService create(Throwable throwable) {
         log.error("api图文服务调用失败:{}", throwable.getMessage());
-        return new RemoteWxMiniService() {
+        return new RemoteUserVipService() {
             @Override
-            public R<List<UserVipInfoVo>> queryUserVipList(QueryUserVipDto dto) {
+            public R<UserVipVo> queryUserVip(Long id) {
                 return R.fail("获取会员信息失败:+"+throwable.getMessage());
             }
 

bnyer-api/bnyer-api-img/src/main/java/com/bnyer/img/api/remote/RemoteUserVipService.java

@@ -0,0 +1,24 @@
+package com.bnyer.img.api.remote;
+
+import com.bnyer.common.core.constant.ServiceNameConstants;
+import com.bnyer.common.core.domain.R;
+import com.bnyer.img.api.factory.RemoteWxMiniFallbackFactory;
+import com.bnyer.img.api.vo.UserVipVo;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+
+/**
+ * @author :WXC
+ * @description :
+ */
+@FeignClient(path = "/img/mini/vip",contextId = "remoteWxMiniService", value = ServiceNameConstants.IMG_SERVICE, fallbackFactory = RemoteWxMiniFallbackFactory.class)
+public interface RemoteUserVipService {
+
+    /**
+     * 获取会员信息
+     * @return
+     */
+    @GetMapping(value = "/queryUserVip/{id}")
+    R<UserVipVo> queryUserVip(@PathVariable(value = "id") Long id);
+}

bnyer-api/bnyer-api-img/src/main/java/com/bnyer/img/api/remote/RemoteWxMiniService.java

@@ -1,27 +0,0 @@
-package com.bnyer.img.api.remote;
-
-import com.bnyer.common.core.constant.ServiceNameConstants;
-import com.bnyer.common.core.domain.R;
-import com.bnyer.img.api.dto.QueryUserVipDto;
-import com.bnyer.img.api.factory.RemoteWxMiniFallbackFactory;
-import com.bnyer.img.api.vo.UserVipInfoVo;
-import org.springframework.cloud.openfeign.FeignClient;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-
-import java.util.List;
-
-/**
- * @author :WXC
- * @description :
- */
-@FeignClient(contextId = "remoteWxMiniService", value = ServiceNameConstants.IMG_SERVICE, fallbackFactory = RemoteWxMiniFallbackFactory.class)
-public interface RemoteWxMiniService {
-
-    /**
-     * 获取会员列表
-     * @return
-     */
-    @PostMapping(value = "/img/mini/fh/queryUserVipList")
-    R<List<UserVipInfoVo>> queryUserVipList(@RequestBody QueryUserVipDto dto);
-}

bnyer-api/bnyer-api-img/src/main/java/com/bnyer/img/api/vo/UserVipInfoVo.java → bnyer-api/bnyer-api-img/src/main/java/com/bnyer/img/api/vo/UserVipVo.java

@@ -12,7 +12,7 @@ import java.math.BigDecimal;
 @Getter
 @Setter
 @ApiModel("会员vip响应类")
-public class UserVipInfoVo implements Serializable {
+public class UserVipVo implements Serializable {
 
     @ApiModelProperty(value="主键Id")
     private Long id;

bnyer-api/bnyer-api-order/src/main/java/com/bnyer/order/api/factory/RemoteVipOrderFallbackFactory.java

@@ -2,6 +2,7 @@ package com.bnyer.order.api.factory;
 
 import com.bnyer.common.core.domain.R;
 import com.bnyer.order.api.query.VipOrderQuery;
+import com.bnyer.order.api.query.VipOrderExtQuery;
 import com.bnyer.order.api.remote.RemoteVipOrderService;
 import com.bnyer.order.api.vo.VipOrderVo;
 import org.slf4j.Logger;
@@ -31,6 +32,11 @@ public class RemoteVipOrderFallbackFactory implements FallbackFactory<RemoteVipO
             public R<List<VipOrderVo>> queryVipOrderList(VipOrderQuery query) {
                 return R.fail("获取会员订单信息失败:+"+throwable.getMessage());
             }
+
+            @Override
+            public R<VipOrderVo> queryVipOrder(VipOrderExtQuery query) {
+                return R.fail("获取会员订单信息失败:+"+throwable.getMessage());
+            }
         };
     }
 }

bnyer-services/bnyer-order/src/main/java/com/bnyer/order/query/VipOrderDetailsQuery.java → bnyer-api/bnyer-api-order/src/main/java/com/bnyer/order/api/query/VipOrderExtQuery.java

@@ -1,22 +1,26 @@
-package com.bnyer.order.query;
+package com.bnyer.order.api.query;
 
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
 import lombok.Setter;
 
-import javax.validation.constraints.NotBlank;
+import java.io.Serializable;
 
 /**
  * @author :WXC
- * @Date :2023/05/09
+ * @Date :2023/03/27
  * @description :
  */
 @Getter
 @Setter
 @NoArgsConstructor
-public class VipOrderDetailsQuery {
-    @NotBlank(message = "订单号不能为空")
+public class VipOrderExtQuery implements Serializable {
+
+    @ApiModelProperty(value = "id")
+    private Long id;
+
     @ApiModelProperty(value="订单号")
     private String orderNo;
+
 }

bnyer-api/bnyer-api-order/src/main/java/com/bnyer/order/api/remote/RemoteVipOrderService.java

@@ -2,8 +2,9 @@ package com.bnyer.order.api.remote;
 
 import com.bnyer.common.core.constant.ServiceNameConstants;
 import com.bnyer.common.core.domain.R;
-import com.bnyer.order.api.query.VipOrderQuery;
 import com.bnyer.order.api.factory.RemoteVipOrderFallbackFactory;
+import com.bnyer.order.api.query.VipOrderQuery;
+import com.bnyer.order.api.query.VipOrderExtQuery;
 import com.bnyer.order.api.vo.VipOrderVo;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -16,7 +17,7 @@ import java.util.List;
  * @Date :2023/04/03
  * @description :订单服务：vip订单接口远程调用
  */
-@FeignClient(contextId = "remoteVipOrderService", value = ServiceNameConstants.ORDER_SERVICE, fallbackFactory = RemoteVipOrderFallbackFactory.class)
+@FeignClient(path = "/vip",contextId = "remoteVipOrderService", value = ServiceNameConstants.ORDER_SERVICE, fallbackFactory = RemoteVipOrderFallbackFactory.class)
 public interface RemoteVipOrderService {
 
     /**
@@ -24,6 +25,12 @@ public interface RemoteVipOrderService {
      * @param query
      * @return
      */
-    @PostMapping("/vip/queryVipOrderList")
+    @PostMapping("/queryVipOrderList")
     R<List<VipOrderVo>> queryVipOrderList(@RequestBody VipOrderQuery query);
+
+    /**
+     * 查询会员订单信息(单表查询)
+     */
+    @PostMapping("/queryVipOrder")
+    R<VipOrderVo> queryVipOrder(@RequestBody VipOrderExtQuery query);
 }

bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/QueryUserVipDto.java

@@ -1,23 +0,0 @@
-package com.bnyer.common.core.dto;
-
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Getter;
-import lombok.Setter;
-
-/**
- * @author :WXC
- * @Date :2023/03/31
- * @description :
- */
-@Getter
-@Setter
-@ApiModel("会员vip查询类")
-public class QueryUserVipDto {
-    @ApiModelProperty(value="主键Id")
-    private Long id;
-
-    @ApiModelProperty(value="vip客户端类型：10用户-抖音 20用户-快手 30用户-微信 40艺术家-微信")
-    private Integer userClientType;
-
-}

bnyer-services/bnyer-img/src/main/java/com/bnyer/img/controller/FhMiniController.java

@@ -64,9 +64,6 @@ public class FhMiniController extends BaseController {
     @Autowired
     private BzDataService bzDataService;
 
-    @Autowired
-    private UserVipService userVipService;
-
     @Autowired
     private UserVipRecordService userVipRecordService;
 
@@ -305,12 +302,6 @@ public class FhMiniController extends BaseController {
         return AjaxResult.error();
     }
 
-    @ApiOperation(value="获取用户会员vip列表")
-    @PostMapping(value = "/queryUserVipList")
-    public R<List<UserVipVo>> queryUserVipList(@RequestBody QueryUserVipDto dto){
-        return R.ok(userVipService.queryFront(dto));
-    }
-
     @ApiOperation(value="支付购买用户会员vip")
     @PostMapping(value = "/payUserVip")
     public AjaxResult payUserVip(@Validated @RequestBody @ApiParam("购买会员vip对象") PayUserVipDto dto){

bnyer-services/bnyer-img/src/main/java/com/bnyer/img/controller/TiktokMiniController.java

@@ -64,9 +64,6 @@ public class TiktokMiniController extends BaseController {
     @Autowired
     private BzDataService bzDataService;
 
-    @Autowired
-    private UserVipService userVipService;
-
     @Autowired
     private UserVipRecordService userVipRecordService;
 
@@ -331,13 +328,6 @@ public class TiktokMiniController extends BaseController {
     }
 
     
-    @ApiOperation(value="获取用户会员vip列表")
-    @GetMapping(value = "/queryUserVipList")
-    public R<List<UserVipVo>> queryUserVipList(QueryUserVipDto dto){
-        return R.ok(userVipService.queryFront(dto));
-    }
-
-    
     @ApiOperation(value="支付购买用户会员vip")
     @PostMapping(value = "/payUserVip")
     public AjaxResult payUserVip(@Validated @RequestBody @ApiParam("购买会员vip对象") PayUserVipDto dto){

bnyer-services/bnyer-img/src/main/java/com/bnyer/img/controller/UserVipController.java

@@ -0,0 +1,43 @@
+package com.bnyer.img.controller;
+
+import com.bnyer.common.core.domain.R;
+import com.bnyer.img.query.UserVipQuery;
+import com.bnyer.img.service.UserVipService;
+import com.bnyer.img.vo.UserVipVo;
+import io.swagger.annotations.Api;
+import io.swagger.v3.oas.annotations.Operation;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+import java.util.List;
+
+/**
+ * @author :WXC
+ * @Date :2023/05/10
+ * @description :
+ */
+@Api(value = "【小程序】用户端接口",tags = "【小程序】用户端接口")
+@RestController
+@RequestMapping("/img/mini/vip")
+@Slf4j
+public class UserVipController {
+
+    @Resource
+    private UserVipService userVipService;
+
+    @Operation(summary="获取用户会员列表",description = "获取用户会员列表")
+    @PostMapping(value = "/queryUserVipList")
+    public R<List<UserVipVo>> queryUserVipList(@RequestBody UserVipQuery query){
+        return R.ok(userVipService.queryUserVipList(query));
+    }
+
+    @Operation(summary="获取会员信息(单表查询)",description = "获取会员信息")
+    @GetMapping(value = "/queryUserVip/{id}")
+    public R<UserVipVo> queryUserVip(@PathVariable(value = "id") Long id){
+        return R.ok(userVipService.queryUserVip(id));
+    }
+
+
+}

bnyer-services/bnyer-img/src/main/java/com/bnyer/img/controller/WxMiniController.java

@@ -12,7 +12,10 @@ import com.bnyer.common.core.web.domain.AjaxResult;
 import com.bnyer.common.core.web.page.TableDataInfo;
 import com.bnyer.img.api.model.LoginWechatUser;
 import com.bnyer.img.service.*;
-import com.bnyer.img.vo.*;
+import com.bnyer.img.vo.CreatorDetailsVo;
+import com.bnyer.img.vo.CreatorFollowVo;
+import com.bnyer.img.vo.SignImgVo;
+import com.bnyer.img.vo.TiktokImgVo;
 import com.github.pagehelper.PageHelper;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -64,9 +67,6 @@ public class WxMiniController extends BaseController {
     @Autowired
     private BzDataService bzDataService;
 
-    @Autowired
-    private UserVipService userVipService;
-
     @Autowired
     private UserVipRecordService userVipRecordService;
 
@@ -318,13 +318,6 @@ public class WxMiniController extends BaseController {
         return AjaxResult.error();
     }
 
-    
-    @ApiOperation(value="获取用户会员vip列表")
-    @GetMapping(value = "/queryUserVipList")
-    public R<List<UserVipVo>> queryUserVipList(QueryUserVipDto dto){
-        return R.ok(userVipService.queryFront(dto));
-    }
-
     @ApiOperation(value="支付购买用户会员vip")
     @PostMapping(value = "/payUserVip")
     public AjaxResult payUserVip(@Validated @RequestBody @ApiParam("购买会员vip对象") PayUserVipDto dto){

bnyer-services/bnyer-img/src/main/java/com/bnyer/img/mapper/UserVipMapper.java

@@ -2,7 +2,7 @@ package com.bnyer.img.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.bnyer.common.core.domain.UserVip;
-import com.bnyer.common.core.dto.QueryUserVipDto;
+import com.bnyer.img.query.UserVipQuery;
 import com.bnyer.img.vo.UserVipVo;
 import org.apache.ibatis.annotations.Mapper;
 
@@ -15,6 +15,6 @@ public interface UserVipMapper extends BaseMapper<UserVip> {
      * 获取小程序端会员vip列表
      * @return -
      */
-    List<UserVipVo> queryFront(QueryUserVipDto dto);
+    List<UserVipVo> queryVipList(UserVipQuery query);
 
 }

bnyer-services/bnyer-img/src/main/java/com/bnyer/img/query/UserVipQuery.java

@@ -0,0 +1,18 @@
+package com.bnyer.img.query;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * @author :WXC
+ * @Date :2023/03/31
+ * @description :
+ */
+@Getter
+@Setter
+@ApiModel("会员查询类")
+public class UserVipQuery {
+
+}

bnyer-services/bnyer-img/src/main/java/com/bnyer/img/service/UserVipService.java

@@ -1,16 +1,25 @@
 package com.bnyer.img.service;
 
-import com.bnyer.common.core.dto.QueryUserVipDto;
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.bnyer.common.core.domain.UserVip;
+import com.bnyer.img.query.UserVipQuery;
 import com.bnyer.img.vo.UserVipVo;
 
 import java.util.List;
 
-public interface UserVipService {
+public interface UserVipService extends IService<UserVip> {
 
     /**
-     * 获取小程序端会员vip列表
-     * @return -
+     * 获取用户会员列表
+     * @param query
+     * @return
      */
-    List<UserVipVo> queryFront(QueryUserVipDto dto);
+    List<UserVipVo> queryUserVipList(UserVipQuery query);
 
+    /**
+     * 获取会员详细信息
+     * @param id
+     * @return
+     */
+    UserVipVo queryUserVip(Long id);
 }

bnyer-services/bnyer-img/src/main/java/com/bnyer/img/service/impl/UserVipServiceImpl.java

@@ -1,7 +1,13 @@
 package com.bnyer.img.service.impl;
 
-import com.bnyer.common.core.dto.QueryUserVipDto;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.bnyer.common.core.domain.UserVip;
+import com.bnyer.common.core.enums.ResponseEnum;
+import com.bnyer.common.core.exception.ServiceException;
+import com.bnyer.common.core.utils.bean.EntityConvertUtil;
 import com.bnyer.img.mapper.UserVipMapper;
+import com.bnyer.img.query.UserVipQuery;
 import com.bnyer.img.service.UserVipService;
 import com.bnyer.img.vo.UserVipVo;
 import lombok.extern.slf4j.Slf4j;
@@ -9,16 +15,37 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.util.List;
+import java.util.Objects;
 
 @Service
 @Slf4j
-public class UserVipServiceImpl implements UserVipService {
+public class UserVipServiceImpl extends ServiceImpl<UserVipMapper, UserVip> implements UserVipService {
 
     @Autowired
     private UserVipMapper userVipMapper;
 
+    /**
+     * 获取用户会员列表
+     * @param query
+     * @return
+     */
     @Override
-    public List<UserVipVo> queryFront(QueryUserVipDto dto) {
-        return userVipMapper.queryFront(dto);
+    public List<UserVipVo> queryUserVipList(UserVipQuery query) {
+        return userVipMapper.queryVipList(query);
+    }
+
+    /**
+     * 获取会员详细信息
+     * @param id
+     * @return
+     */
+    @Override
+    public UserVipVo queryUserVip(Long id) {
+        UserVip userVip = userVipMapper.selectOne(new LambdaQueryWrapper<UserVip>().eq(UserVip::getId, id).eq(UserVip::getIsShow, "1"));
+        if (Objects.isNull(userVip)){
+            throw new ServiceException(ResponseEnum.NOT_EXIST,"会员信息");
+        }
+        UserVipVo userVipVo = EntityConvertUtil.copy(userVip, UserVipVo.class);
+        return userVipVo;
     }
 }

bnyer-services/bnyer-img/src/main/resources/com/bnyer/img/mapper/UserVipMapper.xml

@@ -39,7 +39,7 @@
     v.update_time,
     v.sort
   </sql>
-    <select id="queryFront" resultType="com.bnyer.img.vo.UserVipVo">
+    <select id="queryVipList" resultType="com.bnyer.img.vo.UserVipVo">
       select
       <include refid="Base_Column_List"/>,
       vt.type_code AS vip_type_code,

bnyer-services/bnyer-order/src/main/java/com/bnyer/order/dto/AddVipOrderDto.java → bnyer-services/bnyer-order/src/main/java/com/bnyer/order/bean/dto/AddVipOrderDto.java

@@ -1,4 +1,4 @@
-package com.bnyer.order.dto;
+package com.bnyer.order.bean.dto;
 
 import com.bnyer.common.core.domain.VipOrder;
 import com.bnyer.common.core.dto.BaseDto;

bnyer-services/bnyer-order/src/main/java/com/bnyer/order/bean/query/VipOrderExtQuery.java

@@ -0,0 +1,35 @@
+package com.bnyer.order.bean.query;
+
+import com.bnyer.common.core.exception.ServiceException;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+import org.apache.commons.lang3.StringUtils;
+
+import java.io.Serializable;
+
+/**
+ * @author :WXC
+ * @Date :2023/03/27
+ * @description :
+ */
+@Getter
+@Setter
+@NoArgsConstructor
+public class VipOrderExtQuery implements Serializable {
+
+    @ApiModelProperty(value = "id")
+    private Long id;
+
+    @ApiModelProperty(value="订单号")
+    private String orderNo;
+
+
+    public void valid() {
+        if (this.id == null || StringUtils.isBlank(this.orderNo)){
+            throw new ServiceException("id 和 订单号不能同时为空");
+        }
+    }
+
+}

bnyer-services/bnyer-order/src/main/java/com/bnyer/order/query/VipOrderQuery.java → bnyer-services/bnyer-order/src/main/java/com/bnyer/order/bean/query/VipOrderQuery.java

@@ -1,4 +1,4 @@
-package com.bnyer.order.query;
+package com.bnyer.order.bean.query;
 
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Getter;

bnyer-services/bnyer-order/src/main/java/com/bnyer/order/vo/VipOrderVo.java → bnyer-services/bnyer-order/src/main/java/com/bnyer/order/bean/vo/VipOrderVo.java

@@ -1,4 +1,4 @@
-package com.bnyer.order.vo;
+package com.bnyer.order.bean.vo;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModelProperty;

bnyer-services/bnyer-order/src/main/java/com/bnyer/order/controller/VipOrderController.java

@@ -2,16 +2,20 @@ package com.bnyer.order.controller;
 
 import com.bnyer.common.core.domain.R;
 import com.bnyer.common.core.web.controller.BaseController;
-import com.bnyer.order.dto.AddVipOrderDto;
-import com.bnyer.order.query.VipOrderQuery;
+import com.bnyer.order.bean.dto.AddVipOrderDto;
+import com.bnyer.order.bean.query.VipOrderExtQuery;
+import com.bnyer.order.bean.query.VipOrderQuery;
+import com.bnyer.order.bean.vo.VipOrderVo;
 import com.bnyer.order.service.VipOrderService;
-import com.bnyer.order.vo.VipOrderVo;
 import io.swagger.annotations.Api;
 import io.swagger.v3.oas.annotations.Operation;
 import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
+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;
 
+import javax.annotation.Resource;
 import javax.validation.Valid;
 import java.util.List;
 
@@ -27,7 +31,7 @@ import java.util.List;
 public class VipOrderController extends BaseController {
 
 
-    @Autowired
+    @Resource
     private VipOrderService vipOrderService;
 
 
@@ -42,7 +46,7 @@ public class VipOrderController extends BaseController {
     }
 
     /**
-     * 查询订单信息
+     * 查询订单列表
      */
     @PostMapping("/queryVipOrderList")
     @Operation(summary = "查询会员订单列表信息" , description = "查询会员订单列表信息")
@@ -51,4 +55,15 @@ public class VipOrderController extends BaseController {
         return R.ok(vipOrderVoList);
     }
 
+    /**
+     * 查询会员订单信息
+     */
+    @PostMapping("/queryVipOrder")
+    @Operation(summary = "查询会员订单信息(单表查询)" , description = "查询会员订单信息")
+    public R<VipOrderVo> queryVipOrder(@RequestBody VipOrderExtQuery query) {
+        query.valid();
+        VipOrderVo vipOrderVo = vipOrderService.queryVipOrder(query);
+        return R.ok(vipOrderVo);
+    }
+
 }

bnyer-services/bnyer-order/src/main/java/com/bnyer/order/mapper/VipOrderMapper.java

@@ -2,7 +2,7 @@ package com.bnyer.order.mapper;
 
 import java.util.List;
 
-import com.bnyer.order.query.VipOrderQuery;
+import com.bnyer.order.bean.query.VipOrderQuery;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.bnyer.common.core.domain.VipOrder;

bnyer-services/bnyer-order/src/main/java/com/bnyer/order/service/VipOrderService.java

@@ -2,11 +2,10 @@ package com.bnyer.order.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.bnyer.common.core.domain.VipOrder;
-import com.bnyer.order.query.VipOrderQuery;
-import com.bnyer.order.dto.AddVipOrderDto;
-import com.bnyer.order.query.VipOrderDetailsQuery;
-import com.bnyer.order.vo.VipOrderDetailsVo;
-import com.bnyer.order.vo.VipOrderVo;
+import com.bnyer.order.bean.dto.AddVipOrderDto;
+import com.bnyer.order.bean.query.VipOrderExtQuery;
+import com.bnyer.order.bean.query.VipOrderQuery;
+import com.bnyer.order.bean.vo.VipOrderVo;
 
 import java.util.List;
 
@@ -44,7 +43,7 @@ public interface VipOrderService extends IService<VipOrder> {
      * @param query
      * @return
      */
-    VipOrderDetailsVo queryVipOrder(VipOrderDetailsQuery query);
+    VipOrderVo queryVipOrder(VipOrderExtQuery query);
 
     /**
      * 更新订单信息

bnyer-services/bnyer-order/src/main/java/com/bnyer/order/service/impl/VipOrderServiceImpl.java

@@ -16,17 +16,15 @@ import com.bnyer.common.core.utils.bean.EntityConvertUtil;
 import com.bnyer.common.core.vo.UserInfoVo;
 import com.bnyer.common.rocketmq.config.RocketMqConstant;
 import com.bnyer.common.security.utils.SecurityUtils;
-import com.bnyer.img.api.dto.QueryUserVipDto;
-import com.bnyer.img.api.remote.RemoteWxMiniService;
-import com.bnyer.img.api.vo.UserVipInfoVo;
-import com.bnyer.order.dto.AddVipOrderDto;
-import com.bnyer.order.query.VipOrderDetailsQuery;
-import com.bnyer.order.query.VipOrderQuery;
+import com.bnyer.img.api.remote.RemoteUserVipService;
+import com.bnyer.img.api.vo.UserVipVo;
+import com.bnyer.order.bean.dto.AddVipOrderDto;
+import com.bnyer.order.bean.query.VipOrderQuery;
+import com.bnyer.order.bean.query.VipOrderExtQuery;
+import com.bnyer.order.bean.vo.VipOrderVo;
 import com.bnyer.order.enums.EnumVipOrderStatus;
 import com.bnyer.order.mapper.VipOrderMapper;
 import com.bnyer.order.service.VipOrderService;
-import com.bnyer.order.vo.VipOrderDetailsVo;
-import com.bnyer.order.vo.VipOrderVo;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.rocketmq.client.producer.SendStatus;
 import org.apache.rocketmq.spring.core.RocketMQTemplate;
@@ -56,7 +54,7 @@ public class VipOrderServiceImpl extends ServiceImpl<VipOrderMapper, VipOrder> i
     private VipOrderMapper vipOrderMapper;
 
     @Autowired
-    private RemoteWxMiniService remoteWxMiniService;
+    private RemoteUserVipService remoteUserVipService;
 
     /**
      * 查询会员订单列表信息
@@ -76,8 +74,11 @@ public class VipOrderServiceImpl extends ServiceImpl<VipOrderMapper, VipOrder> i
      * @return
      */
     @Override
-    public VipOrderDetailsVo queryVipOrder(VipOrderDetailsQuery query) {
+    public VipOrderVo queryVipOrder(VipOrderExtQuery query) {
         LambdaQueryWrapper<VipOrder> queryWrapper = new LambdaQueryWrapper<>();
+        if (Objects.nonNull(query.getId())){
+            queryWrapper.eq(VipOrder::getId,query.getId());
+        }
         if (StringUtils.isNotBlank(query.getOrderNo())){
             queryWrapper.eq(VipOrder::getOrderNo,query.getOrderNo());
         }
@@ -85,8 +86,8 @@ public class VipOrderServiceImpl extends ServiceImpl<VipOrderMapper, VipOrder> i
         if (Objects.isNull(vipOrder)){
             throw new ServiceException(ResponseEnum.NOT_EXIST,"会员订单");
         }
-        VipOrderDetailsVo orderDetailsVo = EntityConvertUtil.copy(vipOrder, VipOrderDetailsVo.class);
-        return orderDetailsVo;
+        VipOrderVo vipOrderVo = EntityConvertUtil.copy(vipOrder, VipOrderVo.class);
+        return vipOrderVo;
     }
 
 
@@ -120,23 +121,17 @@ public class VipOrderServiceImpl extends ServiceImpl<VipOrderMapper, VipOrder> i
      */
     private VipOrder buildVipOrder(AddVipOrderDto addVipOrderDto) {
         //查询会员信息
-        QueryUserVipDto queryUserVipDto = new QueryUserVipDto();
-        queryUserVipDto.setId(addVipOrderDto.getVipId());
-        R<List<UserVipInfoVo>> userVipVoListResult = remoteWxMiniService.queryUserVipList(queryUserVipDto);
-        if (!userVipVoListResult.isSuccess()){
-            log.error("内部接口调用异常:url:{}request{},result{},error:{}","queryUserVipList", JSON.toJSONString(queryUserVipDto),JSON.toJSONString(userVipVoListResult),userVipVoListResult.getMsg());
-            throw new ServiceException(userVipVoListResult.getMsg());
-        }
-        List<UserVipInfoVo> userVipInfoVoList = userVipVoListResult.getData();
-        if (CollUtil.isEmpty(userVipInfoVoList)){
-            throw new ServiceException(ResponseEnum.NOT_EXIST,"会员信息");
-        }
-        UserVipInfoVo userVipInfoVo = userVipInfoVoList.get(0);
+        R<UserVipVo> userVipResult = remoteUserVipService.queryUserVip(addVipOrderDto.getVipId());
+        if (!userVipResult.isSuccess()){
+            log.error("内部接口调用异常:url:{}request{},result{},error:{}","queryUserVipList", addVipOrderDto.getVipId(),JSON.toJSONString(userVipResult),userVipResult.getMsg());
+            throw new ServiceException(userVipResult.getMsg());
+        }
+        UserVipVo userVipVo = userVipResult.getData();
         VipOrder vipOrder = null;
-        EnumVipType enumVipType = EnumVipType.getVipTypeByCode(userVipInfoVo.getVipTypeCode());
+        EnumVipType enumVipType = EnumVipType.getVipTypeByCode(userVipVo.getVipTypeCode());
         switch (enumVipType){
             case IMG_VIP:
-                vipOrder = buildImgVipOrder(userVipInfoVo,addVipOrderDto);
+                vipOrder = buildImgVipOrder(userVipVo,addVipOrderDto);
                 break;
             case VIDEO_VIP:
                 break;
@@ -150,31 +145,31 @@ public class VipOrderServiceImpl extends ServiceImpl<VipOrderMapper, VipOrder> i
 
     /**
      * 构建下图会员订单
-     * @param userVipInfoVo
+     * @param userVipDetailsVo
      * @param addVipOrderDto
      * @return
      */
-    private VipOrder buildImgVipOrder(UserVipInfoVo userVipInfoVo, AddVipOrderDto addVipOrderDto) {
+    private VipOrder buildImgVipOrder(UserVipVo userVipVo, AddVipOrderDto addVipOrderDto) {
         VipOrder vipOrder = addVipOrderDto.toEntity();
         UserInfoVo userInfo = SecurityUtils.getUserInfo();
         Long userId = userInfo.getId();
         Integer userClientType = userInfo.getUserClientType();
-        vipOrder.setVipCode(userVipInfoVo.getVipCode());
-        vipOrder.setVipName(userVipInfoVo.getVipName());
-        vipOrder.setVipTypeName(userVipInfoVo.getVipTypeName());
+        vipOrder.setVipCode(userVipVo.getVipCode());
+        vipOrder.setVipName(userVipVo.getVipName());
+        vipOrder.setVipTypeName(userVipVo.getVipTypeName());
         //// TODO: 2023/05/10 待加密
         vipOrder.setPhone(addVipOrderDto.getPhone());
-        vipOrder.setVipName(userVipInfoVo.getVipName());
-        vipOrder.setVipTypeName(userVipInfoVo.getVipTypeName());
-        vipOrder.setPayAmount(userVipInfoVo.getPrice());
-        vipOrder.setVipTypeName(userVipInfoVo.getVipTypeName());
+        vipOrder.setVipName(userVipVo.getVipName());
+        vipOrder.setVipTypeName(userVipVo.getVipTypeName());
+        vipOrder.setPayAmount(userVipVo.getPrice());
+        vipOrder.setVipTypeName(userVipVo.getVipTypeName());
         vipOrder.setUserId(userId);
 //        vipOrder.setIsDelay("0");
         Date nowDate = new Date();
         vipOrder.setStartTime(nowDate);
-        EnumTimeUnit enumTimeUnitByUnit = EnumTimeUnit.getEnumTimeUnitByUnit(userVipInfoVo.getValidTimeUnit());
+        EnumTimeUnit enumTimeUnitByUnit = EnumTimeUnit.getEnumTimeUnitByUnit(userVipVo.getValidTimeUnit());
         //计算会员结束时间
-        vipOrder.setEndTime(DateUtils.getDateByType(enumTimeUnitByUnit,nowDate, userVipInfoVo.getValidTimeNum()));
+        vipOrder.setEndTime(DateUtils.getDateByType(enumTimeUnitByUnit,nowDate, userVipVo.getValidTimeNum()));
         //开通的天数
         vipOrder.setDays((int) DateUtil.betweenDay(vipOrder.getStartTime(), vipOrder.getEndTime(), true));
         vipOrder.setUserClientType(userClientType);

bnyer-services/bnyer-order/src/main/java/com/bnyer/order/vo/VipOrderDetailsVo.java

@@ -1,16 +0,0 @@
-package com.bnyer.order.vo;
-
-import lombok.Getter;
-import lombok.Setter;
-
-/**
- * @author :WXC
- * @Date :2023/03/27
- * @description :
- */
-@Getter
-@Setter
-public class VipOrderDetailsVo extends VipOrderVo{
-
-
-}

bnyer-services/bnyer-pay/src/main/java/com/bnyer/pay/bo/QueryOrderBo.java → bnyer-services/bnyer-pay/src/main/java/com/bnyer/pay/bean/bo/QueryOrderBo.java

@@ -1,4 +1,4 @@
-package com.bnyer.pay.bo;
+package com.bnyer.pay.bean.bo;
 
 import lombok.Getter;
 import lombok.NoArgsConstructor;

bnyer-services/bnyer-pay/src/main/java/com/bnyer/pay/bo/RefundBo.java → bnyer-services/bnyer-pay/src/main/java/com/bnyer/pay/bean/bo/RefundBo.java

@@ -1,4 +1,4 @@
-package com.bnyer.pay.bo;
+package com.bnyer.pay.bean.bo;
 
 import lombok.Getter;
 import lombok.NoArgsConstructor;

bnyer-services/bnyer-pay/src/main/java/com/bnyer/pay/bo/UnifiedOrderBo.java → bnyer-services/bnyer-pay/src/main/java/com/bnyer/pay/bean/bo/UnifiedOrderBo.java

@@ -1,4 +1,4 @@
-package com.bnyer.pay.bo;
+package com.bnyer.pay.bean.bo;
 
 import lombok.Getter;
 import lombok.NoArgsConstructor;

bnyer-services/bnyer-pay/src/main/java/com/bnyer/pay/dto/AddPayInfoDto.java → bnyer-services/bnyer-pay/src/main/java/com/bnyer/pay/bean/dto/AddPayInfoDto.java

@@ -1,4 +1,4 @@
-package com.bnyer.pay.dto;
+package com.bnyer.pay.bean.dto;
 
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.bnyer.common.core.domain.PayInfo;

bnyer-services/bnyer-pay/src/main/java/com/bnyer/pay/dto/EditPayInfoNotifyDto.java → bnyer-services/bnyer-pay/src/main/java/com/bnyer/pay/bean/dto/EditPayInfoNotifyDto.java

@@ -1,4 +1,4 @@
-package com.bnyer.pay.dto;
+package com.bnyer.pay.bean.dto;
 
 import lombok.AllArgsConstructor;
 import lombok.Getter;

bnyer-services/bnyer-pay/src/main/java/com/bnyer/pay/dto/EditPayInfoSingleDto.java → bnyer-services/bnyer-pay/src/main/java/com/bnyer/pay/bean/dto/EditPayInfoSingleDto.java

@@ -1,4 +1,4 @@
-package com.bnyer.pay.dto;
+package com.bnyer.pay.bean.dto;
 
 import lombok.Getter;
 import lombok.NoArgsConstructor;

bnyer-services/bnyer-pay/src/main/java/com/bnyer/pay/dto/PayNotifyCheckDto.java → bnyer-services/bnyer-pay/src/main/java/com/bnyer/pay/bean/dto/PayNotifyCheckDto.java

@@ -1,4 +1,4 @@
-package com.bnyer.pay.dto;
+package com.bnyer.pay.bean.dto;
 
 import com.bnyer.common.core.enums.EnumPayType;
 import lombok.Getter;

bnyer-services/bnyer-pay/src/main/java/com/bnyer/pay/dto/QueryOrderDto.java → bnyer-services/bnyer-pay/src/main/java/com/bnyer/pay/bean/dto/QueryOrderDto.java

@@ -1,4 +1,4 @@
-package com.bnyer.pay.dto;
+package com.bnyer.pay.bean.dto;
 
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Getter;

bnyer-services/bnyer-pay/src/main/java/com/bnyer/pay/dto/RefundDto.java → bnyer-services/bnyer-pay/src/main/java/com/bnyer/pay/bean/dto/RefundDto.java

@@ -1,4 +1,4 @@
-package com.bnyer.pay.dto;
+package com.bnyer.pay.bean.dto;
 
 import lombok.Getter;
 import lombok.NoArgsConstructor;

bnyer-services/bnyer-pay/src/main/java/com/bnyer/pay/dto/UnifiedOrderDto.java → bnyer-services/bnyer-pay/src/main/java/com/bnyer/pay/bean/dto/UnifiedOrderDto.java

@@ -1,4 +1,4 @@
-package com.bnyer.pay.dto;
+package com.bnyer.pay.bean.dto;
 
 import com.bnyer.common.core.annotation.CustomParamsValidation;
 import io.swagger.annotations.ApiModelProperty;

bnyer-services/bnyer-pay/src/main/java/com/bnyer/pay/vo/PayInfoDetailsVo.java → bnyer-services/bnyer-pay/src/main/java/com/bnyer/pay/bean/vo/PayInfoDetailsVo.java

@@ -1,4 +1,4 @@
-package com.bnyer.pay.vo;
+package com.bnyer.pay.bean.vo;
 
 import lombok.Getter;
 import lombok.NoArgsConstructor;

bnyer-services/bnyer-pay/src/main/java/com/bnyer/pay/vo/PayInfoVo.java → bnyer-services/bnyer-pay/src/main/java/com/bnyer/pay/bean/vo/PayInfoVo.java

@@ -1,4 +1,4 @@
-package com.bnyer.pay.vo;
+package com.bnyer.pay.bean.vo;
 
 import io.swagger.annotations.ApiModelProperty;
 import lombok.AllArgsConstructor;

bnyer-services/bnyer-pay/src/main/java/com/bnyer/pay/vo/QueryOrderVo.java → bnyer-services/bnyer-pay/src/main/java/com/bnyer/pay/bean/vo/QueryOrderVo.java

@@ -1,4 +1,4 @@
-package com.bnyer.pay.vo;
+package com.bnyer.pay.bean.vo;
 
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Getter;

bnyer-services/bnyer-pay/src/main/java/com/bnyer/pay/vo/ThirdQueryOrderVo.java → bnyer-services/bnyer-pay/src/main/java/com/bnyer/pay/bean/vo/ThirdQueryOrderVo.java

@@ -1,4 +1,4 @@
-package com.bnyer.pay.vo;
+package com.bnyer.pay.bean.vo;
 
 import lombok.Getter;
 import lombok.NoArgsConstructor;

bnyer-services/bnyer-pay/src/main/java/com/bnyer/pay/vo/ThirdRefundVo.java → bnyer-services/bnyer-pay/src/main/java/com/bnyer/pay/bean/vo/ThirdRefundVo.java

@@ -1,4 +1,4 @@
-package com.bnyer.pay.vo;
+package com.bnyer.pay.bean.vo;
 
 /**
  * @author :WXC

bnyer-services/bnyer-pay/src/main/java/com/bnyer/pay/vo/ThirdUnifiedOrderVo.java → bnyer-services/bnyer-pay/src/main/java/com/bnyer/pay/bean/vo/ThirdUnifiedOrderVo.java

@@ -1,4 +1,4 @@
-package com.bnyer.pay.vo;
+package com.bnyer.pay.bean.vo;
 
 import io.swagger.annotations.ApiModelProperty;
 import lombok.*;

bnyer-services/bnyer-pay/src/main/java/com/bnyer/pay/vo/UnifiedOrderVo.java → bnyer-services/bnyer-pay/src/main/java/com/bnyer/pay/bean/vo/UnifiedOrderVo.java

@@ -1,4 +1,4 @@
-package com.bnyer.pay.vo;
+package com.bnyer.pay.bean.vo;
 
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;

bnyer-services/bnyer-pay/src/main/java/com/bnyer/pay/controller/UnifiedPayController.java

@@ -1,11 +1,11 @@
 package com.bnyer.pay.controller;
 
 import com.bnyer.common.core.domain.R;
-import com.bnyer.pay.dto.UnifiedOrderDto;
-import com.bnyer.pay.dto.QueryOrderDto;
+import com.bnyer.pay.bean.dto.UnifiedOrderDto;
+import com.bnyer.pay.bean.dto.QueryOrderDto;
 import com.bnyer.pay.service.UnifiedPayService;
-import com.bnyer.pay.vo.UnifiedOrderVo;
-import com.bnyer.pay.vo.QueryOrderVo;
+import com.bnyer.pay.bean.vo.UnifiedOrderVo;
+import com.bnyer.pay.bean.vo.QueryOrderVo;
 import io.swagger.annotations.Api;
 import io.swagger.v3.oas.annotations.Operation;
 import lombok.extern.slf4j.Slf4j;

bnyer-services/bnyer-pay/src/main/java/com/bnyer/pay/design/strategy/AbstractPayStrategy.java

@@ -6,9 +6,9 @@ import com.alipay.api.msg.MsgConstants;
 import com.bnyer.common.core.constant.RedisKeyConstant;
 import com.bnyer.common.core.enums.EnumPayType;
 import com.bnyer.common.redis.service.RedissonService;
-import com.bnyer.pay.dto.PayNotifyCheckDto;
+import com.bnyer.pay.bean.dto.PayNotifyCheckDto;
 import com.bnyer.pay.service.PayInfoService;
-import com.bnyer.pay.vo.PayInfoDetailsVo;
+import com.bnyer.pay.bean.vo.PayInfoDetailsVo;
 import com.github.binarywang.wxpay.bean.notify.WxPayNotifyV3Response;
 import lombok.extern.slf4j.Slf4j;
 import org.redisson.api.RLock;

bnyer-services/bnyer-pay/src/main/java/com/bnyer/pay/design/strategy/AliPayStrategy.java

@@ -21,18 +21,18 @@ import com.bnyer.common.core.enums.ResponseEnum;
 import com.bnyer.common.core.exception.ServiceException;
 import com.bnyer.common.core.utils.DateUtils;
 import com.bnyer.common.core.utils.StringUtils;
-import com.bnyer.pay.bo.QueryOrderBo;
-import com.bnyer.pay.bo.RefundBo;
-import com.bnyer.pay.bo.UnifiedOrderBo;
+import com.bnyer.pay.bean.bo.QueryOrderBo;
+import com.bnyer.pay.bean.bo.RefundBo;
+import com.bnyer.pay.bean.bo.UnifiedOrderBo;
 import com.bnyer.pay.constant.AliPayConstant;
-import com.bnyer.pay.dto.EditPayInfoNotifyDto;
-import com.bnyer.pay.dto.PayNotifyCheckDto;
+import com.bnyer.pay.bean.dto.EditPayInfoNotifyDto;
+import com.bnyer.pay.bean.dto.PayNotifyCheckDto;
 import com.bnyer.pay.enums.EnumPayChannel;
 import com.bnyer.pay.manager.AliPayManager;
 import com.bnyer.pay.service.PayInfoService;
-import com.bnyer.pay.vo.ThirdRefundVo;
-import com.bnyer.pay.vo.ThirdUnifiedOrderVo;
-import com.bnyer.pay.vo.ThirdQueryOrderVo;
+import com.bnyer.pay.bean.vo.ThirdRefundVo;
+import com.bnyer.pay.bean.vo.ThirdUnifiedOrderVo;
+import com.bnyer.pay.bean.vo.ThirdQueryOrderVo;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;

bnyer-services/bnyer-pay/src/main/java/com/bnyer/pay/design/strategy/DYPayStrategy.java

@@ -10,12 +10,12 @@ import com.bnyer.common.core.enums.EnumPayType;
 import com.bnyer.common.core.enums.ResponseEnum;
 import com.bnyer.common.core.exception.ServiceException;
 import com.bnyer.common.core.utils.StringUtils;
-import com.bnyer.pay.bo.QueryOrderBo;
-import com.bnyer.pay.bo.RefundBo;
-import com.bnyer.pay.bo.UnifiedOrderBo;
+import com.bnyer.pay.bean.bo.QueryOrderBo;
+import com.bnyer.pay.bean.bo.RefundBo;
+import com.bnyer.pay.bean.bo.UnifiedOrderBo;
 import com.bnyer.pay.constant.DYPayConstants;
-import com.bnyer.pay.dto.EditPayInfoNotifyDto;
-import com.bnyer.pay.dto.PayNotifyCheckDto;
+import com.bnyer.pay.bean.dto.EditPayInfoNotifyDto;
+import com.bnyer.pay.bean.dto.PayNotifyCheckDto;
 import com.bnyer.pay.enums.EnumPayChannel;
 import com.bnyer.pay.enums.EnumPayConfigStatus;
 import com.bnyer.pay.mapper.DypayConfigMapper;
@@ -23,9 +23,9 @@ import com.bnyer.pay.service.PayInfoService;
 import com.bnyer.pay.utils.DYPayUtil;
 import com.bnyer.pay.utils.MoneyUtil;
 import com.bnyer.pay.utils.PayRestTemplateUtil;
-import com.bnyer.pay.vo.ThirdRefundVo;
-import com.bnyer.pay.vo.ThirdUnifiedOrderVo;
-import com.bnyer.pay.vo.ThirdQueryOrderVo;
+import com.bnyer.pay.bean.vo.ThirdRefundVo;
+import com.bnyer.pay.bean.vo.ThirdUnifiedOrderVo;
+import com.bnyer.pay.bean.vo.ThirdQueryOrderVo;
 import com.github.binarywang.wxpay.bean.request.BaseWxPayRequest;
 import com.github.binarywang.wxpay.bean.result.BaseWxPayResult;
 import lombok.extern.slf4j.Slf4j;

bnyer-services/bnyer-pay/src/main/java/com/bnyer/pay/design/strategy/IPayStrategy.java

@@ -1,11 +1,11 @@
 package com.bnyer.pay.design.strategy;
 
-import com.bnyer.pay.bo.QueryOrderBo;
-import com.bnyer.pay.bo.RefundBo;
-import com.bnyer.pay.bo.UnifiedOrderBo;
-import com.bnyer.pay.vo.ThirdRefundVo;
-import com.bnyer.pay.vo.ThirdUnifiedOrderVo;
-import com.bnyer.pay.vo.ThirdQueryOrderVo;
+import com.bnyer.pay.bean.bo.QueryOrderBo;
+import com.bnyer.pay.bean.bo.RefundBo;
+import com.bnyer.pay.bean.bo.UnifiedOrderBo;
+import com.bnyer.pay.bean.vo.ThirdRefundVo;
+import com.bnyer.pay.bean.vo.ThirdUnifiedOrderVo;
+import com.bnyer.pay.bean.vo.ThirdQueryOrderVo;
 
 /**
  * @author :WXC

bnyer-services/bnyer-pay/src/main/java/com/bnyer/pay/design/strategy/KSPayStrategy.java

@@ -6,18 +6,17 @@ import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.alibaba.fastjson.serializer.SerializerFeature;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.bnyer.common.core.context.SecurityContextHolder;
 import com.bnyer.common.core.domain.KspayConfig;
 import com.bnyer.common.core.enums.EnumPayType;
 import com.bnyer.common.core.enums.ResponseEnum;
 import com.bnyer.common.core.exception.ServiceException;
 import com.bnyer.common.core.utils.StringUtils;
-import com.bnyer.pay.bo.QueryOrderBo;
-import com.bnyer.pay.bo.RefundBo;
-import com.bnyer.pay.bo.UnifiedOrderBo;
+import com.bnyer.pay.bean.bo.QueryOrderBo;
+import com.bnyer.pay.bean.bo.RefundBo;
+import com.bnyer.pay.bean.bo.UnifiedOrderBo;
 import com.bnyer.pay.constant.KSPayConstants;
-import com.bnyer.pay.dto.EditPayInfoNotifyDto;
-import com.bnyer.pay.dto.PayNotifyCheckDto;
+import com.bnyer.pay.bean.dto.EditPayInfoNotifyDto;
+import com.bnyer.pay.bean.dto.PayNotifyCheckDto;
 import com.bnyer.pay.enums.EnumPayChannel;
 import com.bnyer.pay.enums.EnumPayConfigStatus;
 import com.bnyer.pay.mapper.KspayConfigMapper;
@@ -25,9 +24,9 @@ import com.bnyer.pay.service.PayInfoService;
 import com.bnyer.pay.utils.KSPayUtil;
 import com.bnyer.pay.utils.MoneyUtil;
 import com.bnyer.pay.utils.PayRestTemplateUtil;
-import com.bnyer.pay.vo.ThirdRefundVo;
-import com.bnyer.pay.vo.ThirdUnifiedOrderVo;
-import com.bnyer.pay.vo.ThirdQueryOrderVo;
+import com.bnyer.pay.bean.vo.ThirdRefundVo;
+import com.bnyer.pay.bean.vo.ThirdUnifiedOrderVo;
+import com.bnyer.pay.bean.vo.ThirdQueryOrderVo;
 import com.github.binarywang.wxpay.bean.request.BaseWxPayRequest;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.codec.digest.DigestUtils;

bnyer-services/bnyer-pay/src/main/java/com/bnyer/pay/design/strategy/WxPayStrategy.java

@@ -1,26 +1,25 @@
 package com.bnyer.pay.design.strategy;
 
 import com.alibaba.fastjson.JSON;
-import com.bnyer.common.core.context.SecurityContextHolder;
 import com.bnyer.common.core.domain.WxpayConfig;
 import com.bnyer.common.core.enums.EnumPayType;
 import com.bnyer.common.core.enums.ResponseEnum;
 import com.bnyer.common.core.exception.ServiceException;
 import com.bnyer.common.core.utils.StringUtils;
-import com.bnyer.pay.bo.QueryOrderBo;
-import com.bnyer.pay.bo.RefundBo;
-import com.bnyer.pay.bo.UnifiedOrderBo;
-import com.bnyer.pay.dto.EditPayInfoNotifyDto;
-import com.bnyer.pay.dto.PayNotifyCheckDto;
+import com.bnyer.pay.bean.bo.QueryOrderBo;
+import com.bnyer.pay.bean.bo.RefundBo;
+import com.bnyer.pay.bean.bo.UnifiedOrderBo;
+import com.bnyer.pay.bean.dto.EditPayInfoNotifyDto;
+import com.bnyer.pay.bean.dto.PayNotifyCheckDto;
 import com.bnyer.pay.enums.EnumPayChannel;
 import com.bnyer.pay.enums.EnumTradeType;
 import com.bnyer.pay.enums.EnumWxPayStatus;
 import com.bnyer.pay.manager.WxPayManager;
 import com.bnyer.pay.service.PayInfoService;
 import com.bnyer.pay.utils.WXPayUtil;
-import com.bnyer.pay.vo.ThirdRefundVo;
-import com.bnyer.pay.vo.ThirdUnifiedOrderVo;
-import com.bnyer.pay.vo.ThirdQueryOrderVo;
+import com.bnyer.pay.bean.vo.ThirdRefundVo;
+import com.bnyer.pay.bean.vo.ThirdUnifiedOrderVo;
+import com.bnyer.pay.bean.vo.ThirdQueryOrderVo;
 import com.github.binarywang.wxpay.bean.notify.WxPayNotifyResponse;
 import com.github.binarywang.wxpay.bean.notify.WxPayOrderNotifyV3Result;
 import com.github.binarywang.wxpay.bean.request.BaseWxPayRequest;

bnyer-services/bnyer-pay/src/main/java/com/bnyer/pay/mapper/PayInfoMapper.java

@@ -2,9 +2,8 @@ package com.bnyer.pay.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.bnyer.common.core.domain.PayInfo;
-import com.bnyer.pay.dto.EditPayInfoSingleDto;
+import com.bnyer.pay.bean.dto.EditPayInfoSingleDto;
 import org.apache.ibatis.annotations.Mapper;
-import org.apache.ibatis.annotations.Param;
 
 /**
  * @author :WXC

bnyer-services/bnyer-pay/src/main/java/com/bnyer/pay/service/PayInfoService.java

@@ -2,9 +2,9 @@ package com.bnyer.pay.service;
 
 import com.bnyer.common.core.domain.PayInfo;
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.bnyer.pay.dto.AddPayInfoDto;
-import com.bnyer.pay.dto.EditPayInfoNotifyDto;
-import com.bnyer.pay.vo.PayInfoDetailsVo;
+import com.bnyer.pay.bean.dto.AddPayInfoDto;
+import com.bnyer.pay.bean.dto.EditPayInfoNotifyDto;
+import com.bnyer.pay.bean.vo.PayInfoDetailsVo;
 
 /**
  * @author :WXC

bnyer-services/bnyer-pay/src/main/java/com/bnyer/pay/service/UnifiedPayService.java

@@ -1,9 +1,9 @@
 package com.bnyer.pay.service;
 
-import com.bnyer.pay.dto.UnifiedOrderDto;
-import com.bnyer.pay.dto.QueryOrderDto;
-import com.bnyer.pay.vo.UnifiedOrderVo;
-import com.bnyer.pay.vo.QueryOrderVo;
+import com.bnyer.pay.bean.dto.UnifiedOrderDto;
+import com.bnyer.pay.bean.dto.QueryOrderDto;
+import com.bnyer.pay.bean.vo.UnifiedOrderVo;
+import com.bnyer.pay.bean.vo.QueryOrderVo;
 
 import javax.servlet.http.HttpServletRequest;
 

bnyer-services/bnyer-pay/src/main/java/com/bnyer/pay/service/impl/PayInfoServiceImpl.java

@@ -10,12 +10,12 @@ import com.bnyer.common.core.enums.ResponseEnum;
 import com.bnyer.common.core.exception.ServiceException;
 import com.bnyer.common.core.utils.bean.EntityConvertUtil;
 import com.bnyer.common.rocketmq.config.RocketMqConstant;
-import com.bnyer.pay.dto.AddPayInfoDto;
-import com.bnyer.pay.dto.EditPayInfoNotifyDto;
-import com.bnyer.pay.dto.EditPayInfoSingleDto;
+import com.bnyer.pay.bean.dto.AddPayInfoDto;
+import com.bnyer.pay.bean.dto.EditPayInfoNotifyDto;
+import com.bnyer.pay.bean.dto.EditPayInfoSingleDto;
 import com.bnyer.pay.mapper.PayInfoMapper;
 import com.bnyer.pay.service.PayInfoService;
-import com.bnyer.pay.vo.PayInfoDetailsVo;
+import com.bnyer.pay.bean.vo.PayInfoDetailsVo;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.rocketmq.client.producer.SendStatus;
 import org.apache.rocketmq.spring.core.RocketMQTemplate;
@@ -24,7 +24,6 @@ import org.springframework.messaging.support.GenericMessage;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
-import java.util.Date;
 import java.util.Objects;
 
 /**

bnyer-services/bnyer-pay/src/main/java/com/bnyer/pay/service/impl/UnifiedPayServiceImpl.java

@@ -8,24 +8,24 @@ import com.bnyer.common.core.utils.bean.EntityConvertUtil;
 import com.bnyer.common.core.utils.ip.IpUtils;
 import com.bnyer.common.core.vo.UserInfoVo;
 import com.bnyer.common.security.utils.SecurityUtils;
-import com.bnyer.order.api.query.VipOrderQuery;
+import com.bnyer.order.api.query.VipOrderExtQuery;
 import com.bnyer.order.api.remote.RemoteVipOrderService;
 import com.bnyer.order.api.vo.VipOrderVo;
-import com.bnyer.pay.bo.QueryOrderBo;
-import com.bnyer.pay.bo.UnifiedOrderBo;
+import com.bnyer.pay.bean.bo.QueryOrderBo;
+import com.bnyer.pay.bean.bo.UnifiedOrderBo;
+import com.bnyer.pay.bean.dto.AddPayInfoDto;
+import com.bnyer.pay.bean.dto.QueryOrderDto;
+import com.bnyer.pay.bean.dto.UnifiedOrderDto;
+import com.bnyer.pay.bean.vo.*;
 import com.bnyer.pay.constant.KSPayConstants;
 import com.bnyer.pay.design.factory.PayFactory;
 import com.bnyer.pay.design.strategy.IPayStrategy;
-import com.bnyer.pay.dto.AddPayInfoDto;
-import com.bnyer.pay.dto.QueryOrderDto;
-import com.bnyer.pay.dto.UnifiedOrderDto;
 import com.bnyer.pay.enums.EnumAliPayStatus;
 import com.bnyer.pay.enums.EnumDyPayStatus;
 import com.bnyer.pay.enums.EnumKsPayStatus;
 import com.bnyer.pay.enums.EnumWxPayStatus;
 import com.bnyer.pay.service.PayInfoService;
 import com.bnyer.pay.service.UnifiedPayService;
-import com.bnyer.pay.vo.*;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -33,7 +33,6 @@ import org.springframework.stereotype.Service;
 import javax.servlet.http.HttpServletRequest;
 import java.math.BigDecimal;
 import java.util.Date;
-import java.util.List;
 import java.util.Objects;
 
 /**
@@ -71,14 +70,14 @@ public class UnifiedPayServiceImpl implements UnifiedPayService {
         switch (enumSceneCode){
             //会员充值场景
             case VIP_RECHARGE:
-                VipOrderQuery vipOrderQuery = new VipOrderQuery();
-                vipOrderQuery.setOrderNo(dto.getOrderNo());
+                VipOrderExtQuery vipOrderExtQuery = new VipOrderExtQuery();
+                vipOrderExtQuery.setOrderNo(dto.getOrderNo());
                 //查询会员业务订单信息
-                R<List<VipOrderVo>> vipOrderVoListR = remoteVipOrderService.queryVipOrderList(vipOrderQuery);
-                if (!vipOrderVoListR.isSuccess()){
-                    throw new ServiceException(vipOrderVoListR.getMsg());
+                R<VipOrderVo> vipOrderR = remoteVipOrderService.queryVipOrder(vipOrderExtQuery);
+                if (!vipOrderR.isSuccess()){
+                    throw new ServiceException(vipOrderR.getMsg());
                 }
-                VipOrderVo vipOrderVo = vipOrderVoListR.getData().get(0);
+                VipOrderVo vipOrderVo = vipOrderR.getData();
                 payAmount =  vipOrderVo.getPayAmount().toString();
                 goodsType = KSPayConstants.GOODS_TYPE_VIP;
                 payId = OrderUtil.getOrderNo("RV",new Date(), EnumUserClientType.getCodeByType(vipOrderVo.getUserClientType())