Merge branch 'master-2.0-pre-rename' into div

admin

2019-09-11 e6670f2a6513c0f1d6e4f2d867d1010970014849

 fanli/src/main/java/com/yeshi/fanli/service/impl/integral/IntegralTaskRecordServiceImpl.java

@@ -431,9 +431,7 @@
    * @param beizu

    */

   private void firstOrderReward(Long uid, Long originUid, Integer addGoldCoin, String level, String beizu) {

      if (uid == null)

           return;

      String uniqueKey = uid.toString();

      String uniqueKey = "firstOrder-"+ uid.toString();

      if (originUid != null) 

         uniqueKey = uniqueKey + "-" + originUid;