蜜雪新增虚拟业务买券

order-application-service/pom.xml

@@ -40,7 +40,7 @@
         <dependency>
             <groupId>cn.freemud</groupId>
             <artifactId>assortment-ordercenter-sdk</artifactId>
-            <version>2.1.15-RELEASE</version>
+            <version>2.2.31-RELEASE</version>
         </dependency>
         <dependency>
             <groupId>com.freemud.application.service.sdk</groupId>
@@ -346,6 +346,18 @@
             <groupId>org.apache.skywalking</groupId>
             <artifactId>apm-toolkit-logback-1.x</artifactId>
         </dependency>
+        <dependency>
+            <groupId>cn.freemud</groupId>
+            <artifactId>assortment-ordercenter-sdk</artifactId>
+            <version>1.9.5-SNAPSHOT</version>
+            <scope>compile</scope>
+        </dependency>
+        <dependency>
+            <groupId>com.freemud.sdk.api.assortment</groupId>
+            <artifactId>assortment-orderdistributor-sdk</artifactId>
+            <version>3.5.5.RELEASE</version>
+            <scope>compile</scope>
+        </dependency>
     </dependencies>
     <build>
         <plugins>

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

@@ -328,44 +328,16 @@ public class OrderAdapterServiceImpl implements OrderAdapterService {
      */
     @Override
     public BaseResponse appCreateOrder(AppCreateOrderVo createOrderVo) {
-        //蜜雪业务新增APP购买虚拟券，此处判断分支->蜜雪买券逻辑走平台买券逻辑20210108 向下还存在发起支付分之判断  wanghanghang
-//        if("6".equals(createOrderVo.getBizType())){
-//            SellCouponCreateOrderVo sellCouponCreateOrderVo = conversionObjByAppCreateOrderVo(createOrderVo);
-//            return sellCouponOrderService.createOrder(sellCouponCreateOrderVo);
-//        }
         AssortmentCustomerInfoVo assortmentCustomerInfoVo = assortmentCustomerInfoManager.getCustomerInfoByObject(createOrderVo.getSessionId());
         if (assortmentCustomerInfoVo == null || StringUtils.isEmpty(assortmentCustomerInfoVo.getMemberId())) {
             return ResponseUtil.error(ResponseResult.NOT_LOGIN);
         }
-//        if (UserLoginChannelEnum.APP.getCode().equals(assortmentCustomerInfoVo.getChannel())) {
+        if (UserLoginChannelEnum.APP.getCode().equals(assortmentCustomerInfoVo.getChannel())) {
             return appOrderService.createOrder(createOrderVo, assortmentCustomerInfoVo);
-//        }
- //       return ResponseUtil.error(ResponseResult.PARAMETER_MISSING);
+        }
+       return ResponseUtil.error(ResponseResult.PARAMETER_MISSING);
     }
 
-
-    /**
-     * 20210107 wanghanghang
-     * 蜜雪业务新增APP购买虚拟券，此处在APP下单时，调用平台买券业务进行对象转换
-     *
-     * @param createOrderVo
-     * @return
-     */
-//    private SellCouponCreateOrderVo conversionObjByAppCreateOrderVo(AppCreateOrderVo createOrderVo) {
-//        SellCouponCreateOrderVo sellCouponCreateOrderVo = new SellCouponCreateOrderVo();
-//        sellCouponCreateOrderVo.setBizType(createOrderVo.getBizType() + "");
-//        sellCouponCreateOrderVo.setSessionId(createOrderVo.getSessionId());
-//        sellCouponCreateOrderVo.setShopId(createOrderVo.getShopId());
-//        //获取商品集合里的虚拟商品skuid
-//        //sellCouponCreateOrderVo.setSkuId(createOrderVo.getOrderProducts().get(0).getSkuId());
-//        sellCouponCreateOrderVo.setSkuId(createOrderVo.getSkuId());
-//        sellCouponCreateOrderVo.setCardCode(null);
-//        sellCouponCreateOrderVo.setMenuType(createOrderVo.getMenuType());
-//        sellCouponCreateOrderVo.setChannel("");
-//        sellCouponCreateOrderVo.setVersion(createOrderVo.getVersion());
-//        return sellCouponCreateOrderVo;
-//    }
-
     /**
      * 标准点餐参数校验
      *

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

@@ -1487,10 +1487,10 @@ public class OrderServiceImpl implements Orderservice {
 
         List<QueryOrdersResponse.DataBean.OrderBean.ProductBean> productList = response.getData().getProductList();
         if(productList!=null && productList.size()>0){
-
             productList.stream().forEach(productBean -> {
-                gson.fromJson(productBean.getExtInfo(), OrderExtInfoDto.class);
-            });
+                productList.get(0).getProductExtInfo().add(gson.fromJson(productBean.getExtInfo(), QueryOrdersResponse.DataBean.OrderBean.ProductBean.ProductExtInfo.class)
+            );
+                });
         }
 
         buildQueryOrderResponseVo(queryOrderResponseVo, response, partnerId);