Merge remote-tracking branch 'origin/hjc' into hjc

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-zhengzai/src/main/java/com/liquidnet/client/admin/zhengzai/adam/service/impl/AdamMemberOrderAdminServiceImpl.java

@@ -71,8 +71,6 @@ 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) {
@@ -210,14 +208,6 @@ public class AdamMemberOrderAdminServiceImpl extends ServiceImpl<AdamMemberOrder
             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.add("code", memberOrder.getPayNo());
         linkedMultiValueMap.add("notifyUrl", notifyUrl);

liquidnet-bus-config/liquidnet-config/liquidnet-client-admin-web-dev.yml

@@ -15,14 +15,14 @@ liquidnet:
             urlHostAndPort: ${liquidnet.mysql.urlHostAndPort}
             username: ${liquidnet.mysql.username}
             password: ${liquidnet.mysql.password}
-            database-name: test_ln_scene
+            database-name: dev_ln_scene
         slave:
             urlHostAndPort: ${liquidnet.mysql.urlHostAndPort}
             username: ${liquidnet.mysql.username}
             password: ${liquidnet.mysql.password}
-            database-name: test_ln_scene
+            database-name: dev_ln_scene
     mongodb:
         sslEnabled: false
-        database: test_ln_scene
+        database: dev_ln_scene
 
 # end-dev-这里是配置信息基本值
\ No newline at end of file

liquidnet-bus-config/liquidnet-config/liquidnet-service-order-dev.yml

@@ -13,10 +13,10 @@ liquidnet:
     file-max-size: 200MB
     level: debug
   mysql:
-    database-name: test_ln_scene
+    database-name: dev_ln_scene
   mongodb:
     sslEnabled: false
-    database: test_ln_scene
+    database: dev_ln_scene
   url-pay:
     pay: ${liquidnet.service.order.url-pay.pay}
     check: ${liquidnet.service.order.url-pay.check}

liquidnet-bus-service/liquidnet-service-adam/liquidnet-service-adam-impl/src/main/java/com/liquidnet/service/adam/service/impl/AdamMemberOrderServiceImpl.java

@@ -391,7 +391,7 @@ public class AdamMemberOrderServiceImpl implements IAdamMemberOrderService {
             try {
                 HttpUtil.get(serviceKylinUrl + "/inner/cache/member/".concat(handleMemberOrderVo.getUid()), CollectionUtil.linkedMultiValueMapStringString());
             } catch (Exception e) {
-                log.error("购买会员支付回调处理成功:同步Kylin会员缓存异常[UID={}]", handleMemberOrderVo.getUid(), e);
+                log.error("购买会员支付回调处理成功:同步Kylin会员缓存异常[UID={},URL={}]", handleMemberOrderVo.getUid(), serviceKylinUrl, e);
             }
             return ResponseDto.success();
         } catch (Exception e) {

liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-impl/src/main/java/com/liquidnet/service/kylin/controller/InnerController.java

@@ -36,27 +36,29 @@ public class InnerController {
     @ApiOperation("获取会员相关数据")
     public void cacheMember(@NotBlank @PathVariable(value = "uid") String uid) {
         try {
-            log.info("同步 接口被调用,uid={}", uid);
             MultiValueMap<String, String> header = CollectionUtil.linkedMultiValueMapStringString();
             header.add("Accept", "application/json;charset=UTF-8");
             String returnData = HttpUtil.get(adamUrl + "/adam/rsc/inquire/member?uid=" + uid, null, header);
-            ResponseDto<AdamUserMemberVo> memberVo = JsonUtils.fromJson(returnData, new TypeReference<ResponseDto<AdamUserMemberVo>>() {
+            ResponseDto<AdamUserMemberVo> responseDto = JsonUtils.fromJson(returnData, new TypeReference<ResponseDto<AdamUserMemberVo>>() {
             });
-            log.info("调用 user = "+returnData);
-            AdamUserMemberVo userMemberVo = memberVo.getData();
-            if (userMemberVo.getState() == 1) {
-                long second = ChronoUnit.SECONDS.between(LocalDateTime.now(), userMemberVo.getExpiryAt());
-                log.debug("过期时间="+second);
-                if (userMemberVo.isOldMember()) {
-                    dataUtils.saveMember(uid, 2, second);
-                } else {
-                    dataUtils.saveMember(uid, 1, second);
+            if (null != responseDto) {
+                AdamUserMemberVo userMemberVo = responseDto.getData();
+                if (null != userMemberVo) {
+                    if (userMemberVo.getState() == 1) {
+                        long second = ChronoUnit.SECONDS.between(LocalDateTime.now(), userMemberVo.getExpiryAt());
+                        log.debug("过期时间="+second);
+                        if (userMemberVo.isOldMember()) {
+                            dataUtils.saveMember(uid, 2, second);
+                        } else {
+                            dataUtils.saveMember(uid, 1, second);
+                        }
+                    } else {
+                        dataUtils.delMember(uid);
+                    }
                 }
-            } else {
-                dataUtils.delMember(uid);
             }
         } catch (Exception e) {
-            log.error("会员信息error", e);
+            log.error("会员信息error[uid={}]", uid, e);
         }
     }
 

liquidnet-bus-service/liquidnet-service-platform/liquidnet-service-platform-impl/src/main/java/com/liquidnet/service/platform/service/impl/adam/PlatformMemberRefundService.java

@@ -5,6 +5,8 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.liquidnet.common.cache.redis.util.AbstractRedisUtil;
 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.dto.vo.AdamMemberOrderVo;
 import com.liquidnet.service.adam.dto.vo.AdamUserMemberVo;
@@ -21,6 +23,7 @@ import com.liquidnet.service.candy.mapper.CandyUserCouponMapper;
 import com.liquidnet.service.feign.stone.api.FeignStoneIntegralClient;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 import org.springframework.util.CollectionUtils;
 
@@ -44,6 +47,11 @@ public class PlatformMemberRefundService extends ServiceImpl<AdamMemberRefundMap
     private CandyUserCouponMapper candyUserCouponMapper;
     @Autowired
     private RedisDataSourceUtil redisDataSourceUtil;
+
+
+    @Value("${liquidnet.service.kylin.url}")
+    private String serviceKylinUrl;
+
     @Autowired
     FeignStoneIntegralClient feignStoneIntegralClient;
 
@@ -194,6 +202,12 @@ public class PlatformMemberRefundService extends ServiceImpl<AdamMemberRefundMap
         int updateRst = adamMemberOrderMapper.updateById(updateInfoMemberOrder);
         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 {
             feignStoneIntegralClient.de2111(memberOrder.getUid(), new BigDecimal(refundAmt).intValue(), "会员注销");
         } catch (Exception e) {