Merge branch 'div' of ssh://193.112.35.168:29418/fanli-server into div

yujian

2019-08-19 59ce2452667a57caf547a753913cf5e573c8cc39

 fanli/src/main/java/com/yeshi/fanli/controller/client/v2/IntegralControllerV2.java

@@ -202,16 +202,16 @@
         return;

      }

      

      Set<Long> gidList = gson.fromJson(gids, new TypeToken<HashSet<Long>>() {}.getType());



      try {

         Integer goldCoin = integralTaskRecordService.receiveGoldCoin(uid, idList);

         

         Set<Long> gidList = gson.fromJson(gids, new TypeToken<HashSet<Long>>() {}.getType());

         List<IntegralTaskRecord> list = null;

         if (gidList != null && gidList.size() > 0) {

            list = integralTaskRecordService.listNotReceived(5 - gidList.size(), uid);

            list = integralTaskRecordService.listNotReceivedExcludeId(5 - gidList.size(), uid, gidList);

         } else {

            list = integralTaskRecordService.listNotReceived(5, uid);

            list = integralTaskRecordService.listNotReceivedExcludeId(5, uid, null);

         }

         

         if (list == null) {

@@ -419,15 +419,15 @@
         

         case "recommendSearch":

            notify.put("name", "完成一次智能搜索");

            notify.put("score", "+20");

            notify.put("score", "+20金币");

            break;

         case "scanGoods":

            notify.put("name", "完成一次商品浏览");

            notify.put("score", "+10");

            notify.put("score", "+100金币");

            break;

         case "scanTBCart":

            notify.put("name", "完成一次购物车浏览");

            notify.put("score", "+30");

            notify.put("score", "+300金币");

            break;

         }