Merge branch 'feature/20200915_麦咖啡p2v3活动入机增加TENDERID字段'

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

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

@@ -801,7 +801,6 @@ 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());
@@ -922,7 +921,7 @@ public class OrderSdkAdapter {
                 productDiscount.setDiscountAmount(orderSettlementResp.getShopDiscountAmount());
                 //无数据
                 productDiscount.setCustomerCode("");
-                productDiscount.setAddInfo("");
+                productDiscount.setAddInfo(orderSettlementResp.getExtInfo());
                 productDiscount.setProductId(orderSettlementResp.getProductId());
                 discountList.add(productDiscount);
             }
@@ -2821,6 +2820,7 @@ public class OrderSdkAdapter {
                 orderSettlementCreateReq.setIsOnline(true);
                 orderSettlementCreateReq.setSettlementType(getDiscountType(accountRequest.getAccountType()));
                 orderSettlementCreateReq.setNote(accountRequest.getName());
+                orderSettlementCreateReq.setExtInfo(accountRequest.getAddInfo());
                 orderSettlementCreateReqList.add(orderSettlementCreateReq);
             }
 

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,15 @@ public class CouponAdapter {
                         }
                         MCCafeProductRedeemVo mcCafeProductRedeemVo = new MCCafeProductRedeemVo();
                         mcCafeProductRedeemVo.setPid(pid);
-                        mcCafeProductRedeemVo.setKeyProductCode(productBean.getCustomerCode());
-                        mcCafeProductRedeemVo.setCustomer_code(productBean.getCustomerCode());
+                        String extInfo = productDiscount.getAddInfo();
+                        Integer extendType = StringUtils.isBlank(extInfo)?null: JSON.parseObject(extInfo).getInteger("extendType");
+                        if(extendType != null && extendType == 4) {
+                            mcCafeProductRedeemVo.setKeyProductCode(JSON.parseObject(extInfo).getString("tenderId"));
+                            mcCafeProductRedeemVo.setCustomer_code(JSON.parseObject(extInfo).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-application-service/src/main/java/cn/freemud/adapter/OrderAdapter.java

@@ -190,11 +190,15 @@ public class OrderAdapter {
             if(mcCafePartnerId.equals(createOrderDto.getCompanyId())) {
                 JSONObject jsonObject = new JSONObject();
                 if(ActivityTypeEnum.TYPE_11.getCode().equals(activityDiscountsDto.getActivityType())
-                        || ActivityTypeEnum.TYPE_12.getCode().equals(activityDiscountsDto.getActivityType())) {
+                        || ActivityTypeEnum.TYPE_12.getCode().equals(activityDiscountsDto.getActivityType())
+                        || ActivityTypeEnum.TYPE_32.getCode().equals(activityDiscountsDto.getActivityType())) {
                     jsonObject.put("tenderId", activityDiscountsDto.getTenderId());
                 } else if(ActivityTypeEnum.TYPE_34.getCode().equals(activityDiscountsDto.getActivityType())) {
                     jsonObject.put("customerCode", activityDiscountsDto.getTenderId());
                 }
+                if(null != activityDiscountsDto.getExtendType()) {
+                    jsonObject.put("extendType", activityDiscountsDto.getExtendType());
+                }
                 createOrderAccountDto.setAddInfo(jsonObject.toJSONString());
             }
             orderAccountDtos.add(createOrderAccountDto);
@@ -360,6 +364,14 @@ public class OrderAdapter {
                     .discountQty((activityDiscountsDto.getActualActivityGoodsNumber()==null||activityDiscountsDto.getActualActivityGoodsNumber()==0)
                             ?createOrderProductDto.getNumber():activityDiscountsDto.getActualActivityGoodsNumber())
                     .build();
+            JSONObject jsonObject = new JSONObject();
+            if(ActivityTypeEnum.TYPE_32.getCode().equals(activityDiscountsDto.getActivityType())) {
+                jsonObject.put("tenderId", activityDiscountsDto.getTenderId());
+            }
+            if(null != activityDiscountsDto.getExtendType()) {
+                jsonObject.put("extendType", activityDiscountsDto.getExtendType());
+            }
+            createOrderAccountDto.setAddInfo(jsonObject.toJSONString());
             orderAccountDtos.add(createOrderAccountDto);
         }
         return orderAccountDtos;

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

@@ -23,4 +23,8 @@ public class ActivityDiscountsDto {
     private Integer activityType;
     private Integer actualActivityGoodsNumber;
     private String tenderId;
+    /**
+     * 1-运费券 2-运费月卡券 3-月卡券 4-万能券 5-啡常月享卡 6-通用券
+     */
+    private Integer extendType;
 }

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

@@ -162,6 +162,8 @@ public class CouponClientServiceImpl implements CouponClientService {
 
     @Override
     public List<CouponRedeemResponse> redeemBatch(QueryOrdersResponseDto.DataBean.OrderBean orderBean) {
+        System.out.println("=======================================================================");
+        System.out.println(JSON.toJSONString(orderBean));
         if (null == orderBean || CollectionUtils.isEmpty(orderBean.getAccountList())) {
             return null;
         }

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,15 @@ public class McCafeCouponAdapter {
                         }
                         MCCafeProductRedeemVo mcCafeProductRedeemVo = new MCCafeProductRedeemVo();
                         mcCafeProductRedeemVo.setPid(pid);
-                        mcCafeProductRedeemVo.setKeyProductCode(productBean.getCustomerCode());
-                        mcCafeProductRedeemVo.setCustomer_code(productBean.getCustomerCode());
+                        String extInfo = productDiscount.getAddInfo();
+                        Integer extendType = StringUtils.isBlank(extInfo)?null: JSON.parseObject(extInfo).getInteger("extendType");
+                        if(extendType != null && extendType == 4) {
+                            mcCafeProductRedeemVo.setKeyProductCode(JSON.parseObject(extInfo).getString("tenderId"));
+                            mcCafeProductRedeemVo.setCustomer_code(JSON.parseObject(extInfo).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);
-}