Commit b7bebd44 by 陈斌

update

parent 5eb17a1c
...@@ -14,6 +14,7 @@ package cn.freemud.controller; ...@@ -14,6 +14,7 @@ package cn.freemud.controller;
import cn.freemud.annotations.IsConvertEN; import cn.freemud.annotations.IsConvertEN;
import cn.freemud.base.entity.BaseResponse; import cn.freemud.base.entity.BaseResponse;
import cn.freemud.entities.dto.order.InvoiceCreateResponseVo;
import cn.freemud.entities.vo.*; import cn.freemud.entities.vo.*;
import cn.freemud.entities.vo.encircle.CreateReserveOrderVo; import cn.freemud.entities.vo.encircle.CreateReserveOrderVo;
import cn.freemud.entities.vo.encircle.EncircleReserveBaseVo; import cn.freemud.entities.vo.encircle.EncircleReserveBaseVo;
...@@ -454,7 +455,7 @@ public class OrderController { ...@@ -454,7 +455,7 @@ public class OrderController {
*/ */
@ApiAnnotation(logMessage = "createOrderInvoice") @ApiAnnotation(logMessage = "createOrderInvoice")
@PostMapping("/createOrderInvoice") @PostMapping("/createOrderInvoice")
public BaseResponse createOrderInvoice(@Validated @LogParams @RequestBody CreateOrderInvoiceRequest request) { public BaseResponse<InvoiceCreateResponseVo> createOrderInvoice(@Validated @LogParams @RequestBody CreateOrderInvoiceRequest request) {
return orderservice.createAndGetOrderInvoice(request); return orderservice.createAndGetOrderInvoice(request);
} }
......
package cn.freemud.entities.dto.order;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@Data
public class InvoiceCreateResponseVo {
@ApiModelProperty(value = "扫码开票url地址")
private String scanUrl;
}
...@@ -4373,7 +4373,7 @@ public class OrderServiceImpl implements Orderservice { ...@@ -4373,7 +4373,7 @@ public class OrderServiceImpl implements Orderservice {
} }
@Override @Override
public BaseResponse createAndGetOrderInvoice(CreateOrderInvoiceRequest request){ public BaseResponse<InvoiceCreateResponseVo> createAndGetOrderInvoice(CreateOrderInvoiceRequest request){
AssortmentCustomerInfoVo userLoginInfoDto = customerInfoManager.getCustomerInfoByObject(request.getSessionId()); AssortmentCustomerInfoVo userLoginInfoDto = customerInfoManager.getCustomerInfoByObject(request.getSessionId());
if (userLoginInfoDto == null || StringUtils.isEmpty(userLoginInfoDto.getMemberId())) { if (userLoginInfoDto == null || StringUtils.isEmpty(userLoginInfoDto.getMemberId())) {
return ResponseUtil.error(ResponseResult.NOT_LOGIN); return ResponseUtil.error(ResponseResult.NOT_LOGIN);
...@@ -4410,7 +4410,9 @@ public class OrderServiceImpl implements Orderservice { ...@@ -4410,7 +4410,9 @@ public class OrderServiceImpl implements Orderservice {
return orderInvoiceResponse; return orderInvoiceResponse;
} }
return ResponseUtil.success(); InvoiceCreateResponseVo responseVo = new InvoiceCreateResponseVo();
responseVo.setScanUrl(invoiceResponse.getData().getScanUrl());
return ResponseUtil.success(responseVo);
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment