奖励券使用区分订单下单三方日期

yujian

2019-08-28 d88c167fc5973a2c15ff1539e4cdab36e4a7842c

 fanli/src/main/java/com/yeshi/fanli/controller/client/v1/UserInfoController.java

@@ -54,6 +54,7 @@
import com.yeshi.fanli.entity.bus.user.UserInfo;

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

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

import com.yeshi.fanli.entity.bus.user.UserInfoModifyRecord.ModifyTypeEnum;

import com.yeshi.fanli.entity.common.AdminUser;

import com.yeshi.fanli.entity.common.Config;

import com.yeshi.fanli.entity.goods.CollectionGoodsV2;

@@ -96,6 +97,7 @@
import com.yeshi.fanli.service.inter.user.UserActiveLogService;

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

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

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

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

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

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

@@ -215,6 +217,8 @@
   @Resource

   private UserTaoLiJinDetailService userTaoLiJinDetailService;

   

   @Resource

   private UserInfoModifyRecordService userInfoModifyRecordService;

   



   private static final String PASSWORD_MAX_ERROR = "password_max_error";

@@ -1080,7 +1084,7 @@
    * @param type

    * @param out

    */

   @RequestSerializableByKey(key = "uid")

   @RequestSerializableByKey(key = "#uid")

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

   public void extractMoneyNew(AcceptData acceptData, long uid, BigDecimal money, String vcode,

         HttpServletRequest request, int type, PrintWriter out) {

@@ -2222,7 +2226,7 @@
         userInfoService.uploadPortrait(file, uid);



         out.print(JsonUtil.loadTrueResult("保存成功"));



			
      } catch (UserInfoException e) {

         out.print(JsonUtil.loadFalseResult(e.getMsg()));

         try {

@@ -2275,6 +2279,8 @@
               return;

            }

            userInfoService.saveUserInfo(nickName, uid);

				
            userInfoModifyRecordService.addModifyRecord(uid, ModifyTypeEnum.nickName, nickName);

         }

         

         // 修改微信号

@@ -2290,6 +2296,8 @@
               extra.setId(userInfoExtra.getId());

               extra.setWeiXin(weiXin);

               userInfoExtraService.saveUserInfoExtra(extra);

					
               userInfoModifyRecordService.addModifyRecord(uid, ModifyTypeEnum.setWeiXinNum, weiXin);

            }

         }

         

@@ -2301,6 +2309,8 @@
               extra.setId(userInfoExtra.getId());

               extra.setSex(sex);

               userInfoExtraService.saveUserInfoExtra(extra);

					
               userInfoModifyRecordService.addModifyRecord(uid, ModifyTypeEnum.gender, sex + "");

            }

         }

         out.print(JsonUtil.loadTrueResult("保存成功"));