|
|
@ -8,8 +8,18 @@ import com.baomidou.mybatisplus.core.toolkit.IdWorker; |
|
|
|
import com.baomidou.mybatisplus.extension.conditions.query.LambdaQueryChainWrapper; |
|
|
|
import com.baomidou.mybatisplus.extension.conditions.query.QueryChainWrapper; |
|
|
|
import com.baomidou.mybatisplus.extension.plugins.pagination.Page; |
|
|
|
import com.cainiao.link.consumer.LinkClient; |
|
|
|
import com.github.binarywang.wxpay.bean.notify.WxPayOrderNotifyResult; |
|
|
|
import com.github.binarywang.wxpay.constant.WxPayErrorCode; |
|
|
|
import com.taobao.pac.sdk.cp.dataobject.request.GUOGUO_QUERY_LOGISTICS_DETAIL.GuoguoQueryLogisticsDetailRequest; |
|
|
|
import com.taobao.pac.sdk.cp.dataobject.request.GUOGUO_QUERY_LOGISTICS_DETAIL.LogisticsDetailOption; |
|
|
|
import com.taobao.pac.sdk.cp.dataobject.request.GUOGUO_QUERY_LOGISTICS_DETAIL.LogisticsDetailRequest; |
|
|
|
import com.taobao.pac.sdk.cp.dataobject.request.GUOGUO_QUERY_SEND_ORDER_FULL_DETAIL.AccessOption; |
|
|
|
import com.taobao.pac.sdk.cp.dataobject.request.GUOGUO_QUERY_SEND_ORDER_FULL_DETAIL.GuoguoCancelSendOrderRequest; |
|
|
|
import com.taobao.pac.sdk.cp.dataobject.request.GUOGUO_QUERY_SEND_ORDER_FULL_DETAIL.QueryOrderConditionDTO; |
|
|
|
import com.taobao.pac.sdk.cp.dataobject.response.GUOGUO_QUERY_LOGISTICS_DETAIL.GuoguoQueryLogisticsDetailResponse; |
|
|
|
import com.taobao.pac.sdk.cp.dataobject.response.GUOGUO_QUERY_SEND_ORDER_FULL_DETAIL.GuoguoCreateSendOrderResponse; |
|
|
|
import com.taobao.pac.sdk.cp.dataobject.response.GUOGUO_QUERY_SEND_ORDER_FULL_DETAIL.LogisticsDetailDTO; |
|
|
|
import com.wechat.pay.contrib.apache.httpclient.auth.AutoUpdateCertificatesVerifier; |
|
|
|
import com.wechat.pay.contrib.apache.httpclient.auth.PrivateKeySigner; |
|
|
|
import com.wechat.pay.contrib.apache.httpclient.auth.WechatPay2Credentials; |
|
|
@ -128,6 +138,14 @@ public class OrderServiceImpl implements IOrderService { |
|
|
|
private String serialNo; |
|
|
|
@Value("${weixin.apiV3Key}") |
|
|
|
private String apiV3Key; |
|
|
|
@Value("${cainiao.appKey}") |
|
|
|
private String appKey; |
|
|
|
@Value("${cainiao.appSecret}") |
|
|
|
private String appSecret; |
|
|
|
@Value("${cainiao.accountId}") |
|
|
|
private String accountId; |
|
|
|
@Value("${cainiao.accessCode}") |
|
|
|
private String accessCode; |
|
|
|
@Resource |
|
|
|
private IHotelOrderLogService hotelOrderLogService; |
|
|
|
@Resource |
|
|
@ -3771,6 +3789,27 @@ public class OrderServiceImpl implements IOrderService { |
|
|
|
return Result.OK(); |
|
|
|
} |
|
|
|
|
|
|
|
@Override |
|
|
|
public Result<?> queryLogistics(QueryLogisticsReq queryLogisticsReq) { |
|
|
|
//通过 LinkClient Builder 构造一个 LinkClient |
|
|
|
com.cainiao.link.consumer.LinkClient linkClient = LinkClient.builder(appKey, appSecret).build(); |
|
|
|
|
|
|
|
GuoguoQueryLogisticsDetailRequest request = new GuoguoQueryLogisticsDetailRequest(); |
|
|
|
|
|
|
|
LogisticsDetailRequest logisticsDetailRequest = new LogisticsDetailRequest(); |
|
|
|
logisticsDetailRequest.setTdOrderId(15592780860652417L); |
|
|
|
LogisticsDetailOption logisticsDetailOption = new LogisticsDetailOption(); |
|
|
|
logisticsDetailOption.setAccessCode(accessCode); |
|
|
|
logisticsDetailOption.setAccessMethod("LINK"); |
|
|
|
|
|
|
|
request.setRequest(logisticsDetailRequest); |
|
|
|
request.setOption(logisticsDetailOption); |
|
|
|
|
|
|
|
GuoguoQueryLogisticsDetailResponse response = linkClient.execute(request, accountId, accessCode); |
|
|
|
log.info("包裹返回信息:"+response.toString()); |
|
|
|
return null; |
|
|
|
} |
|
|
|
|
|
|
|
public Object testPay(String id){ |
|
|
|
HotelOrder hotelOrder = hotelOrderService.lambdaQuery() |
|
|
|
.eq(HotelOrder::getDelFlag, 0) |
|
|
|