orderbean 位置调整

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

@@ -2149,7 +2149,7 @@ public class OrderSdkAdapter {
         if (result.getResult() == null) {
             return response;
         }
-        GetStatisticStoreOrderReportResponse.OrderBean data = new GetStatisticStoreOrderReportResponse.OrderBean();
+        GetStatisticStoreOrderReportResponse.StatisticStoreOrderReport data = new GetStatisticStoreOrderReportResponse.StatisticStoreOrderReport();
         data.setOrderCount(result.getResult().getOrderCount() == null ? null : result.getResult().getOrderCount().longValue());
         data.setTotalAmount(result.getResult().getTotalAmount() == null ? null : result.getResult().getTotalAmount().longValue());
         response.setData(data);

assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/response/order/GetStatisticStoreOrderReportResponse.java

@@ -26,11 +26,11 @@ public class GetStatisticStoreOrderReportResponse {
 
     private Integer errcode;
     private String errmsg;
-    private OrderBean data;
+    private StatisticStoreOrderReport data;
 
     @NoArgsConstructor
     @Data
-    public static class OrderBean {
+    public static class StatisticStoreOrderReport {
         /**
          * orderCount : 23
          * totalAmount : 72052

shopping-cart-application-service/src/main/java/cn/freemud/adapter/ActivityAdapter.java

@@ -24,6 +24,10 @@ import cn.freemud.entities.vo.coupon.CartProduct;
 import cn.freemud.entities.vo.coupon.CouponAvailableCartInfo;
 import cn.freemud.enums.*;
 import cn.freemud.utils.PropertyConvertUtil;
+import com.freemud.application.sdk.api.ordercenter.entities.v1.AccountBeanV1;
+import com.freemud.application.sdk.api.ordercenter.entities.v1.OrderBeanV1;
+import com.freemud.application.sdk.api.ordercenter.entities.v1.ProductBeanV1;
+import com.freemud.application.sdk.api.ordercenter.entities.v1.ProductDiscountV1;
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang.StringUtils;
 import org.springframework.data.util.Pair;
@@ -214,7 +218,7 @@ public class ActivityAdapter {
         return activityUpdateStockRequestDto;
     }
 
-    public ActivityCancelStockRequestDto convert2ActivityCancelStockRequestDto(QueryOrdersResponseDto.DataBean.OrderBean orderBean, List<Integer> transType) {
+    public ActivityCancelStockRequestDto convert2ActivityCancelStockRequestDto(OrderBeanV1 orderBean, List<Integer> transType) {
         ActivityCancelStockRequestDto activityCancelStockRequestDto = new ActivityCancelStockRequestDto();
         activityCancelStockRequestDto.setVer(Version.VERSION_1);
         activityCancelStockRequestDto.setPartnerCode(orderBean.getCompanyId());
@@ -233,19 +237,19 @@ public class ActivityAdapter {
         }
         activityCancelStockRequestDto.setProducts(orderProducts);
         //优惠券冲正
-        List<QueryOrdersResponseDto.DataBean.OrderBean.AccountBean> accountList = orderBean.getAccountList();
+        List<AccountBeanV1> accountList = orderBean.getAccountList();
         if (!CollectionUtils.isEmpty(accountList) && !CollectionUtils.isEmpty(orderBean.getProductList())) {
-            for (QueryOrdersResponseDto.DataBean.OrderBean.AccountBean accountBean : accountList) {
+            for (AccountBeanV1 accountBean : accountList) {
                 List<CouponCodeVerificationProductDto> products = new ArrayList<>();
                 //订单中存储的6代表商品券
                 if (Objects.equals(accountBean.getType(), OrderAccountType.PRODUCT_COUPON.getCode())) {
                     for (int i = 0; i < orderBean.getProductList().size(); i++) {
-                        QueryOrdersResponseDto.DataBean.OrderBean.ProductBean productBean = orderBean.getProductList().get(i);
+                        ProductBeanV1 productBean = orderBean.getProductList().get(i);
                         String pid = StringUtils.isNotBlank(productBean.getSpecification()) ? productBean.getSpecification() : productBean.getProductId();
                         if (!org.springframework.util.CollectionUtils.isEmpty(orderBean.getProductList().get(i).getDiscountList())) {
-                            List<QueryOrdersResponseDto.DataBean.OrderBean.ProductBean.ProductDiscount> discounts = orderBean.getProductList().get(i).getDiscountList().stream().
+                            List<ProductDiscountV1> discounts = orderBean.getProductList().get(i).getDiscountList().stream().
                                     filter(productDiscount -> productDiscount.getDiscountId().equals(accountBean.getAccountId())).collect(Collectors.toList());
-                            for (QueryOrdersResponseDto.DataBean.OrderBean.ProductBean.ProductDiscount productDiscount : discounts) {
+                            for (ProductDiscountV1 productDiscount : discounts) {
                                 CouponCodeVerificationProductDto couponCodeVerificationProductDto = new CouponCodeVerificationProductDto();
                                 couponCodeVerificationProductDto.setPID(pid);
                                 couponCodeVerificationProductDto.setConsume_num(productDiscount.getDiscountQty());

shopping-cart-application-service/src/main/java/cn/freemud/amp/config/PushOrderConfig.java

-package cn.freemud.amp.config;
-
-import cn.freemud.amp.service.OrderMQService;
-import org.springframework.amqp.core.*;
-import org.springframework.context.annotation.Bean;
-
-/**
- * All rights Reserved, Designed By www.freemud.cn
- *
- * @version V1.0
- * @Title: ${FILE_NAME}
- * @Package com.freemud.mail.core
- * @Description: ${TODO}(用一句话描述该文件做什么)
- * @author: aiqi.gong
- * @date: 2019/3/11 18:26
- * @Copyright: 2018 www.freemud.cn Inc. All rights reserved.
- * 注意：本内容仅限于上海非码科技内部传阅，禁止外泄以及用于其他的商业目
- */
-public class PushOrderConfig {
-    public static final String EXCHANGE_NAME = "topic-Exchange";
-    public static final String PUSH_ORDER_QUEUE = "push-order-queue";
-    public static final String PUSH_ORDER_QUEUE_ROUTING_KEY = "push-order-queue-routing-key";
-
-    /**
-     * 定义基于Fanout 的Exchange。
-     * 基于这个代码，也可以非常方便的定义其他的Exchange类型。
-     *
-     * @return Fanout Exchange
-     */
-    @Bean
-    public Exchange topicExchange() {
-        return ExchangeBuilder.topicExchange(EXCHANGE_NAME).durable(true).build();
-    }
-
-    /**
-     * 写入RabbitMQ使用的默认队列
-     *
-     * @return
-     */
-    @Bean
-    public Queue pushOrderQueue() {
-        return QueueBuilder.durable(PUSH_ORDER_QUEUE).build();
-    }
-
-    /**
-     * 绑定消息队列
-     *
-     * @param pushOrderQueue    消息队列
-     * @param topicExchange RabbitMQ Fanout Exchange
-     * @return 消息队列绑定
-     */
-    @Bean
-    Binding bindingMail(Queue pushOrderQueue, Exchange topicExchange) {
-        return BindingBuilder.bind(pushOrderQueue).to(topicExchange).with(PUSH_ORDER_QUEUE_ROUTING_KEY).noargs();
-    }
-
-    @Bean
-    public OrderMQService orderMQService() {
-        return new OrderMQService();
-    }
-}
+//package cn.freemud.amp.config;
+//
+//import org.springframework.amqp.core.*;
+//import org.springframework.context.annotation.Bean;
+//
+///**
+// * All rights Reserved, Designed By www.freemud.cn
+// *
+// * @version V1.0
+// * @Title: ${FILE_NAME}
+// * @Package com.freemud.mail.core
+// * @Description: ${TODO}(用一句话描述该文件做什么)
+// * @author: aiqi.gong
+// * @date: 2019/3/11 18:26
+// * @Copyright: 2018 www.freemud.cn Inc. All rights reserved.
+// * 注意：本内容仅限于上海非码科技内部传阅，禁止外泄以及用于其他的商业目
+// */
+//public class PushOrderConfig {
+//    public static final String EXCHANGE_NAME = "topic-Exchange";
+//    public static final String PUSH_ORDER_QUEUE = "push-order-queue";
+//    public static final String PUSH_ORDER_QUEUE_ROUTING_KEY = "push-order-queue-routing-key";
+//
+//    /**
+//     * 定义基于Fanout 的Exchange。
+//     * 基于这个代码，也可以非常方便的定义其他的Exchange类型。
+//     *
+//     * @return Fanout Exchange
+//     */
+//    @Bean
+//    public Exchange topicExchange() {
+//        return ExchangeBuilder.topicExchange(EXCHANGE_NAME).durable(true).build();
+//    }
+//
+//    /**
+//     * 写入RabbitMQ使用的默认队列
+//     *
+//     * @return
+//     */
+//    @Bean
+//    public Queue pushOrderQueue() {
+//        return QueueBuilder.durable(PUSH_ORDER_QUEUE).build();
+//    }
+//
+//    /**
+//     * 绑定消息队列
+//     *
+//     * @param pushOrderQueue    消息队列
+//     * @param topicExchange RabbitMQ Fanout Exchange
+//     * @return 消息队列绑定
+//     */
+//    @Bean
+//    Binding bindingMail(Queue pushOrderQueue, Exchange topicExchange) {
+//        return BindingBuilder.bind(pushOrderQueue).to(topicExchange).with(PUSH_ORDER_QUEUE_ROUTING_KEY).noargs();
+//    }
+//
+//    @Bean
+//    public OrderMQService orderMQService() {
+//        return new OrderMQService();
+//    }
+//}

shopping-cart-application-service/src/main/java/cn/freemud/amp/service/OrderMQService.java

-package cn.freemud.amp.service;
-
-import cn.freemud.amp.body.OrderBody;
-import cn.freemud.amp.config.PushOrderConfig;
-import cn.freemud.amqp.Header;
-import cn.freemud.amqp.MQMessage;
-import cn.freemud.amqp.MQService;
-import org.springframework.beans.factory.annotation.Autowired;
-
-/**
- * All rights Reserved, Designed By www.freemud.cn
- *
- * @version V1.0
- * @Title: ${FILE_NAME}
- * @Package com.freemud.mail.core
- * @Description: ${TODO}(用一句话描述该文件做什么)
- * @author: aiqi.gong
- * @date: 2019/3/19 20:00
- * @Copyright: 2018 www.freemud.cn Inc. All rights reserved.
- * 注意：本内容仅限于上海非码科技内部传阅，禁止外泄以及用于其他的商业目
- */
-public class OrderMQService {
-    @Autowired
-    private MQService mqService;
-
-    private static final String TEST = "test";
-
-
-    public void sendOrderMQ(OrderBody orderBody) {
-        MQMessage<OrderBody> orderBodyMQMessage = new MQMessage<>();
-        Header header = new Header();
-        orderBodyMQMessage.setHeader(header);
-        orderBodyMQMessage.setBody(orderBody);
-        mqService.convertAndSend(PushOrderConfig.EXCHANGE_NAME, PushOrderConfig.PUSH_ORDER_QUEUE_ROUTING_KEY, orderBodyMQMessage);
-    }
-}
+//package cn.freemud.amp.service;
+//
+//import cn.freemud.amp.body.OrderBody;
+//import cn.freemud.amp.config.PushOrderConfig;
+//import cn.freemud.amqp.Header;
+//import cn.freemud.amqp.MQMessage;
+//import cn.freemud.amqp.MQService;
+//import org.springframework.beans.factory.annotation.Autowired;
+//
+///**
+// * All rights Reserved, Designed By www.freemud.cn
+// *
+// * @version V1.0
+// * @Title: ${FILE_NAME}
+// * @Package com.freemud.mail.core
+// * @Description: ${TODO}(用一句话描述该文件做什么)
+// * @author: aiqi.gong
+// * @date: 2019/3/19 20:00
+// * @Copyright: 2018 www.freemud.cn Inc. All rights reserved.
+// * 注意：本内容仅限于上海非码科技内部传阅，禁止外泄以及用于其他的商业目
+// */
+//public class OrderMQService {
+//    @Autowired
+//    private MQService mqService;
+//
+//    private static final String TEST = "test";
+//
+//
+//    public void sendOrderMQ(OrderBody orderBody) {
+//        MQMessage<OrderBody> orderBodyMQMessage = new MQMessage<>();
+//        Header header = new Header();
+//        orderBodyMQMessage.setHeader(header);
+//        orderBodyMQMessage.setBody(orderBody);
+//        mqService.convertAndSend(PushOrderConfig.EXCHANGE_NAME, PushOrderConfig.PUSH_ORDER_QUEUE_ROUTING_KEY, orderBodyMQMessage);
+//    }
+//}

shopping-cart-application-service/src/main/java/cn/freemud/entities/dto/CreateOrderResponseDto.java

 package cn.freemud.entities.dto;
 
-import cn.freemud.entities.dto.QueryOrdersResponseDto.DataBean.OrderBean;
+import com.freemud.application.sdk.api.ordercenter.entities.v1.OrderBeanV1;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 import lombok.ToString;
@@ -17,7 +17,7 @@ public class CreateOrderResponseDto {
      */
 
     private Integer errcode;
-    private OrderBean data;
+    private OrderBeanV1 data;
     private String errmsg;
 
 }

shopping-cart-application-service/src/main/java/cn/freemud/entities/dto/QueryOrderByIdResponseDto.java

@@ -12,7 +12,7 @@
  */
 package cn.freemud.entities.dto;
 
-import cn.freemud.entities.dto.QueryOrdersResponseDto.DataBean.OrderBean;
+import com.freemud.application.sdk.api.ordercenter.entities.v1.OrderBeanV1;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 import lombok.ToString;
@@ -27,7 +27,7 @@ public class QueryOrderByIdResponseDto {
      * errmsg : 根据订单ID查询订单详细信息成功
      */
 
-    private OrderBean data;
+    private OrderBeanV1 data;
     private Integer errcode;
     private String errmsg;
 

shopping-cart-application-service/src/test/java/cn.freemud/client/MqTest.java

@@ -6,10 +6,10 @@ import cn.freemud.amqp.MQAction;
 import cn.freemud.amqp.MQMessage;
 import cn.freemud.amqp.MQService;
 import cn.freemud.entities.dto.ActivityCancelStockRequestDto;
-import cn.freemud.entities.dto.QueryOrdersResponseDto;
 import cn.freemud.utils.FileUtil;
 import com.alibaba.fastjson.JSON;
 import com.freemud.application.sdk.api.log.ErrorLog;
+import com.freemud.application.sdk.api.ordercenter.entities.v1.OrderBeanV1;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -39,7 +39,7 @@ public class MqTest {
     @Test
     public void mqTest () {
         String fileName = "test";
-        QueryOrdersResponseDto.DataBean.OrderBean orderBean = FileUtil.getObjectFromFile(fileName, QueryOrdersResponseDto.DataBean.OrderBean.class);
+        OrderBeanV1 orderBean = FileUtil.getObjectFromFile(fileName, OrderBeanV1.class);
         // 删除订单 通知活动添加商品库存
         ActivityCancelStockRequestDto activityCancelStockRequestDto = activityAdapter.convert2ActivityCancelStockRequestDto(
                 orderBean, Arrays.asList(1,2,3));