From 0d72d0eb96c3e1b59fd586104935a2eb89b29ace Mon Sep 17 00:00:00 2001
From: rentaiming <806181062@qq.com>
Date: 星期四, 06 六月 2024 18:37:50 +0800
Subject: [PATCH] 用户端商品
---
ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/feignClient/MemberClient.java | 6 ------
ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/SysUser.java | 2 +-
ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/dto/PromotionWishListDTO.java | 2 +-
ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/factory/MemberFallbackFactory.java | 4 ----
ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/dto/MobileDTO.java | 28 ++++++++++++++++++++++++++++
5 files changed, 30 insertions(+), 12 deletions(-)
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 476d8c1..d51a330 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,7 +66,7 @@
/** 用户头像 */
private String avatar;
/** 密码 */
-
+ @TableField("user_type")
private String userType;
/**
diff --git a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/dto/MobileDTO.java b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/dto/MobileDTO.java
new file mode 100644
index 0000000..732c074
--- /dev/null
+++ b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/dto/MobileDTO.java
@@ -0,0 +1,28 @@
+package com.ruoyi.system.api.domain.dto;
+
+import com.fasterxml.jackson.annotation.JsonInclude;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+@ApiModel(value = "小程序获取电话号码", description = "小程序获取电话号码")
+public class MobileDTO {
+
+ //微信的
+ @ApiModelProperty(value = "微信的code")
+ private String code;
+
+
+ //支付宝微信的
+ @ApiModelProperty(value = "支付宝的auth_code")
+ @JsonInclude(JsonInclude.Include.NON_NULL)
+ private String auth_code;
+
+ @ApiModelProperty("1支付宝 ， 2微信")
+ private Integer type;
+
+ @ApiModelProperty(value = "会员id")
+ private Long memberid;
+
+}
diff --git a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/dto/PromotionWishListDTO.java b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/dto/PromotionWishListDTO.java
index 9c46e1c..e409fd3 100644
--- a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/dto/PromotionWishListDTO.java
+++ b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/dto/PromotionWishListDTO.java
@@ -24,7 +24,7 @@
private BigDecimal expectedPrice;
@ApiModelProperty(value = "商品图片")
- private MultipartFile[] goodsImageUrl;
+ private String goodsImageUrl;
@ApiModelProperty(value = "备注")
private String remark;
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 d91172b..fa75e4a 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,10 +43,6 @@
return R.fail("登录用户失败:" + cause.getMessage());
}
- @Override
- public R<AppMiniLoginVO> miniRegister(AppMiniRegisterDTO appUserRegisterDto) {
- return R.fail("注册用户失败:" + cause.getMessage());
- }
@Override
public R<?> addMemberPoints(MemberPointsDTO memberPointsDTO) {
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 3aa9ce1..9c75dfb 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
@@ -38,12 +38,6 @@
@PostMapping("/forepart/member/miniLogin")
public R<AppMiniLoginVO> miniLogin(@RequestBody AppMiniLoginDTO appMiniLoginDto);
-
-
-
- @PostMapping("/forepart/member/miniRegister")
- public R<AppMiniLoginVO> miniRegister(@RequestBody AppMiniRegisterDTO appUserRegisterDto);
-
@PostMapping("/member-points/addMemberPoints")
R<?> addMemberPoints(@RequestBody MemberPointsDTO memberPointsDTO);
--
Gitblit v1.7.1