Commit c0058797 by 陈斌

update3

parent 64325305
...@@ -16,12 +16,14 @@ import cn.freemud.annotations.IsConvertEN; ...@@ -16,12 +16,14 @@ import cn.freemud.annotations.IsConvertEN;
import cn.freemud.base.entity.BaseResponse; import cn.freemud.base.entity.BaseResponse;
import cn.freemud.entities.dto.order.CreateCashierOrderDto; import cn.freemud.entities.dto.order.CreateCashierOrderDto;
import cn.freemud.entities.dto.order.InvoiceCreateResponseVo; import cn.freemud.entities.dto.order.InvoiceCreateResponseVo;
import cn.freemud.entities.dto.order.OrderInvoiceConfigVo;
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;
import cn.freemud.entities.vo.order.CreateCashierOrderVo; import cn.freemud.entities.vo.order.CreateCashierOrderVo;
import cn.freemud.entities.vo.order.CreateOrderInvoiceRequest; import cn.freemud.entities.vo.order.CreateOrderInvoiceRequest;
import cn.freemud.entities.vo.order.OrderAppealVo; import cn.freemud.entities.vo.order.OrderAppealVo;
import cn.freemud.entities.vo.order.GetInvoiceConfigRequest;
import cn.freemud.handler.OrderReportJobHandler; import cn.freemud.handler.OrderReportJobHandler;
import cn.freemud.monitorcenter.tools.HealthUtil; import cn.freemud.monitorcenter.tools.HealthUtil;
import cn.freemud.service.*; import cn.freemud.service.*;
...@@ -481,5 +483,16 @@ public class OrderController { ...@@ -481,5 +483,16 @@ public class OrderController {
return orderservice.createAndGetOrderInvoice(request); return orderservice.createAndGetOrderInvoice(request);
} }
/**
* 查询发票配置
* @param
* @return
*/
@ApiAnnotation(logMessage = "queryInvoiceConfig")
@PostMapping("/queryInvoiceConfig")
public BaseResponse<OrderInvoiceConfigVo> queryInvoiceConfig(@Validated @LogParams @RequestBody GetInvoiceConfigRequest request) {
return orderservice.queryInvoiceConfig(request);
}
} }
package cn.freemud.entities.dto.order;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@Data
public class OrderInvoiceConfigVo {
@ApiModelProperty("商户号")
private String partnerId;
@ApiModelProperty("发票说明")
private String remark;
@ApiModelProperty("状态 0启用 1禁用")
private Integer state;
}
package cn.freemud.entities.vo.order;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import javax.validation.constraints.NotEmpty;
@Data
public class GetInvoiceConfigRequest {
@ApiModelProperty("会话Id")
@NotEmpty(message = "会话Id不能为空")
private String sessionId;
@ApiModelProperty("商户号")
@NotEmpty(message = "商户号不能为空")
private String partnerId;
}
...@@ -2,8 +2,10 @@ package cn.freemud.service; ...@@ -2,8 +2,10 @@ package cn.freemud.service;
import cn.freemud.base.entity.BaseResponse; import cn.freemud.base.entity.BaseResponse;
import cn.freemud.entities.dto.ConfirmOrderDto; import cn.freemud.entities.dto.ConfirmOrderDto;
import cn.freemud.entities.dto.order.OrderInvoiceConfigVo;
import cn.freemud.entities.vo.*; import cn.freemud.entities.vo.*;
import cn.freemud.entities.vo.order.CreateOrderInvoiceRequest; import cn.freemud.entities.vo.order.CreateOrderInvoiceRequest;
import cn.freemud.entities.vo.order.GetInvoiceConfigRequest;
import cn.freemud.entities.vo.order.OrderAppealVo; import cn.freemud.entities.vo.order.OrderAppealVo;
import com.freemud.application.sdk.api.ordercenter.entities.v1.OrderBeanV1; import com.freemud.application.sdk.api.ordercenter.entities.v1.OrderBeanV1;
import com.freemud.application.sdk.api.ordercenter.response.OrderCountResp; import com.freemud.application.sdk.api.ordercenter.response.OrderCountResp;
...@@ -200,4 +202,6 @@ public interface Orderservice extends OrderFactoryService{ ...@@ -200,4 +202,6 @@ public interface Orderservice extends OrderFactoryService{
BaseResponse createAndGetOrderInvoice(CreateOrderInvoiceRequest request); BaseResponse createAndGetOrderInvoice(CreateOrderInvoiceRequest request);
BaseResponse<OrderInvoiceConfigVo> queryInvoiceConfig(GetInvoiceConfigRequest request);
} }
...@@ -39,6 +39,7 @@ import cn.freemud.entities.dto.shoppingCart.NewShoppingCartClearDto; ...@@ -39,6 +39,7 @@ import cn.freemud.entities.dto.shoppingCart.NewShoppingCartClearDto;
import cn.freemud.entities.dto.shoppingCart.ShoppingCartGoodsDto; import cn.freemud.entities.dto.shoppingCart.ShoppingCartGoodsDto;
import cn.freemud.entities.vo.*; import cn.freemud.entities.vo.*;
import cn.freemud.entities.vo.order.CreateOrderInvoiceRequest; import cn.freemud.entities.vo.order.CreateOrderInvoiceRequest;
import cn.freemud.entities.vo.order.GetInvoiceConfigRequest;
import cn.freemud.entities.vo.order.OrderAppealVo; import cn.freemud.entities.vo.order.OrderAppealVo;
import cn.freemud.entities.vo.order.QueryOrderAppealResponseVo; import cn.freemud.entities.vo.order.QueryOrderAppealResponseVo;
import cn.freemud.enums.OrderType; import cn.freemud.enums.OrderType;
...@@ -3449,6 +3450,29 @@ public class OrderServiceImpl implements Orderservice { ...@@ -3449,6 +3450,29 @@ public class OrderServiceImpl implements Orderservice {
return ResponseUtil.success(responseVo); return ResponseUtil.success(responseVo);
} }
@Override
public BaseResponse<OrderInvoiceConfigVo> queryInvoiceConfig(GetInvoiceConfigRequest request){
AssortmentCustomerInfoVo userLoginInfoDto = customerInfoManager.getCustomerInfoByObject(request.getSessionId());
if (userLoginInfoDto == null || StringUtils.isEmpty(userLoginInfoDto.getMemberId())) {
return ResponseUtil.error(ResponseResult.NOT_LOGIN);
}
// 查询发票配置
QueryInvoiceConfigRequest configRequest = new QueryInvoiceConfigRequest();
configRequest.setPartnerId(request.getPartnerId());
BaseResponse<OrderInvoiceResponse> orderInvoiceConfigResponse = microOpenplatformClient.QueryInvoiceConfigByPartnerId(configRequest);
if (!Objects.equals(ResponseCodeConstant.RESPONSE_SUCCESS_STR, orderInvoiceConfigResponse.getCode())) {
return ResponseUtil.error(orderInvoiceConfigResponse.getCode(), orderInvoiceConfigResponse.getMessage());
}
OrderInvoiceResponse orderInvoiceConfig = orderInvoiceConfigResponse.getResult();
if (null == orderInvoiceConfig) {
return ResponseUtil.error(ResponseResult.ORDER_INVOICE_CONFIG_IS_NULL);
}
OrderInvoiceConfigVo configVo = new OrderInvoiceConfigVo();
BeanUtil.convertBean(orderInvoiceConfig, configVo);
return ResponseUtil.success(configVo);
}
/** /**
* 标准点餐参数校验 * 标准点餐参数校验
* *
......
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