修复购买会员订单数据库同步update_at字段;

liquidnet-bus-api/liquidnet-service-adam-api/src/main/java/com/liquidnet/service/adam/dto/vo/AdamThirdPartInfoVo.java

@@ -2,6 +2,7 @@ package com.liquidnet.service.adam.dto.vo;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.liquidnet.commons.lang.util.DateUtil;
+import com.liquidnet.service.adam.entity.AdamThirdParty;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -39,4 +40,17 @@ public class AdamThirdPartInfoVo implements java.io.Serializable, Cloneable {
         }
         return new AdamThirdPartInfoVo();
     }
+
+    public AdamThirdPartInfoVo copy(AdamThirdParty source) {
+        if (null == source) return this;
+        this.setUid(source.getUid());
+        this.setOpenId(source.getOpenId());
+        this.setNickname(source.getNickname());
+        this.setAvatar(source.getAvatar());
+        this.setPlatform(source.getPlatform());
+        this.setState(source.getState());
+        this.setCreatedAt(source.getCreatedAt());
+        this.setUpdatedAt(source.getUpdatedAt());
+        return this;
+    }
 }

liquidnet-bus-api/liquidnet-service-adam-api/src/main/java/com/liquidnet/service/adam/dto/vo/AdamUserInfoVo.java

 package com.liquidnet.service.adam.dto.vo;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.core.type.TypeReference;
 import com.liquidnet.commons.lang.util.DateUtil;
+import com.liquidnet.commons.lang.util.JsonUtils;
 import com.liquidnet.commons.lang.util.SensitizeUtil;
+import com.liquidnet.service.adam.dto.AdamUserInfoDto;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -67,6 +70,32 @@ public class AdamUserInfoVo implements java.io.Serializable, Cloneable {
         return new AdamUserInfoVo();
     }
 
+    public AdamUserInfoVo copy(AdamUserInfoDto source) {
+        if (null == source) return this;
+        this.setUid(source.getUid());
+        this.setMobile(source.getMobile());
+        this.setPasswd(source.getPasswd());
+        this.setNickname(source.getNickname());
+        this.setState(source.getState());
+
+        this.setSex(JsonUtils.fromJson(source.getSex(), AdamTagVo.class));
+        this.setBirthday(source.getBirthday());
+        this.setArea(source.getArea());
+        this.setSignature(source.getSignature());
+        this.setAvatar(source.getAvatar());
+
+        this.setBackground(source.getBackground());
+        this.setTagMe(JsonUtils.fromJson(source.getTagMe(), new TypeReference<List<AdamTagParentVo>>() {}));
+        this.setCreateAt(source.getCreateAt());
+        this.setUpdatedAt(source.getUpdatedAt());
+        this.setClosedAt(source.getClosedAt());
+
+        this.setIsComplete(source.getIsComplete());
+        this.setRongCloudToken(source.getRongCloudToken());
+        this.setQrCode(source.getQrCode());
+        return this;
+    }
+
     public AdamUserInfoVo desensitize() {
         this.setPasswd(null);
 //        this.userInfo.setPayCode(null);

liquidnet-bus-do/liquidnet-service-adam-do/src/main/java/com/liquidnet/service/adam/dto/AdamUserInfoDto.java

+package com.liquidnet.service.adam.dto;
+
+import lombok.Data;
+
+import java.time.LocalDateTime;
+
+@Data
+public class AdamUserInfoDto {
+    private String uid;
+    private String mobile;
+    private String passwd;
+//    private String payCode;
+    private String nickname;
+    private Integer state;
+    private String sex;
+    private String birthday;
+    private String area;
+    private String signature;
+    private String avatar;
+    private String background;
+    private String tagMe;
+    private LocalDateTime createAt;
+    private LocalDateTime updatedAt;
+    private LocalDateTime closedAt;
+    private Integer isComplete;
+    private String rongCloudToken;
+    private String qrCode;
+}

liquidnet-bus-do/liquidnet-service-adam-do/src/main/java/com/liquidnet/service/adam/mapper/AdamUserMapper.java

 package com.liquidnet.service.adam.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.liquidnet.service.adam.dto.AdamUserInfoDto;
 import com.liquidnet.service.adam.entity.AdamUser;
 import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
+
+import java.util.List;
 
 /**
  * <p>
@@ -15,4 +19,29 @@ import org.apache.ibatis.annotations.Param;
 public interface AdamUserMapper extends BaseMapper<AdamUser> {
 
     int executeForDM(@Param("tn") String tn);
+
+    @Select({"select u.mid," +
+            "u.uid," +
+            "u.mobile," +
+            "u.passwd," +
+            "u.state," +
+            "u.is_complete as isComplete," +
+            "u.created_at as createAt," +
+            "u.updated_at as updatedAt," +
+            "u.closed_at as closedAt," +
+            "ui.nickname," +
+            "ui.sex," +
+            "ui.birthday," +
+            "ui.area," +
+            "ui.signature," +
+            "ui.avatar," +
+            "ui.background," +
+            "ui.qr_code as qrCode," +
+            "ui.tag_me as tagMe," +
+            "ui.rong_cloud_token as rongCloudToken " +
+            "from adam_user u,adam_user_info ui where u.uid = ui.uid " +
+            "order by u.uid " +
+            "limit #{rows},#{offset}"
+    })
+    List<AdamUserInfoDto> selectMultiForUserInfoDto(@Param("rows") int rows, @Param("offset") int offset);
 }

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

@@ -307,7 +307,8 @@ public class AdamMemberOrderServiceImpl implements IAdamMemberOrderService {
                     handleMemberOrderVo.getPricePaid(), handleMemberOrderVo.getMemberName(), handleMemberOrderVo.getMemberId(), handleMemberOrderVo.getMemberPriceId(),
                     handleMemberOrderVo.getDays(), handleMemberOrderVo.getState(), handleMemberOrderVo.getMemberNo(), handleMemberOrderVo.getBirthday(),
                     handleMemberOrderVo.getDeviceFrom(), handleMemberOrderVo.getPayType(), handleMemberOrderVo.getPayNo(), handleMemberOrderVo.getPaymentAt(),
-                    handleMemberOrderVo.getCreatedAt(), handleMemberOrderVo.getClientIp(), handleMemberOrderVo.getSource(), handleMemberOrderVo.getVersion()
+                    handleMemberOrderVo.getCreatedAt(), handleMemberOrderVo.getUpdatedAt(),
+                    handleMemberOrderVo.getClientIp(), handleMemberOrderVo.getSource(), handleMemberOrderVo.getVersion()
             });
 
             AdamMemberOrderExtVo memberOrderExtVo = handleMemberOrderVo.getExtendVo();

liquidnet-bus-service/liquidnet-service-adam/liquidnet-service-adam-impl/src/main/resources/sqlmap.properties

@@ -45,7 +45,7 @@ adam_member_code.add=INSERT INTO adam_member_code (code, `type`, member_id, memb
 adam_member_code.exchange=UPDATE adam_member_code SET `state`=?, updated_at=?, use_order_no=?, use_uid=?, use_at=? WHERE code=? 
 
 # ----------------------------------------------------
-adam_member_order.add=INSERT INTO adam_member_order (order_no, `uid`, `mode`, price, price_paid, member_name, member_id, member_price_id, `days`, `state`, member_no, birthday, device_from, pay_type, pay_no, payment_at, created_at, client_ip, `source`, version) VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?) 
+adam_member_order.add=INSERT INTO adam_member_order (order_no, `uid`, `mode`, price, price_paid, member_name, member_id, member_price_id, `days`, `state`, member_no, birthday, device_from, pay_type, pay_no, payment_at, created_at, updated_at, client_ip, `source`, version) VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?) 
 adam_member_order.update=UPDATE adam_member_order SET `state`=?, member_no=?, payment_at=?, updated_at=? WHERE order_no=? 
 
 # ----------------------------------------------------

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

@@ -55,6 +55,7 @@ public class DMRdmService {
 
     public String getUidByMobile(String mobile) {
         String key = AdamRedisConst.IDENTITY_MOBILE.concat(mobile);
+        long s = System.currentTimeMillis();
         String val = (String) redisUtil.get(key);
 //        if (StringUtils.isEmpty(val)) {
 //            Query query = Query.query(Criteria.where("mobile").is(mobile).and("state").is(1));
@@ -67,6 +68,7 @@ public class DMRdmService {
 //                redisUtil.set(key, vo.getUid());
 //            }
 //        }
+        log.debug("#RDM耗时:{}ms", System.currentTimeMillis() - s);
         return val;
     }
 
@@ -80,6 +82,7 @@ public class DMRdmService {
 
     public String getUidByPlatformOpenId(String platform, String openId) {
         String key = AdamRedisConst.IDENTITY_THIRD_PARTY + platform + ":" + openId;
+        long s = System.currentTimeMillis();
         String val = (String) redisUtil.get(key);
 //        if (StringUtils.isEmpty(val)) {
 //            Query query = Query.query(Criteria.where("openId").is(openId).and("platform").is(platform).and("state").is(1));
@@ -92,6 +95,7 @@ public class DMRdmService {
 //                redisUtil.set(key, vo.getUid());
 //            }
 //        }
+        log.debug("#RDM耗时:{}ms", System.currentTimeMillis() - s);
         return val;
     }
 
@@ -107,6 +111,7 @@ public class DMRdmService {
 
     public AdamUserInfoVo getUserInfoVoByUid(String uid) {
         String rk = AdamRedisConst.INFO_USER.concat(uid);
+        long s = System.currentTimeMillis();
         AdamUserInfoVo vo = (AdamUserInfoVo) redisUtil.get(rk);
 //        if (null == vo) {
 //            s = System.currentTimeMillis();
@@ -116,6 +121,7 @@ public class DMRdmService {
 //
 //            if (null != vo) redisUtil.set(rk, vo);
 //        }
+        log.debug("#RDM耗时:{}ms", System.currentTimeMillis() - s);
         return vo;
     }
 
@@ -131,6 +137,7 @@ public class DMRdmService {
 
     public AdamRealInfoVo getRealInfoVoByUid(String uid) {
         String rk = AdamRedisConst.INFO_REAL_NAME.concat(uid);
+        long s = System.currentTimeMillis();
         AdamRealInfoVo vo = (AdamRealInfoVo) redisUtil.get(rk);
 //        if (null == vo) {
 //            s = System.currentTimeMillis();
@@ -144,6 +151,7 @@ public class DMRdmService {
             vo.setName(SensitizeUtil.chineseName(vo.getName()));
             vo.setIdCard(SensitizeUtil.custom(vo.getIdCard(), 3, 2));
         }
+        log.debug("#RDM耗时:{}ms", System.currentTimeMillis() - s);
         return vo;
     }
 
@@ -166,6 +174,7 @@ public class DMRdmService {
 
     public List<AdamThirdPartInfoVo> getThirdPartVoListByUid(String uid) {
         String rk = AdamRedisConst.INFO_THIRD_PARTY.concat(uid);
+        long s = System.currentTimeMillis();
         List<AdamThirdPartInfoVo> thirdPartInfoVos = (List<AdamThirdPartInfoVo>) redisUtil.get(rk);
 //        if (CollectionUtils.isEmpty(thirdPartInfoVos)) {
 //            s = System.currentTimeMillis();
@@ -175,6 +184,7 @@ public class DMRdmService {
 //
 //            if (!CollectionUtils.isEmpty(thirdPartInfoVos)) redisUtil.set(rk, thirdPartInfoVos);
 //        }
+        log.debug("#RDM耗时:{}ms", System.currentTimeMillis() - s);
         return thirdPartInfoVos;
     }
 
@@ -196,10 +206,7 @@ public class DMRdmService {
 
     public AdamThirdPartInfoVo getThirdPartVoByUidPlatform(List<AdamThirdPartInfoVo> vos, String platform) {
         if (!CollectionUtils.isEmpty(vos)) {
-            Optional<AdamThirdPartInfoVo> any = vos.stream().filter(r -> r.getPlatform().equals(platform)).findAny();
-            if (any.isPresent()) {
-                return any.get();
-            }
+            return vos.stream().filter(r -> r.getPlatform().equals(platform)).findAny().orElse(null);
         }
         return null;
     }
@@ -209,10 +216,7 @@ public class DMRdmService {
         if (!CollectionUtils.isEmpty(vos)) {
 //            for (AdamThirdPartInfoVo r : vos)
 //                if (platform.equals(r.getPlatform())) return r;
-            Optional<AdamThirdPartInfoVo> any = vos.stream().filter(r -> r.getPlatform().equals(platform)).findAny();
-            if (any.isPresent()) {
-                return any.get();
-            }
+            return vos.stream().filter(r -> r.getPlatform().equals(platform)).findAny().orElse(null);
         }
         return null;
     }
@@ -229,6 +233,7 @@ public class DMRdmService {
 
     public List<AdamEntersVo> getEntersVoByUid(String uid) {
         String rk = AdamRedisConst.INFO_ENTERS.concat(uid);
+        long s = System.currentTimeMillis();
         ArrayList<AdamEntersVo> vos = (ArrayList<AdamEntersVo>) redisUtil.get(rk);
 //        if (CollectionUtils.isEmpty(vos)) {
 //            s = System.currentTimeMillis();
@@ -240,6 +245,7 @@ public class DMRdmService {
 //
 //            if (!CollectionUtils.isEmpty(vos)) redisUtil.set(rk, vos);
 //        }
+        log.debug("#RDM耗时:{}ms", System.currentTimeMillis() - s);
         return vos;
     }
 
@@ -260,16 +266,18 @@ public class DMRdmService {
     }
 
     public AdamEntersVo getEntersVoByUidEntersId(List<AdamEntersVo> vos, String entersId) {
-        return vos.stream().filter(r -> r.getEntersId().equals(entersId)).findAny().orElse(null);
+        return CollectionUtils.isEmpty(vos) ? null : vos.stream().filter(r -> r.getEntersId().equals(entersId)).findAny().orElse(null);
     }
 
     public AdamEntersVo getEntersVoByUidEntersId(String uid, String entersId) {
-        return this.getEntersVoByUid(uid).stream().filter(r -> r.getEntersId().equals(entersId)).findAny().orElse(null);
+        List<AdamEntersVo> vos = this.getEntersVoByUid(uid);
+        return CollectionUtils.isEmpty(vos) ? null : vos.stream().filter(r -> r.getEntersId().equals(entersId)).findAny().orElse(null);
     }
 
     public List<AdamEntersVo> getEntersVoByUidEntersIds(String uid, String... entersIds) {
         List<String> entersIdList = Arrays.asList(entersIds);
-        return this.getEntersVoByUid(uid).stream().filter(r -> entersIdList.contains(r.getEntersId())).collect(Collectors.toList());
+        List<AdamEntersVo> vos = this.getEntersVoByUid(uid);
+        return CollectionUtils.isEmpty(vos) ? null : vos.stream().filter(r -> entersIdList.contains(r.getEntersId())).collect(Collectors.toList());
     }
 
     public void delEntersVoByUid(String uid) {
@@ -284,6 +292,7 @@ public class DMRdmService {
 
     public List<AdamAddressesVo> getAddressesVoByUid(String uid) {
         String rk = AdamRedisConst.INFO_ADDRESSES.concat(uid);
+        long s = System.currentTimeMillis();
         List<AdamAddressesVo> vos = (List<AdamAddressesVo>) redisUtil.get(rk);
 //        if (CollectionUtils.isEmpty(vos)) {
 //            s = System.currentTimeMillis();
@@ -295,6 +304,7 @@ public class DMRdmService {
 //
 //            if (!CollectionUtils.isEmpty(vos)) redisUtil.set(rk, vos);
 //        }
+        log.debug("#RDM耗时:{}ms", System.currentTimeMillis() - s);
         return vos;
     }
 
@@ -315,11 +325,12 @@ public class DMRdmService {
     }
 
     public AdamAddressesVo getAddressesVoByUidAddressesId(List<AdamAddressesVo> vos, String addressesId) {
-        return vos.stream().filter(r -> r.getAddressesId().equals(addressesId)).findAny().orElse(null);
+        return CollectionUtils.isEmpty(vos) ? null : vos.stream().filter(r -> r.getAddressesId().equals(addressesId)).findAny().orElse(null);
     }
 
     public AdamAddressesVo getAddressesVoByUidAddressesId(String uid, String addressesId) {
-        return this.getAddressesVoByUid(uid).stream().filter(r -> r.getAddressesId().equals(addressesId)).findAny().orElse(null);
+        List<AdamAddressesVo> vos = this.getAddressesVoByUid(uid);
+        return CollectionUtils.isEmpty(vos) ? null : vos.stream().filter(r -> r.getAddressesId().equals(addressesId)).findAny().orElse(null);
     }
 
     public void delAddressesVoByUid(String uid) {
@@ -344,6 +355,7 @@ public class DMRdmService {
 
     public AdamUserMemberVo getUserMemberVoByUid(String uid) {
         String rk = AdamRedisConst.INFO_USER_MEMBER.concat(uid);
+        long s = System.currentTimeMillis();
         AdamUserMemberVo vo = (AdamUserMemberVo) redisUtil.get(rk);
 //        if (null == vo) {
 //            s = System.currentTimeMillis();
@@ -355,6 +367,7 @@ public class DMRdmService {
         if (null != vo) {
             vo.setState(vo.getState() == 1 ? (vo.getExpiryAt().isAfter(LocalDateTime.now()) ? 1 : 2) : vo.getState());
         }
+        log.debug("#RDM耗时:{}ms", System.currentTimeMillis() - s);
         return vo;
     }
 
@@ -369,6 +382,7 @@ public class DMRdmService {
     }
 
     public AdamMemberSimpleVo getMemberSimpleVo() {
+        long s = System.currentTimeMillis();
         AdamMemberSimpleVo vo = (AdamMemberSimpleVo) redisUtil.get(AdamRedisConst.INFO_MEMBER_SIMPLE);
 //        if (null == vo) {
 //            long s = System.currentTimeMillis();
@@ -382,6 +396,7 @@ public class DMRdmService {
 //
 //            if (null != vo) redisUtil.set(AdamRedisConst.INFO_MEMBER_SIMPLE, vo);
 //        }
+        log.debug("#RDM耗时:{}ms", System.currentTimeMillis() - s);
         return vo;
     }
 
@@ -393,6 +408,7 @@ public class DMRdmService {
 
     public AdamMemberVo getMemberVoByMemberId(String memberId) {
         String key = AdamRedisConst.INFO_MEMBER_CATEGORY.concat(memberId);
+        long s = System.currentTimeMillis();
         AdamMemberVo vo = (AdamMemberVo) redisUtil.get(key);
 //        if (null == vo) {
 //            s = System.currentTimeMillis();
@@ -403,6 +419,7 @@ public class DMRdmService {
 //            log.debug("#MDB耗时:{}ms", System.currentTimeMillis() - s);
 //            if (null != vo) redisUtil.set(key, vo);
 //        }
+        log.debug("#RDM耗时:{}ms", System.currentTimeMillis() - s);
         return vo;
     }
 
@@ -418,6 +435,7 @@ public class DMRdmService {
 
     public List<AdamMemberPriceVo> getMemberPriceVoByMemberId(String memberId) {
         String key = AdamRedisConst.INFO_MEMBER_PRICE.concat(memberId);
+        long s = System.currentTimeMillis();
         List<AdamMemberPriceVo> vos = (List<AdamMemberPriceVo>) redisUtil.get(key);
 //        if (CollectionUtils.isEmpty(vos)) {
 //            s = System.currentTimeMillis();
@@ -429,23 +447,13 @@ public class DMRdmService {
 //
 //            if (!CollectionUtils.isEmpty(vos)) redisUtil.set(key, vos);
 //        }
+        log.debug("#RDM耗时:{}ms", System.currentTimeMillis() - s);
         return vos;
     }
 
     public AdamMemberPriceVo getMemberPriceVoByPriceId(String memberId, String memberPriceId) {
         List<AdamMemberPriceVo> vos = this.getMemberPriceVoByMemberId(memberId);
-        if (!CollectionUtils.isEmpty(vos)) {
-//            for (AdamMemberPriceVo r : vos) {
-//                if (memberPriceId.equals(r.getMemberPriceId())) {
-//                    return r;
-//                }
-//            }
-            Optional<AdamMemberPriceVo> any = vos.stream().filter(r -> r.getMemberPriceId().equals(memberPriceId)).findAny();
-            if (any.isPresent()) {
-                return any.get();
-            }
-        }
-        return null;
+        return CollectionUtils.isEmpty(vos) ? null : vos.stream().filter(r -> r.getMemberPriceId().equals(memberPriceId)).findAny().orElse(null);
     }
 
     /* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - | <MEMBER_ID, List<AdamMemberRightsVo>> */
@@ -491,7 +499,9 @@ public class DMRdmService {
     }
 
     public ArrayList<AdamMemberOrderVo> getMemberOrderVosByUid(String uid) {
+        long s = System.currentTimeMillis();
         ArrayList<AdamMemberOrderVo> vos = (ArrayList<AdamMemberOrderVo>) redisUtil.get(AdamRedisConst.INFO_MEMBER_ORDER + uid);
+        log.debug("#RDM耗时:{}ms", System.currentTimeMillis() - s);
         return vos;
     }
 
@@ -511,6 +521,10 @@ public class DMRdmService {
         return redisUtil.set(AdamRedisConst.INFO_MEMBER_ORDER + uid, vos);
     }
 
+    public AdamMemberOrderVo getMemberOrderVoByOrderNo(List<AdamMemberOrderVo> vos, String orderNo) {
+        return CollectionUtils.isEmpty(vos) ? null : vos.stream().filter(r -> r.getOrderNo().equals(orderNo)).findAny().orElse(null);
+    }
+
     public void delMemberOrderVoByUid(String uid) {
         redisUtil.del(AdamRedisConst.INFO_MEMBER_ORDER + uid);
     }
@@ -523,6 +537,7 @@ public class DMRdmService {
 
     public AdamMemberOrderVo getShotMemberOrderVoByOrderNo(String orderNo) {
         String key = AdamRedisConst.SHOT_MEMBER_ORDER + orderNo;
+        long s = System.currentTimeMillis();
         AdamMemberOrderVo vo = (AdamMemberOrderVo) redisUtil.get(key);
 //        if (null == vo) {
 //            s = System.currentTimeMillis();
@@ -534,6 +549,7 @@ public class DMRdmService {
 //
 //            if (null != vo) redisUtil.set(key, vo);
 //        }
+        log.debug("#RDM耗时:{}ms", System.currentTimeMillis() - s);
         return vo;
     }
 
@@ -564,6 +580,7 @@ public class DMRdmService {
 
     public AdamMemberCodeVo getMemberCodeVoByCode(String memberCode) {
         String key = AdamRedisConst.INFO_MEMBER_CODE.concat(memberCode);
+        long s = System.currentTimeMillis();
         AdamMemberCodeVo vo = (AdamMemberCodeVo) redisUtil.get(key);
 //        if (null == vo) {
 //            s = System.currentTimeMillis();
@@ -574,6 +591,7 @@ public class DMRdmService {
 //            log.debug("#MDB耗时:{}ms", System.currentTimeMillis() - s);
 //            if (null != vo && vo.getState() == 0) redisUtil.set(AdamRedisConst.INFO_MEMBER_CODE.concat(memberCode), vo);
 //        }
+        log.debug("#RDM耗时:{}ms", System.currentTimeMillis() - s);
         return vo;
     }