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

# Conflicts:
#	liquidnet-bus-service/liquidnet-service-sweet/src/main/java/com/liquidnet/service/sweet/utils/RedisDataUtils.java

liquidnet-bus-api/liquidnet-service-adam-api/src/main/java/com/liquidnet/service/adam/constant/AdamWechatConst.java

@@ -22,22 +22,22 @@ public class AdamWechatConst {
 
     /* =============================================================== ｜  */
 
-    @Value("${liquidnet.wechat.zhengzai.applet.appid}")
+    @Value("${liquidnet.wechat.applet.zhengzai.appid}")
     public void setZhengzaiAppletAppid(String zhengzaiAppletAppid) {
         AdamWechatConst.zhengzaiAppletAppid = zhengzaiAppletAppid;
     }
 
-    @Value("${liquidnet.wechat.zhengzai.applet.secret}")
+    @Value("${liquidnet.wechat.applet.zhengzai.secret}")
     public void setZhengzaiAppletSecret(String zhengzaiAppletSecret) {
         AdamWechatConst.zhengzaiAppletSecret = zhengzaiAppletSecret;
     }
 
-    @Value("${liquidnet.wechat.zhengzai.service.appid}")
+    @Value("${liquidnet.wechat.service.zhengzai.appid}")
     public void setZhengzaiServiceAppid(String zhengzaiServiceAppid) {
         AdamWechatConst.zhengzaiServiceAppid = zhengzaiServiceAppid;
     }
 
-    @Value("${liquidnet.wechat.zhengzai.service.secret}")
+    @Value("${liquidnet.wechat.service.zhengzai.secret}")
     public void setZhengzaiServiceSecret(String zhengzaiServiceSecret) {
         AdamWechatConst.zhengzaiServiceSecret = zhengzaiServiceSecret;
     }

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

@@ -24,6 +24,11 @@ public class AdamLoginInfoVo implements Serializable, Cloneable {
     @ApiModelProperty(position = 16, value = "用户会员信息")
     private AdamUserMemberVo userMemberVo;
 
+    @ApiModelProperty(position = 17, value = "微信用户openid（微信小程序登录返回，用于给小程序用户推送信息）")
+    private String wechatOpenid;
+    @ApiModelProperty(position = 18, value = "微信用户unionid（微信小程序登录返回，用于给小程序用户推送信息）")
+    private String wechatUnionid;
+
     private static final AdamLoginInfoVo obj = new AdamLoginInfoVo();
 
     public static AdamLoginInfoVo getNew() {

liquidnet-bus-common/liquidnet-common-service-base/src/main/java/com/liquidnet/service/base/constant/MQConst.java

@@ -71,8 +71,7 @@ public class MQConst {
 
 
     public enum SweetQueue {
-        artists_watch("sweet:stream:rk.artists.watch", "group.artists.watch", "艺人-想看"),
-        artists_signature("sweet:stream:rk.artists.signature", "group.artists.signature", "艺人-签售通知"),
+        ARTISTS_RELATION("sweet:stream:rk.artists.relation", "group.artists.relation", "用户-关系"),
         ;
 
         private final String key;

liquidnet-bus-config/liquidnet-config/application-dev.yml

@@ -92,16 +92,16 @@ liquidnet:
       accessKeyId: LTAI4FxrURzMvvu9reFgwY5o
       accessKeySecret: Ym5tfAxOf2zX20MgjikLI3Wz3tlwVV
   wechat:
-    zhengzai:
-      applet:
-        appid: wx4732efeaa2b08086
-        secret: 94562c1f92da1b6cb3f1327c8842c6d3
-      service:
+    service:
+      zhengzai:
         appid: wx3498304dda39c5a1
         secret: a1307fab0a5f2380086a7c636f7339ea
         token: tftipg1427706847
         aeskey: LwVpmpuOcl7Mi3mtfQgBol11MsmMCATIqbPgHrEpDzx
     applet:
+      zhengzai:
+        appid: wx4732efeaa2b08086
+        secret: 94562c1f92da1b6cb3f1327c8842c6d3
       strawberry:
         appid: wx08b852ade69f8019
         secret: 0aac285fd1fbc6aa4e562b7ad81de392

liquidnet-bus-config/liquidnet-config/application-test.yml

@@ -93,16 +93,16 @@ liquidnet:
       accessKeyId: LTAI4FxrURzMvvu9reFgwY5o
       accessKeySecret: Ym5tfAxOf2zX20MgjikLI3Wz3tlwVV
   wechat:
-    zhengzai:
-      applet:
-        appid: wx4732efeaa2b08086
-        secret: 94562c1f92da1b6cb3f1327c8842c6d3
-      service:
+    service:
+      zhengzai:
         appid: wx3498304dda39c5a1
         secret: a1307fab0a5f2380086a7c636f7339ea
         token: tftipg1427706847
         aeskey: LwVpmpuOcl7Mi3mtfQgBol11MsmMCATIqbPgHrEpDzx
     applet:
+      zhengzai:
+        appid: wx4732efeaa2b08086
+        secret: 94562c1f92da1b6cb3f1327c8842c6d3
       strawberry:
         appid: wx08b852ade69f8019
         secret: 0aac285fd1fbc6aa4e562b7ad81de392

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

+package com.liquidnet.service.adam.config;
+
+import cn.binarywang.wx.miniapp.api.WxMaService;
+import cn.binarywang.wx.miniapp.api.impl.WxMaServiceImpl;
+import cn.binarywang.wx.miniapp.config.impl.WxMaDefaultConfigImpl;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.context.annotation.Configuration;
+
+import javax.annotation.PostConstruct;
+
+@Configuration
+public class WechatMaConfigure {
+    private static String appletAppidZhengzai;
+    private static String appletSecretZhengzai;
+
+    private static String appletAppidStrawberry;
+    private static String appletSecretStrawberry;
+
+    private static String appletAppidFive;
+    private static String appletSecretFive;
+
+    private static String appletAppidMdsk;
+    private static String appletSecretMdsk;
+
+    @Value("${liquidnet.wechat.applet.strawberry.appid}")
+    public void setAppletAppidZhengzai(String appletAppidZhengzai) {
+        WechatMaConfigure.appletAppidZhengzai = appletAppidZhengzai;
+    }
+
+    @Value("${liquidnet.wechat.applet.strawberry.secret}")
+    public void setAppletSecretZhengzai(String appletSecretZhengzai) {
+        WechatMaConfigure.appletSecretZhengzai = appletSecretZhengzai;
+    }
+
+    @Value("${liquidnet.wechat.applet.strawberry.appid}")
+    public void setAppletAppidStrawberry(String appletAppidStrawberry) {
+        WechatMaConfigure.appletAppidStrawberry = appletAppidStrawberry;
+    }
+
+    @Value("${liquidnet.wechat.applet.strawberry.secret}")
+    public void setAppletSecretStrawberry(String appletSecretStrawberry) {
+        WechatMaConfigure.appletSecretStrawberry = appletSecretStrawberry;
+    }
+
+    @Value("${liquidnet.wechat.applet.five.appid}")
+    public void setAppletAppidFive(String appletAppidFive) {
+        WechatMaConfigure.appletAppidFive = appletAppidFive;
+    }
+
+    @Value("${liquidnet.wechat.applet.five.secret}")
+    public void setAppletSecretFive(String appletSecretFive) {
+        WechatMaConfigure.appletSecretFive = appletSecretFive;
+    }
+
+    @Value("${liquidnet.wechat.applet.mdsk.appid}")
+    public void setAppletAppidMdsk(String appletAppidMdsk) {
+        WechatMaConfigure.appletAppidMdsk = appletAppidMdsk;
+    }
+
+    @Value("${liquidnet.wechat.applet.mdsk.secret}")
+    public void setAppletSecretMdsk(String appletSecretMdsk) {
+        WechatMaConfigure.appletSecretMdsk = appletSecretMdsk;
+    }
+
+    private WxMaService wxMaAppletZhengzaiService;
+    private WxMaService wxMaAppletStrawberryService;
+    private WxMaService wxMaAppletFiveService;
+    private WxMaService wxMaAppletMdskService;
+
+    @PostConstruct
+    public void init() {
+        wxMaAppletZhengzaiService = new WxMaServiceImpl() {
+            {
+                WxMaDefaultConfigImpl wxMaDefaultConfig = new WxMaDefaultConfigImpl();
+                wxMaDefaultConfig.setAppid(appletAppidZhengzai);
+                wxMaDefaultConfig.setSecret(appletSecretZhengzai);
+                wxMaDefaultConfig.setMsgDataFormat("JSON");
+
+                this.setWxMaConfig(wxMaDefaultConfig);
+            }
+        };
+        wxMaAppletStrawberryService = new WxMaServiceImpl() {
+            {
+                WxMaDefaultConfigImpl wxMaDefaultConfig = new WxMaDefaultConfigImpl();
+                wxMaDefaultConfig.setAppid(appletAppidStrawberry);
+                wxMaDefaultConfig.setSecret(appletSecretStrawberry);
+                wxMaDefaultConfig.setMsgDataFormat("JSON");
+
+                this.setWxMaConfig(wxMaDefaultConfig);
+            }
+        };
+        wxMaAppletFiveService = new WxMaServiceImpl() {
+            {
+                WxMaDefaultConfigImpl wxMaDefaultConfig = new WxMaDefaultConfigImpl();
+                wxMaDefaultConfig.setAppid(appletAppidFive);
+                wxMaDefaultConfig.setSecret(appletSecretFive);
+                wxMaDefaultConfig.setMsgDataFormat("JSON");
+
+                this.setWxMaConfig(wxMaDefaultConfig);
+            }
+        };
+        wxMaAppletMdskService = new WxMaServiceImpl() {
+            {
+                WxMaDefaultConfigImpl wxMaDefaultConfig = new WxMaDefaultConfigImpl();
+                wxMaDefaultConfig.setAppid(appletAppidMdsk);
+                wxMaDefaultConfig.setSecret(appletSecretMdsk);
+                wxMaDefaultConfig.setMsgDataFormat("JSON");
+
+                this.setWxMaConfig(wxMaDefaultConfig);
+            }
+        };
+    }
+
+    public WxMaService getWxMaService(Integer anum) {
+        switch (anum) {
+            case 1:
+                return wxMaAppletZhengzaiService;
+            case 2:
+                return wxMaAppletStrawberryService;
+            case 3:
+                return wxMaAppletFiveService;
+            case 4:
+                return wxMaAppletMdskService;
+        }
+        return null;
+    }
+}

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

@@ -220,16 +220,8 @@ public class AdamMemberOrderController {
                 return ResponseDto.failure(ErrorMapping.get("10000"));
             }
         }
-//        if (RedisLockUtil.tryLock(LOCK_KEY_UMEMBER_CODE + param.getMemberCode(), 1, 5)) {
-            ResponseDto<AdamMemberOrderResult> responseDto = adamMemberOrderService.exchangeMemberCode(param);
-
-//            if (!responseDto.isSuccess()) {
-//                RedisLockUtil.unlock(LOCK_KEY_UMEMBER_CODE + param.getMemberCode());
-//            }
-            return responseDto;
-//        } else {
-//            return ResponseDto.failure(ErrorMapping.get("10000"));
-//        }
+
+        return adamMemberOrderService.exchangeMemberCode(param);
     }
 
     @ApiOperationSupport(order = 5)

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

@@ -329,22 +329,6 @@ public class AdamUserController {
             return ResponseDto.success();
         }
 
-//        LinkedMultiValueMap<String, String> paramsMap = new LinkedMultiValueMap<>();
-//        paramsMap.add("mobile", mobile);
-//        paramsMap.add("code", code);
-//        LinkedMultiValueMap<String, String> headersMap = new LinkedMultiValueMap<>();
-//        headersMap.add("token", null);
-//        try {
-//            String respStr = HttpUtil.get(env.getProperty("liquidnet.url-service.url") + PHP_API_SMS_CODE_VALID, paramsMap, headersMap);
-//            log.debug("###PHP.API.RESP:{}", respStr);
-//
-//            Map respMap = JsonUtils.fromJson(respStr, Map.class);
-//
-//            return StringUtils.equalsIgnoreCase("OK", (String) respMap.get("message"));
-//        } catch (Exception e) {
-//            log.error("验证码验证异常[mobile:{},code:{}]", mobile, code, e);
-//            return false;
-//        }
         String smsCodeByMobile = adamRdmService.getSmsCodeByMobile(mobile);
         if (null == smsCodeByMobile) {
             return ResponseDto.failure(ErrorMapping.get("10004"));

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

+package com.liquidnet.service.adam.service;
+
+import cn.binarywang.wx.miniapp.api.WxMaService;
+import cn.binarywang.wx.miniapp.bean.WxMaJscode2SessionResult;
+import cn.binarywang.wx.miniapp.bean.WxMaPhoneNumberInfo;
+import cn.binarywang.wx.miniapp.bean.WxMaUserInfo;
+import com.liquidnet.service.adam.config.WechatMaConfigure;
+import me.chanjar.weixin.common.error.WxErrorException;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+@Service
+public class AdamWechatService {
+    @Autowired
+    WechatMaConfigure wechatMaConfigure;
+
+    public WxMaJscode2SessionResult sessionInfo(String code, Integer anum) throws WxErrorException {
+        WxMaService wxMaService = wechatMaConfigure.getWxMaService(anum);
+        return wxMaService.getUserService().getSessionInfo(code);
+    }
+
+    public WxMaUserInfo userInfo(String sessionKey, String encryptedData, String iv, Integer anum) {
+        WxMaService wxMaService = wechatMaConfigure.getWxMaService(anum);
+        return wxMaService.getUserService().getUserInfo(sessionKey, encryptedData, iv);
+    }
+
+    public WxMaPhoneNumberInfo phoneNumberInfo(String sessionKey, String encryptedData, String iv, Integer anum) {
+        WxMaService wxMaService = wechatMaConfigure.getWxMaService(anum);
+        return wxMaService.getUserService().getPhoneNoInfo(sessionKey, encryptedData, iv);
+    }
+}

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

@@ -34,8 +34,6 @@ import java.util.stream.IntStream;
 @Slf4j
 @Service
 public class AdamAddressesServiceImpl implements IAdamAddressesService {
-//    @Autowired
-//    MongoTemplate mongoTemplate;
     @Autowired
     QueueUtils queueUtils;
     @Autowired
@@ -57,10 +55,6 @@ public class AdamAddressesServiceImpl implements IAdamAddressesService {
         vo.setState(1);
         vo.setCreatedAt(now);
 
-//        long s = System.currentTimeMillis();
-//        mongoTemplate.insert(vo, AdamAddressesVo.class.getSimpleName());
-//        log.debug("#MDB耗时:{}ms", System.currentTimeMillis() - s);
-
         long s = System.currentTimeMillis();
 //        adamRdmService.delAddressesVoByUid(currentUid);
         adamRdmService.addAddressesVoByUid(currentUid, vos, vo);
@@ -84,48 +78,22 @@ public class AdamAddressesServiceImpl implements IAdamAddressesService {
         LinkedList<Object[]> toMqObjs = CollectionUtil.linkedListObjectArr();
         List<AdamAddressesVo> vos = adamRdmService.getAddressesVoByUid(uid);
         if (vos.size() > 1) {// 取消原默认
-//            AdamAddressesVo unDeaultVo = AdamAddressesVo.getNew();
-//            unDeaultVo.setIsDefault(false);
-//            unDeaultVo.setUpdatedAt(now);
-//            long s = System.currentTimeMillis();
-//            Document doc = mongoTemplate.getCollection(AdamAddressesVo.class.getSimpleName()).findOneAndUpdate(
-//                    Query.query(Criteria.where("uid").is(uid).and("state").is(1).and("isDefault").is(true)).getQueryObject(),
-//                    new Document("$set", new Document("isDefault", false).append("updatedAt", now)),
-//                    new FindOneAndUpdateOptions().returnDocument(ReturnDocument.AFTER)
-//            );
-//            log.debug("#MDB耗时:{}ms", System.currentTimeMillis() - s);
-//            if (null != doc) {
-//                AdamAddressesVo unDefaultVoAfter = BsonUtil.toBean(doc, AdamAddressesVo.class);
-                AdamAddressesVo defaultVo = queryDefault(vos, uid, false);
-                defaultVo.setIsDefault(false);
-                defaultVo.setUpdatedAt(now);
+            AdamAddressesVo defaultVo = queryDefault(vos, uid, false);
+            defaultVo.setIsDefault(false);
+            defaultVo.setUpdatedAt(now);
 
-                toMqObjs.add(new Object[]{false, now, defaultVo.getAddressesId()});
+            toMqObjs.add(new Object[]{false, now, defaultVo.getAddressesId()});
 
-                this.collectionProcess(vos, defaultVo.getAddressesId(), defaultVo);
-//            }
+            this.collectionProcess(vos, defaultVo.getAddressesId(), defaultVo);
         }
         {// 设置新默认
-//            AdamAddressesVo defaultVo = AdamAddressesVo.getNew();
-//            defaultVo.setIsDefault(true);
-//            defaultVo.setUpdatedAt(now);
-//            long s = System.currentTimeMillis();
-//            Document doc = mongoTemplate.getCollection(AdamAddressesVo.class.getSimpleName()).findOneAndUpdate(
-//                    Query.query(Criteria.where("uid").is(uid).and("addressesId").is(addressesId)).getQueryObject(),
-//                    new Document("$set", new Document("isDefault", true).append("updatedAt", now)),
-//                    new FindOneAndUpdateOptions().returnDocument(ReturnDocument.AFTER)
-//            );
-//            log.debug("#MDB耗时:{}ms", System.currentTimeMillis() - s);
-//            if (null != doc) {
-//                AdamAddressesVo defaultVoAfter = BsonUtil.toBean(doc, AdamAddressesVo.class);
-                AdamAddressesVo defaultVoAfter = adamRdmService.getAddressesVoByUidAddressesId(vos, addressesId);
-                defaultVoAfter.setIsDefault(true);
-                defaultVoAfter.setUpdatedAt(now);
+            AdamAddressesVo defaultVoAfter = adamRdmService.getAddressesVoByUidAddressesId(vos, addressesId);
+            defaultVoAfter.setIsDefault(true);
+            defaultVoAfter.setUpdatedAt(now);
 
-                toMqObjs.add(new Object[]{true, now, addressesId});
+            toMqObjs.add(new Object[]{true, now, addressesId});
 
-                this.collectionProcess(vos, defaultVoAfter.getAddressesId(), defaultVoAfter);
-//            }
+            this.collectionProcess(vos, defaultVoAfter.getAddressesId(), defaultVoAfter);
         }
         if (!CollectionUtils.isEmpty(toMqObjs)) {
             long s = System.currentTimeMillis();
@@ -155,56 +123,25 @@ public class AdamAddressesServiceImpl implements IAdamAddressesService {
         updateVo.setCounty(parameter.getCounty());
         updateVo.setAddress(parameter.getAddress());
         updateVo.setUpdatedAt(now);
-//        AdamAddressesVo updateVo = AdamAddressesVo.getNew();
-//        BeanUtils.copyProperties(parameter, updateVo);
-//        long s = System.currentTimeMillis();
-//        Document doc = mongoTemplate.getCollection(AdamAddressesVo.class.getSimpleName()).findOneAndUpdate(
-//                Query.query(Criteria.where("uid").is(currentUid).and("addressesId").is(parameter.getAddressesId())).getQueryObject(),
-//                new Document("$set", Document.parse(JsonUtils.toJson(updateVo)).append("updatedAt", now)),
-//                new FindOneAndUpdateOptions().returnDocument(ReturnDocument.AFTER)
-//        );
-//        log.debug("#MDB耗时:{}ms", System.currentTimeMillis() - s);
-//        if (null != doc) {
-//            updateVo = BsonUtil.toBean(doc, AdamAddressesVo.class);
-//
-//            List<AdamAddressesVo> vos = adamRdmService.getAddressesVoByUid(currentUid);
-            long s = System.currentTimeMillis();
-            adamRdmService.setAddressesVoByUid(updateVo.getUid(), this.collectionProcess(vos, parameter.getAddressesId(), updateVo));
-            log.debug("#RDS耗时:{}ms", System.currentTimeMillis() - s);
+        long s = System.currentTimeMillis();
+        adamRdmService.setAddressesVoByUid(updateVo.getUid(), this.collectionProcess(vos, parameter.getAddressesId(), updateVo));
+        log.debug("#RDS耗时:{}ms", System.currentTimeMillis() - s);
 
-            s = System.currentTimeMillis();
-            queueUtils.sendMsgByRedis(
-                    MQConst.AdamQueue.SQL_UCENTER.getKey(),
-                    SqlMapping.get("adam_addresses.edit",
-                            updateVo.getName(), updateVo.getPhone(), updateVo.getProvince(), updateVo.getCity(), updateVo.getCounty(), updateVo.getAddress(), now, updateVo.getAddressesId()
-                    )
-            );
-            log.debug("#MQ耗时:{}ms", System.currentTimeMillis() - s);
-//        }
+        s = System.currentTimeMillis();
+        queueUtils.sendMsgByRedis(
+                MQConst.AdamQueue.SQL_UCENTER.getKey(),
+                SqlMapping.get("adam_addresses.edit",
+                        updateVo.getName(), updateVo.getPhone(), updateVo.getProvince(), updateVo.getCity(), updateVo.getCounty(), updateVo.getAddress(), now, updateVo.getAddressesId()
+                )
+        );
+        log.debug("#MQ耗时:{}ms", System.currentTimeMillis() - s);
     }
 
     @Override
 //    @Transactional(propagation = Propagation.REQUIRED, rollbackFor = Exception.class)
     public void remove(String uid, String addressesId) {
-//        String currentUid = CurrentUtil.getCurrentUid();
         LocalDateTime now = LocalDateTime.now();
 
-//        AdamAddressesVo removeVo = AdamAddressesVo.getNew();
-//        removeVo.setState(2);
-//        removeVo.setIsDefault(false);
-//        removeVo.setUpdatedAt(now);
-//        removeVo.setDeletedAt(now);
-
-//        long s = System.currentTimeMillis();
-//        DeleteResult deleteResult = mongoTemplate.remove(
-//                Query.query(Criteria.where("uid").is(currentUid).and("addressesId").is(addressesId)), AdamAddressesVo.class.getSimpleName()
-//        );
-//        log.debug("#MDB耗时:{}ms", System.currentTimeMillis() - s);
-//        List<AdamAddressesVo> vos = adamRdmService.getAddressesVoByUid(uid);
-//        vos.removeIf(r -> r.getAddressesId().equals(addressesId));
-//        s = System.currentTimeMillis();
-//        adamRdmService.setAddressesVoByUid(uid, vos);
-//        log.debug("#RDS耗时:{}ms", System.currentTimeMillis() - s);
         adamRdmService.rmvAddressesVoByUid(uid, adamRdmService.getAddressesVoByUid(uid), addressesId);
 
         long s = System.currentTimeMillis();
@@ -244,18 +181,8 @@ public class AdamAddressesServiceImpl implements IAdamAddressesService {
                 .filter(i -> vos.get(i).getAddressesId().equals(replaceId))
                 .findFirst().orElse(-1);
         if (idx == -1) {
-//            adamRdmService.delAddressesVoByUid(updateVo.getUid());
-//
-//            List<AdamAddressesVo> addressesVos = adamRdmService.getAddressesVoByUid(updateVo.getUid());
-//
-//            idx = IntStream.range(0, vos.size())
-//                    .filter(i -> addressesVos.get(i).getAddressesId().equals(replaceId))
-//                    .findFirst().orElse(-1);
-//
-//            if (idx == -1) {
-                ErrorMapping.ErrorMessage errorMessage = ErrorMapping.get("10018");
-                throw new LiquidnetServiceException(errorMessage.getCode(), errorMessage.getMessage());
-//            }
+            ErrorMapping.ErrorMessage errorMessage = ErrorMapping.get("10018");
+            throw new LiquidnetServiceException(errorMessage.getCode(), errorMessage.getMessage());
         }
         vos.set(idx, updateVo);
         log.debug("#collect.process耗时:{}ms", System.currentTimeMillis() - s);

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

@@ -39,8 +39,6 @@ import java.util.List;
 public class AdamMemberOrderServiceImpl implements IAdamMemberOrderService {
     @Autowired
     Environment env;
-//    @Autowired
-//    MongoTemplate mongoTemplate;
     @Autowired
     QueueUtils queueUtils;
     @Autowired
@@ -218,9 +216,6 @@ public class AdamMemberOrderServiceImpl implements IAdamMemberOrderService {
                     initUserMemberVo.setExpiryAt(now.plusDays(memberPriceVo.getDays()).with(LocalTime.MAX));
                     initUserMemberVo.setCreatedAt(now);
 
-    //                long s = System.currentTimeMillis();
-    //                mongoTemplate.insert(initUserMemberVo, AdamUserMemberVo.class.getSimpleName());
-    //                log.debug("#MDB耗时:{}ms", System.currentTimeMillis() - s);
                     long s = System.currentTimeMillis();
                     adamRdmService.setUserMemberVoByUid(handleMemberOrderVo.getUid(), initUserMemberVo);
                     log.debug("#RDS耗时:{}ms", System.currentTimeMillis() - s);
@@ -238,12 +233,6 @@ public class AdamMemberOrderServiceImpl implements IAdamMemberOrderService {
                     LocalDateTime currentExpiryAt = existUserMemberVo.getExpiryAt();
                     LocalDateTime expiryAt = (currentExpiryAt.isBefore(now) ? now : currentExpiryAt).plusDays(memberPriceVo.getDays()).with(LocalTime.MAX);
 
-    //                long s = System.currentTimeMillis();
-    //                mongoTemplate.getCollection(AdamUserMemberVo.class.getSimpleName()).updateOne(
-    //                        Query.query(Criteria.where("uid").is(updateExistUserMemberVo.getUid())).getQueryObject(),
-    //                        new Document("$set", new Document("expiryAt", expiryAt).append("state", 1))
-    //                );
-    //                log.debug("#MDB耗时:{}ms", System.currentTimeMillis() - s);
                     updateExistUserMemberVo.setState(1);
                     updateExistUserMemberVo.setExpiryAt(expiryAt);
                     long s = System.currentTimeMillis();
@@ -273,9 +262,6 @@ public class AdamMemberOrderServiceImpl implements IAdamMemberOrderService {
                 initMemberCodeVo.setBuyAt(handleMemberOrderVo.getCreatedAt());
                 initMemberCodeVo.setCreatedAt(now);
 
-    //            long s = System.currentTimeMillis();
-    //            mongoTemplate.insert(initMemberCodeVo, AdamMemberCodeVo.class.getSimpleName());
-    //            log.debug("#MDB耗时:{}ms", System.currentTimeMillis() - s);
                 long s = System.currentTimeMillis();
                 adamRdmService.setMemberCodeByBuyOrderNo(initMemberCodeVo.getBuyOrderNo(), initMemberCodeVo.getCode());
                 adamRdmService.setMemberCodeVoByCode(initMemberCodeVo.getCode(), initMemberCodeVo);
@@ -292,10 +278,6 @@ public class AdamMemberOrderServiceImpl implements IAdamMemberOrderService {
             handleMemberOrderVo.setUpdatedAt(now);
             handleMemberOrderVo.setState(1);// 1-已支付
 
-//        long s = System.currentTimeMillis();
-//        mongoTemplate.insert(handleMemberOrderVo, AdamMemberOrderVo.class.getSimpleName());
-//        log.debug("#MDB耗时:{}ms", System.currentTimeMillis() - s);
-
             long s = System.currentTimeMillis();
 //            adamRdmService.setShotMemberOrderVoByOrderNo(handleMemberOrderVo.getOrderNo(), handleMemberOrderVo);
             adamRdmService.addMemberOrderVoByUid(
@@ -406,12 +388,6 @@ public class AdamMemberOrderServiceImpl implements IAdamMemberOrderService {
                 updateExistUserMemberVo.setExpiryAt(
                         (expiryAt.isBefore(now) ? now : expiryAt).plusDays(initMemberOrderVo.getDays()).with(LocalTime.MAX)
                 );
-    //            long s = System.currentTimeMillis();
-    //            mongoTemplate.getCollection(AdamUserMemberVo.class.getSimpleName()).updateOne(
-    //                    Query.query(Criteria.where("uid").is(updateExistUserMemberVo.getUid())).getQueryObject(),
-    //                    new Document("$set", new Document("expiryAt", updateExistUserMemberVo.getExpiryAt()).append("state", 1))
-    //            );
-    //            log.debug("#MDB耗时:{}ms", System.currentTimeMillis() - s);
                 toMqSqls.add(SqlMapping.get("adam_user_member.update"));
                 upsertUserMemberObjs.add(new Object[]{
                         updateExistUserMemberVo.getState(), updateExistUserMemberVo.getExpiryAt(), now, updateExistUserMemberVo.getUid()
@@ -426,9 +402,6 @@ public class AdamMemberOrderServiceImpl implements IAdamMemberOrderService {
                 initUserMemberVo.setExpiryAt(now.plusDays(initMemberOrderVo.getDays()).with(LocalTime.MAX));
                 initUserMemberVo.setCreatedAt(now);
 
-    //            long s = System.currentTimeMillis();
-    //            mongoTemplate.insert(initUserMemberVo, AdamUserMemberVo.class.getSimpleName());
-    //            log.debug("#MDB耗时:{}ms", System.currentTimeMillis() - s);
                 toMqSqls.add(SqlMapping.get("adam_user_member.add"));
                 upsertUserMemberObjs.add(new Object[]{
                         initUserMemberVo.getUid(), initUserMemberVo.getMemberId(), initUserMemberVo.getMemberNo(),
@@ -442,25 +415,11 @@ public class AdamMemberOrderServiceImpl implements IAdamMemberOrderService {
 //            adamRdmService.delMemberCodeVoByCode(memberCodeVo.getCode());
             log.debug("#RDS耗时:{}ms", System.currentTimeMillis() - s);
 
-//        Document updateMemberCodeVo = new Document("state", 1)
-//                .append("updatedAt", now)
-//                .append("useOrderNo", initMemberOrderVo.getOrderNo())
-//                .append("useUid", initMemberOrderVo.getUid())
-//                .append("useAt", now);
-//        s = System.currentTimeMillis();
-//        mongoTemplate.getCollection(AdamMemberCodeVo.class.getSimpleName()).updateOne(
-//                Query.query(Criteria.where("code").is(memberCodeVo.getCode())).getQueryObject(),
-//                new Document("$set", updateMemberCodeVo)
-//        );
-//        log.debug("#MDB耗时:{}ms", System.currentTimeMillis() - s);
             toMqSqls.add(SqlMapping.get("adam_member_code.exchange"));
             updateMemberCodeObjs.add(new Object[]{
                     1, now, initMemberOrderVo.getOrderNo(), initMemberOrderVo.getUid(), now, memberCodeVo.getCode()
             });
 
-//        s = System.currentTimeMillis();
-//        mongoTemplate.insert(initMemberOrderVo, AdamMemberOrderVo.class.getSimpleName());
-//        log.debug("#MDB耗时:{}ms", System.currentTimeMillis() - s);
             toMqSqls.add(SqlMapping.get("adam_member_order.add"));
             initMemberOrderObjs.add(new Object[]{
                     initMemberOrderVo.getOrderNo(), initMemberOrderVo.getUid(), initMemberOrderVo.getMode(), initMemberOrderVo.getPrice(),
@@ -498,21 +457,6 @@ public class AdamMemberOrderServiceImpl implements IAdamMemberOrderService {
 
     @Override
     public PagedResult<AdamMemberOrderSimpleVo> queryPage(String uid, int pageNo, int pageSize) {
-//        Query query = Query.query(Criteria.where("uid").is(uid).and("state").in(1,5));
-//
-//        long count = mongoTemplate.count(query, AdamMemberOrderVo.class.getSimpleName());
-//
-//        PagedResult<AdamMemberOrderSimpleVo> pagedResult = ObjectUtil.getAdamMemberOrderSimpleVoPagedResult();
-//        if (count > 0) {
-//            query.with(PageRequest.of(pageNo - 1, pageSize, Sort.by(Sort.Direction.DESC, "createdAt")));
-//
-//            List<AdamMemberOrderSimpleVo> voList = mongoTemplate.find(
-//                    query, AdamMemberOrderSimpleVo.class, AdamMemberOrderVo.class.getSimpleName()
-//            );
-//
-//            pagedResult.setList(voList).setTotal(count, pageSize);
-//        }
-//        return pagedResult;
         // TODO: 2021/7/29 会员订单列表查取
         PagedResult<AdamMemberOrderSimpleVo> pagedResult = ObjectUtil.getAdamMemberOrderSimpleVoPagedResult();
         ArrayList<AdamMemberOrderVo> orderVos = adamRdmService.getMemberOrderVosByUid(uid);

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

@@ -24,8 +24,6 @@ import java.util.List;
 @Slf4j
 @Service
 public class AdamRealNameServiceImpl implements IAdamRealNameService {
-//    @Autowired
-//    MongoTemplate mongoTemplate;
     @Autowired
     RedisUtil redisUtil;
     @Autowired
@@ -34,10 +32,6 @@ public class AdamRealNameServiceImpl implements IAdamRealNameService {
     @Override
 //    @Transactional(propagation = Propagation.REQUIRED, rollbackFor = Exception.class)
     public void add(AdamRealName realName) {
-//        long s = System.currentTimeMillis();
-//        mongoTemplate.insert(realName, AdamRealInfoVo.class.getSimpleName());
-//        log.debug("#MDB耗时:{}ms", System.currentTimeMillis() - s);
-
         List<Object> paramList = Arrays.asList(
                 realName.getRealNameId(),
                 realName.getUid(),

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

@@ -32,8 +32,6 @@ import java.util.Map;
 @Slf4j
 @Service
 public class AdamUserInfoServiceImpl implements IAdamUserInfoService {
-//    @Autowired
-//    MongoTemplate mongoTemplate;
     @Autowired
     AdamRdmService adamRdmService;
     @Autowired
@@ -49,15 +47,6 @@ public class AdamUserInfoServiceImpl implements IAdamUserInfoService {
         userInfoVo.setCreateAt(null);
         Document updateDoc = Document.parse(JsonUtils.toJson(userInfoVo));
         updateDoc.replace("updatedAt", userInfoVo.getUpdatedAt());
-//        long s = System.currentTimeMillis();
-//        UpdateResult updateResult = mongoTemplate.getCollection(AdamUserInfoVo.class.getSimpleName()).updateOne(
-//                Query.query(Criteria.where("uid").is(userInfoVo.getUid())).getQueryObject(),
-//                new Document("$set", updateDoc)
-//        );
-//        log.debug("#MDB耗时:{}ms", System.currentTimeMillis() - s);
-//        if (updateResult.getModifiedCount() <= 0) {
-//            log.warn("Invalid update MDB.AdamUserInfoVo:{}", JsonUtils.toJson(userInfoVo));
-//        }
 
         long s = System.currentTimeMillis();
         adamRdmService.setUserInfoVoByUid(userInfoVo.getUid(), userInfoVo);
@@ -95,18 +84,6 @@ public class AdamUserInfoServiceImpl implements IAdamUserInfoService {
 //    @Transactional(propagation = Propagation.REQUIRED, rollbackFor = Exception.class)
     public String editMobile(String uid, String mobile) {
         LocalDateTime now = LocalDateTime.now();
-//        AdamUserInfoVo updateInfoVo = AdamUserInfoVo.getNew();
-//        updateInfoVo.setUpdatedAt(now);
-//        updateInfoVo.setMobile(mobile);
-//        long s = System.currentTimeMillis();
-//        Document doc = mongoTemplate.getCollection(AdamUserInfoVo.class.getSimpleName()).findOneAndUpdate(
-//                Query.query(Criteria.where("uid").is(uid)).getQueryObject(),
-//                new Document("$set", new Document("mobile", mobile).append("updatedAt", now)),
-//                new FindOneAndUpdateOptions().returnDocument(ReturnDocument.BEFORE)
-//        );
-//        log.debug("#MDB耗时:{}ms", System.currentTimeMillis() - s);
-//        log.debug("edit mobile - before doc:{}", JsonUtils.toJson(doc));
-//        AdamUserInfoVo beforeUserInfoVo = BsonUtil.toBean(doc, AdamUserInfoVo.class);
         AdamUserInfoVo beforeUserInfoVo = adamRdmService.getUserInfoVoByUid(uid);
 
         long s = System.currentTimeMillis();

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

@@ -12,8 +12,6 @@ import java.util.regex.Pattern;
 @Slf4j
 @Service
 public class AdamUserMemberServiceImpl implements IAdamUserMemberService {
-//    @Autowired
-//    MongoTemplate mongoTemplate;
     @Autowired
     AdamRdmService adamRdmService;
 

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

@@ -45,8 +45,6 @@ import java.util.List;
 public class AdamUserServiceImpl implements IAdamUserService {
     @Autowired
     Environment env;
-//    @Autowired
-//    MongoTemplate mongoTemplate;
     @Autowired
     QueueUtils queueUtils;
     @Autowired
@@ -76,10 +74,6 @@ public class AdamUserServiceImpl implements IAdamUserService {
         userInfoVo.setIsComplete(0);
         userInfoVo.setQrCode("lN".concat(userInfoVo.getUid()).concat(RandomStringUtils.randomAlphanumeric(5).toUpperCase()));
 
-//                long s = System.currentTimeMillis();
-//                mongoTemplate.insert(userInfoVo, AdamUserInfoVo.class.getSimpleName());
-//                log.debug("#MDB耗时:{}ms", System.currentTimeMillis() - s);
-
         long s = System.currentTimeMillis();
         adamRdmService.setUidByMobile(mobile, userInfoVo.getUid());
         adamRdmService.setUserInfoVoByUid(userInfoVo.getUid(), userInfoVo);
@@ -128,12 +122,6 @@ public class AdamUserServiceImpl implements IAdamUserService {
             userInfoVo.setQrCode("lN".concat(userInfoVo.getUid()).concat(RandomStringUtils.randomAlphanumeric(5).toUpperCase()));
             userInfoVo.setCreateAt(now);
 
-//                    s = System.currentTimeMillis();
-//                    mongoTemplate.insert(userInfoVo, AdamUserInfoVo.class.getSimpleName());
-//                    log.debug("#MDB耗时:{}ms", System.currentTimeMillis() - s);
-
-//            userInfoVo.setMobile(SensitizeUtil.custom(param.getMobile(), 3, 4));
-
             adamRdmService.setUserInfoVoByUid(userInfoVo.getUid(), userInfoVo);
 
             toMqSqls.add(SqlMapping.get("adam_user.add"));
@@ -147,10 +135,6 @@ public class AdamUserServiceImpl implements IAdamUserService {
             thirdPartInfoVo.setUid(userInfoVo.getUid());
             thirdPartInfoVo.setState(1);// 1-绑定
 
-//                    s = System.currentTimeMillis();
-//                    mongoTemplate.insert(thirdPartInfoVo, AdamThirdPartInfoVo.class.getSimpleName());
-//                    log.debug("#MDB耗时:{}ms", System.currentTimeMillis() - s);
-
             toMqSqls.add(SqlMapping.get("adam_third_party.add"));
             initThirdPartObjs.add(new Object[]{thirdPartInfoVo.getUid(), thirdPartInfoVo.getOpenId(), thirdPartInfoVo.getAvatar(), thirdPartInfoVo.getNickname(), thirdPartInfoVo.getPlatform(), thirdPartInfoVo.getState(), thirdPartInfoVo.getCreatedAt()});
 
@@ -228,8 +212,6 @@ public class AdamUserServiceImpl implements IAdamUserService {
         bindThirdPartVo.setUid(bindUid);
         bindThirdPartVo.setState(1);// 1-绑定
 
-//        mongoTemplate.insert(bindThirdPartVo, AdamThirdPartInfoVo.class.getSimpleName());
-
         adamRdmService.setUidByPlatformOpenId(param.getPlatform(), param.getOpenId(), bindUid);
 
 //        adamRdmService.delThirdPartVoListByUid(bindUid);
@@ -252,23 +234,6 @@ public class AdamUserServiceImpl implements IAdamUserService {
      */
     private void unBindTpaProcess(String uid, String platform) {
         LocalDateTime now = LocalDateTime.now();
-
-//        AdamThirdPartInfoVo unBindThirdPartInfoVo = AdamThirdPartInfoVo.getNew();
-//        unBindThirdPartInfoVo.setUpdatedAt(now);
-//        unBindThirdPartInfoVo.setState(2);// 2-解绑
-
-//        long s = System.currentTimeMillis();
-//        Document doc = mongoTemplate.getCollection(AdamThirdPartInfoVo.class.getSimpleName()).findOneAndUpdate(
-//                Query.query(Criteria.where("uid").is(uid).and("platform").is(platform).and("state").is(1)).getQueryObject(),
-//                new Document("$set", new Document("state", 2).append("updatedAt", now)),
-//                new FindOneAndUpdateOptions().returnDocument(ReturnDocument.AFTER)
-//        );
-//        log.debug("#MDB耗时:{}ms", System.currentTimeMillis() - s);
-//
-//        s = System.currentTimeMillis();
-//        if (null != doc) {
-//            adamRdmService.delUidByPlatformOpenId(platform, doc.getString("openId"));
-//        }
         long s = System.currentTimeMillis();
         List<AdamThirdPartInfoVo> vos = adamRdmService.getThirdPartVoListByUid(uid);
         if (!CollectionUtils.isEmpty(vos)) {
@@ -320,45 +285,26 @@ public class AdamUserServiceImpl implements IAdamUserService {
         adamRdmService.delEntersVoByUid(uid);
         log.debug("##RDS耗时:{}ms", System.currentTimeMillis() - s);
 
-//        DeleteResult deleteResult = mongoTemplate.remove(Query.query(Criteria.where("uid").is(uid)), AdamUserInfoVo.class.getSimpleName());
         toMqSqls.add(SqlMapping.get("adam_user.close"));
         objsUser.add(new Object[]{now, now, uid});
 
         /* ---------------------- 三方账号信息 */
         if (!CollectionUtils.isEmpty(thirdPartInfoVos)) {
-//            s = System.currentTimeMillis();
-//            mongoTemplate.remove(Query.query(Criteria.where("uid").is(uid)), AdamThirdPartInfoVo.class.getSimpleName());
-//            log.debug("#MDB耗时:{}ms", System.currentTimeMillis() - s);
             toMqSqls.add(SqlMapping.get("adam_third_party.close"));
             objsThirdPart.add(new Object[]{now, uid});
         }
 
         /* ---------------------- 用户会员信息 */
-//        s = System.currentTimeMillis();
-//        deleteResult = mongoTemplate.remove(Query.query(Criteria.where("uid").is(uid)), AdamUserMemberVo.class.getSimpleName());
-//        log.debug("#MDB耗时:{}ms", System.currentTimeMillis() - s);
-//        if (deleteResult.getDeletedCount() > 0) {
         toMqSqls.add(SqlMapping.get("adam_user_member.close"));
         objsThirdPart.add(new Object[]{now, uid});
-//        }
 
         /* ---------------------- 收货地址信息 */
-//        s = System.currentTimeMillis();
-//        deleteResult = mongoTemplate.remove(Query.query(Criteria.where("uid").is(uid)), AdamAddressesVo.class.getSimpleName());
-//        log.debug("#MDB耗时:{}ms", System.currentTimeMillis() - s);
-//        if (deleteResult.getDeletedCount() > 0) {
         toMqSqls.add(SqlMapping.get("adam_addresses.close"));
         objsAddresses.add(new Object[]{now, now, uid});
-//        }
 
         /* ---------------------- 入场人信息 */
-//        s = System.currentTimeMillis();
-//        deleteResult = mongoTemplate.remove(Query.query(Criteria.where("uid").is(uid)).getQueryObject(), AdamEnters.class.getSimpleName());
-//        log.debug("#MDB耗时:{}ms", System.currentTimeMillis() - s);
-//        if (deleteResult.getDeletedCount() > 0) {
         toMqSqls.add(SqlMapping.get("adam_enters.close"));
         objsAddresses.add(new Object[]{now, now, uid});
-//        }
 
         s = System.currentTimeMillis();
         queueUtils.sendMsgByRedis(
@@ -373,26 +319,6 @@ public class AdamUserServiceImpl implements IAdamUserService {
     public AdamRealInfoVo identity(String uid, String name, String idCard) {
         AdamRealInfoVo vo = null;
         if (!adamRdmService.isCertification(1, idCard, name)) {
-//                    String respStr = null;
-//                    try {
-//                        LinkedMultiValueMap<String, String> paramsMap = new LinkedMultiValueMap<>();
-//                        paramsMap.add("realName", name);
-//                        paramsMap.add("cardNo", idCard);
-//                        long s = System.currentTimeMillis();
-//                        respStr = HttpUtil.postToPhpApi(env.getProperty("liquidnet.url-service.url") + PHP_API_REAL_NAME, paramsMap);
-//                        log.debug("#PHP.API耗时:{}ms", System.currentTimeMillis() - s);
-//                        log.debug("###PHP.API[{}].RESP:{}", PHP_API_REAL_NAME, respStr);
-//                        Map respMap = JsonUtils.fromJson(respStr, Map.class);
-//                        if (CollectionUtils.isEmpty(respMap) || !StringUtils.equalsIgnoreCase("OK", (String) respMap.get("message"))) {
-//                            log.warn("PHP.API实名认证失败[uid:{},name:{},idCard:{},respStr:{}]", uid, name, idCard, respStr);
-//                            ErrorMapping.ErrorMessage errorMessage = ErrorMapping.get("10102");
-//                            throw new LiquidnetServiceException(errorMessage.getCode(), errorMessage.getMessage());
-//                        }
-//                    } catch (Exception e) {
-//                        log.error("PHP.API实名认证异常[uid:{},name:{},idCard:{},respStr:{}]", uid, name, idCard, respStr, e);
-//                        ErrorMapping.ErrorMessage errorMessage = ErrorMapping.get("10102");
-//                        throw new LiquidnetServiceException(errorMessage.getCode(), errorMessage.getMessage());
-//                    }
             String respStr = IdentityUtils.aliThird(name, idCard);
             JsonNode respJNode = JsonUtils.fromJson(respStr, JsonNode.class);
             if (null == respJNode || !"0".equals(respJNode.get("error_code").asText())) {

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`, is_complete, created_at) VALUES (?,?,?,?,?) 
 adam_user.complete=UPDATE adam_user SET is_complete=?, updated_at=? WHERE `uid`=? 
 adam_user.edit.mobile=UPDATE adam_user SET mobile=?, updated_at=? WHERE `uid`=? 
-adam_user.close=UPDATE adam_user SET `state`=2, mobile=concat(mobile,curdate()), updated_at=?, closed_at=? WHERE `uid`=? 
+adam_user.close=UPDATE adam_user SET `state`=2, mobile=concat(mobile,'_',curtime()), updated_at=?, closed_at=? WHERE `uid`=? 
 
 # ----------------------------------------------------
 adam_user_info.add=INSERT INTO adam_user_info (`uid`, nickname, avatar, qr_code) VALUES (?,?,?,?) 
@@ -13,7 +13,7 @@ adam_real_name.add=INSERT INTO adam_real_name (real_name_id, `uid`, `type`, `nam
 # ----------------------------------------------------
 adam_third_party.add=INSERT INTO adam_third_party (`uid`, open_id, avatar, nickname, platform, `state`, created_at) values (?,?,?,?,?,?,?) 
 adam_third_party.unbind=UPDATE adam_third_party SET `state`=2, updated_at=? WHERE `uid`=? AND platform=? 
-adam_third_party.close=UPDATE adam_third_party SET `state`=2, open_id=concat(open_id, curdate()), updated_at=?, comment='close' WHERE `uid`=? 
+adam_third_party.close=UPDATE adam_third_party SET `state`=2, updated_at=?, comment='close' WHERE `uid`=? 
 
 # ----------------------------------------------------
 adam_addresses.add=INSERT INTO adam_addresses (addresses_id, `uid`, `name`, phone, province, city, county, address, is_default, `state`, created_at) VALUES (?,?,?,?,?,?,?,?,?,?,?) 

liquidnet-bus-service/liquidnet-service-consumer-all/liquidnet-service-consumer-kylin/src/main/java/com/liquidnet/service/consumer/kylin/config/ConsumerSweetSqlUserRelationRedisStreamConfig.java

+package com.liquidnet.service.consumer.kylin.config;
+
+import com.liquidnet.service.consumer.kylin.receiver.ConsumerSweetSqlUserRelationRdsReceiver;
+import lombok.var;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.data.redis.connection.RedisConnectionFactory;
+import org.springframework.data.redis.connection.stream.Consumer;
+import org.springframework.data.redis.connection.stream.MapRecord;
+import org.springframework.data.redis.connection.stream.ReadOffset;
+import org.springframework.data.redis.connection.stream.StreamOffset;
+import org.springframework.data.redis.stream.StreamMessageListenerContainer;
+import org.springframework.data.redis.stream.Subscription;
+
+import java.time.Duration;
+
+import static com.liquidnet.service.base.constant.MQConst.SweetQueue.ARTISTS_RELATION;
+
+@Configuration
+public class ConsumerSweetSqlUserRelationRedisStreamConfig {
+    @Autowired
+    ConsumerSweetSqlUserRelationRdsReceiver consumerSweetSqlUserRelationRdsReceiver;
+
+    private StreamMessageListenerContainer<String, MapRecord<String, String, String>> buildStreamMessageListenerContainer(RedisConnectionFactory factory) {
+        var options = StreamMessageListenerContainer
+                .StreamMessageListenerContainerOptions
+                .builder()
+                .pollTimeout(Duration.ofMillis(1))
+                .build();
+        return StreamMessageListenerContainer.create(factory, options);
+    }
+
+    /**
+     * 缺票登记
+     *
+     * @param listenerContainer
+     * @param t
+     * @return
+     */
+    private Subscription receiveSqlUserRelation(StreamMessageListenerContainer<String, MapRecord<String, String, String>> listenerContainer, int t) {
+        return listenerContainer.receiveAutoAck(
+                Consumer.from(ARTISTS_RELATION.getGroup(), ARTISTS_RELATION.name() + t),
+                StreamOffset.create(ARTISTS_RELATION.getKey(), ReadOffset.lastConsumed()), consumerSweetSqlUserRelationRdsReceiver
+        );
+    }
+
+    /* —————————————————————————— ｜ —————————————————————————— ｜ —————————————————————————— */
+
+    /* -------------------------------------------------------- ｜ 缺票登记 */
+
+    @Bean
+    public Subscription subscriptionSqlUserRelation(RedisConnectionFactory factory) {
+        var listenerContainer = this.buildStreamMessageListenerContainer(factory);
+        var subscription = receiveSqlUserRelation(listenerContainer, 1);
+        listenerContainer.start();
+        return subscription;
+    }
+
+    @Bean
+    public Subscription subscriptionSqlUserRelation2(RedisConnectionFactory factory) {
+        var listenerContainer = this.buildStreamMessageListenerContainer(factory);
+        var subscription = receiveSqlUserRelation(listenerContainer, 1);
+        listenerContainer.start();
+        return subscription;
+    }
+
+    @Bean
+    public Subscription subscriptionSqlUserRelation3(RedisConnectionFactory factory) {
+        var listenerContainer = this.buildStreamMessageListenerContainer(factory);
+        var subscription = receiveSqlUserRelation(listenerContainer, 1);
+        listenerContainer.start();
+        return subscription;
+    }
+
+    /* -------------------------------------------------------- ｜  */
+}

liquidnet-bus-service/liquidnet-service-consumer-all/liquidnet-service-consumer-kylin/src/main/java/com/liquidnet/service/consumer/kylin/receiver/ConsumerSweetSqlUserRelationRdsReceiver.java

+package com.liquidnet.service.consumer.kylin.receiver;
+
+import com.liquidnet.service.base.constant.MQConst;
+import org.springframework.stereotype.Component;
+
+@Component
+public class ConsumerSweetSqlUserRelationRdsReceiver extends AbstractSqlRedisReceiver {
+    @Override
+    protected String getRedisStreamKey() {
+        return MQConst.SweetQueue.ARTISTS_RELATION.getKey();
+    }
+
+    @Override
+    protected String getRedisStreamGroup() {
+        return MQConst.SweetQueue.ARTISTS_RELATION.getGroup();
+    }
+}

liquidnet-bus-service/liquidnet-service-sweet/docu/db_sweetsugar_structure.sql

@@ -209,3 +209,25 @@ CREATE TABLE `sweet_wechat_user`
   DEFAULT CHARSET utf8mb4
   COLLATE utf8mb4_unicode_ci
   ROW_FORMAT = DYNAMIC COMMENT '正在现场服务号关注事件储存用户信息表';
+
+
+-- 用户 收藏/喜欢等状态
+drop TABLE if exists `sweet_user_relation`;
+CREATE TABLE `sweet_user_relation`
+(
+    `mid`               bigint unsigned NOT NULL AUTO_INCREMENT,
+    `user_id`           varchar(200)    NOT NULL DEFAULT '' COMMENT '用户id',
+    `type`             tinyint    NOT NULL DEFAULT 0 COMMENT '类型 1喜欢艺人  2签售艺人',
+    `target_id`         varchar(200)    NOT NULL DEFAULT '' COMMENT '目标id',
+    `manual_id`            varchar(200)    NOT NULL DEFAULT '' COMMENT '电子手册',
+    `status`            tinyint    NOT NULL DEFAULT 0 COMMENT '1是 0否',
+    `created_at`     datetime        NULL     DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
+    `updated_at`     datetime        NULL     DEFAULT CURRENT_TIMESTAMP COMMENT '更新时间',
+    PRIMARY KEY (`mid`),
+    KEY `sweet_wechat_user_user_id` (`user_id`)
+) ENGINE = InnoDB
+  DEFAULT CHARSET utf8mb4
+  COLLATE utf8mb4_unicode_ci
+  ROW_FORMAT = DYNAMIC COMMENT '用户 收藏/喜欢等状态';
+
+

liquidnet-bus-service/liquidnet-service-sweet/docu/redis_queue_create.txt

+XADD sweet:stream:rk.artists.relation * 0 0
+XGROUP CREATE sweet:stream:rk.artists.relation group.artists.relation 0
+

liquidnet-bus-service/liquidnet-service-sweet/src/main/java/com/liquidnet/service/MybatisPlusCodeGenerator.java

@@ -95,7 +95,7 @@ public class MybatisPlusCodeGenerator {
 
         String resourcePath = "/Users/hujiachen/Downloads/tmp";
         String directory = "com.liquidnet.service.sweet";
-        String[] dbTableArray = new String[]{"sweet_manual_shop"};
+        String[] dbTableArray = new String[]{"sweet_user_relation"};
 
         doGenerator(resourcePath, dsc, directory, dbTableArray);
     }

liquidnet-bus-service/liquidnet-service-sweet/src/main/java/com/liquidnet/service/sweet/controller/SweetUserRelationController.java

+package com.liquidnet.service.sweet.controller;
+
+
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <p>
+ * 用户 收藏/喜欢等状态 前端控制器
+ * </p>
+ *
+ * @author liquidnet
+ * @since 2021-08-06
+ */
+@RestController
+@RequestMapping("/sweet-user-relation")
+public class SweetUserRelationController {
+
+}

liquidnet-bus-service/liquidnet-service-sweet/src/main/java/com/liquidnet/service/sweet/entity/SweetUserRelation.java

+package com.liquidnet.service.sweet.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import java.time.LocalDateTime;
+import java.io.Serializable;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * <p>
+ * 用户 收藏/喜欢等状态
+ * </p>
+ *
+ * @author liquidnet
+ * @since 2021-08-06
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+public class SweetUserRelation implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId(value = "mid", type = IdType.AUTO)
+    private Long mid;
+
+    /**
+     * 用户id
+     */
+    private String userId;
+
+    /**
+     * 类型 1喜欢艺人  2签售艺人
+     */
+    private Integer type;
+
+    /**
+     * 目标id
+     */
+    private Integer targetId;
+
+    /**
+     * 手册id
+     */
+    private Integer manualId;
+
+    /**
+     * 1是 0否
+     */
+    private String status;
+
+    /**
+     * 创建时间
+     */
+    private LocalDateTime createdAt;
+
+    /**
+     * 更新时间
+     */
+    private LocalDateTime updatedAt;
+
+
+}

liquidnet-bus-service/liquidnet-service-sweet/src/main/java/com/liquidnet/service/sweet/mapper/SweetUserRelationMapper.java

+package com.liquidnet.service.sweet.mapper;
+
+import com.liquidnet.service.sweet.entity.SweetUserRelation;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ * 用户 收藏/喜欢等状态 Mapper 接口
+ * </p>
+ *
+ * @author liquidnet
+ * @since 2021-08-06
+ */
+public interface SweetUserRelationMapper extends BaseMapper<SweetUserRelation> {
+
+}

liquidnet-bus-service/liquidnet-service-sweet/src/main/java/com/liquidnet/service/sweet/service/ISweetUserRelationService.java

+package com.liquidnet.service.sweet.service;
+
+import com.liquidnet.service.sweet.entity.SweetUserRelation;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ * 用户 收藏/喜欢等状态 服务类
+ * </p>
+ *
+ * @author liquidnet
+ * @since 2021-08-06
+ */
+public interface ISweetUserRelationService extends IService<SweetUserRelation> {
+
+}

liquidnet-bus-service/liquidnet-service-sweet/src/main/java/com/liquidnet/service/sweet/service/impl/SweetUserRelationServiceImpl.java

+package com.liquidnet.service.sweet.service.impl;
+
+import com.liquidnet.service.sweet.entity.SweetUserRelation;
+import com.liquidnet.service.sweet.mapper.SweetUserRelationMapper;
+import com.liquidnet.service.sweet.service.ISweetUserRelationService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 用户 收藏/喜欢等状态 服务实现类
+ * </p>
+ *
+ * @author liquidnet
+ * @since 2021-08-06
+ */
+@Service
+public class SweetUserRelationServiceImpl extends ServiceImpl<SweetUserRelationMapper, SweetUserRelation> implements ISweetUserRelationService {
+
+}

liquidnet-bus-service/liquidnet-service-sweet/src/main/java/com/liquidnet/service/sweet/service/impl/SweetWechatCallbackServiceImpl.java

@@ -28,13 +28,13 @@ import org.springframework.stereotype.Service;
 @Slf4j
 public class SweetWechatCallbackServiceImpl {
 
-    @Value("${liquidnet.wechat.zhengzai.service.appid}")
+    @Value("${liquidnet.wechat.service.zhengzai.appid}")
     private String appid;
-    @Value("${liquidnet.wechat.zhengzai.service.secret}")
+    @Value("${liquidnet.wechat.service.zhengzai.secret}")
     private String secret;
-    @Value("${liquidnet.wechat.zhengzai.service.token}")
+    @Value("${liquidnet.wechat.service.zhengzai.token}")
     private String token;
-    @Value("${liquidnet.wechat.zhengzai.service.aeskey}")
+    @Value("${liquidnet.wechat.service.zhengzai.aeskey}")
     private String aeskey;
 
     @Autowired

liquidnet-bus-service/liquidnet-service-sweet/src/main/java/com/liquidnet/service/sweet/service/impl/SweetWechatTemplateServiceImpl.java

@@ -37,9 +37,9 @@ import java.util.Set;
 @Service
 public class SweetWechatTemplateServiceImpl {
 
-    @Value("${liquidnet.wechat.zhengzai.service.appid}")
+    @Value("${liquidnet.wechat.service.zhengzai.appid}")
     private String appid;
-    @Value("${liquidnet.wechat.zhengzai.service.secret}")
+    @Value("${liquidnet.wechat.service.zhengzai.secret}")
     private String secret;
     @Value("${liquidnet.client.admin.h5Url}")
     private String h5Url;

liquidnet-bus-service/liquidnet-service-sweet/src/main/java/com/liquidnet/service/sweet/utils/RedisDataUtils.java

@@ -4,6 +4,9 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.liquidnet.common.cache.redis.util.RedisUtil;
 import com.liquidnet.commons.lang.util.CollectionUtil;
 import com.liquidnet.commons.lang.util.DateUtil;
+import com.liquidnet.service.base.SqlMapping;
+import com.liquidnet.service.base.constant.MQConst;
+import com.liquidnet.service.kylin.dto.vo.mongo.KylinPerformanceVo;
 import com.liquidnet.service.sweet.constant.SweetConstant;
 import com.liquidnet.service.sweet.dto.SweetManualAppletDto;
 import com.liquidnet.service.sweet.dto.SweetManualArtistList2Dto;
@@ -16,6 +19,7 @@ import com.liquidnet.service.sweet.vo.SweetRemindVo;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
+import java.time.LocalDateTime;
 import java.util.*;
 
 @Component
@@ -23,6 +27,8 @@ public class RedisDataUtils {
 
     @Autowired
     private RedisUtil redisUtil;
+    @Autowired
+    private QueueUtils queueUtils;
 
     @Autowired
     private SweetManualMapper sweetManualMapper;
@@ -85,13 +91,13 @@ public class RedisDataUtils {
 
         //获取时间
         SweetManualAppletDto sweetManualAppletDto = getAppletPerformance(manualId);
-        Date dateEnd=DateUtil.parse(sweetManualAppletDto.getTimeEnd(), DateUtil.DATE_SMALL_STR);
-        Date dateStart=DateUtil.parse(sweetManualAppletDto.getTimeStart(), DateUtil.DATE_SMALL_STR);
-        int intervalDay = (int) DateUtil.intervalDays(dateStart,dateEnd );
+        Date dateEnd = DateUtil.parse(sweetManualAppletDto.getTimeEnd(), DateUtil.DATE_SMALL_STR);
+        Date dateStart = DateUtil.parse(sweetManualAppletDto.getTimeStart(), DateUtil.DATE_SMALL_STR);
+        int intervalDay = (int) DateUtil.intervalDays(dateStart, dateEnd);
         ArrayList<String> list = new ArrayList<>();
         list.add(DateUtil.format(dateStart, DateUtil.Formatter.yyyy_MM_dd));
         for (int i = 0; i < intervalDay; i++) {
-            list.add(DateUtil.format(DateUtil.addDay(dateStart, i+1), DateUtil.Formatter.yyyy_MM_dd));
+            list.add(DateUtil.format(DateUtil.addDay(dateStart, i + 1), DateUtil.Formatter.yyyy_MM_dd));
         }
 
         //获取舞台
@@ -198,42 +204,73 @@ public class RedisDataUtils {
         redisUtil.del(SweetConstant.REDIS_KEY_SWEET_MANUAL_SORT.concat(manualId));//列表
     }
 
-    public void setArtistsRelationRedisVo(String uid, String artistsId,String manualId, String type) {
+    public void setArtistsRelationRedisVo(String uid, String artistsId, String manualId, String type) {
+
+        LinkedList<String> sqls = CollectionUtil.linkedListString();
+        LinkedList<Object[]> sqlsDataA = CollectionUtil.linkedListObjectArr();
+        LocalDateTime now = LocalDateTime.now();
+
         String redisKey = SweetConstant.REDIS_KEY_SWEET_ARTISTS_RELATION.concat(uid).concat(":manualId:").concat(manualId);
-        SweetArtistsRelationVo vo = getArtistsRelationRedisVo(uid,manualId);
+        SweetArtistsRelationVo vo = getArtistsRelationRedisVo(uid, manualId);
         vo.setUid(uid);
         if (type.equalsIgnoreCase("sign")) {
             if (vo.getSignList() == null) {
                 ArrayList<String> signList = new ArrayList<>();
                 signList.add(artistsId);
                 vo.setSignList(signList);
+                sqls.add(SqlMapping.get("sweet_user_relation.insert"));
+                sqlsDataA.add(new Object[]{
+                        uid, 2, artistsId, manualId, now
+                });
             } else {
                 if (vo.getSignList().contains(artistsId)) {
                     vo.getSignList().remove(artistsId);
+                    sqls.add(SqlMapping.get("sweet_user_relation.delete"));
+                    sqlsDataA.add(new Object[]{
+                            uid, artistsId, manualId,2
+                    });
                 } else {
                     vo.getSignList().add(artistsId);
+                    sqls.add(SqlMapping.get("sweet_user_relation.insert"));
+                    sqlsDataA.add(new Object[]{
+                            uid, 2, artistsId, manualId, now
+                    });
                 }
             }
         } else if (type.equalsIgnoreCase("watch")) {
-            if (vo.getSignList() == null) {
+            if (vo.getWatchList() == null) {
                 ArrayList<String> watchList = new ArrayList<>();
                 watchList.add(artistsId);
                 vo.setWatchList(watchList);
+                sqls.add(SqlMapping.get("sweet_user_relation.insert"));
+                sqlsDataA.add(new Object[]{
+                        uid, 1, artistsId, manualId, now
+                });
             } else {
                 if (vo.getWatchList().contains(artistsId)) {
                     vo.getWatchList().remove(artistsId);
+                    sqls.add(SqlMapping.get("sweet_user_relation.delete"));
+                    sqlsDataA.add(new Object[]{
+                            uid, artistsId, manualId,1
+                    });
                 } else {
                     vo.getWatchList().add(artistsId);
+                    sqls.add(SqlMapping.get("sweet_user_relation.insert"));
+                    sqlsDataA.add(new Object[]{
+                            uid, 1, artistsId, manualId, now
+                    });
                 }
             }
         }
-
         redisUtil.set(redisKey, vo);
+
+        queueUtils.sendMsgByRedis(MQConst.SweetQueue.ARTISTS_RELATION.getKey(),
+                SqlMapping.gets(sqls, sqlsDataA));
     }
 
     //获取 签售
     //获取 想看
-    public SweetArtistsRelationVo getArtistsRelationRedisVo(String uid,String manualId) {
+    public SweetArtistsRelationVo getArtistsRelationRedisVo(String uid, String manualId) {
         String redisKey = SweetConstant.REDIS_KEY_SWEET_ARTISTS_RELATION.concat(uid).concat(":manualId:").concat(manualId);
         Object obj = redisUtil.get(redisKey);
         if (obj == null) {
@@ -282,6 +319,7 @@ public class RedisDataUtils {
         String redisKey = SweetConstant.REDIS_KEY_SWEET_WECHAT_USER_INFO.concat(sweetWechatUser.getUnionId());
         redisUtil.set(redisKey, sweetWechatUser);
     }
+
     public SweetWechatUser getSweetWechatUser(String unionid) {
         if (unionid.isEmpty()) {
             return null;
@@ -291,10 +329,10 @@ public class RedisDataUtils {
     }
 
     // 艺人详情
-    public SweetArtists setArtistsDetails(String artistsId){
+    public SweetArtists setArtistsDetails(String artistsId) {
         String redisKey = SweetConstant.REDIS_KEY_SWEET_ARTISTS_DETAILS.concat(artistsId);
-        SweetArtists sweetArtists = sweetArtistsMapper.selectOne(Wrappers.lambdaQuery(SweetArtists.class).eq(SweetArtists::getArtistsId,artistsId).eq(SweetArtists::getStatus,1));
-        redisUtil.set(redisKey,sweetArtists);
+        SweetArtists sweetArtists = sweetArtistsMapper.selectOne(Wrappers.lambdaQuery(SweetArtists.class).eq(SweetArtists::getArtistsId, artistsId).eq(SweetArtists::getStatus, 1));
+        redisUtil.set(redisKey, sweetArtists);
         return sweetArtists;
     }
 

liquidnet-bus-service/liquidnet-service-sweet/src/main/java/com/liquidnet/service/sweet/utils/WechatSignUtils.java

@@ -19,7 +19,7 @@ import java.util.Arrays;
 public class WechatSignUtils {
 
     // 与接口配置信息中的 Token 要一致
-    @Value("${liquidnet.wechat.zhengzai.service.token}")
+    @Value("${liquidnet.wechat.service.zhengzai.token}")
     private String token;
 
     /**

liquidnet-bus-service/liquidnet-service-sweet/src/main/resources/sqlmap.properties

@@ -50,5 +50,6 @@ kylin_order_ticket_entities.overtimeRefund=UPDATE kylin_order_ticket_entities SE
 kylin_order_refund.overtimeRefund=INSERT INTO kylin_order_refunds (order_refunds_id,order_tickets_id,order_refund_code,price,price_express,status,type,applicant_id,applicant_name,applicant_at,reason,refund_cate,created_at) VALUES(?,?,?,?,?,?,?,?,?,?,?,?,?)
 kylin_order_refund_entities.overtimeRefund=INSERT INTO kylin_order_refund_entities (order_refunds_entities_id,order_refunds_id,refund_price,order_ticket_entities_id,created_at) VALUES(?,?,?,?,?)
 
-
-
+# ------------------------用户关系----------------------------
+sweet_user_relation.insert=INSERT INTO sweet_user_relation (user_id,type,target_id,manual_id,status,created_at) VALUES (?,?,?,?,1,?)
+sweet_user_relation.delete=DELETE FROM  sweet_user_relation WHERE user_id = ? and target_id = ? and manual_id = ? and type = ?