Merge branch 'feature/20210107_蜜雪新增APP购买虚拟商品（券）业务_wanghanghang'

# Conflicts:
#	assortment-ordercenter-sdk/pom.xml
#	assortment-ordercenter-sdk/readme.md
#	order-application-service/pom.xml

assortment-ordercenter-sdk/pom.xml

@@ -38,7 +38,7 @@
         <dependency>
             <groupId>cn.freemud</groupId>
             <artifactId>ordercenter-sdk</artifactId>
-            <version>1.3.32.RELEASE</version>
+            <version>1.3.30.RELEASE</version>
         </dependency>
         <dependency>
             <groupId>com.freemud.application.service.sdk</groupId>

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

@@ -572,6 +572,11 @@ public class QueryOrdersResponse {
                 public List<ProductBean> materialProduct;
 
                 /**
+                 * 商品拓展字段extInfo转换对象接收
+                 */
+                public List<ProductExtInfo> productExtInfo;
+
+                /**
                  * 购物车行uid
                  */
                 private String cartGoodsUid;
@@ -620,6 +625,21 @@ public class QueryOrdersResponse {
                     private String productId;
                 }
 
+                @NoArgsConstructor
+                @Data
+                public static class ProductExtInfo {
+
+                    //券活动编号
+                    private String activityCode;
+
+                    //数量
+                    private Integer num;
+
+                    //券活动名称
+                    private String activityName;
+
+                }
+
             }
 
             @NoArgsConstructor

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

@@ -86,6 +86,7 @@ import org.apache.commons.lang.time.FastDateFormat;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Component;
+import tk.mybatis.mapper.util.StringUtil;
 
 import java.awt.geom.Point2D;
 import java.io.*;
@@ -2898,6 +2899,7 @@ public class OrderAdapter {
 
     /**
      * 预支付接口获取类型
+     *
      * @return
      */
     private String getFoodOrderType(Integer orderType) {
@@ -2949,12 +2951,12 @@ public class OrderAdapter {
         createOrderResponseVo.setSignType(payOrderBean == null ? "" : payOrderBean.getSignType());
         createOrderResponseVo.setSign(payOrderBean == null ? "" : payOrderBean.getSign());
         //微信新版订阅消息判断新加字段
-        if(orderBean != null && orderBean.getType() != null){
+        if (orderBean != null && orderBean.getType() != null) {
             createOrderResponseVo.setOrderType(getNewOrderType(orderBean.getType(), orderBean.getGmtExpect()));
         }
         createOrderResponseVo.setOrderStr(payOrderBean == null ? "" : payOrderBean.getAliPayOrder());
         //抖音支付添加返回OrderInfo
-        if(String.valueOf(PayChannelType.TIKTOKPAY.getIndex()).equals(orderBean.getPayChannelType())) {
+        if (String.valueOf(PayChannelType.TIKTOKPAY.getIndex()).equals(orderBean.getPayChannelType())) {
             OrderInfo orderInfo = new OrderInfo();
             orderInfo.setOrder_id(orderPayResponse.getThirdOrderId());
             orderInfo.setOrder_token(orderPayResponse.getThirdOrderToken());

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/AppCreateOrderVo.java

@@ -76,4 +76,13 @@ public class AppCreateOrderVo {
      * 下单渠道 版本号
      */
     private String version;
+
+    //20210107蜜雪新增APP购买虚拟商品（券）业务--》》新增以下字段 bizType  skuId --wanghanghang
+    /**
+     * 代表蜜雪APP买虚拟商品（买券）业务标识
+     */
+    private Integer bizType;
+
+
+
 }

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/entities/vo/ProductVo.java

@@ -13,6 +13,7 @@
 package cn.freemud.entities.vo;
 
 import cn.freemud.entities.dto.ProductGroupDto;
+import com.freemud.sdk.api.assortment.order.response.order.QueryOrdersResponse;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
@@ -200,4 +201,10 @@ public class ProductVo {
      */
     private String ocid;
 
+
+    /**
+     * 商品拓展字段extInfo转换对象接收
+     */
+    private List<QueryOrdersResponse.DataBean.OrderBean.ProductBean.ProductExtInfo> productExtInfo;
+
 }

order-application-service/src/main/java/cn/freemud/enums/BizTypeEnum.java

+package cn.freemud.enums;
+
+public enum BizTypeEnum {
+
+    APP_COUPON(6, "APP买券"),
+
+    APP_PRO(1, "未知（目前暂不支持）,后续可能预留给正常商品");
+
+    private Integer bizType;
+    private String desc;
+
+    BizTypeEnum(Integer bizType, String desc) {
+        this.bizType = bizType;
+        this.desc = desc;
+    }
+
+    public static cn.freemud.enums.BizTypeEnum getByCode(Integer code) {
+        for (cn.freemud.enums.BizTypeEnum payType : values()) {
+            if (payType.getBizType().equals(code)) {
+                return payType;
+            }
+        }
+        return null;
+    }
+
+    public Integer getBizType() {
+        return bizType;
+    }
+
+    public void setBizType(Integer bizType) {
+        this.bizType = bizType;
+    }
+
+    public String getDesc() {
+        return desc;
+    }
+
+    public void setDesc(String desc) {
+        this.desc = desc;
+    }
+}
\ No newline at end of file

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

@@ -144,6 +144,7 @@ import com.freemud.sdk.api.assortment.payment.service.StandardPaymentService;
 import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;
 import com.google.gson.Gson;
+import com.google.gson.JsonElement;
 import lombok.SneakyThrows;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections4.CollectionUtils;
@@ -1537,6 +1538,7 @@ public class OrderServiceImpl implements Orderservice {
         }
 
 
+
         buildQueryOrderResponseVo(queryOrderResponseVo, response, partnerId);
 
         return ResponseUtil.success(queryOrderResponseVo);
@@ -2540,7 +2542,7 @@ public class OrderServiceImpl implements Orderservice {
             orderClient = OrderClientType.APP;
         }
         //抖音小程序
-        if("5".equalsIgnoreCase(createOrderVo.getChannel())) {
+        if ("5".equalsIgnoreCase(createOrderVo.getChannel())) {
             createOrderVo.setPayChannelType(PayChannelType.TIKTOKPAY.getIndex());
             orderClient = OrderClientType.TIKTOKPAY;
         }
@@ -2842,7 +2844,7 @@ public class OrderServiceImpl implements Orderservice {
                     orderPayResponse.setPayMode(PayChannelType.ALIPAY.getEbcode());
                 }
                 //抖音支付
-                if(PayChannelType.TIKTOKPAY.getIndex().toString().equalsIgnoreCase(orderBean.getPayChannelType())){
+                if (PayChannelType.TIKTOKPAY.getIndex().toString().equalsIgnoreCase(orderBean.getPayChannelType())) {
                     orderPayResponse.setPayMode(PayChannelType.TIKTOKPAY.getEbcode());
                 }
 
@@ -2967,7 +2969,7 @@ public class OrderServiceImpl implements Orderservice {
             orderExtInfoDto.setSendPointActivityCode(sendPoint.getActivityCode());
             orderExtInfoDto.setSendPointEndTime(sendPoint.getEndTime().getTime() + "");
             orderExtInfoDto.setSendPointSendPoint(sendPoint.getSendPoint());
-            orderExtInfoDto.setSendPointStoreLevel(sendPoint.getStoreLevel());
+//            orderExtInfoDto.setSendPointStoreLevel(sendPoint.getStoreLevel());
         }
         return orderExtInfoDto;
     }

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
\ No newline at end of file
+mcCafe.partnerId=1206
+
+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

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

 package cn.freemud;
 
+import cn.freemud.utils.QrCodeUtilTest;
+import com.google.gson.Gson;
+import com.google.gson.reflect.TypeToken;
 import org.junit.Test;
 
 import java.io.File;
@@ -9,9 +12,7 @@ import java.lang.reflect.Method;
 import java.lang.reflect.Type;
 import java.net.URL;
 import java.net.URLDecoder;
-import java.util.Enumeration;
-import java.util.LinkedHashSet;
-import java.util.Set;
+import java.util.*;
 
 
 public class AllTests {
@@ -125,6 +126,65 @@ public class AllTests {
     }
 
 
+
+   @Test
+    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;
+        }
+    }
+
+
+
     /**
      * 以文件的形式来获取包下的所有Class
      *