Commit 843cb081 by 周晓航

新增百旺二期开发 接口对接

Signed-off-by: 周晓航 <xiaohang.zhou@freemud.com>
parent 2c428293
......@@ -11,6 +11,7 @@ import cn.freemud.entities.dto.pay.OrderInvoiceRequest;
import cn.freemud.entities.dto.pay.QueryInvoiceByCodesRequest;
import cn.freemud.entities.vo.order.CreateOrderInvoiceRequest;
import cn.freemud.enums.InvoiceTypeCodeEnum;
import cn.freemud.enums.OrderInvoiceConfigEnum;
import cn.freemud.enums.OrderStatus;
import cn.freemud.enums.ResponseResult;
import cn.freemud.service.thirdparty.OrderServiceClient;
......@@ -161,6 +162,15 @@ public class OrderInvoiceAdapter {
invoiceDetailRequest.setGoodsTotalTax(goodsTotalTax);
productDetailList.add(invoiceDetailRequest);
request.setProductDetailList(productDetailList);
// fisherman 新增缺少字段
request.setAppKey(orderInvoiceConfig.getAppKey());
request.setAppSercret(orderInvoiceConfig.getAppSercret());
// 百旺云
request.setClientCode(OrderInvoiceConfigEnum.getClientCode(orderInvoiceConfig.getChannelType()));
request.setSalt(orderInvoiceConfig.getSalt());
request.setTaxNo(orderInvoiceConfig.getTaxNo());
request.setUserName(orderInvoiceConfig.getUserName());
request.setPassword(orderInvoiceConfig.getPassword());
return request;
}
......
......@@ -36,6 +36,9 @@ public class OrderInvoiceResponse {
@ApiModelProperty("userName")
private String userName;
@ApiModelProperty("password")
private String password;
@ApiModelProperty("盐值,加密盐")
private String salt;
......
......@@ -41,4 +41,26 @@ public class InvoiceCreateRequest {
@ApiModelProperty(value = "发票明细")
private List<InvoiceProductDetailRequest> productDetailList;
@ApiModelProperty("appKey")
private String appKey;
@ApiModelProperty("appSercret")
private String appSercret;
@ApiModelProperty("clientCode")
private String clientCode;
@ApiModelProperty("盐值,加密盐")
private String salt;
@ApiModelProperty("税号")
private String taxNo;
@ApiModelProperty("userName")
private String userName;
@ApiModelProperty("password")
private String password;
}
package cn.freemud.enums;
import lombok.AllArgsConstructor;
import lombok.Getter;
import java.util.Arrays;
/**
* @author : xh.Z
* @email : fisherman0510@163.com
* @Date : 2021/10/18 下午6:17
* @description : 发票配置 渠道映射关系
*/
@AllArgsConstructor
@Getter
public enum OrderInvoiceConfigEnum {
/**
* 百旺云渠道类型
*/
BAIWANGYUN("baiwangyun", "10990");
private String channelType;
private String clientCode;
public static String getClientCode(String channelType) {
OrderInvoiceConfigEnum orderInvoiceConfigEnum = Arrays.stream(OrderInvoiceConfigEnum.values())
.filter(e -> e.getChannelType().equals(channelType))
.findFirst()
.orElseGet(() -> BAIWANGYUN);
return orderInvoiceConfigEnum.getClientCode();
}
}
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