diff --git a/jsowell-admin/src/main/java/com/jsowell/api/thirdparty/MapController.java b/jsowell-admin/src/main/java/com/jsowell/api/thirdparty/MapController.java new file mode 100644 index 000000000..ff59979f7 --- /dev/null +++ b/jsowell-admin/src/main/java/com/jsowell/api/thirdparty/MapController.java @@ -0,0 +1,18 @@ +package com.jsowell.api.thirdparty; + +import com.jsowell.common.annotation.Anonymous; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +/** + * 地图相关接口 + */ +@Anonymous +@RestController +@RequestMapping("/map") +public class MapController { + + // 根据经纬度查询地址信息 + + +} diff --git a/jsowell-admin/src/main/java/com/jsowell/api/thirdparty/ZheJiangController.java b/jsowell-admin/src/main/java/com/jsowell/api/thirdparty/ZheJiangController.java index 7cf09ed48..0031f84dc 100644 --- a/jsowell-admin/src/main/java/com/jsowell/api/thirdparty/ZheJiangController.java +++ b/jsowell-admin/src/main/java/com/jsowell/api/thirdparty/ZheJiangController.java @@ -44,7 +44,7 @@ public class ZheJiangController extends ThirdPartyBaseController { logger.info("{}-请求令牌, params:{}, result:{}", platformName, JSON.toJSONString(dto), JSON.toJSONString(map)); return CommonResult.success(0, "请求令牌成功!", map.get("Data"), map.get("Sig")); } catch (Exception e) { - logger.error("{}-获取token接口, 异常, params:{}", platformName, JSON.toJSONString(dto)); + logger.error("{}-获取token接口, 异常, params:{}", platformName, JSON.toJSONString(dto), e); return CommonResult.failed("获取token发生异常"); } } diff --git a/jsowell-netty/src/main/java/com/jsowell/netty/handler/yunkuaichong/TransactionRecordsRequestHandler.java b/jsowell-netty/src/main/java/com/jsowell/netty/handler/yunkuaichong/TransactionRecordsRequestHandler.java index 2dcfebc43..29cf3e3c3 100644 --- a/jsowell-netty/src/main/java/com/jsowell/netty/handler/yunkuaichong/TransactionRecordsRequestHandler.java +++ b/jsowell-netty/src/main/java/com/jsowell/netty/handler/yunkuaichong/TransactionRecordsRequestHandler.java @@ -22,7 +22,6 @@ import com.jsowell.pile.service.*; import com.jsowell.pile.service.programlogic.AbstractProgramLogic; import com.jsowell.pile.service.programlogic.ProgramLogicFactory; import com.jsowell.thirdparty.common.CommonService; -import io.netty.channel.Channel; import io.netty.channel.ChannelHandlerContext; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; @@ -640,10 +639,11 @@ public class TransactionRecordsRequestHandler extends AbstractHandler { } // 异步绑定第三方平台优惠券 + OrderBasicInfo finalOrderBasicInfo = orderBasicInfo; CompletableFuture.runAsync(() -> { try { - String bindResult = commonService.bindCoupon(orderBasicInfo); - log.info("绑定优惠券 订单信息:{}, result:{}", orderBasicInfo, bindResult); + String bindResult = commonService.bindCoupon(finalOrderBasicInfo); + log.info("绑定优惠券 订单信息:{}, result:{}", finalOrderBasicInfo, bindResult); } catch (Exception e) { log.error("绑定优惠券 error,", e); } @@ -666,7 +666,7 @@ public class TransactionRecordsRequestHandler extends AbstractHandler { // 异步推送第三方平台订单信息 CompletableFuture.runAsync(() -> { try { - commonService.commonPushOrderInfo(orderBasicInfo); + commonService.commonPushOrderInfo(finalOrderBasicInfo); } catch (Exception e) { log.error("推送第三方平台订单信息error, ", e); e.printStackTrace(); @@ -676,7 +676,7 @@ public class TransactionRecordsRequestHandler extends AbstractHandler { // 异步推送第三方平台订单信息V2 CompletableFuture.runAsync(() -> { try { - commonService.commonPushOrderInfoV2(orderBasicInfo); + commonService.commonPushOrderInfoV2(finalOrderBasicInfo); } catch (Exception e) { log.error("推送第三方平台订单信息error, ", e); e.printStackTrace();