From 477781911a88b846d46518b0f8c90e915c3181ae Mon Sep 17 00:00:00 2001 From: xhxu Date: Tue, 15 Jun 2021 14:36:13 +0800 Subject: [PATCH] tt --- .../interceptor/AuthorizationInterceptor.java | 6 ++- .../main/java/com/iformall/utils/AppTest.java | 40 +++++++++---------- .../controller/tt/TtUpSettleinController.java | 2 +- 3 files changed, 26 insertions(+), 22 deletions(-) diff --git a/mallinkPublicApi/src/main/java/com/iformall/interceptor/AuthorizationInterceptor.java b/mallinkPublicApi/src/main/java/com/iformall/interceptor/AuthorizationInterceptor.java index aceb86e20..8d7f68669 100644 --- a/mallinkPublicApi/src/main/java/com/iformall/interceptor/AuthorizationInterceptor.java +++ b/mallinkPublicApi/src/main/java/com/iformall/interceptor/AuthorizationInterceptor.java @@ -78,7 +78,11 @@ public class AuthorizationInterceptor extends HandlerInterceptorAdapter { if(parameterMap.isEmpty()){ throw new MallinkException(ErrorCode.SYS_PARAMETER_ERROR.getCode(),"参数格式不正确"); } - String timeStamp = String.valueOf(parameterMap.get("timeStamp")); + + String timeStamp = parameterMap.get("timeStamp")==null?"":parameterMap.get("timeStamp").toString(); + if(StringUtils.isBlank(timeStamp)){ + throw new MallinkException(ErrorCode.SYS_PARAMETER_ERROR.getCode(),"缺少timeStamp"); + } long timestampDate = Long.valueOf(timeStamp) + 1000*60*5;//五分钟有效 long currDate = System.currentTimeMillis(); // 请求过期 diff --git a/mallinkPublicApi/src/main/java/com/iformall/utils/AppTest.java b/mallinkPublicApi/src/main/java/com/iformall/utils/AppTest.java index 6a4e415d1..a8cc5ff32 100644 --- a/mallinkPublicApi/src/main/java/com/iformall/utils/AppTest.java +++ b/mallinkPublicApi/src/main/java/com/iformall/utils/AppTest.java @@ -47,29 +47,29 @@ public class AppTest { /** * 创建交易信息 参数 */ - IdWorker idWorker = IdWorker.get(); - - paramMap.put("sourceType", EnumUserType.BUSINESS_CIRCLE.getCode().toString()); - - paramMap.put("transactionId",String.valueOf(idWorker.nextId()));//***订单Id - paramMap.put("shopNumber","1001");//***门店唯一标识 对应双方平台门店 - paramMap.put("shopName","百丽");//门店名称 - paramMap.put("userNumber","441388943427399680");//***会员Id -// paramMap.put("userPhone","18872592633");//会员手机号 - paramMap.put("timeEnd","2021-06-14 01:50:11");//***付款时间(yyyy-MM-dd HH:mm:ss) - paramMap.put("amount","9000");//***付款金额(分) -// paramMap.put("summary","");//付款摘要 +// IdWorker idWorker = IdWorker.get(); +// +//// paramMap.put("sourceType", EnumUserType.THIRD_CIRCLE.getCode().toString()); +// +// paramMap.put("transactionId",String.valueOf(idWorker.nextId()));//***订单Id +// paramMap.put("shopNumber","1001");//***门店唯一标识 对应双方平台门店 +// paramMap.put("shopName","百丽");//门店名称 +// paramMap.put("userNumber","441388943427399680");//***会员Id +//// paramMap.put("userPhone","18872592633");//会员手机号 +// paramMap.put("timeEnd","2021-06-14 12:50:11");//***付款时间(yyyy-MM-dd HH:mm:ss) +// paramMap.put("amount","9000");//***付款金额(分) +//// paramMap.put("summary","");//付款摘要 /** * 交易退款信息 参数 */ -// IdWorker idWorker = IdWorker.get(); + IdWorker idWorker = IdWorker.get(); // paramMap.put("sourceType", EnumUserType.BUSINESS_CIRCLE.getCode().toString()); -// paramMap.put("transactionId","564097161459499008");//***订单Id -// paramMap.put("refundTime","2021-06-14 00:58:00");//***退款时间(yyyy-MM-dd HH:mm:ss) -//// paramMap.put("refundAmount","1000");//退款金额(分) -// paramMap.put("refundSummary","我要退款");//付款摘要 -// paramMap.put("refundId",String.valueOf(idWorker.nextId()));//退款订单号 + paramMap.put("transactionId","564279392066437120");//***订单Id + paramMap.put("refundTime","2021-06-14 00:58:00");//***退款时间(yyyy-MM-dd HH:mm:ss) +// paramMap.put("refundAmount","1000");//退款金额(分) + paramMap.put("refundSummary","我要退款1");//付款摘要 + paramMap.put("refundId",String.valueOf(idWorker.nextId()));//退款订单号 /** * 积分抵扣 参数 @@ -107,14 +107,14 @@ public class AppTest { /** * 创建交易信息 接口 */ - String s = HttpUtil.doPost("https://openapitest.malls.iformall.com/api/thirdCircle/order", headMap, JSON.toJSONString(paramMap)); +// String s = HttpUtil.doPost("https://openapitest.malls.iformall.com/api/thirdCircle/order", headMap, JSON.toJSONString(paramMap)); // String s = HttpUtil.doPost("http://localhost:7070/public/api/thirdCircle/order", headMap, JSON.toJSONString(paramMap)); /** * 交易退款 接口 */ -// String s = HttpUtil.doPost("https://openapitest.malls.iformall.com/api/thirdCircle/orderRefund", headMap, JSON.toJSONString(paramMap)); + String s = HttpUtil.doPost("https://openapitest.malls.iformall.com/api/thirdCircle/orderRefund", headMap, JSON.toJSONString(paramMap)); /** * 积分抵扣 接口 diff --git a/mallinkTTAdmin/src/main/java/com/iformall/controller/tt/TtUpSettleinController.java b/mallinkTTAdmin/src/main/java/com/iformall/controller/tt/TtUpSettleinController.java index 90ccbce4b..a5309d5c0 100644 --- a/mallinkTTAdmin/src/main/java/com/iformall/controller/tt/TtUpSettleinController.java +++ b/mallinkTTAdmin/src/main/java/com/iformall/controller/tt/TtUpSettleinController.java @@ -44,7 +44,7 @@ public class TtUpSettleinController extends BaseController { public ResultData list(@ModelAttribute TtUpSettlein record, Integer pageNum, Integer pageSize, Integer dataType) { logger.debug("[" + getIpAddr() + "] TtCouponController::list"); if (record == null) record = new TtUpSettlein(); - record.updateTenantInfo(getTenantInfo()); + record.updateTenantInfo(ifParentUpdateTenantInfo()); if(StringUtils.isBlank(record.getSortColumn())){ record.setSortColumns(BaseEntity.SortField.CreateDate_DESC); }