Merge branches 'ka-券包资金分账-20211020-jxy' and 'qa' of…

Merge branches 'ka-券包资金分账-20211020-jxy' and 'qa' of http://gitlab.freemud.com/order-group-application/order-group into qa

 Conflicts:
	order-application-service/src/main/java/cn/freemud/adapter/OrderAdapter.java
	order-application-service/src/main/java/cn/freemud/service/impl/SellCouponOrderServiceImpl.java

assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/request/order/ProductBindingCouponType.java

@@ -34,4 +34,11 @@ public class ProductBindingCouponType {
      */
 //    private int sequence;
 
+    //是否开启分账（0不开启，1开启）
+    private Integer isSplitAccount;
+    //最大核销次数"
+    private Integer maxRedeemTimes;
+    //券单价（分）
+    private Integer price;
+
 }

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

@@ -22,8 +22,7 @@ import cn.freemud.entities.dto.activity.ShareDiscountActivityDto;
 import cn.freemud.entities.dto.order.CreateOrderAccountDto;
 import cn.freemud.entities.dto.order.CreateOrderProductDto;
 import cn.freemud.entities.dto.order.*;
-import cn.freemud.entities.dto.pay.CombPayResponse;
-import cn.freemud.entities.dto.pay.OrderPayResponse;
+import cn.freemud.entities.dto.pay.*;
 import cn.freemud.entities.dto.promotion.OrderBeanRequest;
 import cn.freemud.entities.dto.promotion.ShoppingCartGoodsResponse;
 import cn.freemud.entities.dto.shoppingCart.ActivityDiscountsDto;
@@ -70,6 +69,7 @@ import com.freemud.application.sdk.api.ordercenter.response.orderInfo.AfterSales
 import com.freemud.application.sdk.api.ordercenter.response.orderInfo.OrderInfoReqs;
 import com.freemud.application.sdk.api.ordercenter.response.orderInfo.OrderPayItemResp;
 import com.freemud.application.sdk.api.ordercenter.response.orderInfo.OrderSettlementResp;
+import com.freemud.application.sdk.api.ordercenter.response.orderInfo.*;
 import com.freemud.application.sdk.api.promotioncenter.dto.promotion.GoodsStockDTO;
 import com.freemud.application.sdk.api.promotioncenter.request.promotion.ActivityUpdateStockRequest;
 import com.freemud.application.sdk.api.storecenter.response.StoreResponse;

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

@@ -231,6 +231,7 @@ public class PointsMallOrderAdapter {
                 productBeans.add(productBean);
             }
         }
+        requestDto.setProducts(productBeans);
         requestDto.setBody(payProductName);
         return requestDto;
     }

order-application-service/src/main/java/cn/freemud/entities/dto/product/ProductInfo.java

@@ -13,7 +13,7 @@
 package cn.freemud.entities.dto.product;
 
 import cn.freemud.entities.dto.ProductComboListDto;
-import cn.freemud.entities.dto.ProductGroupDto;
+import com.freemud.sdk.api.assortment.order.request.order.ProductBindingCouponType;
 import lombok.Data;
 
 import java.util.List;
@@ -84,4 +84,8 @@ public class ProductInfo {
 
     //用于标识虚拟商品是否限制购买数量,0-否、1-是
     private Integer isLimitNumProduct;
+
+    //虚拟商品的券信息集合
+    private List<ProductBindingCouponType> productBindingCouponTypes;
+
 }

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

@@ -23,12 +23,17 @@ import cn.freemud.entities.dto.delivery.DeliveryBaseResponse;
 import cn.freemud.entities.dto.delivery.GetDeliveryFlagRequest;
 import cn.freemud.entities.dto.delivery.GetDeliveryFlagResponseDto;
 import cn.freemud.entities.dto.order.BusinessDate;
+import cn.freemud.entities.dto.order.FacePayResponseDto;
+import cn.freemud.entities.dto.pay.PayOrderDto;
+import cn.freemud.entities.dto.pay.PayProductDto;
+import cn.freemud.entities.dto.pay.UnifiedOrderRequestDto;
 import cn.freemud.entities.dto.shoppingCart.GetShoppingCartGoodsApportionDto;
 import cn.freemud.entities.dto.shoppingCart.ShoppingCartGoodsDto;
 import cn.freemud.entities.dto.store.*;
 import cn.freemud.entities.dto.user.CustomerPropertyBaseResponse;
 import cn.freemud.entities.dto.user.GetSvcInfoByMemberIdResponseVo;
 import cn.freemud.entities.dto.user.StatisticalScoreRequestVo;
+import cn.freemud.entities.vo.CreateOrderResponseVo;
 import cn.freemud.entities.vo.CreateOrderVo;
 import cn.freemud.entities.vo.GetMemberCouponRequestVo;
 import cn.freemud.entities.vo.ShoppingCartInfoRequestVo;
@@ -55,6 +60,8 @@ import com.freemud.application.sdk.api.membercenter.request.QueryReceiveAddressR
 import com.freemud.application.sdk.api.membercenter.response.QueryReceiveAddressResponse;
 import com.freemud.application.sdk.api.membercenter.service.MemberCenterService;
 import com.freemud.application.sdk.api.ordercenter.enums.BizTypeEnum;
+import com.freemud.application.sdk.api.ordercenter.response.orderInfo.OrderInfoReqs;
+import com.freemud.application.sdk.api.ordercenter.response.orderInfo.OrderItemResp;
 import com.freemud.application.sdk.api.paymentcenter.client.service.PaymentNewService;
 import com.freemud.application.sdk.api.storecenter.request.QueryDeliveryRequest;
 import com.freemud.application.sdk.api.storecenter.request.StoreInfoRequest;
@@ -1342,5 +1349,90 @@ public class CheckOrder {
         }
     }
 
+    public UnifiedOrderRequestDto convert2UnifiedOrderRequestDto(OrderInfoReqs orderInfo, String openId, Long cashPrice,
+                                                                 Long clientCode, String reverseNotifyiDcUrl, String payTimeOutTime) {
+
+        String partnerId = orderInfo.getPartnerId();
+        String storeId = orderInfo.getStoreId();
+        String appId = orderInfo.getAppId();
+
+        //现金支付唤起线上支付
+        UnifiedOrderRequestDto requestDto = new UnifiedOrderRequestDto();
+        requestDto.setTransId(orderInfo.getOrderCode());
+        requestDto.setPartnerId(partnerId);
+        requestDto.setStoreId(storeId);
+        requestDto.setAmount(cashPrice);
+
+        String businessDate = DateUtil.convert2String(new Date(), "yyyyMMdd");
+        requestDto.setBusinessDate(businessDate);
+        requestDto.setClientCode(clientCode);
+        requestDto.setFoodOrderType(getFoodOrderType(1));
+        requestDto.setNotifyUrl(reverseNotifyiDcUrl);
+        requestDto.setOpenId(openId);
+        requestDto.setPayTimeOutTime(payTimeOutTime);
+        List<PayProductDto> productBeans = new ArrayList<>();
+        String payProductName = "";
+        if (org.apache.commons.collections.CollectionUtils.isNotEmpty(orderInfo.getOrderItemList())) {
+
+            for (OrderItemResp orderProductBean : orderInfo.getOrderItemList()) {
+                PayProductDto productBean = new PayProductDto();
+                productBean.setId(orderProductBean.getProductId());
+                productBean.setQuantity(orderProductBean.getProductQuantity());
+                productBean.setPrice(orderProductBean.getProductPrice().longValue());
+                if (StringUtils.isNotBlank(payProductName)) {
+                    payProductName = orderProductBean.getProductName();
+                } else if (payProductName.endsWith("...")) {
+                    //不处理
+                } else {
+                    payProductName = payProductName + "...";
+                }
+                productBean.setName(orderProductBean.getProductName());
+                productBeans.add(productBean);
+            }
+        }
+        requestDto.setProducts(productBeans);
+        requestDto.setBody(payProductName);
+        return requestDto;
+    }
+
+    /**
+     * 预支付接口获取类型
+     * @return
+     */
+    private String getFoodOrderType(Integer orderType) {
+        //1=外卖 4=自提，5=堂食
+        //qr_order（店内扫码点餐）,pre_order（预点到店自提）,home_delivery （外送到家）
+        String foodOrderType;
+        switch (orderType) {
+            case 1:
+                foodOrderType = "home_delivery";
+                break;
+            case 4:
+                foodOrderType = "pre_order";
+                break;
+            case 5:
+            default:
+                foodOrderType = "qr_order";
+                break;
+        }
+        return foodOrderType;
+    }
+
+    public void convent2CreateOrderResponseVo(CreateOrderResponseVo createOrderResponseVo, String appId, FacePayResponseDto response){
+        createOrderResponseVo.setWxappId(appId);
+        createOrderResponseVo.setFmId(response.getFmId());
+        createOrderResponseVo.setPaySuccess(false);
+        String payOrderDto = response.getPayOrder();
+        PayOrderDto payOrder = JSONObject.parseObject(payOrderDto, PayOrderDto.class);
+        if (payOrder != null) {
+            createOrderResponseVo.setTimestamp(payOrder.getTimestamp());
+            createOrderResponseVo.setNonceStr(payOrder.getNonceStr());
+            createOrderResponseVo.setPackageX(payOrder.getPackageX());
+            createOrderResponseVo.setSignType(payOrder.getSignType());
+            createOrderResponseVo.setSign(payOrder.getPaySign());
+            createOrderResponseVo.setOrderStr(payOrder.getAliPayOrder());
+        }
+    }
+
 
 }

ordercenter-sdk/readme.md

@@ -106,4 +106,5 @@
 | 1.3.67.RELEASE | 新增爱马哥需求代码改动 | 周晓航 | 2021-08-23 |
 | 1.3.68.RELEASE | 新增维护商品类型同步商品服务 | 周晓航 | 2021-09-03 |
 | 1.3.69.RELEASE | 升级sdk | 伍平 | 2021-09-16 |
-| 1.3.70.RELEASE | 升级sdk | 伍平 | 2021-10-11 |
+| 1.3.70.RELEASE | 升级sdk | 伍平 | 2021-10-11 |
\ No newline at end of file
+| 1.3.71.RELEASE | 升级sdk | 蒋小洋 | 2021-10-27 |
\ No newline at end of file

ordercenter-sdk/src/main/java/com/freemud/application/sdk/api/ordercenter/entities/extinfo/ProductBindingCouponType.java

@@ -22,4 +22,11 @@ public class ProductBindingCouponType {
      */
 //    private int sequence;
 
+    //是否开启分账（0不开启，1开启）
+    private Integer isSplitAccount;
+    //最大核销次数"
+    private Integer maxRedeemTimes;
+    //券单价（分）
+    private Integer price;
+
 }