核销券

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

@@ -660,7 +660,9 @@ public class CouponAdapter {
     public MCCafeCouponRequest convert2MCCafeCouponRequest(QueryOrdersResponseDto.DataBean.OrderBean orderBean, QueryOrdersResponseDto.DataBean.OrderBean.AccountBean accountBean, McdNetBatchQueryResponse.Coupon coupon) {
         List<MCCafeProductRedeemVo> products = new ArrayList<>();
         //商品券核销核销参数
-        if (OldOrderAccountType.PRODUCT_COUPON.getCode().equals(accountBean.getType()) || OldOrderAccountType.EVM_PRODUCT_COUPON.getCode().equals(accountBean.getType())) {
+        if (OldOrderAccountType.PRODUCT_COUPON.getCode().equals(accountBean.getType())
+                || OldOrderAccountType.EVM_PRODUCT_COUPON.getCode().equals(accountBean.getType())
+                || OldOrderAccountType.B3S1_COUPON.getCode().equals(accountBean.getType())) {
             for (int i = 0; i < orderBean.getProductList().size(); i++) {
                 QueryOrdersResponseDto.DataBean.OrderBean.ProductBean productBean = orderBean.getProductList().get(i);
                 String pid = org.apache.commons.lang3.StringUtils.isNotBlank(productBean.getSpecification()) ? productBean.getSpecification() : productBean.getProductId();

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

@@ -74,6 +74,7 @@ public class CouponClientServiceImpl implements CouponClientService {
                 account -> (OldOrderAccountType.COUPON.getCode().equals(account.getType())
                         || OldOrderAccountType.PRODUCT_COUPON.getCode().equals(account.getType())
                         || OldOrderAccountType.EVM_PRODUCT_COUPON.getCode().equals(account.getType())
+                        || OldOrderAccountType.B3S1_COUPON.getCode().equals(account.getType())
                         || OldOrderAccountType.DISCOUNT_COUPON.getCode().equals(account.getType())
                         || OldOrderAccountType.FREIGHT_COUPON.getCode().equals(account.getType()))
         ).collect(Collectors.toList());
@@ -147,6 +148,7 @@ public class CouponClientServiceImpl implements CouponClientService {
                 account -> (OldOrderAccountType.PRODUCT_COUPON.getCode().equals(account.getType())
                         || OldOrderAccountType.EVM_PRODUCT_COUPON.getCode().equals(account.getType())
                         || OldOrderAccountType.COUPON.getCode().equals(account.getType())
+                        || OldOrderAccountType.B3S1_COUPON.getCode().equals(account.getType())
                         || OldOrderAccountType.DISCOUNT_COUPON.getCode().equals(account.getType())
                         )).collect(Collectors.toList());
         if (CollectionUtils.isEmpty(accountList)) {