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

yujian

2019-11-15 dbc8f0b2058d809e6dad0ada92d391109cbb4f57

 fanli/src/main/java/com/yeshi/fanli/controller/TestController.java

@@ -42,6 +42,7 @@
import com.yeshi.fanli.dto.jd.JDSearchResult;

import com.yeshi.fanli.entity.bus.activity.ActivityShareResult;

import com.yeshi.fanli.entity.bus.activity.RecommendActivity;

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

import com.yeshi.fanli.entity.dynamic.DynamicInfo;

import com.yeshi.fanli.entity.dynamic.GoodsPicture;

import com.yeshi.fanli.entity.dynamic.InviteMaterial;

@@ -60,6 +61,7 @@
import com.yeshi.fanli.service.inter.dynamic.DynamicInfoService;

import com.yeshi.fanli.service.inter.dynamic.InviteMaterialService;

import com.yeshi.fanli.service.inter.goods.TaoBaoGoodsBriefService;

import com.yeshi.fanli.service.inter.money.UserMoneyExtraService;

import com.yeshi.fanli.service.inter.order.config.HongBaoManageService;

import com.yeshi.fanli.service.inter.user.integral.IntegralGetService;

import com.yeshi.fanli.tag.PageEntity;

@@ -126,6 +128,9 @@


   @Resource

   private IntegralGetService integralGetService;

	
   @Resource

   private UserMoneyExtraService userMoneyExtraService;



   @RequestMapping(value = "testimg")

   public void testImg(HttpServletRequest request, PrintWriter out) {

@@ -641,4 +646,16 @@
      }

   }



   @RequestMapping("taoLiJinExchange")

   public void taoLiJinExchange(PrintWriter out) {

      try {

         for (int i = 1; i <= 100; i ++) {

            userMoneyExtraService.taoLiJinExchange(i, 200);

         }

         JsonUtil.printMode(out, null, JsonUtil.loadTrueResult("操作成功"));

      } catch (Exception e) {

         JsonUtil.printMode(out, null, JsonUtil.loadFalseResult("操作失败"));

         e.printStackTrace();

      }

   }

}