Merge branch 'feature-2020/8/6-McCafe-会阳' into develop

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

@@ -46,7 +46,7 @@ public class McCafeCouponAdapter {
     public MCCafeCouponRequest convert2MCCafeCouponRequest(QueryOrdersResponse.DataBean.OrderBean orderBean, QueryOrdersResponse.DataBean.OrderBean.AccountBean accountBean) {
         List<MCCafeProductRedeemVo> products = new ArrayList<>();
         //商品券核销核销参数
-        if (QueryOrderAccountType.PRODUCT_COUPON.equals(accountBean.getType())) {
+        if (QueryOrderAccountType.PRODUCT_COUPON.equals(getQueryOrderAccountType(getOrderAccountType(accountBean.getType())))) {
             for (int i = 0; i < orderBean.getProductList().size(); i++) {
                 QueryOrdersResponse.DataBean.OrderBean.ProductBean productBean = orderBean.getProductList().get(i);
                 String pid = StringUtils.isNotBlank(productBean.getSpecification()) ? productBean.getSpecification() : productBean.getProductId();
@@ -67,6 +67,18 @@ public class McCafeCouponAdapter {
                     }
                 }
             }
+        }else if (QueryOrderAccountType.COUPON.equals(getQueryOrderAccountType(getOrderAccountType(accountBean.getType())))) {
+            for (int i = 0; i < orderBean.getProductList().size(); i++) {
+                QueryOrdersResponse.DataBean.OrderBean.ProductBean productBean = orderBean.getProductList().get(i);
+                String pid = StringUtils.isNotBlank(productBean.getSpecification()) ? productBean.getSpecification() : productBean.getProductId();
+                MCCafeProductRedeemVo mcCafeProductRedeemVo = new MCCafeProductRedeemVo();
+                mcCafeProductRedeemVo.setPid(pid);
+                mcCafeProductRedeemVo.setKeyProductCode(productBean.getCustomerCode());
+                mcCafeProductRedeemVo.setCustomer_code(productBean.getCustomerCode());
+                mcCafeProductRedeemVo.setConsume_num(productBean.getNumber());
+                mcCafeProductRedeemVo.setSeq(i + 1);
+                products.add(mcCafeProductRedeemVo);
+            }
         }
         MCCafeCouponRequest mcCafeCouponRequest = new MCCafeCouponRequest();
         mcCafeCouponRequest.setVer(Integer.valueOf(Version.VERSION_1));