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

Commit 64af0127 authored by 张国柄's avatar 张国柄

~退会员同步KYLIN逻辑由原admin退款申请阶段迁移到退款成功回调中处理;

parent a788e46c
...@@ -71,8 +71,6 @@ public class AdamMemberOrderAdminServiceImpl extends ServiceImpl<AdamMemberOrder ...@@ -71,8 +71,6 @@ public class AdamMemberOrderAdminServiceImpl extends ServiceImpl<AdamMemberOrder
private String applyUrl; private String applyUrl;
@Value("${liquidnet.service.platform.urls.memberRefundNotify}") @Value("${liquidnet.service.platform.urls.memberRefundNotify}")
private String notifyUrl; private String notifyUrl;
@Value("${liquidnet.service.kylin.url}")
private String serviceKylinUrl;
@Override @Override
public List<MemberOrderDto> getMemberOrderList(MemberOrderListReq memberOrderListReq) { public List<MemberOrderDto> getMemberOrderList(MemberOrderListReq memberOrderListReq) {
...@@ -210,14 +208,6 @@ public class AdamMemberOrderAdminServiceImpl extends ServiceImpl<AdamMemberOrder ...@@ -210,14 +208,6 @@ public class AdamMemberOrderAdminServiceImpl extends ServiceImpl<AdamMemberOrder
reason = existsRefund.getRefundReason(); reason = existsRefund.getRefundReason();
} }
try {
String reqKylinUrl = serviceKylinUrl + "/inner/cache/member/".concat(memberOrder.getUid());
log.info("reqKylinUrl={}", reqKylinUrl);
HttpUtil.get(reqKylinUrl, CollectionUtil.linkedMultiValueMapStringString());
} catch (Exception e) {
log.error("购买会员支付回调处理成功:同步Kylin会员缓存异常[UID={}]", memberOrder.getUid(), e);
}
LinkedMultiValueMap<String, String> linkedMultiValueMap = new LinkedMultiValueMap<>(); LinkedMultiValueMap<String, String> linkedMultiValueMap = new LinkedMultiValueMap<>();
linkedMultiValueMap.add("code", memberOrder.getPayNo()); linkedMultiValueMap.add("code", memberOrder.getPayNo());
linkedMultiValueMap.add("notifyUrl", notifyUrl); linkedMultiValueMap.add("notifyUrl", notifyUrl);
......
...@@ -5,6 +5,8 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers; ...@@ -5,6 +5,8 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.liquidnet.common.cache.redis.util.AbstractRedisUtil; import com.liquidnet.common.cache.redis.util.AbstractRedisUtil;
import com.liquidnet.common.cache.redis.util.RedisDataSourceUtil; import com.liquidnet.common.cache.redis.util.RedisDataSourceUtil;
import com.liquidnet.commons.lang.util.CollectionUtil;
import com.liquidnet.commons.lang.util.HttpUtil;
import com.liquidnet.service.adam.constant.AdamRedisConst; import com.liquidnet.service.adam.constant.AdamRedisConst;
import com.liquidnet.service.adam.dto.vo.AdamMemberOrderVo; import com.liquidnet.service.adam.dto.vo.AdamMemberOrderVo;
import com.liquidnet.service.adam.dto.vo.AdamUserMemberVo; import com.liquidnet.service.adam.dto.vo.AdamUserMemberVo;
...@@ -21,6 +23,7 @@ import com.liquidnet.service.candy.mapper.CandyUserCouponMapper; ...@@ -21,6 +23,7 @@ import com.liquidnet.service.candy.mapper.CandyUserCouponMapper;
import com.liquidnet.service.feign.stone.api.FeignStoneIntegralClient; import com.liquidnet.service.feign.stone.api.FeignStoneIntegralClient;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import org.springframework.util.CollectionUtils; import org.springframework.util.CollectionUtils;
...@@ -44,6 +47,11 @@ public class PlatformMemberRefundService extends ServiceImpl<AdamMemberRefundMap ...@@ -44,6 +47,11 @@ public class PlatformMemberRefundService extends ServiceImpl<AdamMemberRefundMap
private CandyUserCouponMapper candyUserCouponMapper; private CandyUserCouponMapper candyUserCouponMapper;
@Autowired @Autowired
private RedisDataSourceUtil redisDataSourceUtil; private RedisDataSourceUtil redisDataSourceUtil;
@Value("${liquidnet.service.kylin.url}")
private String serviceKylinUrl;
@Autowired @Autowired
FeignStoneIntegralClient feignStoneIntegralClient; FeignStoneIntegralClient feignStoneIntegralClient;
...@@ -194,6 +202,12 @@ public class PlatformMemberRefundService extends ServiceImpl<AdamMemberRefundMap ...@@ -194,6 +202,12 @@ public class PlatformMemberRefundService extends ServiceImpl<AdamMemberRefundMap
int updateRst = adamMemberOrderMapper.updateById(updateInfoMemberOrder); int updateRst = adamMemberOrderMapper.updateById(updateInfoMemberOrder);
log.info("###会员退款回调处理成功:更新DB订单信息{}[orderNo:{}]", updateRst <= 0 ? "失败" : "成功", orderNo); log.info("###会员退款回调处理成功:更新DB订单信息{}[orderNo:{}]", updateRst <= 0 ? "失败" : "成功", orderNo);
try {
HttpUtil.get(serviceKylinUrl + "/inner/cache/member/".concat(memberOrder.getUid()), CollectionUtil.linkedMultiValueMapStringString());
} catch (Exception e) {
log.error("购买会员支付回调处理成功:同步Kylin会员缓存异常[UID={},URL={}]", memberOrder.getUid(), serviceKylinUrl, e);
}
try { try {
feignStoneIntegralClient.de2111(memberOrder.getUid(), new BigDecimal(refundAmt).intValue(), "会员注销"); feignStoneIntegralClient.de2111(memberOrder.getUid(), new BigDecimal(refundAmt).intValue(), "会员注销");
} catch (Exception e) { } catch (Exception e) {
......
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