支持储值卡状态查询

shopping-cart-application-service/src/main/java/cn/freemud/entities/dto/GetMemberInfoRequestDto.java

@@ -14,7 +14,7 @@ public class GetMemberInfoRequestDto {
     private String userId;
 
     /**
-     * 储值卡状态
+     * 储值卡状态 0可用1转赠中2已转赠3已移除
      */
     private List<Integer> statusFlagList;
 

shopping-cart-application-service/src/main/java/cn/freemud/entities/dto/GetSvcInfoByMemberIdResponse.java

@@ -12,5 +12,4 @@ public class GetSvcInfoByMemberIdResponse {
     private String memberId;
     private String cardCode;
     private Integer statusFlag;
-    private Date createTime;
 }

shopping-cart-application-service/src/main/java/cn/freemud/entities/dto/StatisticalPropertyRequest.java

@@ -12,7 +12,7 @@ public class StatisticalPropertyRequest {
     private String partnerId;
     private String memberId;
     /**
-     * 储值卡状态
+     * 储值卡状态 0可用1转赠中2已转赠3已移除
      */
     private List<Integer> statusFlagList;
 }

shopping-cart-application-service/src/main/java/cn/freemud/service/impl/ShoppingCartNewServiceImpl.java

@@ -65,9 +65,7 @@ import com.freemud.application.sdk.api.base.SDKCommonBaseContextWare;
 import com.freemud.application.sdk.api.log.ErrorLog;
 import com.freemud.application.sdk.api.log.LogThreadLocal;
 import com.freemud.application.sdk.api.membercenter.request.QueryReceiveAddressRequest;
-import com.freemud.application.sdk.api.membercenter.request.StatisticalPropertyRequest;
 import com.freemud.application.sdk.api.membercenter.request.StatisticalScoreRequest;
-import com.freemud.application.sdk.api.membercenter.response.GetSvcInfoByMemberIdResponse;
 import com.freemud.application.sdk.api.membercenter.response.QueryReceiveAddressResponse;
 import com.freemud.application.sdk.api.membercenter.response.StatisticalScoreResponse;
 import com.freemud.application.sdk.api.membercenter.service.MemberCenterService;
@@ -138,6 +136,8 @@ public class ShoppingCartNewServiceImpl implements ShoppingCartNewService {
     @Autowired
     private CustomerApplicationClient customerApplicationClient;
     @Autowired
+    private CustomerPropertyClient customerPropertyClient;
+    @Autowired
     private AssortmentCustomerInfoManager customerInfoManager;
     @Autowired
     private SvcAppClient svcAppClient;
@@ -1307,10 +1307,11 @@ public class ShoppingCartNewServiceImpl implements ShoppingCartNewService {
             responseData.setScore(score);
         }
         // 储值卡
-        com.freemud.application.sdk.api.membercenter.request.StatisticalPropertyRequest getMemberCardRequest = new StatisticalPropertyRequest();
+        StatisticalPropertyRequest getMemberCardRequest = new StatisticalPropertyRequest();
         getMemberCardRequest.setPartnerId(partnerId);
         getMemberCardRequest.setMemberId(memberId);
-        com.freemud.application.sdk.api.base.BaseResponse<List<GetSvcInfoByMemberIdResponse>> svcInfoByMemberId = memberPropertyService.getSvcInfoByMemberId(getMemberCardRequest, LogThreadLocal.getTrackingNo());
+        getMemberCardRequest.setStatusFlagList(statusFlagList);
+        com.freemud.application.sdk.api.base.BaseResponse<List<GetSvcInfoByMemberIdResponse>> svcInfoByMemberId = customerPropertyClient.getMemberCards(getMemberCardRequest);
         if (svcInfoByMemberId != null && CollectionUtils.isNotEmpty(svcInfoByMemberId.getData())) {
             List<GetSvcInfoByMemberIdResponse> memberCardResponses = svcInfoByMemberId.getData();
             // 查询储值卡的余额

shopping-cart-application-service/src/main/java/cn/freemud/service/thirdparty/CustomerPropertyClient.java

@@ -2,11 +2,14 @@
 package cn.freemud.service.thirdparty;
 import cn.freemud.entities.dto.GetSvcInfoByMemberIdResponse;
 import cn.freemud.entities.dto.StatisticalPropertyRequest;
+import com.freemud.application.sdk.api.base.BaseResponse;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 
+import java.util.List;
+
 /**
  * @author yuanyuan.jing
  */
@@ -17,5 +20,5 @@ public interface CustomerPropertyClient {
 
 
     @PostMapping(value = "/propertyservice/card/getMemberCards")
-    GetSvcInfoByMemberIdResponse getMemberCards(@RequestBody StatisticalPropertyRequest statisticalPropertyRequest);
+    BaseResponse<List<GetSvcInfoByMemberIdResponse>> getMemberCards(@RequestBody StatisticalPropertyRequest statisticalPropertyRequest);
 }