mirror of
https://gitee.com/dromara/dy-java.git
synced 2024-11-29 18:49:37 +08:00
Merge branch 'v1.0.0.0'
This commit is contained in:
commit
a939490607
@ -2117,6 +2117,15 @@ public class DyAppletClient extends BaseClient {
|
||||
return new IndustryTransactionHandler(configuration().getAgentByTenantId(tenantId, clientKey)).deliveryVerify(body);
|
||||
}
|
||||
|
||||
/**
|
||||
* 生活服务交易系统->核销->抖音码->撤销核销
|
||||
* @param body 撤销核销请求值
|
||||
* @return
|
||||
*/
|
||||
public DataAndExtraVo<BaseVo> verifyCancel(VerifyCancelQuery body){
|
||||
return new IndustryTransactionHandler(configuration().getAgentByTenantId(tenantId, clientKey)).verifyCancel(body);
|
||||
}
|
||||
|
||||
/**
|
||||
* 获取抖音号绑定所需的资质模版列表
|
||||
*
|
||||
|
@ -8,6 +8,7 @@ import com.dyj.applet.domain.query.*;
|
||||
import com.dyj.applet.domain.vo.*;
|
||||
import com.dyj.common.domain.DataAndExtraVo;
|
||||
import com.dyj.common.domain.DySimpleResult;
|
||||
import com.dyj.common.domain.vo.BaseVo;
|
||||
import com.dyj.common.interceptor.ClientQueryTokenInterceptor;
|
||||
import com.dyj.common.interceptor.ClientTokenInterceptor;
|
||||
import com.dyj.common.interceptor.TokenHeaderInterceptor;
|
||||
@ -74,4 +75,12 @@ public interface IndustryTransactionClient {
|
||||
*/
|
||||
@Post(value = "${deliveryVerify}", interceptor = ClientTokenInterceptor.class)
|
||||
DataAndExtraVo<DeliveryVerifyVo> deliveryVerify(@JSONBody DeliveryVerifyQuery body);
|
||||
|
||||
/**
|
||||
* 生活服务交易系统->核销->抖音码->撤销核销
|
||||
* @param body 撤销核销请求值
|
||||
* @return
|
||||
*/
|
||||
@Post(value = "${verifyCancel}", interceptor = ClientTokenInterceptor.class)
|
||||
DataAndExtraVo<BaseVo> verifyCancel(@JSONBody VerifyCancelQuery body);
|
||||
}
|
||||
|
@ -0,0 +1,99 @@
|
||||
package com.dyj.applet.domain.query;
|
||||
|
||||
import com.dyj.common.domain.query.BaseQuery;
|
||||
|
||||
/**
|
||||
* 撤销核销请求值
|
||||
*/
|
||||
public class VerifyCancelQuery extends BaseQuery {
|
||||
|
||||
/**
|
||||
* 代表一张券码的标识
|
||||
*/
|
||||
private String certificate_id;
|
||||
/**
|
||||
* 需要撤销的certificate_id所属的订单id
|
||||
*/
|
||||
private String order_id;
|
||||
/**
|
||||
* 代表券码一次核销的唯一标识(验券时返回)
|
||||
*/
|
||||
private String verify_id;
|
||||
|
||||
public String getCertificate_id() {
|
||||
return certificate_id;
|
||||
}
|
||||
|
||||
public VerifyCancelQuery setCertificate_id(String certificate_id) {
|
||||
this.certificate_id = certificate_id;
|
||||
return this;
|
||||
}
|
||||
|
||||
public String getOrder_id() {
|
||||
return order_id;
|
||||
}
|
||||
|
||||
public VerifyCancelQuery setOrder_id(String order_id) {
|
||||
this.order_id = order_id;
|
||||
return this;
|
||||
}
|
||||
|
||||
public String getVerify_id() {
|
||||
return verify_id;
|
||||
}
|
||||
|
||||
public VerifyCancelQuery setVerify_id(String verify_id) {
|
||||
this.verify_id = verify_id;
|
||||
return this;
|
||||
}
|
||||
|
||||
public static VerifyCancelQueryBuilder builder() {
|
||||
return new VerifyCancelQueryBuilder();
|
||||
}
|
||||
|
||||
public static final class VerifyCancelQueryBuilder {
|
||||
private String certificate_id;
|
||||
private String order_id;
|
||||
private String verify_id;
|
||||
private Integer tenantId;
|
||||
private String clientKey;
|
||||
|
||||
private VerifyCancelQueryBuilder() {
|
||||
}
|
||||
|
||||
public VerifyCancelQueryBuilder certificateId(String certificateId) {
|
||||
this.certificate_id = certificateId;
|
||||
return this;
|
||||
}
|
||||
|
||||
public VerifyCancelQueryBuilder orderId(String orderId) {
|
||||
this.order_id = orderId;
|
||||
return this;
|
||||
}
|
||||
|
||||
public VerifyCancelQueryBuilder verifyId(String verifyId) {
|
||||
this.verify_id = verifyId;
|
||||
return this;
|
||||
}
|
||||
|
||||
public VerifyCancelQueryBuilder tenantId(Integer tenantId) {
|
||||
this.tenantId = tenantId;
|
||||
return this;
|
||||
}
|
||||
|
||||
public VerifyCancelQueryBuilder clientKey(String clientKey) {
|
||||
this.clientKey = clientKey;
|
||||
return this;
|
||||
}
|
||||
|
||||
public VerifyCancelQuery build() {
|
||||
VerifyCancelQuery verifyCancelQuery = new VerifyCancelQuery();
|
||||
verifyCancelQuery.setCertificate_id(certificate_id);
|
||||
verifyCancelQuery.setOrder_id(order_id);
|
||||
verifyCancelQuery.setVerify_id(verify_id);
|
||||
verifyCancelQuery.setTenantId(tenantId);
|
||||
verifyCancelQuery.setClientKey(clientKey);
|
||||
return verifyCancelQuery;
|
||||
}
|
||||
}
|
||||
}
|
@ -8,6 +8,7 @@ import com.dyj.applet.domain.vo.*;
|
||||
import com.dyj.common.config.AgentConfiguration;
|
||||
import com.dyj.common.domain.DataAndExtraVo;
|
||||
import com.dyj.common.domain.DySimpleResult;
|
||||
import com.dyj.common.domain.vo.BaseVo;
|
||||
import com.dyj.common.interceptor.ClientTokenInterceptor;
|
||||
|
||||
/**
|
||||
@ -88,4 +89,14 @@ public class IndustryTransactionHandler extends AbstractAppletHandler{
|
||||
baseQuery(body);
|
||||
return getIndustryOpenTransactionClient().deliveryVerify(body);
|
||||
}
|
||||
|
||||
/**
|
||||
* 生活服务交易系统->核销->抖音码->撤销核销
|
||||
* @param body 撤销核销请求值
|
||||
* @return
|
||||
*/
|
||||
public DataAndExtraVo<BaseVo> verifyCancel(VerifyCancelQuery body){
|
||||
baseQuery(body);
|
||||
return getIndustryOpenTransactionClient().verifyCancel(body);
|
||||
}
|
||||
}
|
||||
|
@ -498,9 +498,14 @@ public enum DyAppletUrlPathEnum {
|
||||
DELIVERY_PREPARE("deliveryPrepare", "/api/apps/trade/v2/fulfillment/delivery_prepare"),
|
||||
|
||||
/**
|
||||
* 验券
|
||||
* 生活服务交易系统->核销->抖音码->验券
|
||||
*/
|
||||
DELIVERY_VERIFY("deliveryVerify", "/api/apps/trade/v2/fulfillment/delivery_verify"),
|
||||
|
||||
/**
|
||||
* 生活服务交易系统->核销->抖音码->撤销核销
|
||||
*/
|
||||
VERIFY_CANCEL("verifyCancel", "/api/trade/v2/fulfillment/verify_cancel")
|
||||
;
|
||||
|
||||
|
||||
|
@ -441,4 +441,17 @@ public class TransactionTest {
|
||||
);
|
||||
}
|
||||
|
||||
/**
|
||||
* 生活服务交易系统->核销->抖音码->撤销核销
|
||||
*/
|
||||
@Test
|
||||
public void verifyCancel(){
|
||||
DyAppletClient dyAppletClient = new DyAppletClient();
|
||||
System.out.println(
|
||||
JSON.toJSONString(
|
||||
dyAppletClient.verifyCancel(VerifyCancelQuery.builder().build())
|
||||
)
|
||||
);
|
||||
}
|
||||
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user