[fix]修改粉丝与关注

ruoyi-modules/ruoyi-member/pom.xml

@@ -98,22 +98,22 @@
             <groupId>org.dromara</groupId>
             <artifactId>ruoyi-common-sse</artifactId>
         </dependency>
-        <dependency>
-            <groupId>org.dromara</groupId>
-            <artifactId>ruoyi-order</artifactId>
-            <scope>runtime</scope>
-        </dependency>
+<!--        <dependency>-->
+<!--            <groupId>org.dromara</groupId>-->
+<!--            <artifactId>ruoyi-order</artifactId>-->
+<!--            <scope>runtime</scope>-->
+<!--        </dependency>-->
 
-        <dependency>
-            <groupId>org.dromara</groupId>
-            <artifactId>ruoyi-goods</artifactId>
-            <scope>runtime</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.dromara</groupId>
-            <artifactId>ruoyi-content</artifactId>
-            <scope>runtime</scope>
-        </dependency>
+<!--        <dependency>-->
+<!--            <groupId>org.dromara</groupId>-->
+<!--            <artifactId>ruoyi-goods</artifactId>-->
+<!--            <scope>runtime</scope>-->
+<!--        </dependency>-->
+<!--        <dependency>-->
+<!--            <groupId>org.dromara</groupId>-->
+<!--            <artifactId>ruoyi-content</artifactId>-->
+<!--            <scope>runtime</scope>-->
+<!--        </dependency>-->
 
     </dependencies>
     <build>

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<MemberCartVO, MemberCartBO,MemberCart> {
 
+    @Override
+    @Mapping(target = "member.id", source = "memberId")
+    @Mapping(target = "memberId", source = "memberId")
+    MemberCartVO toVO(MemberCart memberCart);
 }

ruoyi-modules/ruoyi-member/src/main/java/com/wzj/soopin/member/domain/bo/MemberCartBO.java

@@ -34,13 +34,11 @@ public class MemberCartBO extends BaseBO<MemberCart> {
     private String productName;
 
     @Schema(description ="商品属性 精确匹配")
-    private String spData;
+    private String spec;
 
     @Schema(description ="商品数量 精确匹配")
     private Integer quantity;
 
-    @Schema(description ="用户手机号")
-    private String phone;
 
     @Override
     public LambdaQueryWrapper<MemberCart> toWrapper() {
@@ -51,7 +49,7 @@ public class MemberCartBO extends BaseBO<MemberCart> {
             .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);
     }
 }

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;

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 = "备注")