获取会员接口

order-application-service/src/main/java/cn/freemud/entities/dto/GetMemberExtendInfoRequestDto.java

+package cn.freemud.entities.dto;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ * @ClassName: GetMemberExtendInfoRequestDto
+ * @Description:
+ * @Author: freemud
+ * @Date: 2021/6/9 下午4:28
+ */
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class GetMemberExtendInfoRequestDto {
+    private String partnerId;
+
+    private String memberId;
+
+    private Integer isQueryGrade;
+
+    private Integer isQueryPaid;
+
+    private Integer isQueryLabel;
+}

order-application-service/src/main/java/cn/freemud/entities/dto/GetMemberExtendInfoResponseDto.java

+package cn.freemud.entities.dto;
+
+/**
+ * @ClassName: GetMemberExtendInfoResponseDto
+ * @Description:
+ * @Author: freemud
+ * @Date: 2021/6/9 下午4:29
+ */
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.util.Date;
+import java.util.List;
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class GetMemberExtendInfoResponseDto {
+    private GetMemberExtendInfoResponseDto.MemberGradeDto memberGrade;
+    private List<GetMemberExtendInfoResponseDto.MemberPaidDetail> memberPaids;
+    private List<GetMemberExtendInfoResponseDto.GetMemberLabels> memberLabels;
+
+    @Data
+    public static class MemberGradeDto {
+        private String ruleCode;
+        private String ruleName;
+        private String cycleDate;
+    }
+
+    @Data
+    public static class MemberPaidDetail {
+        private String id;
+        private String paidId;
+        private String paidName;
+        private Date openTime;
+        private Date expiryTime;
+    }
+
+    @Data
+    public static class GetMemberLabels {
+        private String memberId;
+        private String labelCode;
+        private String labelName;
+        private Date updateTime;
+    }
+}

order-application-service/src/main/java/cn/freemud/service/business/OrderBusinessService.java

+package cn.freemud.service.business;
+
+import com.freemud.application.sdk.api.ordercenter.request.PaySuccessReq;
+import com.freemud.sdk.api.assortment.order.request.order.ConfirmOrderRequest;
+import com.freemud.sdk.api.assortment.order.response.order.PayAccessResponse;
+
+/**
+ * @ClassName: OrderBusinessService
+ * @Description:
+ * @Author: freemud
+ * @Date: 2021/6/9 下午4:12
+ */
+public interface OrderBusinessService {
+    PayAccessResponse payAccess(ConfirmOrderRequest confirmOrderRequest);
+
+    Integer getPaySuccessTimeout(ConfirmOrderRequest confirmOrderRequest, PaySuccessReq request);
+}

order-application-service/src/main/java/cn/freemud/service/impl/MallOrderServiceImpl.java

@@ -34,6 +34,7 @@ import cn.freemud.redis.RedisCache;
 import cn.freemud.service.BuriedPointService;
 import cn.freemud.service.CouponActivityService;
 import cn.freemud.service.MallOrderService;
+import cn.freemud.service.business.OrderBusinessService;
 import cn.freemud.service.thirdparty.EcologyAdminApplicationClient;
 import cn.freemud.service.thirdparty.ShoppingCartClient;
 import cn.freemud.utils.LogUtil;
@@ -154,7 +155,8 @@ public class MallOrderServiceImpl implements MallOrderService {
     private AssortmentCustomerInfoManager assortmentCustomerInfoManager;
     @Autowired
     private PaymentQueueService paymentQueueService;
-
+    @Autowired
+    private OrderBusinessService orderBusinessService;
     /**
      * 创建订单
      */
@@ -508,7 +510,7 @@ public class MallOrderServiceImpl implements MallOrderService {
 
         }
         // 订单支付成功
-        com.freemud.sdk.api.assortment.order.response.order.PayAccessResponse payAccessRes = orderCenterSdkService.payAccess(confirmOrderRequest);
+        com.freemud.sdk.api.assortment.order.response.order.PayAccessResponse payAccessRes = orderBusinessService.payAccess(confirmOrderRequest);
         String string2 = JSONObject.toJSONString(payAccessRes);
         JSONObject jsonObject2 = JSONObject.parseObject(string2);
         payAccessResponse = jsonObject2.toJavaObject(PayAccessResponse.class);

order-application-service/src/main/java/cn/freemud/service/impl/OrderServiceImpl.java

@@ -71,6 +71,7 @@ import cn.freemud.service.BuriedPointService;
 import cn.freemud.service.CouponActivityService;
 import cn.freemud.service.OrderAdapterService;
 import cn.freemud.service.Orderservice;
+import cn.freemud.service.business.OrderBusinessService;
 import cn.freemud.service.order.OrderRelationFactory;
 import cn.freemud.service.order.OrderRelationService;
 import cn.freemud.service.thirdparty.*;
@@ -337,6 +338,9 @@ public class OrderServiceImpl implements Orderservice {
     @Autowired
     private OrderTackCodeManager orderTackCodeManager;
 
+    @Autowired
+    private OrderBusinessService orderBusinessService;
+
     @Override
     public BaseResponse checkBeforeCreateOrder(CheckBeforeCreateOrderRequestVo requestVo) {
         String trackingNo = LogTreadLocal.getTrackingNo();
@@ -547,7 +551,7 @@ public class OrderServiceImpl implements Orderservice {
         String pickUpGoodsNo = orderTackCodeManager.generateTackCode(orderBean.getType(),partnerId,storeId,var1,OrderTackCodeFactory.getByOrderClient(orderBean.getOrderClient()).getGenerateTackCodeFunc());
         var1.setPickUpGoodsNo(pickUpGoodsNo);
         // 订单支付成功
-        com.freemud.sdk.api.assortment.order.response.order.PayAccessResponse payAccessRes = orderCenterSdkService.payAccess(var1);
+        com.freemud.sdk.api.assortment.order.response.order.PayAccessResponse payAccessRes = orderBusinessService.payAccess(var1);
         String string2 = JSONObject.toJSONString(payAccessRes);
         JSONObject jsonObject2 = JSONObject.parseObject(string2);
         payAccessResponse = jsonObject2.toJavaObject(PayAccessResponse.class);

order-application-service/src/main/java/cn/freemud/service/impl/SellCouponOrderServiceImpl.java

@@ -20,6 +20,7 @@ import cn.freemud.enums.UserLoginChannelEnum;
 import cn.freemud.interceptor.ServiceException;
 import cn.freemud.redis.RedisCache;
 import cn.freemud.service.CouponService;
+import cn.freemud.service.business.OrderBusinessService;
 import cn.freemud.service.thirdparty.StoreItemClient;
 import cn.freemud.utils.LogUtil;
 import cn.freemud.utils.ResponseUtil;
@@ -139,7 +140,8 @@ public class SellCouponOrderServiceImpl {
     private final String SUCCESS = "100";
 
     private final String ngsCouponProductId = "76161384";
-
+    @Autowired
+    private OrderBusinessService orderBusinessService;
     /**
      * 卖券订单创建
      */
@@ -762,7 +764,7 @@ public class SellCouponOrderServiceImpl {
         }
         try {
             // 订单支付成功
-            PayAccessResponse payAccessResponse = orderCenterSdkService.payAccess(var1);
+            PayAccessResponse payAccessResponse = orderBusinessService.payAccess(var1);
         }catch (Exception e){
             LogUtil.error(LogThreadLocal.getTrackingNo(),"sdkPayAccessError",JSONObject.toJSONString(var1),null,e);
         }

order-application-service/src/main/java/cn/freemud/service/thirdparty/CustomerClient.java

-///**
-// * All rights Reserved, Designed By www.freemud.cn
-// *
-// * @Title: CustomerExtendClient
-// * @Package cn.freemud.service.thirdparty
-// * @Description:
-// * @author: song.cai
-// * @date: 2019/2/20 16:42
-// * @version V1.0
-// * @Copyright: 2019 www.freemud.cn Inc. All rights reserved.
-// * 注意：本内容仅限于上海非码科技内部传阅，禁止外泄以及用于其他的商业目
-// */
-//
-//package cn.freemud.service.thirdparty;
-//
-//import cn.freemud.entities.dto.*;
-//import com.alibaba.fastjson.JSONObject;
-//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;
-//
-//@FeignClient(name = "CUSTOMER-SERVICE", url = "${saas.customerclient.feign.url}")
-//@RequestMapping(produces = {"application/json;charset=UTF-8"})
-//public interface CustomerClient {
-//    /**
-//     * 根据聚道注册会员
-//     */
-//    @PostMapping(value = "/customerservice/registerByChannel")
-//    MemberRegisterResponseDto registerByChannel(@RequestBody MemberRegisterRequestDto memberRegisterRequestDto);
-//
-//    /**
-//     * 根据渠道信息查询顾客信息
-//     */
-//    @PostMapping(value = "/customerservice/getMemberByChannel")
-//    GetMemberInfoByChannelResponseDto getMemberInfoByChannel(@RequestBody GetMemberInfoByChannelRequestDto getMemberInfoByChannelRequestDto);
-//
-//    /**
-//     * 修改unionid
-//     */
-//    @PostMapping(value = "/customerservice/updateMemberChannel")
-//    JSONObject updateUserUnionId(@RequestBody UpdateMemUnionIdRequestDto updateMemUnionIdRequestDto);
-//
-//    /**
-//     * 根据会员id获取会员信息
-//     */
-//    @PostMapping(value = "/customerservice/getMemberById")
-//    GetMemberInfoByIdResponseDto getMemberInfoById(@RequestBody GetMemberInfoByIdRequestDto getMemberInfoByIdRequestDto);
-//
-//    /**
-//     * 修改顾客信息
-//     */
-//    @PostMapping(value = "/customerservice/update")
-//    JSONObject editMemberInfo(@RequestBody EditMemberInfoRequestDto editMemberInfoRequestDto);
-//
-//
-//    /**
-//     * 获取用户收货地址列表
-//     */
-//    @PostMapping(value = "/customerservice/address/getAddressList")
-//    GetReceiveAddressListResponseDto getReceiveAddressList(@RequestBody GetReceiveAddressListDto getReceiveListDto);
-//
-//    /**
-//     * 新增收货地址
-//     */
-//    @PostMapping(value = "/customerservice/address/add")
-//    AddReceiveAddressResponseDto addReceiveAddress(@RequestBody AddReceiveAddressDto addReceiveDto);
-//
-//    /**
-//     * 修改收货地址
-//     */
-//    @PostMapping(value = "/customerservice/address/update")
-//    UpdateReceiveAddressResponseDto updateReceiveAddress(@RequestBody UpdateReceiveAddressDto updateReceiveAddressDto);
-//
-//    /**
-//     * 删除收货地址
-//     */
-//    @PostMapping(value = "/customerservice/address/delete")
-//    DeleteReceiveAddressResponseDto deleteReceiveAddress(@RequestBody DeleteReceiveAddressDto deleteReceiveAddressDto);
-//
-//
-//    /**
-//     * 查询收货地址详情
-//     */
-//    @PostMapping(value = "/customerservice/address/get")
-//    QueryReceiveAddressResponseDto queryReceiveAddressById(@RequestBody QueryReceiveAddressDto queryReceiveAddressDto);
-//}
+/**
+ * All rights Reserved, Designed By www.freemud.cn
+ *
+ * @Title: CustomerExtendClient
+ * @Package cn.freemud.service.thirdparty
+ * @Description:
+ * @author: song.cai
+ * @date: 2019/2/20 16:42
+ * @version V1.0
+ * @Copyright: 2019 www.freemud.cn Inc. All rights reserved.
+ * 注意：本内容仅限于上海非码科技内部传阅，禁止外泄以及用于其他的商业目
+ */
+
+package cn.freemud.service.thirdparty;
+
+import cn.freemud.entities.dto.*;
+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;
+
+@FeignClient(name = "CUSTOMER-SERVICE", url = "${saas.customerclient.feign.url}")
+@RequestMapping(produces = { "application/json;charset=UTF-8" })
+public interface CustomerClient {
+    // /**
+    // * 根据聚道注册会员
+    // */
+    // @PostMapping(value = "/customerservice/registerByChannel")
+    // MemberRegisterResponseDto registerByChannel(@RequestBody MemberRegisterRequestDto memberRegisterRequestDto);
+    //
+    // /**
+    // * 根据渠道信息查询顾客信息
+    // */
+    // @PostMapping(value = "/customerservice/getMemberByChannel")
+    // GetMemberInfoByChannelResponseDto getMemberInfoByChannel(@RequestBody GetMemberInfoByChannelRequestDto
+    // getMemberInfoByChannelRequestDto);
+    //
+    // /**
+    // * 修改unionid
+    // */
+    // @PostMapping(value = "/customerservice/updateMemberChannel")
+    // JSONObject updateUserUnionId(@RequestBody UpdateMemUnionIdRequestDto updateMemUnionIdRequestDto);
+    //
+    // /**
+    // * 根据会员id获取会员信息
+    // */
+    // @PostMapping(value = "/customerservice/getMemberById")
+    // GetMemberInfoByIdResponseDto getMemberInfoById(@RequestBody GetMemberInfoByIdRequestDto
+    // getMemberInfoByIdRequestDto);
+    //
+    // /**
+    // * 修改顾客信息
+    // */
+    // @PostMapping(value = "/customerservice/update")
+    // JSONObject editMemberInfo(@RequestBody EditMemberInfoRequestDto editMemberInfoRequestDto);
+    //
+    //
+    // /**
+    // * 获取用户收货地址列表
+    // */
+    // @PostMapping(value = "/customerservice/address/getAddressList")
+    // GetReceiveAddressListResponseDto getReceiveAddressList(@RequestBody GetReceiveAddressListDto getReceiveListDto);
+    //
+    // /**
+    // * 新增收货地址
+    // */
+    // @PostMapping(value = "/customerservice/address/add")
+    // AddReceiveAddressResponseDto addReceiveAddress(@RequestBody AddReceiveAddressDto addReceiveDto);
+    //
+    // /**
+    // * 修改收货地址
+    // */
+    // @PostMapping(value = "/customerservice/address/update")
+    // UpdateReceiveAddressResponseDto updateReceiveAddress(@RequestBody UpdateReceiveAddressDto
+    // updateReceiveAddressDto);
+    //
+    // /**
+    // * 删除收货地址
+    // */
+    // @PostMapping(value = "/customerservice/address/delete")
+    // DeleteReceiveAddressResponseDto deleteReceiveAddress(@RequestBody DeleteReceiveAddressDto
+    // deleteReceiveAddressDto);
+    //
+    //
+    // /**
+    // * 查询收货地址详情
+    // */
+    // @PostMapping(value = "/customerservice/address/get")
+    // QueryReceiveAddressResponseDto queryReceiveAddressById(@RequestBody QueryReceiveAddressDto
+    // queryReceiveAddressDto);
+
+    /**
+     * 查询收货地址详情
+     */
+    @PostMapping(value = "/customerservice/extend/getMemberExtendInfo")
+    BaseResponse<GetMemberExtendInfoResponseDto>
+            getMemberExtendInfo(@RequestBody GetMemberExtendInfoRequestDto extendInfoRequest);
+}