蜜雪新增虚拟业务买券

order-application-service/pom.xml

@@ -25,7 +25,7 @@
         <dependency>
             <groupId>com.freemud.sdk.api.assortment</groupId>
             <artifactId>assortment-orderdistributor-sdk</artifactId>
-            <version>3.5.6.RELEASE</version>
+            <version>1.9.5-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>com.freemud.application.service.sdk</groupId>

order-application-service/src/main/java/cn/freemud/controller/OrderController.java

@@ -28,6 +28,7 @@ import com.freemud.application.sdk.api.log.LogParams;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.BindingResult;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
@@ -96,7 +97,7 @@ public class OrderController {
      */
     @ApiAnnotation(logMessage = "appCreateOrder")
     @PostMapping("/app/create")
-    public BaseResponse appCreateOrder(@Validated @LogParams @RequestBody AppCreateOrderVo createOrderVo) {
+    public BaseResponse appCreateOrder(@Validated @LogParams @RequestBody AppCreateOrderVo createOrderVo, BindingResult bindingResult) {
         return orderAdapterService.appCreateOrder(createOrderVo);
     }
 

order-application-service/src/main/java/cn/freemud/entities/vo/OrderProductVo.java

@@ -6,6 +6,10 @@ import org.hibernate.validator.constraints.NotEmpty;
 import javax.validation.constraints.Min;
 import java.util.List;
 
+
+
+
+
 /**
  * All rights Reserved, Designed By www.freemud.cn
  *

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

@@ -88,6 +88,13 @@ public class AppOrderServiceImpl implements AppOrderService {
     @Autowired
     private StoreCenterService storeCenterService;
 
+    @Autowired
+    private OrderSdkService orderSdkService;
+    @Autowired
+    private OrderSdkAdapter orderSdkAdapter;
+    @Autowired
+    private SellCouponOrderServiceImpl sellCouponOrderService;
+
     /**
      * 不支持会员卡
      */
@@ -143,10 +150,7 @@ public class AppOrderServiceImpl implements AppOrderService {
         return orderservice.createPrepayOrder(createPrepayRequestDto);
     }
 
-    @Autowired
-    private OrderSdkService orderSdkService;
-    @Autowired
-    private OrderSdkAdapter orderSdkAdapter;
+
     /**
      * APP下单，下单带商品信息，不经过购物车服务，不唤起支付
      */
@@ -170,7 +174,7 @@ public class AppOrderServiceImpl implements AppOrderService {
         if (createOrderReq.getBizType() != null && BizTypeEnum.APP_COUPON.getBizType().equals(createOrderReq.getBizType())) {
             //20200107提取虚拟商品券效验方法---》校验虚拟商品，如果正常则返回创建订单对象
             BaseResponse createOrderRequestResponse =
-                    new SellCouponOrderServiceImpl().checkOrderCoupon(customerInfo,storeResponse,trackingNo,createOrderReq.getMenuType(), Integer.valueOf(createOrderReq.getBizType()), partnerId, shopId, createOrderReq.getSkuId(), null);
+                    sellCouponOrderService.checkOrderCoupon(customerInfo,storeResponse,trackingNo,createOrderReq.getMenuType(), Integer.valueOf(createOrderReq.getBizType()), partnerId, shopId, createOrderReq.getSkuId(), null);
             if (createOrderRequestResponse == null || !ResponseResult.SUCCESS.getCode().equals(createOrderRequestResponse.getCode()) || createOrderRequestResponse.getResult() == null) {
                 return createOrderRequestResponse;
             }
@@ -181,9 +185,6 @@ public class AppOrderServiceImpl implements AppOrderService {
                 return ResponseUtil.error(ResponseResult.ORDER_CREATE_ERROR);
             }
             orderBean = createOrderResponse.getData();
-
-
-
         }else{
             /**APP创建实体商品业务逻辑**/
             // 查商品服务确定金额

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

@@ -337,10 +337,10 @@ public class OrderAdapterServiceImpl implements OrderAdapterService {
         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);
     }
 
 

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

@@ -1485,6 +1485,13 @@ public class OrderServiceImpl implements Orderservice {
             joinPayGift(sessionId, queryOrderResponseVo, partnerId);
         }
 
+        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);
+            });
+        }
 
         buildQueryOrderResponseVo(queryOrderResponseVo, response, partnerId);
 

order-application-service/src/main/resources/application.properties

@@ -24,4 +24,6 @@ management.endpoint.shutdown.enabled=true
 management.security.enabled=false
 management.health.rabbit.enabled=false
 
-mcCafe.partnerId=1206
+mcCafe.partnerId=1206
\ No newline at end of file
+
+eureka.client.enabled=false
\ No newline at end of file

order-application-service/src/test/java/cn.freemud/utils/QrCodeUtilTest.java

@@ -13,14 +13,72 @@
 package cn.freemud.utils;
 
 
+import com.google.gson.Gson;
+import com.google.gson.reflect.TypeToken;
 import org.junit.Test;
 
+import java.util.ArrayList;
+import java.util.List;
+
 public class QrCodeUtilTest {
 
     @Test
-    public void createQrCodeTest() throws Exception {
-        String imageString = QrCodeUtil.createQrCode("1243456", 200, "PNG");
-        System.out.println(imageString);
+    public void qq() {
+//        String imageString = QrCodeUtil.createQrCode("1243456", 200, "PNG");
+//        System.out.println(imageString);
+
+        aa a1 = new aa();
+        List<aa> list = new ArrayList<>();
+
+        for (int i = 0;i<4 ;i++){
+            a1.setA("1" + i);
+            a1.setB("1"+ i);
+            a1.setC("1"+ i);
+            list.add(a1);
+        }
+        String astr = list.toString();
+
+        Gson gson = new Gson();
+        List<aa> goods = gson.fromJson(astr,
+                new TypeToken<List<aa>>() {
+                }.getType());
+
+        System.out.println(goods);
+
+    }
+
+
+    public class aa {
+        String a;
+        String b;
+        String c;
+
+        public String getA() {
+            return a;
+        }
+
+        public void setA(String a) {
+            this.a = a;
+        }
+
+        public String getB() {
+            return b;
+        }
+
+        public void setB(String b) {
+            this.b = b;
+        }
+
+        public String getC() {
+            return c;
+        }
+
+        public void setC(String c) {
+            this.c = c;
+        }
     }
 
+
+
+
 }
\ No newline at end of file