修复购买会员订单数据库同步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=? 
 
 # ----------------------------------------------------