核销万能券

assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/adapter/OrderSdkAdapter.java

@@ -801,7 +801,7 @@ public class OrderSdkAdapter {
                 }
                 accountBean.setSequence(orderSettlementResp.getProductSeq());
                 accountBean.setType(getOldOrderAccountType(orderSettlementResp.getSettlementType()));
-                accountBean.setAddInfo("");
+                accountBean.setAddInfo(orderSettlementResp.getExtInfo());
                 accountBean.setPlatformDiscountAmount(orderSettlementResp.getPlatformDiscountAmount());
                 accountBean.setShopDiscountAmount(orderSettlementResp.getShopDiscountAmount());
                 accountList.add(accountBean);

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

@@ -32,6 +32,7 @@ import cn.freemud.management.enums.OrderSource;
 import cn.freemud.service.mccafe.CouponClientService;
 import cn.freemud.utils.BeanUtil;
 import cn.freemud.utils.LogUtil;
+import com.alibaba.fastjson.JSON;
 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;
@@ -671,8 +672,14 @@ public class CouponAdapter {
                         }
                         MCCafeProductRedeemVo mcCafeProductRedeemVo = new MCCafeProductRedeemVo();
                         mcCafeProductRedeemVo.setPid(pid);
-                        mcCafeProductRedeemVo.setKeyProductCode(productBean.getCustomerCode());
-                        mcCafeProductRedeemVo.setCustomer_code(productBean.getCustomerCode());
+                        Integer extendType = StringUtils.isBlank(accountBean.getAddInfo())?null: JSON.parseObject(accountBean.getAddInfo()).getInteger("extendType");
+                        if(extendType != null && extendType == 4) {
+                            mcCafeProductRedeemVo.setKeyProductCode(JSON.parseObject(accountBean.getAddInfo()).getString("tenderId"));
+                            mcCafeProductRedeemVo.setCustomer_code(JSON.parseObject(accountBean.getAddInfo()).getString("tenderId"));
+                        } else {
+                            mcCafeProductRedeemVo.setKeyProductCode(productBean.getCustomerCode());
+                            mcCafeProductRedeemVo.setCustomer_code(productBean.getCustomerCode());
+                        }
                         mcCafeProductRedeemVo.setConsume_num(productDiscount.getDiscountQty());
                         mcCafeProductRedeemVo.setSeq(i + 1);
                         if(null != coupon && CollectionUtils.isNotEmpty(coupon.getCodeInfo().getGroups())) {

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

@@ -8,6 +8,7 @@ import cn.freemud.management.enums.CouponReqTypeEnum;
 import cn.freemud.management.enums.MCCafeChannelEnum;
 import cn.freemud.management.enums.OrderSource;
 import cn.freemud.management.thirdparty.CouponOfflineMCCafeClient;
+import com.alibaba.fastjson.JSON;
 import com.freemud.application.sdk.api.ordercenter.enums.OrderClientType;
 import com.freemud.sdk.api.assortment.order.enums.OldOrderAccountType;
 import com.freemud.sdk.api.assortment.order.enums.OrderSourceType;
@@ -90,8 +91,14 @@ public class McCafeCouponAdapter {
                         }
                         MCCafeProductRedeemVo mcCafeProductRedeemVo = new MCCafeProductRedeemVo();
                         mcCafeProductRedeemVo.setPid(pid);
-                        mcCafeProductRedeemVo.setKeyProductCode(productBean.getCustomerCode());
-                        mcCafeProductRedeemVo.setCustomer_code(productBean.getCustomerCode());
+                        Integer extendType = StringUtils.isBlank(accountBean.getAddInfo())?null: JSON.parseObject(accountBean.getAddInfo()).getInteger("extendType");
+                        if(extendType != null && extendType == 4) {
+                            mcCafeProductRedeemVo.setKeyProductCode(JSON.parseObject(accountBean.getAddInfo()).getString("tenderId"));
+                            mcCafeProductRedeemVo.setCustomer_code(JSON.parseObject(accountBean.getAddInfo()).getString("tenderId"));
+                        } else {
+                            mcCafeProductRedeemVo.setKeyProductCode(productBean.getCustomerCode());
+                            mcCafeProductRedeemVo.setCustomer_code(productBean.getCustomerCode());
+                        }
                         mcCafeProductRedeemVo.setConsume_num(productDiscount.getDiscountQty());
                         mcCafeProductRedeemVo.setSeq(i + 1);
                         if(null != coupon && CollectionUtils.isNotEmpty(coupon.getCodeInfo().getGroups())) {

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

-package cn.freemud.service.thirdparty;
-
-import cn.freemud.entities.dto.CouponCodeResponseDto;
-import cn.freemud.entities.dto.CouponCodeVerificationMCCafeDto;
-import com.freemud.application.sdk.api.couponcenter.offline.response.CouponRedeemResponse;
-import org.springframework.cloud.netflix.feign.FeignClient;
-import org.springframework.web.bind.annotation.PostMapping;
-
-@FeignClient(name = "COUPONMCCafe",url="http://coupon-api-gateway-koderover-dev-coupon.api-ingress.sandload.cn")
-public interface CouponOfflineMCCafeClient {
-
-    @PostMapping("/mccafe/redeem")
-    CouponRedeemResponse redeem(CouponCodeVerificationMCCafeDto couponCodeVerificationMCCafeDto);
-
-    @PostMapping("/mccafe/cancelRedeem")
-    CouponRedeemResponse cancelRedeem(CouponCodeVerificationMCCafeDto couponCodeVerificationMCCafeDto);
-
-    @PostMapping("/mccafe/query")
-    CouponRedeemResponse query(CouponCodeVerificationMCCafeDto couponCodeVerificationMCCafeDto);
-
-    @PostMapping("/mccafe/lock")
-    CouponRedeemResponse lock(CouponCodeVerificationMCCafeDto couponCodeVerificationMCCafeDto);
-
-    @PostMapping("/mccafe/unlock")
-    CouponRedeemResponse unlock(CouponCodeVerificationMCCafeDto couponCodeVerificationMCCafeDto);
-}