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

liquidnet-bus-api/liquidnet-service-candy-api/src/main/java/com/liquidnet/service/candy/dto/admin/CandyMgtCouponBuildParam.java

@@ -28,7 +28,7 @@ public class CandyMgtCouponBuildParam {
     @ApiModelProperty(required = true, value = "券类型[1-代金券｜2-满减券｜3-兑换券｜4-折扣券｜101-优先券]", allowableValues = "1,2,3,4,101")
     private Integer couType;
     @NotNull(message = "券领取方式不能为空")
-    @ApiModelProperty(required = true, value = "领取方式[0-用户输入兑换｜1-发放至用户｜2-积分商品｜3-发送需领取]", allowableValues = "0,1,2,3")
+    @ApiModelProperty(required = true, value = "领取方式[0-用户输入兑换｜1-发放至用户｜2-积分商品｜3-发送需领取｜4-会员专属]", allowableValues = "0,1,2,3,4")
     private Integer bindType;
     @ApiModelProperty(required = false, value = "折扣[8折即0.8]", example = "0.8")
     private BigDecimal discount;

liquidnet-bus-api/liquidnet-service-candy-api/src/main/java/com/liquidnet/service/candy/vo/CandyCouponVo.java

@@ -29,7 +29,7 @@ public class CandyCouponVo implements Serializable, Cloneable {
     private Integer busiType;
     @ApiModelProperty(value = "券类型[1-代金券｜2-满减券｜3-兑换券｜4-折扣券 | 101-优先券]",example = "1")
     private Integer couType;
-    @ApiModelProperty(value = "[0-用户输入兑换｜1-发放至用户]",example = "1")
+    @ApiModelProperty(value = "[0-用户输入兑换｜1-发放至用户｜2-积分兑换｜3-发放需领取｜4-会员专属]",example = "1")
     private Integer bindType;
     @ApiModelProperty(value = "折扣 可null",example = "0.5")
     private BigDecimal discount;

liquidnet-bus-service/liquidnet-service-platform/liquidnet-service-platform-impl/src/main/java/com/liquidnet/service/platform/controller/stone/InnerController.java

+package com.liquidnet.service.platform.controller.stone;
+
+import com.liquidnet.service.base.ResponseDto;
+import com.liquidnet.service.platform.service.impl.stone.StoneServerImpl;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+
+@Api(tags = "数据迁移 (会重复)")
+@RestController
+@RequestMapping("stone/inner")
+public class InnerController {
+
+    @Autowired
+    private StoneServerImpl data;
+
+    @PostMapping("initScore")
+    @ApiOperation("会员卡领取积分")
+    public ResponseDto<Boolean> initScore(@RequestParam("uid") String uid) {
+        Boolean result = data.initScore(uid);
+        return ResponseDto.success(result);
+    }
+
+}

liquidnet-bus-service/liquidnet-service-platform/liquidnet-service-platform-impl/src/main/java/com/liquidnet/service/platform/service/impl/stone/StoneServerImpl.java

@@ -21,6 +21,7 @@ import com.liquidnet.service.stone.mapper.StoneScoreUserMapper;
 import com.liquidnet.service.stone.vo.StoneUserVo;
 import com.liquidnet.service.sweet.constant.SweetConstant;
 import com.liquidnet.service.sweet.vo.SweetAppletUsersVo;
+import com.mysql.cj.jdbc.result.ResultSetImpl;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
@@ -32,6 +33,9 @@ import org.springframework.data.mongodb.core.query.Criteria;
 import org.springframework.data.mongodb.core.query.Query;
 import org.springframework.stereotype.Service;
 
+import java.sql.Connection;
+import java.sql.DriverManager;
+import java.sql.PreparedStatement;
 import java.time.LocalDateTime;
 import java.util.Arrays;
 import java.util.HashMap;
@@ -46,9 +50,6 @@ public class StoneServerImpl {
 
     @Autowired
     private MongoTemplate mongoTemplate;
-    @Autowired
-    private RedisDataSourceUtil redisDataSourceUtil;
-    private static final List<String> defaultBackgroundList = Arrays.asList("https://img.zhengzai.tv/other/2021/07/27/150eeb0e20af4fc88e8a1ec57c46c362.png", "https://img.zhengzai.tv/files/2021/01/13/5ffeab3584b7d.png", "http://pic.zhengzai.tv/default/background.png", "http://img.zhengzai.tv/album/20171027/1509106243302.png");
 
     @Autowired
     AdamUserMapper userMapper;
@@ -61,10 +62,43 @@ public class StoneServerImpl {
     @Autowired
     FeignStoneIntegralClient stoneIntegralClient;
 
+    private static final String SQL_URL = "jdbc:mysql://zhengzai.mysql.polardb.rds.aliyuncs.com:3306/ln_scene";
+    private static final String SQL_USER = "java";
+    private static final String SQL_PWD = "pOOs9Y3wj#2^";
 
-    public boolean initScore(int page, int size) {
+    public boolean initScore(String uid) {
         try {
-
+            String sql = "select * from temp_score where uid = +uid";
+            Connection connection = DriverManager.getConnection(SQL_URL, SQL_USER, SQL_PWD);
+            //查询数据
+            PreparedStatement preparedStatement = connection.prepareStatement(sql);
+            ResultSetImpl row = (ResultSetImpl) preparedStatement.executeQuery();
+            row.close();
+            preparedStatement.close();
+            //数据迁移
+            while (row.next()) {
+                int score = row.getInt("price_cost");
+                int isLog = stoneScoreLogsMapper.selectCount(Wrappers.lambdaQuery(StoneScoreLogs.class).eq(StoneScoreLogs::getUid, uid).eq(StoneScoreLogs::getContent, "历史积分"));
+                if (isLog > 0) {
+                    return true;
+                }
+                //创建 用户积分数据
+                int isExists = stoneScoreUserMapper.selectCount(Wrappers.lambdaQuery(StoneScoreUser.class).eq(StoneScoreUser::getUid, uid));
+                if (isExists <= 0) {
+                    StoneScoreUser data = StoneScoreUser.getNew();
+                    data.setStatus(1);
+                    data.setScoreId(IDGenerator.nextTimeId2());
+                    data.setUid(uid);
+                    data.setCreatedAt(LocalDateTime.now());
+                    stoneScoreUserMapper.insert(data);
+                    StoneUserVo userTaskVo = StoneUserVo.getNew();
+                    userTaskVo.getTask();
+                    userTaskVo.setUid(uid);
+                    userTaskVo.setStatus(1);
+                    userCreate(userTaskVo);
+                }
+                stoneIntegralClient.in2111(uid, score, "历史积分");
+            }
         } catch (Exception e) {
             log.info("异常 : {} ", e);
             e.printStackTrace();
@@ -82,27 +116,4 @@ public class StoneServerImpl {
     private Object userCreate(StoneUserVo data) {
         return mongoTemplate.insert(data, StoneUserVo.class.getSimpleName());
     }
-
-    private String getUnionIdByPhone(String phone) {
-        log.info("mobile = " + phone);
-        String redisKey = SweetConstant.REDIS_KEY_SWEET_APPLET_USERS_PHONE.concat(phone);
-        Object obj = redisDataSourceUtil.getRedisSweetUtil().get(redisKey);
-        if (null == obj) {
-            return null;
-        }
-        SweetAppletUsersVo sweetAppletUsers = (SweetAppletUsersVo) obj;
-
-        String redisKey2 = SweetConstant.REDIS_KEY_SWEET_WECHAT_USERS_UNIONID.concat(sweetAppletUsers.getUnionId())
-                .concat(SweetConstant.REDIS_KEY_SWEET_WECHAT_USERS_TYPE).concat(String.valueOf(2));
-        Object obj2 = redisDataSourceUtil.getRedisSweetUtil().get(redisKey2);
-        if (null == obj2) {
-            return null;
-        } else {
-            return "true";
-        }
-    }
-
-    private Object logCreate(StoneScoreLogs data) {
-        return mongoTemplate.insert(data, StoneScoreLogs.class.getSimpleName());
-    }
 }