Merge branch 'feature/20201013_麦咖啡p4v1问题修复_xukangg' into develop

# Conflicts:
#	order-management/src/main/java/cn/freemud/management/service/handle/OrderVerifyHandle.java

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

@@ -87,6 +87,7 @@ import org.springframework.data.redis.core.RedisTemplate;
 import org.springframework.stereotype.Component;
 
 import java.awt.geom.Point2D;
+import java.io.*;
 import java.math.BigDecimal;
 import java.security.NoSuchAlgorithmException;
 import java.security.spec.InvalidKeySpecException;
@@ -1127,6 +1128,8 @@ public class OrderAdapter {
             responseVo.setPayStatusDesc(Optional.ofNullable(PayStatus.getByCode(ordersBean.getPayStatus()))
                     .map(PayStatus::getDesc).orElse(""));
             responseVo.setPayVoucher(orderExtInfoDto != null ? orderExtInfoDto.getPayTransId() : "");
+            responseVo.setPayVoucherBarCode(Base64.getEncoder().encodeToString(
+                    BarcodeUtil.generateBarCode128(responseVo.getPayVoucher(),null,null, true, true)));
             responseVo.setPayCreateTime(orderExtInfoDto != null ? orderExtInfoDto.getPayDate() : "");
             responseVo.setPayChannel(ordersBean.getPayChannel());
             if (StringUtils.isNotBlank(ordersBean.getPayChannel())) {

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

@@ -203,6 +203,10 @@ public class QueryOrderResponseVo {
      */
     private String payVoucher;
     /**
+     * 付款单号条形码
+     */
+    private String payVoucherBarCode;
+    /**
      * 退款状态  enum  refundStatus
      */
     private Integer refundStatus;

order-management/src/main/java/cn/freemud/management/service/handle/OrderVerifyHandle.java

@@ -18,6 +18,8 @@ import com.freemud.application.sdk.api.ordercenter.enums.OperateClient;
 import com.freemud.sdk.api.assortment.order.adapter.OrderSdkAdapter;
 import com.freemud.sdk.api.assortment.message.enums.OrderType;
 import com.freemud.sdk.api.assortment.order.enums.OldOrderAccountType;
+import com.freemud.sdk.api.assortment.order.enums.OldOrderType;
+import com.freemud.sdk.api.assortment.order.enums.RefundStatus;
 import com.freemud.sdk.api.assortment.order.request.order.CancelOrderRequest;
 import com.freemud.sdk.api.assortment.order.response.order.BaseOrderResponse;
 import com.freemud.sdk.api.assortment.order.response.order.QueryOrdersResponse;
@@ -207,7 +209,7 @@ public class OrderVerifyHandle {
         if (OrderStatus.COMPLETE.getCode().equals(status)) {
             return ResponseUtil.error(ResponseResult.REJECT_FAIL_ORDER_IS_COMPLETE, getOrderManagerResponse(orderBean));
         }
-        if (!OrderStatus.TAKE_ORDER.getCode().equals(status)) {
+        if (!OrderStatus.TAKE_ORDER.getCode().equals(status) && !OldOrderType.TAKE_OUT.getCode().equals(orderBean.getOrderType())) {
             return ResponseUtil.error(ResponseResult.REJECT_FAIL_ORDER_IS_NOT_NEW, getOrderManagerResponse(orderBean));
         }
         return ResponseUtil.success();