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

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/resources/templates/zhengzai/stone/integralList.html

@@ -47,7 +47,7 @@
         var dicCouponBusiType = [[${@dict.getType('zhengzai_coupon_busi_type')}]];
         var dicCouponBindType = [[${@dict.getType('zhengzai_coupon_bind_type')}]];
         var prefix = ctx + "stone/logs";
-        var prefix2 = ctx + "local";
+        // var prefix2 = ctx + "local";
 
         var viewMgtCouponFlag = [[${@permission.hasPermi('candy:coupon:mgt:detail')}]];
         var cancelMgtCouponFlag = [[${@permission.hasPermi('candy:coupon:mgt:cancel')}]];
@@ -150,7 +150,7 @@
             }
             // console.log(userIds.toString(), 'dataParam')
         	$.modal.confirm(tipMsg, function() {
-    			$.post('list/export', {uidString: userIds.toString()}, function(result) {
+    			$.post(prefix+'/list/export', {uidString: userIds.toString()}, function(result) {
                     if (result.code == web_status.SUCCESS) {
                         window.location.href = ctx + "common/download?fileName=" + encodeURI(result.msg) + "&delete=" + true;
                         $("button[name=refresh]").click();

liquidnet-bus-do/liquidnet-service-stone-do/src/main/resources/com/liquidnet/service/stone/mapper/StoneScoreUserMapper.xml

@@ -31,8 +31,11 @@
             <if test="mobile!=''">
                 AND mobile LIKE concat('%', #{mobile}, '%')
             </if>
-            <if test="status!=''">
-                AND status = #{status} OR status is null
+            <if test="status==1">
+                AND status = 1 OR status is null
+            </if>
+            <if test="status==2">
+                AND status = 2
             </if>
             <if test="uid!='-999'">
                 AND au.uid = #{uid}

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

@@ -9,6 +9,7 @@ import com.liquidnet.service.adam.constant.AdamRedisConst;
 import com.liquidnet.service.adam.dto.vo.AdamUserInfoVo;
 import com.liquidnet.service.adam.entity.AdamUser;
 import com.liquidnet.service.adam.mapper.AdamUserMapper;
+import com.liquidnet.service.kylin.dto.vo.mongo.KylinPerformanceVo;
 import com.liquidnet.service.kylin.mapper.*;
 import com.liquidnet.service.stone.constant.StoneConstant;
 import com.liquidnet.service.stone.entity.StoneScoreLogs;
@@ -19,6 +20,7 @@ import com.liquidnet.service.stone.vo.StoneUserVo;
 import com.liquidnet.service.sweet.constant.SweetConstant;
 import com.liquidnet.service.sweet.vo.SweetAppletUsersVo;
 import com.liquidnet.service.sweet.vo.SweetWechatUsersVo;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.data.domain.PageRequest;
@@ -37,6 +39,7 @@ import java.util.HashMap;
 import java.util.List;
 
 @Service
+@Slf4j
 public class DataImpl {
 
     @Value("${liquidnet.service.stone.url}")
@@ -63,6 +66,8 @@ public class DataImpl {
             //查询全部用户
             List<AdamUser> adamUserList = userMapper.selectList(Wrappers.lambdaQuery(AdamUser.class).eq(AdamUser::getState, 1)
                     .select(AdamUser::getUid).last("limit " + ((page - 1) * size) + "," + ((page) * size)));
+            log.info("AdamUserSize = " + adamUserList.size());
+            int finishCount = 0;
             for (AdamUser item : adamUserList) {
                 //获取用户相关信息
                 String uid = item.getUid();
@@ -133,8 +138,11 @@ public class DataImpl {
                     params.add("content", "历史积分");
                     HttpUtil.post(stoneUrl + "/user/logs/in2111", params);
                 }
+                finishCount += 1;
             }
+            log.info("完成次数 = " + finishCount);
         } catch (Exception e) {
+            log.info("异常 : {} ", e);
             e.printStackTrace();
             return false;
         }
@@ -218,11 +226,12 @@ public class DataImpl {
 
     public boolean initLogs(String uid) {
         List<StoneScoreLogs> list = stoneScoreLogsMapper.selectList(Wrappers.lambdaQuery(StoneScoreLogs.class).eq(StoneScoreLogs::getUid, uid));
-        mongoTemplate.remove(Query.query(Criteria.where("uid").is(uid)));
+        mongoTemplate.remove(Query.query(Criteria.where("uid").is(uid)), StoneScoreLogs.class, StoneScoreLogs.class.getSimpleName());
         String redisKey = StoneConstant.LOGS_LIST.concat(uid);
         redisDataSourceUtil.getRedisStoneUtil().del(redisKey);
+        int scoreAll = 0;
+        int scoreUse = 0;
         for (StoneScoreLogs item : list) {
-            //初始化 redis
             //初始化 mongo
             StoneScoreLogs logs = new StoneScoreLogs();
             logs.setLogsId(item.getLogsId());
@@ -231,9 +240,20 @@ public class DataImpl {
             logs.setUid(uid);
             logs.setScore(item.getScore());
             logs.setCreatedAt(item.getCreatedAt());
+            if (item.getScore().intValue() < 0) {
+                scoreUse += item.getScore().negate().intValue();
+            } else {
+                scoreAll += item.getScore().intValue();
+            }
+            logCreate(logs);
         }
+        //初始化 redis
         List<StoneScoreLogs> getLogsList = (List<StoneScoreLogs>) logList(uid, 1, 40).get("data");
-        redisDataSourceUtil.getRedisStoneUtil().set(redisKey,getLogsList);
+        redisDataSourceUtil.getRedisStoneUtil().set(redisKey, getLogsList);
+        String restKey = StoneConstant.USER.concat(uid).concat(StoneConstant.SURPLUS_SCORE);
+        String useKey = StoneConstant.USER.concat(uid).concat(StoneConstant.USE_SCORE);
+        redisDataSourceUtil.getRedisStoneUtil().set(useKey, scoreUse);
+        redisDataSourceUtil.getRedisStoneUtil().set(restKey, scoreAll - scoreUse);
         return true;
     }
 
@@ -265,8 +285,12 @@ public class DataImpl {
         }
     }
 
+    public Object logCreate(StoneScoreLogs data) {
+        return mongoTemplate.insert(data, StoneScoreLogs.class.getSimpleName());
+    }
+
     public HashMap<String, Object> logList(String uid, int page, int size) {
-        LocalDateTime now  = LocalDateTime.now();
+        LocalDateTime now = LocalDateTime.now();
         HashMap<String, Object> info = CollectionUtil.mapStringObject();
         // 排序 分页
         Pageable pageable = PageRequest.of(page - 1, size, Sort.by(Sort.Direction.DESC, "createdAt"));