|
@@ -93,15 +93,15 @@ public class GigThirdApiController {
|
|
|
// 请求body json
|
|
|
JSONObject bodyJson = JSONUtil.parseObj(body);
|
|
|
|
|
|
- // 平台任务编号
|
|
|
- String orderNo = bodyJson.getStr("orderNo");
|
|
|
+ // 三方订单号
|
|
|
+ String thirdOrderNo = bodyJson.getStr("thirdOrderNo");
|
|
|
|
|
|
Map<String, Object> result = new HashMap<>();
|
|
|
|
|
|
- String redisKey = String.format("%s_%s", CacheConstants.ZHONG_ZHI_SETTLE_NOTIFY_KEY, orderNo);
|
|
|
- Boolean absent = redisTemplate.opsForValue().setIfAbsent(redisKey, orderNo, 30, TimeUnit.MINUTES);
|
|
|
+ String redisKey = String.format("%s_%s", CacheConstants.ZHONG_ZHI_SETTLE_NOTIFY_KEY, thirdOrderNo);
|
|
|
+ Boolean absent = redisTemplate.opsForValue().setIfAbsent(redisKey, thirdOrderNo, 30, TimeUnit.MINUTES);
|
|
|
if (Boolean.FALSE.equals(absent)) {
|
|
|
- log.warn("存在在途操作orderNo={}", orderNo);
|
|
|
+ log.warn("存在在途操作orderNo={}", thirdOrderNo);
|
|
|
result.put("code", "00000400");
|
|
|
result.put("msg", "成功");
|
|
|
return result;
|
|
@@ -109,7 +109,7 @@ public class GigThirdApiController {
|
|
|
|
|
|
// 请求记录到数据库
|
|
|
ZhongzhiInputRecord inputRecord = new ZhongzhiInputRecord();
|
|
|
- inputRecord.setOrderNo(orderNo);
|
|
|
+ inputRecord.setThirdOrderNo(thirdOrderNo);
|
|
|
inputRecord.setReqType(ZhongzhiInputRecord.ReqType.SETTLE_NOTIFY.getType());
|
|
|
inputRecord.setReqBody(body);
|
|
|
zhongzhiInputRecordService.save(inputRecord);
|