Merge branch 'feature/20210127_xukang_麦咖啡p5v4'

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

@@ -2870,9 +2870,9 @@ public class OrderAdapter {
         return convent2UnifiedOrderRequest(orderBean, paymentRequest, amount, cardAmount, transId, null);
     }
 
-        /**
-         * 支付信息转换
-         */
+    /**
+     * 支付信息转换
+     */
     public UnifiedOrderRequest convent2UnifiedOrderRequest(QueryOrdersResponse.DataBean.OrderBean orderBean, PaymentRequest paymentRequest, Long amount, Integer cardAmount, String transId, String partnerPayOvertime) {
         UnifiedOrderRequest orderPayDto = new UnifiedOrderRequest();
         orderPayDto.setPartnerId(orderBean.getCompanyId());
@@ -2911,6 +2911,43 @@ public class OrderAdapter {
         return orderPayDto;
     }
 
+    /**
+     * 麦咖啡支付信息转换
+     */
+    public UnifiedOrderRequest convent2MCCafeUnifiedOrderRequest(QueryOrdersResponse.DataBean.OrderBean orderBean, PaymentRequest paymentRequest, Long amount, Integer cardAmount, String transId, String partnerPayOvertime) {
+        UnifiedOrderRequest orderPayDto = new UnifiedOrderRequest();
+        orderPayDto.setPartnerId(orderBean.getCompanyId());
+        orderPayDto.setBody(paymentRequest.getPrincipalName());
+        orderPayDto.setNotifyUrl(paymentRequest.getReverseNotifyiDcUrl());
+        orderPayDto.setStoreId(orderBean.getShopId());
+        orderPayDto.setTransId(transId);
+        orderPayDto.setOpenId(paymentRequest.getOpenId());
+        String businessDate = com.freemud.application.sdk.api.util.DateUtil.convert2String(new Date(), "yyyyMMdd");
+        orderPayDto.setBusinessDate(businessDate);
+        orderPayDto.setAmount(amount);
+        orderPayDto.setUndisAmount(1L);
+        orderPayDto.setVipAmount(Long.valueOf(cardAmount));
+        orderPayDto.setAppId(paymentRequest.getWxAppId());
+        orderPayDto.setPayTimeOutTime(StringUtils.defaultIfBlank(partnerPayOvertime, "30"));
+        List<UnifiedOrderRequest.ProductBean> productBeans = new ArrayList<UnifiedOrderRequest.ProductBean>();
+        if (CollectionUtils.isNotEmpty(orderBean.getProductList())) {
+            orderBean.getProductList().forEach(orderProductBean -> {
+                UnifiedOrderRequest.ProductBean productBean = new UnifiedOrderRequest.ProductBean();
+                productBean.setPid(orderProductBean.getSpecification());
+                productBean.setConsumeNum(orderProductBean.getNumber());
+                productBean.setSeq(orderProductBean.getSequence());
+                productBean.setSalesType("NORMAL");
+                productBean.setPrice(orderProductBean.getPrice());
+                productBean.setName(orderProductBean.getProductName());
+                productBeans.add(productBean);
+            });
+        }
+        orderPayDto.setProducts(productBeans);
+        orderPayDto.setPayCode(paymentRequest.getPayCode());
+        orderPayDto.setFoodOrderType(getFoodOrderType(orderBean.getOrderType()));
+        return orderPayDto;
+    }
+
 
     /**
      * 预支付接口获取类型

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

@@ -259,7 +259,11 @@ public class MCCafeOrderServiceImpl implements MCCafeOrderService {
                 createOrderOperateDto.getTotalAmount() == null ? 0 : createOrderOperateDto.getTotalAmount(),
                 createOrderOperateDto.getCardAmount() == null ? 0 : createOrderOperateDto.getCardAmount(), extInfo,
                 createOrderOperateDto.getFatherOrderBean().getOid(), null);
-        createPrepayRequestDto.setNeedInvoice(createOrderVo.getNeedInvoice());
+        if(createOrderVo.getOrderType().equals(CreateOrderType.COLLECT_GOODS.getCode())) {
+            createPrepayRequestDto.setNeedInvoice(createOrderVo.getNeedInvoice());
+        } else {
+            createPrepayRequestDto.setNeedInvoice(0);
+        }
         return this.createPrepayOrder(createPrepayRequestDto);
     }
 
@@ -628,7 +632,7 @@ public class MCCafeOrderServiceImpl implements MCCafeOrderService {
 
     public OrderPayResponse getPreOrderPay(QueryOrdersResponse.DataBean.OrderBean orderBean, PaymentRequest paymentRequest, String trackingNo, Integer cardAmount, String transId, int needInvoice) {
         try {
-            UnifiedOrderRequest request = orderAdapter.convent2UnifiedOrderRequest(orderBean, paymentRequest, orderBean.getAmount(), cardAmount, transId);
+            UnifiedOrderRequest request = orderAdapter.convent2MCCafeUnifiedOrderRequest(orderBean, paymentRequest, orderBean.getAmount(), cardAmount, transId, null);
             request.setInvoiceFlag(needInvoice);
             Map<String, String> extendParams = new HashMap<>();
             if(OldOrderType.TAKE_OUT.getCode().equals(orderBean.getOrderType())) {