运费券核销

order-application-service/src/main/java/cn/freemud/adapter/CouponAdapter.java

@@ -14,11 +14,10 @@ package cn.freemud.adapter;
 
 import cn.freemud.base.constant.Version;
 import cn.freemud.base.util.DateUtil;
+import cn.freemud.constant.ResponseCodeConstant;
 import cn.freemud.entities.dto.*;
-import cn.freemud.management.entities.dto.request.order.MCCafeCouponRequest;
-import cn.freemud.management.entities.dto.request.order.MCCafeCouponLockRequest;
-import cn.freemud.management.entities.dto.request.order.MCCafeProductRedeemVo;
-import cn.freemud.management.entities.dto.request.order.MCCafeTransactionVo;
+import cn.freemud.interceptor.ServiceException;
+import cn.freemud.management.entities.dto.request.order.*;
 import cn.freemud.entities.dto.openplatform.AddWeixinCardCodeRequestDto;
 import cn.freemud.entities.dto.openplatform.AddWeixinCardCodeResponseDto;
 import cn.freemud.entities.dto.openplatform.AddWeixinCardJudgeRequestDto;
@@ -27,7 +26,11 @@ import cn.freemud.entities.dto.promotion.CouponPromotionDto;
 import cn.freemud.entities.dto.promotion.OrderBeanRequest;
 import cn.freemud.entities.vo.*;
 import cn.freemud.enums.*;
+import cn.freemud.management.entities.dto.response.coupon.McdNetBatchQueryResponse;
+import cn.freemud.management.entities.dto.response.coupon.McdNetCouponProductRespDto;
+import cn.freemud.service.mccafe.CouponClientService;
 import cn.freemud.utils.BeanUtil;
+import cn.freemud.utils.LogUtil;
 import com.freemud.application.sdk.api.ordercenter.enums.OrderClientType;
 import com.freemud.card.sdk.vo.coupon.request.MemberAddCouponVo;
 import com.freemud.sdk.api.assortment.order.enums.OldOrderAccountType;
@@ -52,6 +55,9 @@ public class CouponAdapter {
     @Autowired
     private OrderAdapter orderAdapter;
 
+    @Autowired
+    private CouponClientService couponClientService;
+
     public CouponListDto convert2CouponListDto(String userId, String partnerId) {
         CouponListDto couponListDto = new CouponListDto();
         couponListDto.setPartnerCode(partnerId);
@@ -684,6 +690,39 @@ public class CouponAdapter {
                 mcCafeProductRedeemVo.setSeq(i + 1);
                 products.add(mcCafeProductRedeemVo);
             }
+        } else if (QueryOrderAccountType.FREIGHT_COUPON.equals(orderAdapter.getQueryOrderAccountType(OldOrderAccountType.getByCode(accountBean.getType())))) {
+            MCCafeCouponRequest mcCafeCouponRequest = MCCafeCouponRequest.builder()
+                    .ver(88)
+                    .reqtype(CouponReqTypeEnum.BATCH_QUERY.getCode())
+                    .partnerId(Integer.parseInt(orderBean.getCompanyId()))
+                    .store_id(orderBean.getShopId())
+                    .station_id("1")
+                    .operator_id(orderBean.getUserId())
+                    .channel(UserLoginChannelEnum.ALIPAY.getCode().equals(orderBean.getSource())?MCCafeChannelEnum.MOCOFFEE_ZFB.getName():MCCafeChannelEnum.MOCOFFEE_WX.getName())
+                    .couponlist(Arrays.asList(new MCCafeCouponVo(accountBean.getAccountId())))
+                    .sign("skip")
+                    .build();
+            McdNetBatchQueryResponse mcdNetBatchQueryResponse = couponClientService.batchQuery(mcCafeCouponRequest);
+            if (mcdNetBatchQueryResponse == null || !ResponseCodeConstant.RESPONSE_SUCCESS.equals(mcdNetBatchQueryResponse.getStatusCode())
+                    || CollectionUtils.isEmpty(mcdNetBatchQueryResponse.getCouponlist())) {
+                LogUtil.error("获取运费券绑定商品异常，无法核销", mcCafeCouponRequest, mcdNetBatchQueryResponse);
+                return null;
+            } else {
+                try {
+                    McdNetCouponProductRespDto mcdNetCouponProductRespDto = mcdNetBatchQueryResponse.getCouponlist().get(0).getCodeInfo().getProducts().get(0);
+                    String pid = mcdNetCouponProductRespDto.getPid();
+                    MCCafeProductRedeemVo mcCafeProductRedeemVo = new MCCafeProductRedeemVo();
+                    mcCafeProductRedeemVo.setPid(pid);
+                    mcCafeProductRedeemVo.setKeyProductCode(mcdNetCouponProductRespDto.getMcd_productCode());
+                    mcCafeProductRedeemVo.setCustomer_code(mcdNetCouponProductRespDto.getMcd_productCode());
+                    mcCafeProductRedeemVo.setConsume_num(mcdNetCouponProductRespDto.getNumber());
+                    mcCafeProductRedeemVo.setSeq(1);
+                    products.add(mcCafeProductRedeemVo);
+                } catch (Exception e) {
+                    LogUtil.error("获取运费券绑定商品异常，无法核销", mcCafeCouponRequest, mcdNetBatchQueryResponse);
+                    return null;
+                }
+            }
         }
         MCCafeCouponRequest mcCafeCouponRequest = new MCCafeCouponRequest();
         mcCafeCouponRequest.setVer(Integer.valueOf(Version.VERSION_1));

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

@@ -174,7 +174,7 @@ public class CouponClientServiceImpl implements CouponClientService {
         }
 
         List<MCCafeCouponRequest> list =
-                accountList.stream().map(accountBean -> couponAdapter.convert2MCCafeCouponRequest(orderBean, accountBean)).collect(Collectors.toList());
+                accountList.stream().map(accountBean -> couponAdapter.convert2MCCafeCouponRequest(orderBean, accountBean)).filter(o -> o!=null).collect(Collectors.toList());
 
         List<CouponRedeemResponse> couponRedeemResponseList = new ArrayList<>();
         List<CouponRedeemResponse> couponRedeemResponseListAll = new ArrayList<>();
@@ -292,8 +292,7 @@ public class CouponClientServiceImpl implements CouponClientService {
         List<QueryOrdersResponseDto.DataBean.OrderBean.AccountBean> accountList = orderBean.getAccountList().stream().filter(
                 account -> (orderAdapter.getQueryOrderAccountType(OldOrderAccountType.getByCode(account.getType())).equals(QueryOrderAccountType.COUPON)
                         ||  orderAdapter.getQueryOrderAccountType(OldOrderAccountType.getByCode(account.getType())).equals(QueryOrderAccountType.PRODUCT_COUPON)
-                        ||  orderAdapter.getQueryOrderAccountType(OldOrderAccountType.getByCode(account.getType())).equals(QueryOrderAccountType.DISCOUNT_COUPON)
-                        ||  orderAdapter.getQueryOrderAccountType(OldOrderAccountType.getByCode(account.getType())).equals(QueryOrderAccountType.FREIGHT_COUPON))
+                        ||  orderAdapter.getQueryOrderAccountType(OldOrderAccountType.getByCode(account.getType())).equals(QueryOrderAccountType.DISCOUNT_COUPON))
         ).collect(Collectors.toList());
         if (CollectionUtils.isEmpty(accountList)) {
             return null;

order-management/src/main/java/cn/freemud/management/adapter/McCafeCouponAdapter.java

@@ -34,8 +34,7 @@ public class McCafeCouponAdapter {
         List<QueryOrdersResponse.DataBean.OrderBean.AccountBean> accountList = orderBean.getAccountList().stream().filter(
                 account -> (getQueryOrderAccountType(OldOrderAccountType.getByCode(account.getType())).equals(QueryOrderAccountType.COUPON)
                         ||  getQueryOrderAccountType(OldOrderAccountType.getByCode(account.getType())).equals(QueryOrderAccountType.PRODUCT_COUPON)
-                        ||  getQueryOrderAccountType(OldOrderAccountType.getByCode(account.getType())).equals(QueryOrderAccountType.DISCOUNT_COUPON)
-                        ||  getQueryOrderAccountType(OldOrderAccountType.getByCode(account.getType())).equals(QueryOrderAccountType.FREIGHT_COUPON))
+                        ||  getQueryOrderAccountType(OldOrderAccountType.getByCode(account.getType())).equals(QueryOrderAccountType.DISCOUNT_COUPON))
         ).collect(Collectors.toList());
         if (CollectionUtils.isEmpty(accountList) ) {
             return null;
@@ -126,8 +125,8 @@ public class McCafeCouponAdapter {
         List<QueryOrdersResponse.DataBean.OrderBean.AccountBean> accountList = orderBean.getAccountList().stream().filter(
                 account -> (getQueryOrderAccountType(OldOrderAccountType.getByCode(account.getType())).equals(QueryOrderAccountType.COUPON)
                         ||  getQueryOrderAccountType(OldOrderAccountType.getByCode(account.getType())).equals(QueryOrderAccountType.PRODUCT_COUPON)
-                        ||  getQueryOrderAccountType(OldOrderAccountType.getByCode(account.getType())).equals(QueryOrderAccountType.DISCOUNT_COUPON)
-                        ||  getQueryOrderAccountType(OldOrderAccountType.getByCode(account.getType())).equals(QueryOrderAccountType.FREIGHT_COUPON))).collect(Collectors.toList());
+                        ||  getQueryOrderAccountType(OldOrderAccountType.getByCode(account.getType())).equals(QueryOrderAccountType.DISCOUNT_COUPON))
+        ).collect(Collectors.toList());
         if (CollectionUtils.isEmpty(accountList) ) {
             return null;
         }