Merge remote-tracking branch 'origin/div' into div

admin

2019-09-20 db88b87df461820152d68d3d55a28f30c2da83e6

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

@@ -58,6 +58,7 @@
import com.yeshi.fanli.util.Constant;

import com.yeshi.fanli.util.StringUtil;

import com.yeshi.fanli.util.TimeUtil;

import com.yeshi.fanli.util.annotation.RequestSerializableByKey;

import com.yeshi.fanli.vo.integral.DailySignVO;

import com.yeshi.fanli.vo.integral.ExchangeTipVO;

import com.yeshi.fanli.vo.integral.IntegralDetailVO;

@@ -312,6 +313,7 @@
    *            // 未领取id

    * @param out

    */

   @RequestSerializableByKey(key = "'receiveGoldCoin-'+#uid")

   @RequestMapping(value = "receiveGoldCoin", method = RequestMethod.POST)

   public void receiveGoldCoin(AcceptData acceptData, Long uid, Integer type, String ids, String gids,

         PrintWriter out) {

@@ -421,6 +423,7 @@
    * @param id

    * @param out

    */

   @RequestSerializableByKey(key = "'integralexchange-'+#uid")

   @RequestMapping(value = "exchange", method = RequestMethod.POST)

   public void exchange(AcceptData acceptData, Long uid, Long id, PrintWriter out) {

      try {

@@ -472,6 +475,7 @@
    * @param id

    * @param out

    */

   @RequestSerializableByKey(key = "'exchangeInviteCode-'+#uid")

   @RequestMapping(value = "exchangeInviteCode", method = RequestMethod.POST)

   public void exchangeInviteCode(AcceptData acceptData, Long uid, Long id, PrintWriter out) {

      try {