Merge branch 'feature/20211011_购物车服务查询会员资产兼容储值卡状态查询' into qa

ordercenter-sdk/readme.md

@@ -105,4 +105,5 @@
 | 1.3.66.RELEASE | 基础订单sdk版本升级 | 伍平 | 2021-08-10 |
 | 1.3.67.RELEASE | 新增爱马哥需求代码改动 | 周晓航 | 2021-08-23 |
 | 1.3.68.RELEASE | 新增维护商品类型同步商品服务 | 周晓航 | 2021-09-03 |
-| 1.3.69.RELEASE | 升级sdk | 伍平 | 2021-09-16 |
+| 1.3.69.RELEASE | 升级sdk | 伍平 | 2021-09-16 |
\ No newline at end of file
+| 1.3.70.RELEASE | 升级sdk | 伍平 | 2021-10-11 |
\ No newline at end of file

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

@@ -13,6 +13,11 @@ 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

+package cn.freemud.entities.dto;
+
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * @author yuanyuan.jing
+ */
+@Data
+public class GetSvcInfoByMemberIdResponse {
+    private String memberId;
+    private String cardCode;
+    private Integer statusFlag;
+}

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

+package cn.freemud.entities.dto;
+
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * @author yuanyuan.jing
+ */
+@Data
+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

@@ -66,9 +66,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;
@@ -140,6 +138,8 @@ public class ShoppingCartNewServiceImpl implements ShoppingCartNewService {
     @Autowired
     private CustomerApplicationClient customerApplicationClient;
     @Autowired
+    private CustomerPropertyClient customerPropertyClient;
+    @Autowired
     private AssortmentCustomerInfoManager customerInfoManager;
     @Autowired
     private SvcAppClient svcAppClient;
@@ -1266,6 +1266,7 @@ public class ShoppingCartNewServiceImpl implements ShoppingCartNewService {
 
         String partnerId = request.getPartnerId();
         String memberId = request.getUserId();
+        List<Integer> statusFlagList = request.getStatusFlagList();
         responseData.setUserId(memberId);
         List<GetMemberInfoRequestDto.OrderItemRequest> orderItemList = request.getOrderItemList();
         if (CollectionUtils.isEmpty(orderItemList)) {
@@ -1334,7 +1335,8 @@ public class ShoppingCartNewServiceImpl implements ShoppingCartNewService {
         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

+
+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
+ */
+@FeignClient(name = "customer-property-service", url = "${member.property.baseUrl:}")
+@RequestMapping(produces = {"application/json;charset=UTF-8"})
+public interface CustomerPropertyClient {
+
+
+
+    @PostMapping(value = "/propertyservice/card/getMemberCards")
+    BaseResponse<List<GetSvcInfoByMemberIdResponse>> getMemberCards(@RequestBody StatisticalPropertyRequest statisticalPropertyRequest);
+}