From e1f5ba620ad2f0b3f62c1faa45ad65a854a3c79a Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期三, 05 六月 2024 20:04:52 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/dto/AppMiniLoginDTO.java | 4
ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/feignClient/MemberClient.java | 3
ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/dto/AuctionSalesroomGoodsInfoDTO.java | 2
ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/dto/MemberAuctionSalesroomWdDTO.java | 2
ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/vo/OrderReturnVO.java | 59 +++++++
ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/controller/inner/MemberAddressController.java | 8 -
ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/feignClient/AuctionClient.java | 5
ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/dto/CouponMemberDTO.java | 2
ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/dto/ForepartAuctionVideo.java | 2
ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/service/impl/AuctionSalesroomServiceImpl.java | 124 ++++++++++-----
ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/factory/MemberFallbackFactory.java | 5
ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/dto/AuctionSalesroomGoodsDTO.java | 2
ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/controller/forepart/ForepartMemberAddressController.java | 12
ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/dto/SaveSignUpNowDTO.java | 2
ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/dto/PromotionWishListDTO.java | 4
ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/controller/forepart/ForepartMemberController.java | 12
ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/IOrderReturnRequestService.java | 3
ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/dto/OrderUpdDTO.java | 2
ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/dto/MemberOrderDTO.java | 2
ruoyi-auth/src/main/java/com/ruoyi/auth/controller/TokenController.java | 2
ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/forepart/ForepartOrderReturnRequestController.java | 8 +
ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/dto/MemberAuctionSalesroomDTO.java | 2
ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/dto/MemberAuctionSalesroomBondDTO.java | 2
ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/service/impl/MemberPointsServiceImpl.java | 2
ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/service/TokenService.java | 32 ++++
ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/dto/AuctionCollectionDTO.java | 2
ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/dto/BidDTO.java | 2
ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/service/IMemberPointsService.java | 2
ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/dto/AuctionGoodsListPageDTO.java | 2
ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/dto/AuctionGoodsListDTO.java | 2
ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/dto/OrderAuctionBondDTO.java | 2
ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/PaylogServiceImpl.java | 4
ruoyi-modules/ruoyi-promotion/src/main/java/com/ruoyi/promotion/controller/forepart/FrepartPromotionWishListController.java | 2
ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/SysUser.java | 4
ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/dto/MemberAddressDTO.java | 4
ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/service/impl/MemberAddressServiceImpl.java | 2
ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/dto/OrderReturnDTO.java | 2
ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/service/IMemberService.java | 3
ruoyi-modules/ruoyi-promotion/src/main/java/com/ruoyi/promotion/service/IPromotionWishListService.java | 2
ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/Order.java | 5
ruoyi-modules/ruoyi-promotion/src/main/java/com/ruoyi/promotion/service/impl/PromotionWishListServiceImpl.java | 2
ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/dto/ForepartAuctionBidRecordDTO.java | 2
ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/dto/PayInfoDTO.java | 2
ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/OrderReturnRequestServiceImpl.java | 33 +++
ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/dto/MemberDTO.java | 4
ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/service/IMemberAddressService.java | 3
ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/dto/AppMiniRegisterDTO.java | 2
ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/controller/forepart/ForepartMemberPointsController.java | 2
ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/dto/OrderDTO.java | 2
ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/factory/AuctionFallbackFactory.java | 7
ruoyi-auth/src/main/java/com/ruoyi/auth/service/SysLoginService.java | 6
ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/dto/BondDTO.java | 2
ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/Member.java | 9 +
ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/dto/MemberOrderListDTO.java | 2
ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/OrderServiceImpl.java | 20 ++
ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/dto/HomeGoodsSkuDTO.java | 2
ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/service/impl/MemberServiceImpl.java | 20 +-
57 files changed, 359 insertions(+), 104 deletions(-)
diff --git a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/Member.java b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/Member.java
index 6b6a29e..14da973 100644
--- a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/Member.java
+++ b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/Member.java
@@ -14,7 +14,7 @@
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
-
+import com.fasterxml.jackson.annotation.JsonInclude;
/**
* <p>
* 会员表
@@ -43,24 +43,30 @@
private String avatar;
@ApiModelProperty(value = "会员姓名")
+ @JsonInclude(JsonInclude.Include.ALWAYS)
private String realName;
@ApiModelProperty(value = "身份证号")
private String idNumber;
@ApiModelProperty(value = "联系电话")
+ @JsonInclude(JsonInclude.Include.ALWAYS)
private String phone;
@ApiModelProperty(value = "性别 0=女,1=男,2=未知")
+ @JsonInclude(JsonInclude.Include.ALWAYS)
private GenderEnum gender;
@ApiModelProperty(value = "等级")
+ @JsonInclude(JsonInclude.Include.ALWAYS)
private Integer level;
@ApiModelProperty(value = "会员积分")
+ @JsonInclude(JsonInclude.Include.ALWAYS)
private Integer totalPoints;
@ApiModelProperty(value = "已用积分")
+ @JsonInclude(JsonInclude.Include.ALWAYS)
private Integer usedPoints;
@ApiModelProperty(value = "微信openid")
@@ -96,6 +102,7 @@
private Integer delFlag;
@ApiModelProperty(value = "1未认证，2已认证")
+ @JsonInclude(JsonInclude.Include.ALWAYS)
private Integer isAuthentication;
@ApiModelProperty(value = "后台对应id")
diff --git a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/Order.java b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/Order.java
index 39f14d3..d0abc5a 100644
--- a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/Order.java
+++ b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/Order.java
@@ -61,7 +61,7 @@
@ApiModelProperty(value = "支付合计")
private BigDecimal totalAmount;
- @ApiModelProperty(value = "订单状态 1=待支付 2=待发货 3=待收货 4=已完成 5=已取消")
+ @ApiModelProperty(value = "订单状态 1=待支付 2=待发货 3=待收货 4=已完成 5=已取消,6 售后")
private OrderStatusEnum orderStatus;
@ApiModelProperty(value = "支付时间")
@@ -144,5 +144,8 @@
@ApiModelProperty(value = "商品价格")
private BigDecimal price;
+ @ApiModelProperty(value = "积分")
+ private Integer points;
+
}
diff --git a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/SysUser.java b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/SysUser.java
index a208157..9119408 100644
--- a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/SysUser.java
+++ b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/SysUser.java
@@ -66,10 +66,6 @@
/** 用户头像 */
private String avatar;
/** 密码 */
-
- private String userType;
-
- /** 密码 */
@NotBlank(message = "密码不能为空")
private String password;
diff --git a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/dto/AppMiniLoginDTO.java b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/dto/AppMiniLoginDTO.java
index c1e4e7e..cf8b99a 100644
--- a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/dto/AppMiniLoginDTO.java
+++ b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/dto/AppMiniLoginDTO.java
@@ -1,5 +1,8 @@
package com.ruoyi.system.api.domain.dto;
+import com.alibaba.fastjson2.JSON;
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.core.JsonToken;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -13,6 +16,7 @@
//支付宝微信的
@ApiModelProperty(value = "支付宝的auth_code")
+ @JsonInclude(JsonInclude.Include.NON_NULL)
private String auth_code;
@ApiModelProperty("1支付宝 ， 2微信")
diff --git a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/dto/AppMiniRegisterDTO.java b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/dto/AppMiniRegisterDTO.java
index 9c8b80c..c259d04 100644
--- a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/dto/AppMiniRegisterDTO.java
+++ b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/dto/AppMiniRegisterDTO.java
@@ -1,9 +1,11 @@
package com.ruoyi.system.api.domain.dto;
+import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@Data
+@ApiModel(value = "用户登录数据传输对象", description = "用户登录数据传输对象")
public class AppMiniRegisterDTO {
@ApiModelProperty(value = "openid")
private String miniOpenid;
diff --git a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/dto/AuctionCollectionDTO.java b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/dto/AuctionCollectionDTO.java
index 7479e28..e5d1577 100644
--- a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/dto/AuctionCollectionDTO.java
+++ b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/dto/AuctionCollectionDTO.java
@@ -1,10 +1,12 @@
package com.ruoyi.system.api.domain.dto;
import com.ruoyi.common.core.web.page.BasePage;
+import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@Data
+@ApiModel(value = "商品收藏数据传输对象", description = "商品收藏数据传输对象")
public class AuctionCollectionDTO extends BasePage {
@ApiModelProperty(value = "商品id")
private Long goodsSkuId;
diff --git a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/dto/AuctionGoodsListDTO.java b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/dto/AuctionGoodsListDTO.java
index 7919076..245893f 100644
--- a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/dto/AuctionGoodsListDTO.java
+++ b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/dto/AuctionGoodsListDTO.java
@@ -1,10 +1,12 @@
package com.ruoyi.system.api.domain.dto;
import com.ruoyi.common.core.web.page.BasePage;
+import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@Data
+@ApiModel(value = "拍卖普通商品数据传输对象", description = "拍卖普通商品数据传输对象")
public class AuctionGoodsListDTO extends BasePage {
@ApiModelProperty(value = "商品id")
private Long goodsSkuId;
diff --git a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/dto/AuctionGoodsListPageDTO.java b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/dto/AuctionGoodsListPageDTO.java
index 72d321d..2f00761 100644
--- a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/dto/AuctionGoodsListPageDTO.java
+++ b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/dto/AuctionGoodsListPageDTO.java
@@ -1,11 +1,13 @@
package com.ruoyi.system.api.domain.dto;
+import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.util.Set;
@Data
+@ApiModel(value = "拍卖普通商品集合数据传输对象", description = "拍卖普通商品集合数据传输对象")
public class AuctionGoodsListPageDTO {
private Set<Long> goodsSkuIdList ;
diff --git a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/dto/AuctionSalesroomGoodsDTO.java b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/dto/AuctionSalesroomGoodsDTO.java
index a1dfc91..a67b94f 100644
--- a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/dto/AuctionSalesroomGoodsDTO.java
+++ b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/dto/AuctionSalesroomGoodsDTO.java
@@ -1,10 +1,12 @@
package com.ruoyi.system.api.domain.dto;
import com.ruoyi.common.core.web.page.BasePage;
+import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@Data
+@ApiModel(value = "拍卖商品数据传输对象", description = "拍卖商品数据传输对象")
public class AuctionSalesroomGoodsDTO extends BasePage {
@ApiModelProperty(value = "拍卖场id")
private Long auctionSalesroomId;
diff --git a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/dto/AuctionSalesroomGoodsInfoDTO.java b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/dto/AuctionSalesroomGoodsInfoDTO.java
index 90b3830..caa92c2 100644
--- a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/dto/AuctionSalesroomGoodsInfoDTO.java
+++ b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/dto/AuctionSalesroomGoodsInfoDTO.java
@@ -1,9 +1,11 @@
package com.ruoyi.system.api.domain.dto;
+import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@Data
+@ApiModel(value = "拍卖商品详情数据传输对象", description = "拍卖商品详情数据传输对象")
public class AuctionSalesroomGoodsInfoDTO {
@ApiModelProperty(value = "拍卖会id")
diff --git a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/dto/BidDTO.java b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/dto/BidDTO.java
index c6a5816..2ce4eb7 100644
--- a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/dto/BidDTO.java
+++ b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/dto/BidDTO.java
@@ -1,5 +1,6 @@
package com.ruoyi.system.api.domain.dto;
+import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -7,6 +8,7 @@
import java.time.LocalDateTime;
@Data
+@ApiModel(value = "拍卖出价数据传输对象", description = "拍卖出价数据传输对象")
public class BidDTO {
@ApiModelProperty(value = "目标商品id（普通拍品id 或 拍卖会拍品id）")
private Long targetId;
diff --git a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/dto/BondDTO.java b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/dto/BondDTO.java
index 85ae528..7090582 100644
--- a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/dto/BondDTO.java
+++ b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/dto/BondDTO.java
@@ -1,9 +1,11 @@
package com.ruoyi.system.api.domain.dto;
+import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@Data
+@ApiModel(value = "订单编号传输对象", description = "订单编号传输对象")
public class BondDTO {
@ApiModelProperty(value = "订单编号")
private String orderNO;
diff --git a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/dto/CouponMemberDTO.java b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/dto/CouponMemberDTO.java
index 2201d07..6d3d586 100644
--- a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/dto/CouponMemberDTO.java
+++ b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/dto/CouponMemberDTO.java
@@ -1,10 +1,12 @@
package com.ruoyi.system.api.domain.dto;
import com.ruoyi.common.core.web.page.BasePage;
+import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@Data
+@ApiModel(value = "优惠卷对象", description = "优惠卷对象")
public class CouponMemberDTO extends BasePage {
@ApiModelProperty(value = "优惠卷id")
diff --git a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/dto/ForepartAuctionBidRecordDTO.java b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/dto/ForepartAuctionBidRecordDTO.java
index 5e4b93b..e5f0e7a 100644
--- a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/dto/ForepartAuctionBidRecordDTO.java
+++ b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/dto/ForepartAuctionBidRecordDTO.java
@@ -1,11 +1,13 @@
package com.ruoyi.system.api.domain.dto;
+import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import javax.validation.constraints.NotNull;
@Data
+@ApiModel(value = "拍卖场扫码对象", description = "拍卖场扫码对象")
public class ForepartAuctionBidRecordDTO {
@ApiModelProperty("拍卖场编号")
diff --git a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/dto/ForepartAuctionVideo.java b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/dto/ForepartAuctionVideo.java
index 0b8ebdd..a62043a 100644
--- a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/dto/ForepartAuctionVideo.java
+++ b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/dto/ForepartAuctionVideo.java
@@ -1,10 +1,12 @@
package com.ruoyi.system.api.domain.dto;
import com.ruoyi.common.core.web.page.BasePage;
+import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@Data
+@ApiModel(value = "拍卖场视频对象", description = "拍卖场视频对象")
public class ForepartAuctionVideo extends BasePage {
@ApiModelProperty(value = "视频id")
private Long promotionVideoId;
diff --git a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/dto/HomeGoodsSkuDTO.java b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/dto/HomeGoodsSkuDTO.java
index 884419f..e58fc5e 100644
--- a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/dto/HomeGoodsSkuDTO.java
+++ b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/dto/HomeGoodsSkuDTO.java
@@ -1,10 +1,12 @@
package com.ruoyi.system.api.domain.dto;
import com.ruoyi.common.core.web.page.BasePage;
+import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@Data
+@ApiModel(value = "首页商品传输对象", description = "首页商品传输对象")
public class HomeGoodsSkuDTO extends BasePage {
@ApiModelProperty(value = "商品名称")
diff --git a/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/dto/MemberAddressDTO.java b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/dto/MemberAddressDTO.java
similarity index 84%
rename from ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/dto/MemberAddressDTO.java
rename to ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/dto/MemberAddressDTO.java
index cc90814..c16ae60 100644
--- a/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/dto/MemberAddressDTO.java
+++ b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/dto/MemberAddressDTO.java
@@ -1,11 +1,13 @@
-package com.ruoyi.member.dto;
+package com.ruoyi.system.api.domain.dto;
import com.baomidou.mybatisplus.annotation.TableLogic;
import com.ruoyi.common.core.web.page.BasePage;
+import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@Data
+@ApiModel(value = "地址数据传输对象", description = "地址数据数据传输对象")
public class MemberAddressDTO extends BasePage {
@ApiModelProperty(value = "地址id")
diff --git a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/dto/MemberAuctionSalesroomBondDTO.java b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/dto/MemberAuctionSalesroomBondDTO.java
index b1db13a..bf5a14c 100644
--- a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/dto/MemberAuctionSalesroomBondDTO.java
+++ b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/dto/MemberAuctionSalesroomBondDTO.java
@@ -2,10 +2,12 @@
import com.ruoyi.common.core.enums.AuctionOrderTypeEnum;
import com.ruoyi.common.core.enums.PaymentMethodEnum;
+import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@Data
+@ApiModel(value = "保证金传输对象", description = "保证金传输对象")
public class MemberAuctionSalesroomBondDTO {
@ApiModelProperty(value = "会员id")
private Long memberId;
diff --git a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/dto/MemberAuctionSalesroomDTO.java b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/dto/MemberAuctionSalesroomDTO.java
index 5dcf7b2..c73d58e 100644
--- a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/dto/MemberAuctionSalesroomDTO.java
+++ b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/dto/MemberAuctionSalesroomDTO.java
@@ -1,10 +1,12 @@
package com.ruoyi.system.api.domain.dto;
import com.ruoyi.common.core.web.page.BasePage;
+import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@Data
+@ApiModel(value = "拍卖会传输对象", description = "拍卖会传输对象")
public class MemberAuctionSalesroomDTO extends BasePage {
@ApiModelProperty(value = "会员id")
private Long memberId;
diff --git a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/dto/MemberAuctionSalesroomWdDTO.java b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/dto/MemberAuctionSalesroomWdDTO.java
index d3ca12c..e26d9be 100644
--- a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/dto/MemberAuctionSalesroomWdDTO.java
+++ b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/dto/MemberAuctionSalesroomWdDTO.java
@@ -1,12 +1,14 @@
package com.ruoyi.system.api.domain.dto;
import com.ruoyi.common.core.enums.AuctionStartStatusEnum;
+import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.util.Set;
@Data
+@ApiModel(value = "拍卖会我的里面筛选条件传输对象", description = "拍卖会我的里面筛选条件传输对象")
public class MemberAuctionSalesroomWdDTO {
@ApiModelProperty(value = "会员id")
private Long memberId;
diff --git a/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/dto/MemberDTO.java b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/dto/MemberDTO.java
similarity index 83%
rename from ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/dto/MemberDTO.java
rename to ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/dto/MemberDTO.java
index 28f8802..c0acd90 100644
--- a/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/dto/MemberDTO.java
+++ b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/dto/MemberDTO.java
@@ -1,11 +1,13 @@
-package com.ruoyi.member.dto;
+package com.ruoyi.system.api.domain.dto;
import com.ruoyi.common.core.enums.GenderEnum;
import com.ruoyi.common.core.web.page.BasePage;
+import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@Data
+@ApiModel(value = "用户信息数据传输对象", description = "用户信息数据传输对象")
public class MemberDTO extends BasePage {
@ApiModelProperty(value = "会员id")
private Long memberid;
diff --git a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/dto/MemberOrderDTO.java b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/dto/MemberOrderDTO.java
index ecaf8fd..8be38a9 100644
--- a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/dto/MemberOrderDTO.java
+++ b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/dto/MemberOrderDTO.java
@@ -3,12 +3,14 @@
import com.ruoyi.common.core.enums.OrderFromEnum;
import com.ruoyi.common.core.enums.OrderStatusEnum;
import com.ruoyi.common.core.enums.PaymentMethodEnum;
+import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.math.BigDecimal;
@Data
+@ApiModel(value = "用户订单详情传输对象", description = "用户订单详情传输对象")
public class MemberOrderDTO {
@ApiModelProperty("订单id")
private Long id;
diff --git a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/dto/MemberOrderListDTO.java b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/dto/MemberOrderListDTO.java
index 3bba2ec..6721370 100644
--- a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/dto/MemberOrderListDTO.java
+++ b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/dto/MemberOrderListDTO.java
@@ -2,10 +2,12 @@
import com.ruoyi.common.core.enums.OrderStatusEnum;
import com.ruoyi.common.core.web.page.BasePage;
+import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@Data
+@ApiModel(value = "用户订单传输对象", description = "用户订单传输对象")
public class MemberOrderListDTO extends BasePage {
@ApiModelProperty("订单id")
private Long id;
diff --git a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/dto/OrderAuctionBondDTO.java b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/dto/OrderAuctionBondDTO.java
index c81596e..af8d875 100644
--- a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/dto/OrderAuctionBondDTO.java
+++ b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/dto/OrderAuctionBondDTO.java
@@ -1,11 +1,13 @@
package com.ruoyi.system.api.domain.dto;
+import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.util.List;
@Data
+@ApiModel(value = "拍卖会获奖传输对象", description = "拍卖会获奖传输对象")
public class OrderAuctionBondDTO {
@ApiModelProperty(value = "拍卖会id")
private Long auctionSalesroomId;
diff --git a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/dto/OrderDTO.java b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/dto/OrderDTO.java
index 27698e9..c80bfcf 100644
--- a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/dto/OrderDTO.java
+++ b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/dto/OrderDTO.java
@@ -2,6 +2,7 @@
import com.ruoyi.common.core.enums.AuctionOrderTypeEnum;
import com.ruoyi.common.core.enums.OrderFromEnum;
+import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -9,6 +10,7 @@
import java.time.LocalDateTime;
@Data
+@ApiModel(value = "订单传输对象", description = "订单传输对象")
public class OrderDTO {
private static final long serialVersionUID = 1L;
diff --git a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/dto/OrderReturnDTO.java b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/dto/OrderReturnDTO.java
index 1e67a86..9a6cc07 100644
--- a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/dto/OrderReturnDTO.java
+++ b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/dto/OrderReturnDTO.java
@@ -1,6 +1,7 @@
package com.ruoyi.system.api.domain.dto;
import com.ruoyi.common.core.enums.RequestTypeEnum;
+import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import org.springframework.web.multipart.MultipartFile;
@@ -8,6 +9,7 @@
import java.time.LocalDateTime;
@Data
+@ApiModel(value = "售后订单传输对象", description = "售后订单传输对象")
public class OrderReturnDTO {
@ApiModelProperty(value = "数据id")
private Integer id;
diff --git a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/dto/OrderUpdDTO.java b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/dto/OrderUpdDTO.java
index 6920211..821e97f 100644
--- a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/dto/OrderUpdDTO.java
+++ b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/dto/OrderUpdDTO.java
@@ -4,6 +4,7 @@
import com.ruoyi.common.core.enums.OrderFromEnum;
import com.ruoyi.common.core.enums.OrderStatusEnum;
import com.ruoyi.common.core.enums.PaymentMethodEnum;
+import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import java.io.Serializable;
import java.math.BigDecimal;
@@ -15,6 +16,7 @@
* @date 2024/5/29
*/
@Data
+@ApiModel(value = "用户下单传输对象", description = "用户下单传输对象")
public class OrderUpdDTO implements Serializable {
private static final long serialVersionUID = -437243191517275308L;
diff --git a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/dto/PayInfoDTO.java b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/dto/PayInfoDTO.java
index 24f75be..6fb95d8 100644
--- a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/dto/PayInfoDTO.java
+++ b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/dto/PayInfoDTO.java
@@ -1,9 +1,11 @@
package com.ruoyi.system.api.domain.dto;
+import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@Data
+@ApiModel(value = "用户订单支付传输对象", description = "用户订单支付传输对象")
public class PayInfoDTO {
@ApiModelProperty(value = "会员id")
diff --git a/ruoyi-modules/ruoyi-promotion/src/main/java/com/ruoyi/promotion/controller/forepart/dto/PromotionWishListDTO.java b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/dto/PromotionWishListDTO.java
similarity index 83%
rename from ruoyi-modules/ruoyi-promotion/src/main/java/com/ruoyi/promotion/controller/forepart/dto/PromotionWishListDTO.java
rename to ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/dto/PromotionWishListDTO.java
index d6678a3..9c46e1c 100644
--- a/ruoyi-modules/ruoyi-promotion/src/main/java/com/ruoyi/promotion/controller/forepart/dto/PromotionWishListDTO.java
+++ b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/dto/PromotionWishListDTO.java
@@ -1,8 +1,9 @@
-package com.ruoyi.promotion.controller.forepart.dto;
+package com.ruoyi.system.api.domain.dto;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.ruoyi.common.core.web.page.BasePage;
+import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import org.springframework.web.multipart.MultipartFile;
@@ -10,6 +11,7 @@
import java.math.BigDecimal;
@Data
+@ApiModel(value = "心愿求购传输对象", description = "心愿求购传输对象")
public class PromotionWishListDTO extends BasePage {
@ApiModelProperty(value = "心愿求购id")
@TableId(value = "id", type = IdType.ASSIGN_ID)
diff --git a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/dto/SaveSignUpNowDTO.java b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/dto/SaveSignUpNowDTO.java
index 8e4f802..1fc2f37 100644
--- a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/dto/SaveSignUpNowDTO.java
+++ b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/dto/SaveSignUpNowDTO.java
@@ -1,9 +1,11 @@
package com.ruoyi.system.api.domain.dto;
+import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@Data
+@ApiModel(value = "用户拍卖会传输对象", description = "用户拍卖会传输对象")
public class SaveSignUpNowDTO {
@ApiModelProperty(value = "拍卖会id")
diff --git a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/vo/OrderReturnVO.java b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/vo/OrderReturnVO.java
new file mode 100644
index 0000000..46965a2
--- /dev/null
+++ b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/vo/OrderReturnVO.java
@@ -0,0 +1,59 @@
+package com.ruoyi.system.api.domain.vo;
+
+import com.baomidou.mybatisplus.annotation.*;
+import com.ruoyi.common.core.enums.AuditStatusEnum;
+import com.ruoyi.common.core.enums.RequestTypeEnum;
+import com.ruoyi.common.core.enums.ReturnRequestStatusEnum;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.time.LocalDateTime;
+
+@Data
+public class OrderReturnVO {
+
+ @ApiModelProperty(value = "售后id")
+ @TableId(value = "id", type = IdType.ASSIGN_ID)
+ private Long id;
+
+ @ApiModelProperty(value = "订单id")
+ private Long orderId;
+
+ @ApiModelProperty(value = "申请时间")
+ private LocalDateTime requestTime;
+
+ @ApiModelProperty(value = "售后类型 1=退款 2=退款退货")
+ private RequestTypeEnum requestType;
+
+ @ApiModelProperty(value = "申请原因")
+ private String requestReason;
+
+ @ApiModelProperty(value = "售后状态 1=待审核 2=待退货 3=待平台收货 4=已完成 5=已拒绝")
+ private ReturnRequestStatusEnum status;
+
+ @ApiModelProperty(value = "拒绝理由")
+ private String refuseReason;
+
+ @ApiModelProperty(value = "删除标志（0代表存在 1代表删除）")
+ @TableLogic
+ private Integer delFlag;
+
+ @ApiModelProperty(value = "详情图，不超过五张图片")
+ private String album;
+
+ @ApiModelProperty(value = "收件人姓名")
+ private String recipientName;
+
+ @ApiModelProperty(value = "收件人电话")
+ private String recipientPhone;
+
+ @ApiModelProperty(value = "详细地址")
+ private String detailedAddress;
+
+ @ApiModelProperty(value = "备注")
+ private String remark;
+
+ @ApiModelProperty(value = "快递单号")
+ private String courierNumber;
+
+}
diff --git a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/factory/AuctionFallbackFactory.java b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/factory/AuctionFallbackFactory.java
index 6b0bdfb..753530d 100644
--- a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/factory/AuctionFallbackFactory.java
+++ b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/factory/AuctionFallbackFactory.java
@@ -1,8 +1,10 @@
package com.ruoyi.system.api.factory;
import com.ruoyi.common.core.domain.R;
+import com.ruoyi.system.api.domain.AppMiniLoginVO;
import com.ruoyi.system.api.domain.AuctionGoods;
import com.ruoyi.system.api.domain.AuctionSalesroom;
+import com.ruoyi.system.api.domain.dto.AppMiniLoginDTO;
import com.ruoyi.system.api.feignClient.AuctionClient;
import org.springframework.cloud.openfeign.FallbackFactory;
@@ -35,6 +37,11 @@
public R<?> startAuctionGoods(Long id, String source) {
return R.fail("开始普通拍卖商品失败" + cause.getMessage());
}
+
+ @Override
+ public R<AppMiniLoginVO> actionMiniLogin(AppMiniLoginDTO appMiniLoginDto) {
+ return R.fail("登录失败" + cause.getMessage());
+ }
};
}
}
diff --git a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/factory/MemberFallbackFactory.java b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/factory/MemberFallbackFactory.java
index 8e4f588..3480afa 100644
--- a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/factory/MemberFallbackFactory.java
+++ b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/factory/MemberFallbackFactory.java
@@ -43,11 +43,6 @@
}
@Override
- public R<AppMiniLoginVO> actionMiniLogin(AppMiniLoginDTO appMiniLoginDto) {
- return R.fail("拍卖师登录用户失败:" + cause.getMessage());
- }
-
- @Override
public R<AppMiniLoginVO> miniRegister(AppMiniRegisterDTO appUserRegisterDto) {
return R.fail("注册用户失败:" + cause.getMessage());
}
diff --git a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/feignClient/AuctionClient.java b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/feignClient/AuctionClient.java
index 2ff5881..a4219cc 100644
--- a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/feignClient/AuctionClient.java
+++ b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/feignClient/AuctionClient.java
@@ -3,8 +3,10 @@
import com.ruoyi.common.core.constant.SecurityConstants;
import com.ruoyi.common.core.constant.ServiceNameConstants;
import com.ruoyi.common.core.domain.R;
+import com.ruoyi.system.api.domain.AppMiniLoginVO;
import com.ruoyi.system.api.domain.AuctionGoods;
import com.ruoyi.system.api.domain.AuctionSalesroom;
+import com.ruoyi.system.api.domain.dto.AppMiniLoginDTO;
import com.ruoyi.system.api.factory.AuctionFallbackFactory;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.web.bind.annotation.PathVariable;
@@ -30,4 +32,7 @@
@PutMapping("/auction-goods/start/{id}")
R<?> startAuctionGoods(@PathVariable("id") Long id,
@RequestHeader(SecurityConstants.FROM_SOURCE) String source);
+
+ @PostMapping("/forepart/auction-salesroom/actionMiniLogin")
+ R<AppMiniLoginVO> actionMiniLogin(@RequestBody AppMiniLoginDTO appMiniLoginDto);
}
diff --git a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/feignClient/MemberClient.java b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/feignClient/MemberClient.java
index 82ddda7..f87af09 100644
--- a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/feignClient/MemberClient.java
+++ b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/feignClient/MemberClient.java
@@ -35,8 +35,7 @@
@PostMapping("/forepart/member/miniLogin")
public R<AppMiniLoginVO> miniLogin(@RequestBody AppMiniLoginDTO appMiniLoginDto);
- @PostMapping("/forepart/auction-salesroom/actionMiniLogin")
- public R<AppMiniLoginVO> actionMiniLogin(@RequestBody AppMiniLoginDTO appMiniLoginDto);
+
@PostMapping("/forepart/member/miniRegister")
diff --git a/ruoyi-auth/src/main/java/com/ruoyi/auth/controller/TokenController.java b/ruoyi-auth/src/main/java/com/ruoyi/auth/controller/TokenController.java
index 0a44c6f..27c269e 100644
--- a/ruoyi-auth/src/main/java/com/ruoyi/auth/controller/TokenController.java
+++ b/ruoyi-auth/src/main/java/com/ruoyi/auth/controller/TokenController.java
@@ -88,7 +88,7 @@
// 小程序用户登录
AppMiniLoginVO appMiniLoginVo = sysLoginService.actionMiniLogin(appMiniLoginDto);
// 获取登录token
- return R.ok(tokenService.createMiniToken(appMiniLoginVo));
+ return R.ok(tokenService.createMiniToken1(appMiniLoginVo));
}
diff --git a/ruoyi-auth/src/main/java/com/ruoyi/auth/service/SysLoginService.java b/ruoyi-auth/src/main/java/com/ruoyi/auth/service/SysLoginService.java
index 0c77097..011989d 100644
--- a/ruoyi-auth/src/main/java/com/ruoyi/auth/service/SysLoginService.java
+++ b/ruoyi-auth/src/main/java/com/ruoyi/auth/service/SysLoginService.java
@@ -17,6 +17,7 @@
import com.ruoyi.system.api.domain.SysUser;
import com.ruoyi.system.api.domain.dto.AppMiniLoginDTO;
import com.ruoyi.system.api.domain.dto.AppMiniRegisterDTO;
+import com.ruoyi.system.api.feignClient.AuctionClient;
import com.ruoyi.system.api.feignClient.MemberClient;
import com.ruoyi.system.api.model.LoginUser;
import org.springframework.beans.factory.annotation.Autowired;
@@ -46,6 +47,9 @@
@Resource
private MemberClient MemberClient;
+
+ @Resource
+ private AuctionClient uctionClient;
/**
* 登录
@@ -182,7 +186,7 @@
public AppMiniLoginVO actionMiniLogin(AppMiniLoginDTO appMiniLoginDto)
{
// 查询用户信息
- R<AppMiniLoginVO> userResult = MemberClient.actionMiniLogin(appMiniLoginDto);
+ R<AppMiniLoginVO> userResult = uctionClient.actionMiniLogin(appMiniLoginDto);
if (R.FAIL == userResult.getCode())
{
throw new ServiceException(userResult.getMsg());
diff --git a/ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/service/TokenService.java b/ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/service/TokenService.java
index 0351a6b..19d9c4e 100644
--- a/ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/service/TokenService.java
+++ b/ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/service/TokenService.java
@@ -100,6 +100,38 @@
rspMap.put("mini_openid", appMiniLoginVo.getMiniOpenid());
rspMap.put("zfb_userid", appMiniLoginVo.getZfbuserid());
rspMap.put("phone",appMiniLoginVo.getPhone());
+ rspMap.put("memberid",appMiniLoginVo.getMemberid().toString());
+ return rspMap;
+ }
+
+ public Map<String, Object> createMiniToken1(AppMiniLoginVO appMiniLoginVo)
+ {
+ LoginUser loginUser = new LoginUser();
+ // Jwt存储信息
+ Map<String, Object> claimsMap = new HashMap<String, Object>();
+ // 接口返回信息
+ Map<String, Object> rspMap = new HashMap<String, Object>();
+ //用户为空只返回openid
+ rspMap.put("mobile","");
+ rspMap.put("access_token", "");
+ if(appMiniLoginVo.getSysUser()!=null){
+ loginUser.setSysUser(appMiniLoginVo.getSysUser());
+ String token = IdUtils.fastUUID();
+ Long userId = loginUser.getSysUser().getUserId();
+ String userName = loginUser.getSysUser().getUserName();
+ loginUser.setToken(token);
+ loginUser.setUserid(userId);
+ loginUser.setUsername(userName);
+ loginUser.setIpaddr(IpUtils.getIpAddr());
+ refreshToken(loginUser);
+ claimsMap.put(SecurityConstants.USER_KEY, token);
+ claimsMap.put(SecurityConstants.DETAILS_USER_ID, userId);
+ claimsMap.put(SecurityConstants.DETAILS_USERNAME, userName);
+ claimsMap.put(SecurityConstants.LOGIN_FROM, Constants.FROM_MINI_APP);
+ rspMap.put("access_token", JwtUtils.createToken(claimsMap));
+ rspMap.put("expires_in", EXPIRE_TIME);
+ }
+ rspMap.put("phone",appMiniLoginVo.getPhone());
return rspMap;
}
diff --git a/ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/service/impl/AuctionSalesroomServiceImpl.java b/ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/service/impl/AuctionSalesroomServiceImpl.java
index 79ebed2..b1379ab 100644
--- a/ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/service/impl/AuctionSalesroomServiceImpl.java
+++ b/ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/service/impl/AuctionSalesroomServiceImpl.java
@@ -2,10 +2,15 @@
import cn.binarywang.wx.miniapp.api.WxMaService;
import cn.binarywang.wx.miniapp.bean.WxMaJscode2SessionResult;
+import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
+import com.alibaba.fastjson.TypeReference;
+import com.alibaba.fastjson.parser.Feature;
import com.alipay.api.AlipayApiException;
import com.alipay.api.AlipayClient;
import com.alipay.api.DefaultAlipayClient;
+import com.alipay.api.internal.util.AlipayEncrypt;
+import com.alipay.api.internal.util.AlipaySignature;
import com.alipay.api.request.AlipaySystemOauthTokenRequest;
import com.alipay.api.request.AlipayUserInfoShareRequest;
import com.alipay.api.response.AlipaySystemOauthTokenResponse;
@@ -237,10 +242,6 @@
throw new ServiceException("密码输入错误");
}
- if (!sysUser.getUserType().equals("2")){
- throw new ServiceException("该人员不是拍卖师");
- }
-
LambdaQueryWrapper<AuctionSalesroom> wrapper=Wrappers.lambdaQuery();
wrapper.eq(AuctionSalesroom::getAuctionSalesroomNo,arepartAuctionBidRecordDTO.getAuctionSalesroomQrcode());
wrapper.eq(AuctionSalesroom::getDelFlag,0);
@@ -250,12 +251,11 @@
@Override
public AppMiniLoginVO actionMiniLogin(AppMiniLoginDTO appMiniLoginDto) {
- try {
AppMiniLoginVO appMiniLoginVo = new AppMiniLoginVO();
- if (appMiniLoginDto.getType()==1){
- if (appMiniLoginDto.getAuth_code()== null || appMiniLoginDto.getAuth_code().length() == 0) {
+ if (appMiniLoginDto.getType()==1) {
+ if (appMiniLoginDto.getAuth_code() == null || appMiniLoginDto.getAuth_code().length() == 0) {
} else {
- AppMiniLoginVO user=new AppMiniLoginVO();
+ /* AppMiniLoginVO user=new AppMiniLoginVO();
//String serverUrl, String appId, String privateKey, String format,String charset, String alipayPublicKey, String signType
//实例化客户端 参数：正式环境URL,Appid,商户私钥 PKCS8格式,字符编码格式,字符格式,支付宝公钥,签名方式
AlipayClient alipayClient = new DefaultAlipayClient(ALIPAY_BORDER_PROD,APP_ID_PROD, APP_PRIVATE_KEY, "json", "GBK", ALIPAY_PUBLIC_KEY, "RSA2");
@@ -272,7 +272,6 @@
throw new RuntimeException(e);
}
//刷新令牌，上次换取访问令牌时得到。见出参的refresh_token字段
- request.setRefreshToken(response.getAccessToken());
//返回成功时 就将唯一标识返回
if (response.isSuccess()) {
@@ -280,37 +279,92 @@
//我这里只返回了一个字段给前端用
String user1= response.getOpenId();
appMiniLoginVo.setZfbuserid(response.getOpenId());
- AlipayUserInfoShareResponse alipayUserInfoShareResponse=getAliUserInfo(response.getAccessToken());
- appMiniLoginVo.setPhone(alipayUserInfoShareResponse.getPhone());
+ AlipayUserInfoShareResponse alipayUserInfoShareResponse= null;
+ try {
+ AlipayUserInfoShareRequest request1 = new AlipayUserInfoShareRequest();
+ AlipayUserInfoShareResponse response1 = alipayClient.execute(request1, response.getAccessToken());
+ appMiniLoginVo.setPhone(response1.getPhone());
+ } catch (Exception e) {
+ throw new RuntimeException(e);
+ }
+
R<SysUser> sysUserR = sysUserClient.queryUserByPhone(alipayUserInfoShareResponse.getPhone());
SysUser data = sysUserR.getData();
appMiniLoginVo.setSysUser(data);
}
+ }*/
+
+
+ String response = JSON.parseObject(appMiniLoginDto.getAuth_code()).getString("response");
+
+ //1. 获取验签和解密所需要的参数
+ Map<String, String> openapiResult = JSON.parseObject(appMiniLoginDto.getAuth_code(),
+ new TypeReference<Map<String, String>>() {
+ }, Feature.OrderedField);
+ String signType = "RSA2";
+ String charset = "UTF-8";
+ String encryptType = "AES";
+ String sign = openapiResult.get("sign");
+ String content = openapiResult.get("response");
+
+ //如果密文的
+ boolean isDataEncrypted = !content.startsWith("{");
+ boolean signCheckPass = false;
+
+ //2. 验签
+ String signContent = content;
+
+ //如果是加密的报文则需要在密文的前后添加双引号
+ if (isDataEncrypted) {
+ signContent = "\"" + signContent + "\"";
+ }
+ try {
+ signCheckPass = AlipaySignature.rsaCheck(signContent, sign, ALIPAY_PUBLIC_KEY, charset, signType);
+ } catch (AlipayApiException e) {
+ //验签异常, 日志
+ }
+ if (!signCheckPass) {
+ //验签不通过（异常或者报文被篡改），终止流程（不需要做解密）
+ }
+
+ //3. 解密
+ String plainData = null;
+ if (isDataEncrypted) {
+ try {
+ plainData = AlipayEncrypt.decryptContent(content, encryptType, "VSpPcLQjLSoTz6Yd7KNoyQ==", charset);
+ } catch (AlipayApiException e) {
+ //解密异常, 记录日志
+ e.getMessage();
+ }
+ } else {
+ plainData = content;
+ }
+
}
}else{
- WxMaJscode2SessionResult session = null;
- String unionid;
- String openid;
- String sessionKey = null;
- //获取session
- session = wxMaService.getUserService().getSessionInfo(appMiniLoginDto.getCode());
- if (session != null && StringUtils.isNotBlank(session.getOpenid())) {
- unionid = session.getUnionid();
- openid = session.getOpenid();
- sessionKey = session.getSessionKey();
- String responseAccessToken = getAccessTokenByWX();
+ String responseAccessToken = null;
+ try {
+ responseAccessToken = getAccessTokenByWX();
+ } catch (Exception e) {
+ throw new RuntimeException(e);
+ }
- JSONObject jsonAccessToken = JSONObject.parseObject(responseAccessToken);
+ JSONObject jsonAccessToken = JSONObject.parseObject(responseAccessToken);
String accessToken = jsonAccessToken.getString("access_token");
String errmsg = jsonAccessToken.getString("errmsg");
Long expiresIn = jsonAccessToken.getLong("expires_in");
if (StringUtils.isBlank(accessToken)) {
throw new ServiceException(errmsg);
}
- String responseUserPhoneNumber = getMobileByWX(accessToken, appMiniLoginDto.getCode());
- JSONObject jsonUserPhoneNumber = JSONObject.parseObject(responseUserPhoneNumber);
+ String responseUserPhoneNumber = null;
+ try {
+ responseUserPhoneNumber = getMobileByWX(accessToken, appMiniLoginDto.getCode());
+ } catch (Exception e) {
+ throw new RuntimeException(e);
+ }
+ JSONObject jsonUserPhoneNumber = JSONObject.parseObject(responseUserPhoneNumber);
String phoneInfo = jsonUserPhoneNumber.getString("phone_info");
@@ -320,33 +374,15 @@
R<SysUser> sysUserR = sysUserClient.queryUserByPhone(mobile);
SysUser data = sysUserR.getData();
appMiniLoginVo.setSysUser(data);
-
- appMiniLoginVo.setMiniOpenid(openid);
- appMiniLoginVo.setWxUnionid(unionid);
appMiniLoginVo.setPhone(mobile);
- appMiniLoginVo.setSessionKey(sessionKey);
- }
}
return appMiniLoginVo;
- } catch (Exception e) {
- e.printStackTrace();
- return null;
- }
+
}
- private AlipayUserInfoShareResponse getAliUserInfo (String accessToken) throws Exception {
- AlipayClient alipayClient = new DefaultAlipayClient(ALIPAY_BORDER_PROD,APP_ID_PROD, APP_PRIVATE_KEY, "json", "GBK", ALIPAY_PUBLIC_KEY, "RSA2");
- AlipayUserInfoShareRequest request = new AlipayUserInfoShareRequest();
- AlipayUserInfoShareResponse response = alipayClient.execute(request, accessToken);
- if(response.isSuccess()){
- System.out.println("获取会员信息 - 调用成功");
- return response;
- }
- return null;
- }
@Override
public PageDTO<MemberAuctionSalesroomVO> getMemberAuctionSalesroomList(MemberAuctionSalesroomDTO memberAuctionSalesroomDTO) {
diff --git a/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/controller/forepart/ForepartMemberAddressController.java b/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/controller/forepart/ForepartMemberAddressController.java
index 17fc2fe..f69db52 100644
--- a/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/controller/forepart/ForepartMemberAddressController.java
+++ b/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/controller/forepart/ForepartMemberAddressController.java
@@ -1,21 +1,19 @@
package com.ruoyi.member.controller.forepart;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.core.utils.page.PageDTO;
-import com.ruoyi.common.security.annotation.InnerAuth;
-import com.ruoyi.member.dto.MemberAddressDTO;
+
import com.ruoyi.member.domain.vo.RegionVo;
+import com.ruoyi.system.api.domain.dto.MemberAddressDTO;
import com.ruoyi.member.service.IMemberAddressService;
import com.ruoyi.member.service.IRegionService;
import com.ruoyi.system.api.domain.MemberAddress;
import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiModelProperty;
import io.swagger.annotations.ApiOperation;
import org.springframework.web.bind.annotation.*;
+import javax.annotation.Resource;
import java.util.List;
/**
@@ -35,10 +33,10 @@
*
*/
- @ApiModelProperty
+ @Resource
private IMemberAddressService iMemberAddressService;
- @ApiModelProperty
+ @Resource
private IRegionService IRegionService;
diff --git a/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/controller/forepart/ForepartMemberController.java b/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/controller/forepart/ForepartMemberController.java
index b06eb0a..db60520 100644
--- a/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/controller/forepart/ForepartMemberController.java
+++ b/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/controller/forepart/ForepartMemberController.java
@@ -2,8 +2,7 @@
import com.ruoyi.common.core.domain.R;
-import com.ruoyi.common.security.annotation.InnerAuth;
-import com.ruoyi.member.dto.MemberDTO;
+import com.ruoyi.system.api.domain.dto.MemberDTO;
import com.ruoyi.member.service.IMemberService;
import com.ruoyi.system.api.domain.AppMiniLoginVO;
import com.ruoyi.system.api.domain.Member;
@@ -17,7 +16,6 @@
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.ResponseBody;
import org.springframework.web.bind.annotation.RestController;
import org.springframework.web.multipart.MultipartFile;
import org.springframework.web.multipart.MultipartHttpServletRequest;
@@ -40,8 +38,12 @@
@PostMapping("/miniLogin")
@ApiOperation(value = "用户端-第三方登陸")
public R<AppMiniLoginVO> loginThird(@RequestBody AppMiniLoginDTO appMiniLoginDto) {
- return R.ok(iMemberService.loginThird(appMiniLoginDto));
- }
+ try {
+ return R.ok(iMemberService.loginThird(appMiniLoginDto));
+ } catch (Exception e) {
+ throw new RuntimeException(e);
+ }
+ }
@PostMapping(value = "/miniRegister")
@ApiOperation(value = "用户端-小程序注册")
diff --git a/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/controller/forepart/ForepartMemberPointsController.java b/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/controller/forepart/ForepartMemberPointsController.java
index 89e39d2..d112a18 100644
--- a/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/controller/forepart/ForepartMemberPointsController.java
+++ b/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/controller/forepart/ForepartMemberPointsController.java
@@ -4,7 +4,7 @@
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.core.utils.page.PageDTO;
import com.ruoyi.member.domain.MemberPoints;
-import com.ruoyi.member.dto.MemberDTO;
+import com.ruoyi.system.api.domain.dto.MemberDTO;
import com.ruoyi.member.service.IMemberPointsService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
diff --git a/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/controller/inner/MemberAddressController.java b/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/controller/inner/MemberAddressController.java
index 1501799..7b7bb86 100644
--- a/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/controller/inner/MemberAddressController.java
+++ b/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/controller/inner/MemberAddressController.java
@@ -4,19 +4,11 @@
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.ruoyi.common.core.domain.R;
-import com.ruoyi.common.core.utils.page.PageDTO;
import com.ruoyi.common.security.annotation.InnerAuth;
-import com.ruoyi.member.domain.vo.RegionVo;
-import com.ruoyi.member.dto.MemberAddressDTO;
import com.ruoyi.member.service.IMemberAddressService;
-import com.ruoyi.member.service.IRegionService;
import com.ruoyi.system.api.domain.MemberAddress;
-import io.swagger.annotations.Api;
import io.swagger.annotations.ApiModelProperty;
-import io.swagger.annotations.ApiOperation;
import org.springframework.web.bind.annotation.*;
-
-import java.util.List;
/**
* <p>
diff --git a/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/service/IMemberAddressService.java b/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/service/IMemberAddressService.java
index d63c3f5..788d1fb 100644
--- a/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/service/IMemberAddressService.java
+++ b/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/service/IMemberAddressService.java
@@ -1,10 +1,9 @@
package com.ruoyi.member.service;
import com.ruoyi.common.core.utils.page.PageDTO;
-import com.ruoyi.member.dto.MemberAddressDTO;
+import com.ruoyi.system.api.domain.dto.MemberAddressDTO;
import com.baomidou.mybatisplus.extension.service.IService;
import com.ruoyi.system.api.domain.MemberAddress;
-import org.springframework.web.bind.annotation.RequestBody;
/**
* <p>
diff --git a/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/service/IMemberPointsService.java b/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/service/IMemberPointsService.java
index 2fc1bf2..a0bd96a 100644
--- a/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/service/IMemberPointsService.java
+++ b/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/service/IMemberPointsService.java
@@ -3,7 +3,7 @@
import com.baomidou.mybatisplus.extension.service.IService;
import com.ruoyi.common.core.utils.page.PageDTO;
import com.ruoyi.member.domain.MemberPoints;
-import com.ruoyi.member.dto.MemberDTO;
+import com.ruoyi.system.api.domain.dto.MemberDTO;
/**
* <p>
diff --git a/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/service/IMemberService.java b/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/service/IMemberService.java
index 8f3240d..95e1160 100644
--- a/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/service/IMemberService.java
+++ b/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/service/IMemberService.java
@@ -5,6 +5,7 @@
import com.ruoyi.member.controller.management.dto.MgtMemberQuery;
import com.ruoyi.member.controller.management.vo.MgtMemberVO;
import com.ruoyi.member.dto.MemberDTO;
+import com.ruoyi.system.api.domain.dto.MemberDTO;
import com.ruoyi.system.api.domain.AppMiniLoginVO;
import com.ruoyi.system.api.domain.Member;
import com.ruoyi.system.api.domain.dto.AppMiniLoginDTO;
@@ -23,7 +24,7 @@
*/
public interface IMemberService extends IService<Member> {
- AppMiniLoginVO loginThird(AppMiniLoginDTO appMiniLoginDto);
+ AppMiniLoginVO loginThird(AppMiniLoginDTO appMiniLoginDto) throws Exception;
Member getMembeid(MemberDTO memberDTO);
diff --git a/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/service/impl/MemberAddressServiceImpl.java b/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/service/impl/MemberAddressServiceImpl.java
index 05119dd..e85f6d4 100644
--- a/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/service/impl/MemberAddressServiceImpl.java
+++ b/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/service/impl/MemberAddressServiceImpl.java
@@ -4,7 +4,7 @@
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.common.core.utils.page.PageDTO;
-import com.ruoyi.member.dto.MemberAddressDTO;
+import com.ruoyi.system.api.domain.dto.MemberAddressDTO;
import com.ruoyi.member.mapper.MemberAddressMapper;
import com.ruoyi.member.service.IMemberAddressService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
diff --git a/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/service/impl/MemberPointsServiceImpl.java b/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/service/impl/MemberPointsServiceImpl.java
index 2b8d732..841eec1 100644
--- a/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/service/impl/MemberPointsServiceImpl.java
+++ b/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/service/impl/MemberPointsServiceImpl.java
@@ -6,7 +6,7 @@
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.common.core.utils.page.PageDTO;
import com.ruoyi.member.domain.MemberPoints;
-import com.ruoyi.member.dto.MemberDTO;
+import com.ruoyi.system.api.domain.dto.MemberDTO;
import com.ruoyi.member.mapper.MemberPointsMapper;
import com.ruoyi.member.service.IMemberPointsService;
import org.springframework.stereotype.Service;
diff --git a/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/service/impl/MemberServiceImpl.java b/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/service/impl/MemberServiceImpl.java
index b0a943e..6bc6097 100644
--- a/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/service/impl/MemberServiceImpl.java
+++ b/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/service/impl/MemberServiceImpl.java
@@ -24,6 +24,7 @@
import com.ruoyi.member.controller.management.dto.MgtMemberQuery;
import com.ruoyi.member.controller.management.vo.MgtMemberVO;
import com.ruoyi.member.dto.MemberDTO;
+import com.ruoyi.system.api.domain.dto.MemberDTO;
import com.ruoyi.member.mapper.MemberMapper;
import com.ruoyi.member.service.IMemberService;
import com.ruoyi.member.util.HttpUtils;
@@ -120,7 +121,7 @@
@Override
- public AppMiniLoginVO loginThird(AppMiniLoginDTO appMiniLoginDto) {
+ public AppMiniLoginVO loginThird(AppMiniLoginDTO appMiniLoginDto) throws Exception {
AppMiniLoginVO appMiniLoginVo = new AppMiniLoginVO();
if(appMiniLoginDto.getType()==1){
@@ -144,6 +145,7 @@
}
//刷新令牌，上次换取访问令牌时得到。见出参的refresh_token字段
request.setRefreshToken(response.getAccessToken());
+
//返回成功时 就将唯一标识返回
if (response.isSuccess()) {
System.out.println("调用成功");
@@ -165,13 +167,16 @@
String memberId = IdUtils.simpleUUID();
sysUser = new SysUser();
sysUser.setUserName(memberId);
- sysUser.setUserType("03");
sysUser.setNickName("白金用户");
sysUser.setPhonenumber(response.getOpenId());
sysUser.setAvatar("https://hongruitang.oss-cn-beijing.aliyuncs.com/default.png");
String password = "123456";
sysUser.setPassword(SecurityUtils.encryptPassword(password));
sysUser = sysUserService.registerUser(sysUser).getData();
+
+ if (sysUser==null){
+ sysUser = sysUserService.getSysUser(member.getUserId()).getData();
+ }
member = new Member();
member.setUserId(sysUser.getUserId());
@@ -205,7 +210,7 @@
sessionKey = session.getSessionKey();
//获取用户
LambdaQueryWrapper<Member> wrapper= Wrappers.lambdaQuery();
- wrapper.eq(Member::getZfbOpenid,session.getOpenid());
+ wrapper.eq(Member::getMiniOpenid,session.getOpenid());
Member member=this.getOne(wrapper);
SysUser sysUser = null;
if (member != null) {
@@ -214,7 +219,7 @@
LambdaQueryWrapper<Member> wrapper1= Wrappers.lambdaQuery();
wrapper1.eq(Member::getMiniOpenid,openid);
- Member member1=this.getOne(wrapper);
+ Member member1=this.getOne(wrapper1);
if (member1==null){
@@ -222,13 +227,14 @@
String memberId = IdUtils.simpleUUID();
sysUser = new SysUser();
sysUser.setUserName(memberId);
- sysUser.setUserType("03");
sysUser.setNickName("白金用户");
- sysUser.setPhonenumber(openid);
sysUser.setAvatar("https://hongruitang.oss-cn-beijing.aliyuncs.com/default.png");
String password = "123456";
sysUser.setPassword(SecurityUtils.encryptPassword(password));
sysUser = sysUserService.registerUser(sysUser).getData();
+ if (sysUser==null){
+ sysUser = sysUserService.getSysUser(member.getUserId()).getData();
+ }
member = new Member();
@@ -378,7 +384,6 @@
String memberId = IdUtils.simpleUUID();
sysUser = new SysUser();
sysUser.setUserName(memberId);
- sysUser.setUserType("03");
sysUser.setNickName("白金用户");
sysUser.setPhonenumber(appMiniRegisterDTO.getMiniOpenid());
sysUser.setAvatar("https://hongruitang.oss-cn-beijing.aliyuncs.com/default.png");
@@ -417,7 +422,6 @@
String memberId = IdUtils.simpleUUID();
sysUser = new SysUser();
sysUser.setUserName(memberId);
- sysUser.setUserType("03");
sysUser.setNickName("白金用户");
sysUser.setPhonenumber(appMiniRegisterDTO.getMiniOpenid());
sysUser.setAvatar("https://hongruitang.oss-cn-beijing.aliyuncs.com/default.png");
diff --git a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/forepart/ForepartOrderReturnRequestController.java b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/forepart/ForepartOrderReturnRequestController.java
index ae56064..c838889 100644
--- a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/forepart/ForepartOrderReturnRequestController.java
+++ b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/forepart/ForepartOrderReturnRequestController.java
@@ -5,6 +5,7 @@
import com.ruoyi.order.service.IMemberInvoiceRiseService;
import com.ruoyi.order.service.IOrderReturnRequestService;
import com.ruoyi.system.api.domain.dto.OrderReturnDTO;
+import com.ruoyi.system.api.domain.vo.OrderReturnVO;
import io.swagger.annotations.ApiOperation;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
@@ -41,4 +42,11 @@
return R.ok();
}
+ @PostMapping("/OrderReturnRequestInfo")
+ @ApiOperation(value = "修改用户端-订单售后详情")
+ public R<OrderReturnVO> OrderReturnRequestInfo(@RequestBody OrderReturnDTO OrderReturnDTO) {
+ OrderReturnRequestService.OrderReturnRequestInfo(OrderReturnDTO);
+ return R.ok();
+ }
+
}
diff --git a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/IOrderReturnRequestService.java b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/IOrderReturnRequestService.java
index 297e5be..3fc115b 100644
--- a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/IOrderReturnRequestService.java
+++ b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/IOrderReturnRequestService.java
@@ -3,6 +3,7 @@
import com.baomidou.mybatisplus.extension.service.IService;
import com.ruoyi.order.domain.OrderReturnRequest;
import com.ruoyi.system.api.domain.dto.OrderReturnDTO;
+import com.ruoyi.system.api.domain.vo.OrderReturnVO;
import org.springframework.web.bind.annotation.RequestBody;
/**
@@ -18,5 +19,7 @@
void saveOrderReturnRequest(OrderReturnDTO OrderReturnDTO);
void updOrderReturnRequest(@RequestBody OrderReturnDTO OrderReturnDTO);
+ OrderReturnVO OrderReturnRequestInfo(@RequestBody OrderReturnDTO OrderReturnDTO);
+
}
diff --git a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/OrderReturnRequestServiceImpl.java b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/OrderReturnRequestServiceImpl.java
index 312fed7..8c661f5 100644
--- a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/OrderReturnRequestServiceImpl.java
+++ b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/OrderReturnRequestServiceImpl.java
@@ -1,13 +1,22 @@
package com.ruoyi.order.service.impl;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.common.core.enums.AuditStatusEnum;
+import com.ruoyi.common.core.enums.OrderStatusEnum;
import com.ruoyi.common.core.enums.ReturnRequestStatusEnum;
+import com.ruoyi.common.core.utils.page.BeanUtils;
import com.ruoyi.order.domain.OrderReturnRequest;
+import com.ruoyi.order.mapper.OrderMapper;
import com.ruoyi.order.mapper.OrderReturnRequestMapper;
import com.ruoyi.order.service.IOrderReturnRequestService;
import com.ruoyi.system.api.domain.CustomConfig;
+import com.ruoyi.system.api.domain.GoodsCategory;
+import com.ruoyi.system.api.domain.Member;
+import com.ruoyi.system.api.domain.Order;
import com.ruoyi.system.api.domain.dto.OrderReturnDTO;
+import com.ruoyi.system.api.domain.vo.OrderReturnVO;
import com.ruoyi.system.api.feignClient.SysUserClient;
import com.ruoyi.system.api.util.HuaWeiOBSUtil;
import org.springframework.stereotype.Service;
@@ -31,8 +40,16 @@
public class OrderReturnRequestServiceImpl extends ServiceImpl<OrderReturnRequestMapper, OrderReturnRequest> implements IOrderReturnRequestService {
@Resource
private SysUserClient sysUserClient;
+
+ @Resource
+ private OrderMapper orderMapper;
+
@Override
public void saveOrderReturnRequest(OrderReturnDTO OrderReturnDTO) {
+
+ Order order = orderMapper.selectById(OrderReturnDTO.getOrderId());
+ order.setOrderStatus(OrderStatusEnum.AFTER_SALE);
+ orderMapper.updateById(order);
OrderReturnRequest orderReturnRequest = new OrderReturnRequest();
orderReturnRequest.setOrderId(OrderReturnDTO.getOrderId());
orderReturnRequest.setRequestTime(LocalDateTime.now());
@@ -40,7 +57,6 @@
orderReturnRequest.setRequestReason(OrderReturnDTO.getRequestReason());
orderReturnRequest.setStatus(ReturnRequestStatusEnum.TO_BE_REVIEWED);
orderReturnRequest.setAuditStatus(AuditStatusEnum.TO_BE_REVIEWED);
-
List<String> urlList = new ArrayList<>();
if (OrderReturnDTO.getAlbum().length > 0) {
for (MultipartFile file : OrderReturnDTO.getAlbum()) {
@@ -55,11 +71,11 @@
}
CustomConfig returnAddressUserName = sysUserClient.getconfig("RETURN_ADDRESS_USER_NAME").getData();
- orderReturnRequest.setRecipientName(returnAddressUserName.getConfigName());
+ orderReturnRequest.setRecipientName(returnAddressUserName.getConfigValue());
CustomConfig returnAddressUserPhone = sysUserClient.getconfig("RETURN_ADDRESS_USER_PHONE").getData();
- orderReturnRequest.setRecipientPhone(returnAddressUserPhone.getConfigName());
+ orderReturnRequest.setRecipientPhone(returnAddressUserPhone.getConfigValue());
CustomConfig returnAddressUserAddress = sysUserClient.getconfig("RETURN_ADDRESS_USER_ADDRESS").getData();
- orderReturnRequest.setDetailedAddress(returnAddressUserAddress.getConfigName());
+ orderReturnRequest.setDetailedAddress(returnAddressUserAddress.getConfigValue());
this.save(orderReturnRequest);
}
@@ -70,4 +86,13 @@
byId.setCourierNumber(OrderReturnDTO.getCourierNumber());
this.updateById(byId);
}
+
+ @Override
+ public OrderReturnVO OrderReturnRequestInfo(OrderReturnDTO OrderReturnDTO) {
+ LambdaQueryWrapper<OrderReturnRequest> wrapper= Wrappers.lambdaQuery();
+ wrapper.eq(OrderReturnRequest::getOrderId,OrderReturnDTO.getOrderId());
+ OrderReturnRequest one = this.getOne(wrapper);
+ OrderReturnVO orderReturnVO = BeanUtils.copyBean(one, OrderReturnVO.class);
+ return orderReturnVO;
+ }
}
diff --git a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/OrderServiceImpl.java b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/OrderServiceImpl.java
index 1f65ef3..2e0c504 100644
--- a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/OrderServiceImpl.java
+++ b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/OrderServiceImpl.java
@@ -39,6 +39,7 @@
import com.ruoyi.system.api.feignClient.GoodsSkuClient;
import com.ruoyi.system.api.feignClient.MemberClient;
import com.ruoyi.system.api.feignClient.PromotionClient;
+import com.ruoyi.system.api.feignClient.SysUserClient;
import org.apache.commons.beanutils.BeanUtils;
import org.springframework.stereotype.Service;
@@ -70,6 +71,9 @@
@Resource
private PaylogServiceImpl paylogService;
+
+ @Resource
+ private SysUserClient sysUserClient;
@Override
@@ -273,6 +277,13 @@
order.setOrderTime(LocalDateTime.now());
order.setGoodsQuantity(memberOrderDTO.getGoodsQuantity());
order.setTotalAmount(pice.multiply(new BigDecimal(memberOrderDTO.getGoodsQuantity())));
+ CustomConfig memberPointsMoney = sysUserClient.getconfig("MEMBER_POINTS_MONEY").getData();
+ CustomConfig memberPointsPoints = sysUserClient.getconfig("MEMBER_POINTS_POINTS").getData();
+
+ BigDecimal pic=pice.multiply(new BigDecimal(memberOrderDTO.getGoodsQuantity()));
+ Double aDouble= Double.valueOf(memberPointsMoney.getConfigValue()) * Double.valueOf(memberPointsPoints.getConfigValue());
+ BigDecimal pi=pic.multiply(new BigDecimal(aDouble));
+ order.setPoints(pi.intValue());
order.setOrderStatus(OrderStatusEnum.TO_PLAY);
if (memberOrderDTO.getOrderFrom()==3){
@@ -434,6 +445,15 @@
promotionClient.updCouponMember(couponMemberDTO2, SecurityConstants.INNER);
order.setTotalAmount(pice);
+
+ CustomConfig memberPointsMoney = sysUserClient.getconfig("MEMBER_POINTS_MONEY").getData();
+ CustomConfig memberPointsPoints = sysUserClient.getconfig("MEMBER_POINTS_POINTS").getData();
+
+ BigDecimal pic=pice.multiply(new BigDecimal(memberOrderDTO.getGoodsQuantity()));
+ Double aDouble= Double.valueOf(memberPointsMoney.getConfigValue()) * Double.valueOf(memberPointsPoints.getConfigValue());
+ BigDecimal pi=pic.multiply(new BigDecimal(aDouble));
+ order.setPoints(pi.intValue());
+
}
baseMapper.updateById(order);
diff --git a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/PaylogServiceImpl.java b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/PaylogServiceImpl.java
index b1eaece..8f17f2f 100644
--- a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/PaylogServiceImpl.java
+++ b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/PaylogServiceImpl.java
@@ -3,6 +3,10 @@
import static com.ruoyi.order.util.tencent.WXPay.requestRefundService;
import static com.ruoyi.order.util.tencent.WXPay.requestUnifiedorderService;
+import com.alipay.api.AlipayClient;
+import com.alipay.api.DefaultAlipayClient;
+import com.alipay.api.request.AlipayTradeRefundRequest;
+import com.alipay.api.response.AlipayTradeRefundResponse;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
diff --git a/ruoyi-modules/ruoyi-promotion/src/main/java/com/ruoyi/promotion/controller/forepart/FrepartPromotionWishListController.java b/ruoyi-modules/ruoyi-promotion/src/main/java/com/ruoyi/promotion/controller/forepart/FrepartPromotionWishListController.java
index fdd9d9b..1266995 100644
--- a/ruoyi-modules/ruoyi-promotion/src/main/java/com/ruoyi/promotion/controller/forepart/FrepartPromotionWishListController.java
+++ b/ruoyi-modules/ruoyi-promotion/src/main/java/com/ruoyi/promotion/controller/forepart/FrepartPromotionWishListController.java
@@ -3,7 +3,7 @@
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.core.utils.page.PageDTO;
-import com.ruoyi.promotion.controller.forepart.dto.PromotionWishListDTO;
+import com.ruoyi.system.api.domain.dto.PromotionWishListDTO;
import com.ruoyi.promotion.domain.PromotionWishList;
import com.ruoyi.promotion.service.IPromotionWishListService;
import io.swagger.annotations.Api;
diff --git a/ruoyi-modules/ruoyi-promotion/src/main/java/com/ruoyi/promotion/service/IPromotionWishListService.java b/ruoyi-modules/ruoyi-promotion/src/main/java/com/ruoyi/promotion/service/IPromotionWishListService.java
index 73a57a9..5d47578 100644
--- a/ruoyi-modules/ruoyi-promotion/src/main/java/com/ruoyi/promotion/service/IPromotionWishListService.java
+++ b/ruoyi-modules/ruoyi-promotion/src/main/java/com/ruoyi/promotion/service/IPromotionWishListService.java
@@ -2,7 +2,7 @@
import com.baomidou.mybatisplus.extension.service.IService;
import com.ruoyi.common.core.utils.page.PageDTO;
-import com.ruoyi.promotion.controller.forepart.dto.PromotionWishListDTO;
+import com.ruoyi.system.api.domain.dto.PromotionWishListDTO;
import com.ruoyi.promotion.domain.PromotionWishList;
/**
diff --git a/ruoyi-modules/ruoyi-promotion/src/main/java/com/ruoyi/promotion/service/impl/PromotionWishListServiceImpl.java b/ruoyi-modules/ruoyi-promotion/src/main/java/com/ruoyi/promotion/service/impl/PromotionWishListServiceImpl.java
index 57c439b..0f4db48 100644
--- a/ruoyi-modules/ruoyi-promotion/src/main/java/com/ruoyi/promotion/service/impl/PromotionWishListServiceImpl.java
+++ b/ruoyi-modules/ruoyi-promotion/src/main/java/com/ruoyi/promotion/service/impl/PromotionWishListServiceImpl.java
@@ -5,7 +5,7 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.common.core.utils.page.PageDTO;
-import com.ruoyi.promotion.controller.forepart.dto.PromotionWishListDTO;
+import com.ruoyi.system.api.domain.dto.PromotionWishListDTO;
import com.ruoyi.promotion.domain.PromotionWishList;
import com.ruoyi.promotion.mapper.PromotionWishListMapper;
import com.ruoyi.promotion.service.IPromotionWishListService;
--
Gitblit v1.7.1