Merge remote-tracking branch 'origin/master'

admin

2019-01-29 a6b1160da8cbb78a664a6dd7496bee648c7c148c

 fanli/src/main/java/com/yeshi/fanli/controller/client/RecommendController.java

@@ -94,6 +94,7 @@
import com.yeshi.fanli.service.inter.lable.QualityGoodsService;

import com.yeshi.fanli.service.inter.monitor.MonitorService;

import com.yeshi.fanli.service.inter.order.OrderService;

import com.yeshi.fanli.service.inter.order.ShareGoodsActivityOrderService;

import com.yeshi.fanli.service.inter.taobao.TaoBaoGoodsUpdateService;

import com.yeshi.fanli.service.inter.taobao.TaoBaoUnionConfigService;

import com.yeshi.fanli.service.inter.user.ShamUserService;

@@ -229,6 +230,9 @@


   @Resource

   private UserCustomSettingsService userCustomSettingsService;



   @Resource

   private ShareGoodsActivityOrderService shareGoodsActivityOrderService;



   @RequestMapping(value = "getrecommendsection")

   public void getRecommendSection(AcceptData acceptData, int index, PrintWriter out) {

@@ -2044,10 +2048,13 @@


      JSONObject shareActivity = new JSONObject();

      shareActivity.put("moneyDesc", "春节狂欢奖金:¥" + TaoBaoUtil.getGoodsHongBaoMoney(tb,

            new BigDecimal(configService.get("share_activity_proportion")).divide(new BigDecimal(100))));

            new BigDecimal(hongBaoManageService.get("share_activity_proportion"))));

      shareActivity.put("ruleDescPicture", "http://img.flqapp.com/resource/share_activity_img.png");



      data.put("shareActivity", shareActivity);

      if (!StringUtil.isNullOrEmpty(uid)

            && shareGoodsActivityOrderService.countShareGoodsActivityOrder(Long.parseLong(uid)) > 0) {

      } else

         data.put("shareActivity", shareActivity);



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