记得上下班打卡 | git大法好,push需谨慎

Commit 8369a596 authored by 张国柄's avatar 张国柄

+购买会员成功、退会员同步kylin.redis缓存会员信息逻辑;

parent 8c66935a
......@@ -71,6 +71,8 @@ public class AdamMemberOrderAdminServiceImpl extends ServiceImpl<AdamMemberOrder
private String applyUrl;
@Value("${liquidnet.service.platform.urls.memberRefundNotify}")
private String notifyUrl;
@Value("${liquidnet.service.kylin.url}")
private String serviceKylinUrl;
@Override
public List<MemberOrderDto> getMemberOrderList(MemberOrderListReq memberOrderListReq) {
......@@ -208,6 +210,12 @@ public class AdamMemberOrderAdminServiceImpl extends ServiceImpl<AdamMemberOrder
reason = existsRefund.getRefundReason();
}
try {
HttpUtil.post(serviceKylinUrl + "/inner/cache/member?uid=".concat(memberOrder.getUid()), CollectionUtil.linkedMultiValueMapStringString());
} catch (Exception e) {
log.error("会员管理:会员订单:退款:同步Kylin会员缓存异常[UID={}]", memberOrder.getUid());
}
LinkedMultiValueMap<String, String> linkedMultiValueMap = new LinkedMultiValueMap<>();
linkedMultiValueMap.add("code", memberOrder.getPayNo());
linkedMultiValueMap.add("notifyUrl", notifyUrl);
......@@ -222,11 +230,16 @@ public class AdamMemberOrderAdminServiceImpl extends ServiceImpl<AdamMemberOrder
linkedMultiheadersMap.add("Accept", MediaType.APPLICATION_JSON_UTF8_VALUE);
log.info("会员管理:会员订单:退款:支付中心请求参数:{}", linkedMultiValueMap);
String postResult = HttpUtil.post(applyUrl, linkedMultiValueMap, linkedMultiheadersMap);
log.info("会员管理:会员订单:退款:支付中心返回数据:{}", postResult);
String postResult = null;
try {
postResult = HttpUtil.post(applyUrl, linkedMultiValueMap, linkedMultiheadersMap);
log.info("会员管理:会员订单:退款:支付中心返回数据:{}", postResult);
} catch (Exception e) {
log.error("会员管理:会员订单:退款:支付中心请求异常");
}
JsonNode postResultJNode = JsonUtils.fromJson(postResult, JsonNode.class);
if (!postResultJNode.get("success").asBoolean()) {
if (null == postResultJNode || !postResultJNode.get("success").asBoolean()) {
return AjaxResult.warn("会员退款请求支付中心失败");
}
......
......@@ -128,6 +128,7 @@ global-auth:
- ${liquidnet.info.context}/myPerformance/*
# 场地摄像头列表
- ${liquidnet.info.context}/camera/list
- ${liquidnet.info.context}/inner/**
oncheck-url-pattern:
- ${liquidnet.info.context}/order/details
- ${liquidnet.info.context}/order/transfer*
......
......@@ -20,6 +20,7 @@ import com.liquidnet.service.feign.stone.api.FeignStoneIntegralClient;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.core.env.Environment;
import org.springframework.stereotype.Service;
import org.springframework.util.CollectionUtils;
......@@ -45,6 +46,10 @@ public class AdamMemberOrderServiceImpl implements IAdamMemberOrderService {
@Autowired
FeignStoneIntegralClient feignStoneIntegralClient;
@Value("${liquidnet.service.kylin.url}")
private String serviceKylinUrl;
@Override
// @Transactional(propagation = Propagation.REQUIRED, rollbackFor = Exception.class)
public ResponseDto<AdamMemberOrderResult> buyMemberOrMemberCode(String currentUid, AdamMemberOrderParam param) {
......@@ -382,6 +387,12 @@ public class AdamMemberOrderServiceImpl implements IAdamMemberOrderService {
queueUtils.sendMsgByRedis(MQConst.AdamQueue.SMS_NOTICE.getKey(), SmsMessage.builder().setPhone(userInfoVo.getMobile())
.setSignName(SmsEnum.ADSignName.M01.getVal()).setTemplateCode(SmsEnum.ADTemplate.SMS_232908714.name()).toJson()
);
try {
HttpUtil.post(serviceKylinUrl + "/inner/cache/member?uid=".concat(handleMemberOrderVo.getUid()), CollectionUtil.linkedMultiValueMapStringString());
} catch (Exception e) {
log.error("购买会员支付回调处理成功:同步Kylin会员缓存异常[UID={}]", handleMemberOrderVo.getUid());
}
return ResponseDto.success();
} catch (Exception e) {
log.error("购买会员支付回调处理异常[CallbackParam={}]", JsonUtils.toJson(parameter), e);
......
package com.liquidnet.service.kylin.controller;
import ch.qos.logback.core.util.Duration;
import com.liquidnet.service.adam.dto.vo.AdamMemberVo;
import com.liquidnet.service.adam.dto.vo.AdamUserMemberVo;
import com.liquidnet.service.base.ResponseDto;
import com.liquidnet.service.feign.adam.api.FeignAdamBaseClient;
import com.liquidnet.service.kylin.entity.KylinBanners;
import com.liquidnet.service.kylin.utils.DataUtils;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
......@@ -13,7 +10,10 @@ import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
import java.time.LocalDateTime;
import java.time.temporal.ChronoUnit;
......@@ -28,12 +28,12 @@ public class InnerController {
@Autowired
FeignAdamBaseClient adamBaseClient;
@PostMapping("save/member")
@PostMapping("cache/member")
@ApiOperation("获取会员相关数据")
@ApiImplicitParams({
@ApiImplicitParam(type = "query", dataType = "String", name = "uid", value = "会员id"),
})
public void saveMember(@RequestParam("uid") String uid) {
public void cacheMember(@RequestParam("uid") String uid) {
try {
ResponseDto<AdamUserMemberVo> memberVo = adamBaseClient.queryMember(uid);
AdamUserMemberVo userMemberVo = memberVo.getData();
......
......@@ -7,7 +7,6 @@ import com.liquidnet.common.cache.redis.util.AbstractRedisUtil;
import com.liquidnet.common.cache.redis.util.RedisDataSourceUtil;
import com.liquidnet.service.adam.constant.AdamRedisConst;
import com.liquidnet.service.adam.dto.vo.AdamMemberOrderVo;
import com.liquidnet.service.adam.dto.vo.AdamUserInfoVo;
import com.liquidnet.service.adam.dto.vo.AdamUserMemberVo;
import com.liquidnet.service.adam.entity.AdamMemberOrder;
import com.liquidnet.service.adam.entity.AdamMemberRefund;
......@@ -43,10 +42,8 @@ public class PlatformMemberRefundService extends ServiceImpl<AdamMemberRefundMap
private AdamUserMemberMapper adamUserMemberMapper;
@Autowired
private CandyUserCouponMapper candyUserCouponMapper;
@Autowired
private RedisDataSourceUtil redisDataSourceUtil;
@Autowired
FeignStoneIntegralClient feignStoneIntegralClient;
......@@ -197,6 +194,10 @@ public class PlatformMemberRefundService extends ServiceImpl<AdamMemberRefundMap
int updateRst = adamMemberOrderMapper.updateById(updateInfoMemberOrder);
log.info("###会员退款回调处理成功:更新DB订单信息{}[orderNo:{}]", updateRst <= 0 ? "失败" : "成功", orderNo);
feignStoneIntegralClient.de2111(memberOrder.getUid(), new BigDecimal(refundAmt).intValue(), "会员注销");
try {
feignStoneIntegralClient.de2111(memberOrder.getUid(), new BigDecimal(refundAmt).intValue(), "会员注销");
} catch (Exception e) {
log.error("###会员退款回调处理成功:减积分调用API异常[UID={},refundAmt={}]", memberOrder.getUid(), refundAmt);
}
}
}
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment