Merge branch 'dev' into test

liquidnet-bus-do/liquidnet-service-adam-do/src/main/java/com/liquidnet/service/adam/entity/AdamUserInfo.java

@@ -77,6 +77,18 @@ public class AdamUserInfo implements Serializable {
      */
     private String tagMe;
 
+    /**
+     * 旧数据迁移
+     * 融云token
+     */
+    private String rongCloudToken;
+
+    /**
+     * 旧数据迁移（stringid为上上版系统用户id，uid为上版系统用户id，旧数据迁移至当前版本延用原uid）
+     * 0-老融云token(用stringid生成),1重新生成过的token(用uid生成)
+     */
+    private Integer rongCloudTag;
+
     private String comment;
 
 

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

+package com.liquidnet.service.adam.controller.admin;
+
+import com.liquidnet.service.adam.service.processor.DMUserInformationProcessor;
+import com.liquidnet.service.base.ResponseDto;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.time.LocalDateTime;
+
+@Api(tags = "DM")
+@Slf4j
+@Validated
+@RestController
+@RequestMapping("dm")
+public class AdamDMAdminController {
+    @Autowired
+    DMUserInformationProcessor dmUserInformationProcessor;
+
+    @ApiOperation(value = "user")
+    @GetMapping(value = {"user"})
+    public ResponseDto<Object> dataMigrationForUser(@RequestParam int alis, @RequestParam boolean flg) {
+        if (verify(alis)) dmUserInformationProcessor.handler(flg);
+        return ResponseDto.success();
+    }
+
+    @ApiOperation(value = "tpa")
+    @GetMapping(value = {"tpa"})
+    public ResponseDto<Object> dataMigrationForTpa(@RequestParam int alis, @RequestParam boolean flg) {
+        if (verify(alis)) dmUserInformationProcessor.handler(flg);
+        return ResponseDto.success();
+    }
+
+    @ApiOperation(value = "real")
+    @GetMapping(value = {"real"})
+    public ResponseDto<Object> dataMigrationForReal(@RequestParam int alis, @RequestParam boolean flg) {
+        if (verify(alis)) dmUserInformationProcessor.handler(flg);
+        return ResponseDto.success();
+    }
+
+    @ApiOperation(value = "vip")
+    @GetMapping(value = {"vip"})
+    public ResponseDto<Object> dataMigrationForVip(@RequestParam int alis, @RequestParam boolean flg) {
+        if (verify(alis)) dmUserInformationProcessor.handler(flg);
+        return ResponseDto.success();
+    }
+
+    @ApiOperation(value = "morder")
+    @GetMapping(value = {"morder"})
+    public ResponseDto<Object> dataMigrationForMOrder(@RequestParam int alis, @RequestParam boolean flg) {
+        if (verify(alis)) dmUserInformationProcessor.handler(flg);
+        return ResponseDto.success();
+    }
+
+    @ApiOperation(value = "enters")
+    @GetMapping(value = {"enters"})
+    public ResponseDto<Object> dataMigrationForEnters(@RequestParam int alis, @RequestParam boolean flg) {
+        if (verify(alis)) dmUserInformationProcessor.handler(flg);
+        return ResponseDto.success();
+    }
+
+    @ApiOperation(value = "addr")
+    @GetMapping(value = {"addr"})
+    public ResponseDto<Object> dataMigrationForAddr(@RequestParam int alis, @RequestParam boolean flg) {
+        if (verify(alis)) dmUserInformationProcessor.handler(flg);
+        return ResponseDto.success();
+    }
+
+    private boolean verify(int alis) {
+        LocalDateTime now = LocalDateTime.now();
+        int hour = now.getHour();
+        return alis == Integer.parseInt((hour > 12 ? hour - 12 : hour) + "" + now.getMinute());
+    }
+}

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

+package com.liquidnet.service.adam.service;
+
+import lombok.SneakyThrows;
+
+import java.sql.*;
+
+public abstract class DataMigrationProcessorService {
+    public Connection connection = null;
+    public PreparedStatement statement = null;
+    public ResultSet resultSet = null;
+
+    public void handler(boolean flg) {
+        preHandler();
+
+        try {
+            dataProcessing(flg);
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+
+        postHandler();
+    }
+
+    @SneakyThrows
+    private void preHandler() {
+        Class.forName("com.mysql.cj.jdbc.Driver");
+        connection = DriverManager.getConnection(
+                "jdbc:mysql://zhengzai.mysql.polardb.rds.aliyuncs.com:3306/passport",
+                "readonly", "ZWDsf8Fy");
+    }
+
+    protected abstract void dataProcessing(boolean flg);
+
+    private void postHandler() {
+        try {
+            assert resultSet != null;
+            resultSet.close();
+            statement.close();
+            connection.close();
+        } catch (SQLException throwables) {
+            throwables.printStackTrace();
+        }
+    }
+}

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

@@ -15,6 +15,7 @@ import org.springframework.stereotype.Service;
 import org.springframework.util.CollectionUtils;
 import org.springframework.util.StringUtils;
 
+import java.time.LocalDateTime;
 import java.util.Arrays;
 import java.util.List;
 import java.util.stream.Collectors;
@@ -243,15 +244,18 @@ public class AdamRdmServiceImpl implements IAdamRdmService {
     @Override
     public AdamUserMemberVo getUserMemberVoByUid(String uid) {
         String rk = AdamRedisConst.INFO_USER_MEMBER.concat(uid);
-        AdamUserMemberVo adamUserMemberVo = (AdamUserMemberVo) redisUtil.get(rk);
-        if (null == adamUserMemberVo) {
+        AdamUserMemberVo vo = (AdamUserMemberVo) redisUtil.get(rk);
+        if (null == vo) {
             long s = System.currentTimeMillis();
-            adamUserMemberVo = mongoTemplate.findOne(Query.query(Criteria.where("uid").is(uid)), AdamUserMemberVo.class, AdamUserMemberVo.class.getSimpleName());
+            vo = mongoTemplate.findOne(Query.query(Criteria.where("uid").is(uid)), AdamUserMemberVo.class, AdamUserMemberVo.class.getSimpleName());
             log.debug("#MDB耗时:{}ms", System.currentTimeMillis() - s);
 
-            if (null != adamUserMemberVo) redisUtil.set(rk, adamUserMemberVo);
+            if (null != vo) redisUtil.set(rk, vo);
         }
-        return adamUserMemberVo;
+        if (null != vo) {
+            vo.setState(vo.getState() == 1 ? (vo.getExpiryAt().isAfter(LocalDateTime.now()) ? 1 : 2) : vo.getState());
+        }
+        return vo;
     }
 
     @Override

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

@@ -497,7 +497,7 @@ public class DataImpl {
                     ResultSet refundData = pstmt.executeQuery();
                     while (refundData.next()) {
                         refundNumber+=refundData.getInt("refund_number");
-                        refundPrice.add(refundData.getBigDecimal("refund_price"));
+                        refundPrice=refundPrice.add(refundData.getBigDecimal("refund_price"));
                     }
 
                     //演出