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

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

@@ -88,6 +88,7 @@ import org.springframework.beans.factory.annotation.Value;
 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;
@@ -1120,6 +1121,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;