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

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

@@ -672,7 +672,16 @@ public class CouponAdapter {
                         }
                         MCCafeProductRedeemVo mcCafeProductRedeemVo = new MCCafeProductRedeemVo();
                         mcCafeProductRedeemVo.setPid(pid);
-                        Integer extendType = StringUtils.isBlank(accountBean.getAddInfo())?null: JSON.parseObject(accountBean.getAddInfo()).getInteger("extendType");
+                        String extInfo = null;
+                        if(CollectionUtils.isNotEmpty(productBean.getDiscountList())) {
+                            for (QueryOrdersResponseDto.DataBean.OrderBean.ProductBean.ProductDiscount discount : productBean.getDiscountList()) {
+                                if(discount.getDiscountId().equals(accountBean.getAccountId())) {
+                                    extInfo = discount.getAddInfo();
+                                    break;
+                                }
+                            }
+                        }
+                        Integer extendType = StringUtils.isBlank(extInfo)?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"));

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

@@ -91,7 +91,17 @@ public class McCafeCouponAdapter {
                         }
                         MCCafeProductRedeemVo mcCafeProductRedeemVo = new MCCafeProductRedeemVo();
                         mcCafeProductRedeemVo.setPid(pid);
-                        Integer extendType = StringUtils.isBlank(accountBean.getAddInfo())?null: JSON.parseObject(accountBean.getAddInfo()).getInteger("extendType");
+
+                        String extInfo = null;
+                        if(CollectionUtils.isNotEmpty(productBean.getDiscountList())) {
+                            for (QueryOrdersResponse.DataBean.OrderBean.ProductBean.ProductDiscount discount : productBean.getDiscountList()) {
+                                if(discount.getDiscountId().equals(accountBean.getAccountId())) {
+                                    extInfo = discount.getAddInfo();
+                                    break;
+                                }
+                            }
+                        }
+                        Integer extendType = StringUtils.isBlank(extInfo)?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"));