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

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

@@ -25,7 +25,7 @@ liquidnet:
   url-pay:
     pay: http://testpay.zhengzai.tv
     check: http://testpay.zhengzai.tv/order/verify
-    callback: http://zuul.zhengzai.tv/adam/member/order/callback
+    callback: http://devzuul.zhengzai.tv/adam/member/order/callback
   aliyun:
     accessKeyId: LTAI4FvoqxJUT5T1ydJSyhUn
     accessSecret: WNCgFn9dSjnoDdej2YTvR0v0216WWU

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

 package com.liquidnet.service.adam.service.impl;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.liquidnet.common.cache.redis.util.RedisUtil;
 import com.liquidnet.common.mq.constant.MQConst;
 import com.liquidnet.commons.lang.util.BsonUtil;
-import com.liquidnet.service.adam.constant.AdamRedisConst;
+import com.liquidnet.commons.lang.util.DateUtil;
+import com.liquidnet.commons.lang.util.JsonUtils;
 import com.liquidnet.service.adam.dto.vo.AdamUserInfoVo;
 import com.liquidnet.service.adam.entity.AdamUserInfo;
 import com.liquidnet.service.adam.mapper.AdamUserInfoMapper;
 import com.liquidnet.service.adam.service.IAdamRdmService;
 import com.liquidnet.service.adam.service.IAdamUserInfoService;
 import com.liquidnet.service.base.SqlMapping;
-import com.mongodb.BasicDBObject;
 import com.mongodb.client.model.FindOneAndUpdateOptions;
 import com.mongodb.client.model.ReturnDocument;
 import org.bson.Document;
@@ -22,9 +21,8 @@ import org.springframework.data.mongodb.core.convert.MongoConverter;
 import org.springframework.data.mongodb.core.query.Criteria;
 import org.springframework.data.mongodb.core.query.Query;
 import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Propagation;
-import org.springframework.transaction.annotation.Transactional;
 
+import java.time.LocalDateTime;
 import java.util.Arrays;
 import java.util.List;
 
@@ -48,13 +46,14 @@ public class AdamUserInfoServiceImpl extends ServiceImpl<AdamUserInfoMapper, Ada
     IAdamRdmService adamRdmService;
 
     @Override
-    @Transactional(propagation = Propagation.REQUIRED, rollbackFor = Exception.class)
+//    @Transactional(propagation = Propagation.REQUIRED, rollbackFor = Exception.class)
     public void edit(AdamUserInfoVo userInfoVo) {
-        BasicDBObject object = new BasicDBObject("$set", mongoConverter.convertToMongoType(userInfoVo));
         Document doc = mongoTemplate.getCollection(AdamUserInfoVo.class.getSimpleName()).findOneAndUpdate(
                 Query.query(Criteria.where("uid").is(userInfoVo.getUid())).getQueryObject(),
-                object, new FindOneAndUpdateOptions().returnDocument(ReturnDocument.AFTER)
+                new Document("$set", Document.parse(JsonUtils.toJson(userInfoVo))),
+                new FindOneAndUpdateOptions().returnDocument(ReturnDocument.AFTER)
         );
+        userInfoVo = BsonUtil.toBean(doc, AdamUserInfoVo.class);
 
         List<Object> paramList = Arrays.asList(
                 userInfoVo.getNickname(),
@@ -69,24 +68,28 @@ public class AdamUserInfoServiceImpl extends ServiceImpl<AdamUserInfoMapper, Ada
                 userInfoVo.getTagMe(),
                 userInfoVo.getUid()
         );
-//        rabbitTemplate.convertAndSend(MQConst.EXCHANGES_LIQUIDNET_SQL, MQConst.ROUTING_KEY_SQL,
-//                SqlMapping.get(userInfoVo.getIsComplete() == 0 ? "adam_user_info.add" : "adam_user_info.edit", paramList.toArray()));
+        rabbitTemplate.convertAndSend(MQConst.EXCHANGES_LIQUIDNET_SQL, MQConst.ROUTING_KEY_SQL,
+                SqlMapping.get(userInfoVo.getIsComplete() == 0 ? "adam_user_info.add" : "adam_user_info.edit", paramList.toArray()));
 
         adamRdmService.setUserInfoVoByUid(userInfoVo.getUid(), userInfoVo);
     }
 
     @Override
-    @Transactional(propagation = Propagation.REQUIRED, rollbackFor = Exception.class)
+//    @Transactional(propagation = Propagation.REQUIRED, rollbackFor = Exception.class)
     public void editMobile(String uid, String mobile) {
+        LocalDateTime now = LocalDateTime.now();
+        String nowStr = DateUtil.Formatter.yyyyMMddHHmmss.format(now);
         AdamUserInfoVo updateInfoVo = AdamUserInfoVo.getNew();
+        updateInfoVo.setUpdatedAt(nowStr);
         updateInfoVo.setMobile(mobile);
-        BasicDBObject object = new BasicDBObject("$set", mongoConverter.convertToMongoType(updateInfoVo));
         Document doc = mongoTemplate.getCollection(AdamUserInfoVo.class.getSimpleName()).findOneAndUpdate(
                 Query.query(Criteria.where("uid").is(uid)).getQueryObject(),
-                object, new FindOneAndUpdateOptions().returnDocument(ReturnDocument.BEFORE)
+                new Document("$set", Document.parse(JsonUtils.toJson(updateInfoVo))),
+                new FindOneAndUpdateOptions().returnDocument(ReturnDocument.BEFORE)
         );
-
         AdamUserInfoVo beforeUserInfoVo = BsonUtil.toBean(doc, AdamUserInfoVo.class);
+        rabbitTemplate.convertAndSend(MQConst.EXCHANGES_LIQUIDNET_SQL, MQConst.ROUTING_KEY_SQL,
+                SqlMapping.get("adam_user.edit.mobile", mobile, now, uid));
 
         adamRdmService.delUidByMobile(beforeUserInfoVo.getMobile());
         adamRdmService.setUidByMobile(beforeUserInfoVo.getMobile(), uid);

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

 adam_user.add=INSERT INTO adam_user (`uid`, mobile, `state`, created_at) VALUES (?,?,?,?) 
+adam_user.edit.mobile=UPDATE adam_user SET mobile=?, updated_at=? WHERE `uid`=? 
 adam_user.close=UPDATE adam_user SET `state`=2, updated_at=?, closed_at=? WHERE `uid`=? 
 
 # ----------------------------------------------------
-adam_user_info.add=insert into adam_user_info (nickname, sex, birthday, area, signature, avatar, background, qr_code, qr_pic, tag_me, `uid`) VALUES (?,?,?,?,?,?,?,?,?,?,?) 
+adam_user_info.add=INSERT INTO adam_user_info (nickname, sex, birthday, area, signature, avatar, background, qr_code, qr_pic, tag_me, `uid`) VALUES (?,?,?,?,?,?,?,?,?,?,?) 
 adam_user_info.edit=UPDATE adam_user_info SET nickname=?, sex=?, birthday=?, area=?, signature=?, avatar=?, background=?, qr_code=?, qr_pic=?, tag_me=? WHERE uid=? 
 
 # ----------------------------------------------------