Merge remote-tracking branch 'remotes/origin/feature/20210915_订单发票_chenbin' into qa

order-application-service/src/main/java/cn/freemud/controller/OrderController.java

@@ -14,6 +14,7 @@ package cn.freemud.controller;
 
 import cn.freemud.annotations.IsConvertEN;
 import cn.freemud.base.entity.BaseResponse;
+import cn.freemud.entities.dto.order.InvoiceCreateResponseVo;
 import cn.freemud.entities.vo.*;
 import cn.freemud.entities.vo.encircle.CreateReserveOrderVo;
 import cn.freemud.entities.vo.encircle.EncircleReserveBaseVo;
@@ -454,7 +455,7 @@ public class OrderController {
      */
     @ApiAnnotation(logMessage = "createOrderInvoice")
     @PostMapping("/createOrderInvoice")
-    public BaseResponse createOrderInvoice(@Validated @LogParams @RequestBody CreateOrderInvoiceRequest request) {
+    public BaseResponse<InvoiceCreateResponseVo> createOrderInvoice(@Validated @LogParams @RequestBody CreateOrderInvoiceRequest request) {
         return orderservice.createAndGetOrderInvoice(request);
     }
 

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

+package cn.freemud.entities.dto.order;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+public class InvoiceCreateResponseVo {
+
+    @ApiModelProperty(value = "扫码开票url地址")
+    private String scanUrl;
+
+}

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

@@ -4388,7 +4388,7 @@ public class OrderServiceImpl implements Orderservice {
     }
 
     @Override
-    public BaseResponse createAndGetOrderInvoice(CreateOrderInvoiceRequest request){
+    public BaseResponse<InvoiceCreateResponseVo> createAndGetOrderInvoice(CreateOrderInvoiceRequest request){
         AssortmentCustomerInfoVo userLoginInfoDto = customerInfoManager.getCustomerInfoByObject(request.getSessionId());
         if (userLoginInfoDto == null || StringUtils.isEmpty(userLoginInfoDto.getMemberId())) {
             return ResponseUtil.error(ResponseResult.NOT_LOGIN);
@@ -4425,7 +4425,9 @@ public class OrderServiceImpl implements Orderservice {
             return orderInvoiceResponse;
         }
 
-        return ResponseUtil.success();
+        InvoiceCreateResponseVo responseVo = new InvoiceCreateResponseVo();
+        responseVo.setScanUrl(invoiceResponse.getData().getScanUrl());
+        return ResponseUtil.success(responseVo);
     }