diff --git a/ruoyi-modules/ruoyi-member/pom.xml b/ruoyi-modules/ruoyi-member/pom.xml
index 44e90bd2e..84c541590 100644
--- a/ruoyi-modules/ruoyi-member/pom.xml
+++ b/ruoyi-modules/ruoyi-member/pom.xml
@@ -98,22 +98,22 @@
org.dromara
ruoyi-common-sse
-
- org.dromara
- ruoyi-order
- runtime
-
+
+
+
+
+
-
- org.dromara
- ruoyi-goods
- runtime
-
-
- org.dromara
- ruoyi-content
- runtime
-
+
+
+
+
+
+
+
+
+
+
diff --git a/ruoyi-modules/ruoyi-member/src/main/java/com/wzj/soopin/member/convert/MemberCartConvert.java b/ruoyi-modules/ruoyi-member/src/main/java/com/wzj/soopin/member/convert/MemberCartConvert.java
index 9dbcd0a4d..d6d1f6436 100644
--- a/ruoyi-modules/ruoyi-member/src/main/java/com/wzj/soopin/member/convert/MemberCartConvert.java
+++ b/ruoyi-modules/ruoyi-member/src/main/java/com/wzj/soopin/member/convert/MemberCartConvert.java
@@ -5,6 +5,7 @@ import com.wzj.soopin.member.domain.po.MemberCart;
import com.wzj.soopin.member.domain.vo.MemberCartVO;
import org.dromara.common.web.core.BaseConverter;
import org.mapstruct.Mapper;
+import org.mapstruct.Mapping;
import java.util.List;
@@ -16,4 +17,8 @@ import java.util.List;
@Mapper(componentModel = "spring",uses = BaseConverter.class)
public interface MemberCartConvert extends BaseConverter {
+ @Override
+ @Mapping(target = "member.id", source = "memberId")
+ @Mapping(target = "memberId", source = "memberId")
+ MemberCartVO toVO(MemberCart memberCart);
}
diff --git a/ruoyi-modules/ruoyi-member/src/main/java/com/wzj/soopin/member/domain/bo/MemberCartBO.java b/ruoyi-modules/ruoyi-member/src/main/java/com/wzj/soopin/member/domain/bo/MemberCartBO.java
index 4c370dcb7..62515dcd4 100644
--- a/ruoyi-modules/ruoyi-member/src/main/java/com/wzj/soopin/member/domain/bo/MemberCartBO.java
+++ b/ruoyi-modules/ruoyi-member/src/main/java/com/wzj/soopin/member/domain/bo/MemberCartBO.java
@@ -34,13 +34,11 @@ public class MemberCartBO extends BaseBO {
private String productName;
@Schema(description ="商品属性 精确匹配")
- private String spData;
+ private String spec;
@Schema(description ="商品数量 精确匹配")
private Integer quantity;
- @Schema(description ="用户手机号")
- private String phone;
@Override
public LambdaQueryWrapper toWrapper() {
@@ -51,7 +49,7 @@ public class MemberCartBO extends BaseBO {
.eq(pic!=null,MemberCart::getPic,pic)
.eq(skuId!=null,MemberCart::getSkuId,skuId)
.eq(productName!=null,MemberCart::getProductName,productName)
- .eq(spData!=null,MemberCart::getSpData,spData)
+ .eq(spec!=null,MemberCart::getSpec,spec)
.eq(quantity!=null,MemberCart::getQuantity,quantity);
}
}
diff --git a/ruoyi-modules/ruoyi-member/src/main/java/com/wzj/soopin/member/domain/po/MemberCart.java b/ruoyi-modules/ruoyi-member/src/main/java/com/wzj/soopin/member/domain/po/MemberCart.java
index a8dae466d..ff4db535a 100644
--- a/ruoyi-modules/ruoyi-member/src/main/java/com/wzj/soopin/member/domain/po/MemberCart.java
+++ b/ruoyi-modules/ruoyi-member/src/main/java/com/wzj/soopin/member/domain/po/MemberCart.java
@@ -40,7 +40,7 @@ public class MemberCart extends BaseAudit {
private String productName;
@Schema(description ="商品属性")
- private String spData;
+ private String spec;
@Schema(description ="商品数量")
private Integer quantity;
diff --git a/ruoyi-modules/ruoyi-member/src/main/java/com/wzj/soopin/member/domain/vo/MemberCartVO.java b/ruoyi-modules/ruoyi-member/src/main/java/com/wzj/soopin/member/domain/vo/MemberCartVO.java
index 5d9ba0180..c4128e2c4 100644
--- a/ruoyi-modules/ruoyi-member/src/main/java/com/wzj/soopin/member/domain/vo/MemberCartVO.java
+++ b/ruoyi-modules/ruoyi-member/src/main/java/com/wzj/soopin/member/domain/vo/MemberCartVO.java
@@ -38,10 +38,6 @@ public class MemberCartVO {
private MemberVO member;
- @Excel(name = "会员")
- @Schema(description = "会员")
- private String nickname;
-
@Excel(name = "备注")
@Schema(description = "备注")