| @@ -46,10 +46,10 @@ public class UserBasicInfoController extends BaseController { | |||||
| @ApiOperation(value = "会员", notes = "") | @ApiOperation(value = "会员", notes = "") | ||||
| public ResultData userRegister(@RequestBody Map<String,Object> map) { | public ResultData userRegister(@RequestBody Map<String,Object> map) { | ||||
| logger.info("UserBasicInfoController >>>>>>>>>>>> userRegister >>>>>>>>>>>>>"+map.toString()); | logger.info("UserBasicInfoController >>>>>>>>>>>> userRegister >>>>>>>>>>>>>"+map.toString()); | ||||
| String phone = (String) map.get("phone"); | |||||
| String nickName = (String) map.get("nickName"); | |||||
| String sexStr = (String) map.get("sex"); | |||||
| String avatarUrl = (String) map.get("avatarUrl"); | |||||
| String phone = String.valueOf(map.get("phone")) ; | |||||
| String nickName = String.valueOf(map.get("nickName")); | |||||
| String sexStr = String.valueOf(map.get("sex")); | |||||
| String avatarUrl = String.valueOf(map.get("avatarUrl")); | |||||
| if(StringUtils.isBlank(phone)){ | if(StringUtils.isBlank(phone)){ | ||||
| return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(),"手机号不能为空"); | return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(),"手机号不能为空"); | ||||
| } | } | ||||
| @@ -84,8 +84,8 @@ public class UserBasicInfoController extends BaseController { | |||||
| @ApiOperation(value = "会员", notes = "") | @ApiOperation(value = "会员", notes = "") | ||||
| public ResultData getUserInfo(@RequestBody Map<String,Object> map) { | public ResultData getUserInfo(@RequestBody Map<String,Object> map) { | ||||
| logger.info("UserBasicInfoController >>>>>>>>>>>> getUserInfo >>>>>>>>>>>>>"+map.toString()); | logger.info("UserBasicInfoController >>>>>>>>>>>> getUserInfo >>>>>>>>>>>>>"+map.toString()); | ||||
| String phone = (String) map.get("phone"); | |||||
| String openId = (String) map.get("openId"); | |||||
| String phone = String.valueOf(map.get("phone")); | |||||
| String openId = String.valueOf(map.get("openId")); | |||||
| WxCUserBasicInfo basicInfo = null; | WxCUserBasicInfo basicInfo = null; | ||||
| if(StringUtils.isBlank(phone) && StringUtils.isBlank(openId)){ | if(StringUtils.isBlank(phone) && StringUtils.isBlank(openId)){ | ||||
| return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL); | return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL); | ||||
| @@ -46,14 +46,14 @@ public class UserThirdCircleOrderController extends BaseController { | |||||
| public ResultData createOrder(@RequestBody Map<String,Object> map) { | public ResultData createOrder(@RequestBody Map<String,Object> map) { | ||||
| logger.info("UserThirdCircleOrderController >>>>>>>>>>>> createOrder >>>>>>>>>>>>>"+map.toString()); | logger.info("UserThirdCircleOrderController >>>>>>>>>>>> createOrder >>>>>>>>>>>>>"+map.toString()); | ||||
| String transactionId = (String) map.get("transactionId");//***订单Id | |||||
| String shopNumber = (String) map.get("shopNumber");//***门店唯一标识 对应双方平台门店 | |||||
| String shopName = (String) map.get("shopName");//门店名称 | |||||
| String userNumber = (String) map.get("userNumber");//***会员Id | |||||
| String userPhone = (String) map.get("userPhone");//会员手机号 | |||||
| String timeEnd = (String) map.get("timeEnd");//***付款时间(yyyy-MM-dd HH:mm:ss) | |||||
| String amount = (String) map.get("amount");//***付款金额(分) | |||||
| String summary = (String) map.get("summary");//付款摘要 | |||||
| String transactionId = String.valueOf(map.get("transactionId"));//***订单Id | |||||
| String shopNumber = String.valueOf(map.get("shopNumber"));//***门店唯一标识 对应双方平台门店 | |||||
| String shopName = String.valueOf(map.get("shopName"));//门店名称 | |||||
| String userNumber = String.valueOf(map.get("userNumber"));//***会员Id | |||||
| String userPhone = String.valueOf(map.get("userPhone"));//会员手机号 | |||||
| String timeEnd = String.valueOf(map.get("timeEnd"));//***付款时间(yyyy-MM-dd HH:mm:ss) | |||||
| String amount = String.valueOf(map.get("amount"));//***付款金额(分) | |||||
| String summary = String.valueOf(map.get("summary"));//付款摘要 | |||||
| if(StringUtils.isBlank(transactionId)){ | if(StringUtils.isBlank(transactionId)){ | ||||
| return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL,"transactionId为空"); | return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL,"transactionId为空"); | ||||
| @@ -120,11 +120,11 @@ public class UserThirdCircleOrderController extends BaseController { | |||||
| public ResultData orderRefund(@RequestBody Map<String,Object> map) { | public ResultData orderRefund(@RequestBody Map<String,Object> map) { | ||||
| logger.info("UserThirdCircleOrderController >>>>>>>>>>>> orderRefund >>>>>>>>>>>>>"+map.toString()); | logger.info("UserThirdCircleOrderController >>>>>>>>>>>> orderRefund >>>>>>>>>>>>>"+map.toString()); | ||||
| String transactionId = (String) map.get("transactionId");//***订单Id | |||||
| String refundTime = (String) map.get("refundTime");//***退款时间(yyyy-MM-dd HH:mm:ss) | |||||
| String refundSummary = (String) map.get("refundSummary");//退款摘要 | |||||
| String refundAmount = (String) map.get("refundAmount");//退款金额(分) | |||||
| String refundId = (String) map.get("refundId");//**退款Id | |||||
| String transactionId = String.valueOf(map.get("transactionId"));//***订单Id | |||||
| String refundTime = String.valueOf(map.get("refundTime"));//***退款时间(yyyy-MM-dd HH:mm:ss) | |||||
| String refundSummary = String.valueOf(map.get("refundSummary"));//退款摘要 | |||||
| String refundAmount = String.valueOf(map.get("refundAmount"));//退款金额(分) | |||||
| String refundId = String.valueOf(map.get("refundId"));//**退款Id | |||||
| if(StringUtils.isBlank(transactionId)){ | if(StringUtils.isBlank(transactionId)){ | ||||
| return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL,"transactionId为空"); | return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL,"transactionId为空"); | ||||
| @@ -181,14 +181,14 @@ public class UserThirdCircleOrderController extends BaseController { | |||||
| public ResultData pointDeduction(@RequestBody Map<String,Object> map) { | public ResultData pointDeduction(@RequestBody Map<String,Object> map) { | ||||
| logger.info("UserThirdCircleOrderController >>>>>>>>>>>> pointDeduction >>>>>>>>>>>>>"+map.toString()); | logger.info("UserThirdCircleOrderController >>>>>>>>>>>> pointDeduction >>>>>>>>>>>>>"+map.toString()); | ||||
| String transactionId = (String) map.get("transactionId");//***订单Id | |||||
| String shopNumber = (String) map.get("shopNumber");//***门店唯一标识 对应双方平台门店 | |||||
| String shopName = (String) map.get("shopName");//门店名称 | |||||
| String userNumber = (String) map.get("userNumber");//***会员Id | |||||
| String userPhone = (String) map.get("userPhone");//会员手机号 | |||||
| String timeEnd = (String) map.get("timeEnd");//***抵扣时间 | |||||
| String amount = (String) map.get("amount");//***积分数量 | |||||
| String summary = (String) map.get("summary");//摘要 | |||||
| String transactionId = String.valueOf(map.get("transactionId"));//***订单Id | |||||
| String shopNumber = String.valueOf(map.get("shopNumber"));//***门店唯一标识 对应双方平台门店 | |||||
| String shopName = String.valueOf(map.get("shopName"));//门店名称 | |||||
| String userNumber = String.valueOf(map.get("userNumber"));//***会员Id | |||||
| String userPhone = String.valueOf(map.get("userPhone"));//会员手机号 | |||||
| String timeEnd = String.valueOf(map.get("timeEnd"));//***抵扣时间 | |||||
| String amount = String.valueOf(map.get("amount"));//***积分数量 | |||||
| String summary = String.valueOf(map.get("summary"));//摘要 | |||||
| if(StringUtils.isBlank(transactionId)){ | if(StringUtils.isBlank(transactionId)){ | ||||
| return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL,"transactionId为空"); | return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL,"transactionId为空"); | ||||
| @@ -79,7 +79,7 @@ public class AuthorizationInterceptor extends HandlerInterceptorAdapter { | |||||
| if(parameterMap.isEmpty()){ | if(parameterMap.isEmpty()){ | ||||
| throw new MallinkException(ErrorCode.SYS_PARAMETER_ERROR.getCode(),"参数格式不正确"); | throw new MallinkException(ErrorCode.SYS_PARAMETER_ERROR.getCode(),"参数格式不正确"); | ||||
| } | } | ||||
| String timeStamp = (String) parameterMap.get("timeStamp"); | |||||
| String timeStamp = String.valueOf(parameterMap.get("timeStamp")); | |||||
| long timestampDate = Long.valueOf(timeStamp) + 1000*60*5;//五分钟有效 | long timestampDate = Long.valueOf(timeStamp) + 1000*60*5;//五分钟有效 | ||||
| long currDate = System.currentTimeMillis(); | long currDate = System.currentTimeMillis(); | ||||
| // 请求过期 | // 请求过期 | ||||
| @@ -39,22 +39,22 @@ public class AppTest { | |||||
| /** | /** | ||||
| * 查询用户详细信息 参数 | * 查询用户详细信息 参数 | ||||
| */ | */ | ||||
| // paramMap.put("phone","18872592633"); | |||||
| paramMap.put("phone","18872592633"); | |||||
| // paramMap.put("openId","opvcM5A41kbQF_NY8k3LMDqxCDUM"); | // paramMap.put("openId","opvcM5A41kbQF_NY8k3LMDqxCDUM"); | ||||
| /** | /** | ||||
| * 创建交易信息 参数 | * 创建交易信息 参数 | ||||
| */ | */ | ||||
| IdWorker idWorker = IdWorker.get(); | |||||
| paramMap.put("transactionId",String.valueOf(idWorker.nextId()));//***订单Id | |||||
| paramMap.put("shopNumber","1001");//***门店唯一标识 对应双方平台门店 | |||||
| paramMap.put("shopName","百丽");//门店名称 | |||||
| paramMap.put("userNumber","551612907794915328");//***会员Id | |||||
| paramMap.put("userPhone","18872592633");//会员手机号 | |||||
| paramMap.put("timeEnd","2021-05-31 11:43:00");//***付款时间(yyyy-MM-dd HH:mm:ss) | |||||
| paramMap.put("amount","2200");//***付款金额(分) | |||||
| paramMap.put("summary","再来一单");//付款摘要 | |||||
| // IdWorker idWorker = IdWorker.get(); | |||||
| // paramMap.put("transactionId",String.valueOf(idWorker.nextId()));//***订单Id | |||||
| // paramMap.put("shopNumber","1001");//***门店唯一标识 对应双方平台门店 | |||||
| // paramMap.put("shopName","百丽");//门店名称 | |||||
| // paramMap.put("userNumber","551612907794915328");//***会员Id | |||||
| // paramMap.put("userPhone","18872592633");//会员手机号 | |||||
| // paramMap.put("timeEnd","2021-05-31 11:43:00");//***付款时间(yyyy-MM-dd HH:mm:ss) | |||||
| // paramMap.put("amount","2200");//***付款金额(分) | |||||
| // paramMap.put("summary","再来一单");//付款摘要 | |||||
| /** | /** | ||||
| * 交易退款信息 参数 | * 交易退款信息 参数 | ||||
| @@ -91,7 +91,7 @@ public class AppTest { | |||||
| /** | /** | ||||
| * 注册并查询用户详细信息 接口 | * 注册并查询用户详细信息 接口 | ||||
| */ | */ | ||||
| // String s = HttpUtil.doPost("https://openapitest.malls.iformall.com/api/userInfo/register", headMap, JSON.toJSONString(paramMap)); | |||||
| String s = HttpUtil.doPost("https://openapitest.malls.iformall.com/api/userInfo/register", headMap, JSON.toJSONString(paramMap)); | |||||
| /** | /** | ||||
| * 注册并查询用户详细信息 接口 | * 注册并查询用户详细信息 接口 | ||||
| @@ -102,7 +102,7 @@ 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("http://localhost:7070/public/api/thirdCircle/order", headMap, JSON.toJSONString(paramMap)); | ||||