团队补贴按照下单时间兼容

admin

2020-03-20 f0d06601a6be8c09ef5e8e7e76666cb1e8ef72a5

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

@@ -33,6 +33,7 @@
import com.yeshi.fanli.entity.bus.tlj.UserTaoLiJinDetail.TaoLiJinDetailTypeEnum;

import com.yeshi.fanli.entity.bus.tlj.UserTaoLiJinNewbies;

import com.yeshi.fanli.entity.bus.user.UserMoneyExtra;

import com.yeshi.fanli.entity.system.ConfigKeyEnum;

import com.yeshi.fanli.entity.taobao.ShareHotGoods;

import com.yeshi.fanli.entity.taobao.TLJBuyGoods;

import com.yeshi.fanli.entity.taobao.TLJFreeBuyGoods;

@@ -622,7 +623,7 @@
         else

            data.put("topPicture", "");



         data.put("ruleUrl", configService.get("zigoulijian_rule"));

         data.put("ruleUrl", configService.get(ConfigKeyEnum.zigoulijianRule.getKey()));

      }

      out.print(JsonUtil.loadTrueResult(data));

   }

@@ -709,7 +710,7 @@
         else

            data.put("topPicture", "");



         data.put("ruleUrl", configService.get("zigoulijian_rule"));

         data.put("ruleUrl", configService.get(ConfigKeyEnum.zigoulijianRule.getKey()));

      }

      out.print(JsonUtil.loadTrueResult(data));

   }

@@ -843,7 +844,7 @@
         }

         

         String rule = configTaoLiJinService.getValueByKey("new_user_free_buy_list_rule");

         rule = rule.replace("{链接}", configService.get("customer_service_link"));

         rule = rule.replace("{链接}", configService.get(ConfigKeyEnum.customerServiceLink.getKey()));

         

         data.put("state", state);

         data.put("balance","新人红包：" + balance.setScale(2) + "元");