Merge remote-tracking branch 'origin/base-modify' into base-modify

ace-modules/ace-admin-api/src/main/java/com/github/wxiaoqi/security/admin/entity/AppUserLogin.java

@@ -35,5 +35,39 @@ public class AppUserLogin {
 	private String idNumber;
 	@Column(name = "certification_status")
 	private Integer certificationStatus;
+	/**
+	 * 创建ip
+	 */
+	@Column(name = "crt_host")
+	private  String crtHost;
+	/**
+	 * 更新ip
+	 */
+	@Column(name = "upd_host")
+	private  String updHost;
+
+	/**
+	 * 最后登录ip
+	 */
+	@Column(name = "last_host")
+	private String lastHost;
+
+	/**
+	 * 最后登录时间
+	 */
+	@Column(name = "last_time")
+	private Long lastTime;
+
+	/**
+	 * 省份编号
+	 */
+	@Column(name = "province_code")
+	private Integer provinceCode;
+
+	/**
+	 * 市编号
+	 */
+	@Column(name = "city_code")
+	private Integer cityCode;
 
 }

ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/biz/AppUserLoginBiz.java

@@ -17,6 +17,7 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import tk.mybatis.mapper.entity.Example;
 
+import java.time.Instant;
 import java.util.Arrays;
 import java.util.List;
 import java.util.Map;
@@ -149,4 +150,13 @@ public class AppUserLoginBiz extends BaseBiz<AppUserLoginMapper, AppUserLogin> {
     public AppUserLogin getUserById(Integer userId){
         return mapper.selectByPrimaryKey(userId);
     }
+
+    /**
+     * 登录信息更改
+     * @param userId
+     * @param ip
+     */
+    public void updateLoginInfo(Integer userId,String ip){
+        mapper.updateLoginUserInfoById(userId,ip, Instant.now().toEpochMilli());
+    }
 }

ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/biz/BaseUserMemberBiz.java

@@ -62,6 +62,16 @@ public class BaseUserMemberBiz extends BaseBiz<BaseUserMemberMapper,BaseUserMemb
             baseUserMember.setBuyCount(1);
             insertSelective(baseUserMember);
         }else {
+            Integer discount=userMemberVo.getDiscount()==null?0:userMemberVo.getDiscount();
+            Integer discount1=baseUserMember.getDiscount()==null?0:baseUserMember.getDiscount();
+            if(discount<discount1){
+                baseUserMember.setDiscount(discount);
+            }
+            Integer level=userMemberVo.getMemberLevel()==null?0:userMemberVo.getMemberLevel();
+            Integer level1=baseUserMember.getMemberLevel()==null?0:baseUserMember.getMemberLevel();
+            if(level>level1){
+                baseUserMember.setMemberLevel(level);
+            }
             baseUserMember.setId(userMemberVo.getId());
             totalNumber+=userMemberVo.getTotalNumber()==null?0:userMemberVo.getTotalNumber();
             freeDays+=userMemberVo.getRentFreeDays()==null?0:userMemberVo.getRentFreeDays();

ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/config/WebConfiguration.java

@@ -6,6 +6,7 @@ import com.github.wxiaoqi.security.common.handler.GlobalExceptionHandler;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Primary;
+import org.springframework.web.client.RestTemplate;
 import org.springframework.web.servlet.config.annotation.InterceptorRegistry;
 import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
 
@@ -64,4 +65,8 @@ public class WebConfiguration implements WebMvcConfigurer {
         return list;
     }
 
+    @Bean
+    public RestTemplate restTemplate(){
+        return new RestTemplate();
+    }
 }

ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/mapper/AppUserLoginMapper.java

@@ -2,9 +2,19 @@ package com.github.wxiaoqi.security.admin.mapper;
 
 import com.github.wxiaoqi.security.admin.entity.AppUserLogin;
 import com.github.wxiaoqi.security.admin.entity.AppUserManage;
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Update;
 import tk.mybatis.mapper.common.Mapper;
 
 public interface AppUserLoginMapper extends Mapper<AppUserLogin> {
 
 
+    /**
+     * 登录信息更改 ip 登录时间
+     * @param userId
+     * @param ip
+     * @param lastTime
+     */
+    @Update("update `app_user_login` set `last_host`=#{ip},`last_time`=#{lastTime} where `id`=#{userId}")
+    void updateLoginUserInfoById(@Param("userId") Integer userId,@Param("ip") String ip, @Param("lastTime") long lastTime);
 }
\ No newline at end of file

ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/rpc/AppUserRest.java

@@ -196,4 +196,5 @@ public class AppUserRest {
         return appPermissionService.appletRegistry(username,headimgurl,nickname);
     }
 
+
 }

ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/rpc/service/AppPermissionService.java

 package com.github.wxiaoqi.security.admin.rpc.service;
 
+import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.github.wxiaoqi.security.admin.biz.AppUserBiz;
 import com.github.wxiaoqi.security.admin.biz.AppUserDetailBiz;
@@ -13,6 +14,7 @@ import com.github.wxiaoqi.security.api.vo.user.AppUserInfo;
 import com.github.wxiaoqi.security.common.msg.BaseResponse;
 import com.github.wxiaoqi.security.common.msg.ObjectRestResponse;
 import com.github.wxiaoqi.security.common.util.EmojiFilter;
+import com.github.wxiaoqi.security.common.util.EntityUtils;
 import com.github.wxiaoqi.security.common.util.VerificationUtils;
 import com.github.wxiaoqi.security.common.util.process.ResultCode;
 import com.github.wxiaoqi.security.common.util.process.SystemConfig;
@@ -27,6 +29,11 @@ import org.springframework.data.redis.core.RedisTemplate;
 import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
+import org.springframework.web.client.RestTemplate;
+import org.springframework.web.context.request.RequestAttributes;
+import org.springframework.web.context.request.RequestContextHolder;
+import org.springframework.web.context.request.ServletRequestAttributes;
+
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
@@ -63,6 +70,11 @@ public class AppPermissionService {
     @Autowired
     private AppUserLoginBiz appUserLoginBiz;
 
+    @Autowired
+    private RestTemplate restTemplate;
+
+    private static final String BASE_IP_PARSING_URL="http://ip.taobao.com/service/getIpInfo.php?ip=";
+
 
     public AppUserInfo validate(String username, String password) {
         AppUserInfo info = new AppUserInfo();
@@ -193,6 +205,8 @@ public class AppPermissionService {
         try {
             Long now = System.currentTimeMillis() / 1000;
             AppUserLogin appUserLogin = new AppUserLogin();
+             //主要是ip地址
+            EntityUtils.setCreatAndUpdatInfo(appUserLogin);
             appUserLogin.setUsername(username);
             appUserLogin.setPassword(password);
             appUserLogin.setIsdel(0);
@@ -285,6 +299,9 @@ public class AppPermissionService {
             data.put("username", StringUtils.isNotEmpty(username)?username:userLoign.getUsername());
             data.put("userId", userid);
 
+            //更新登录时间 和 ip
+            EntityUtils.setCreatAndUpdatInfo(userLoign);
+            appUserLoginBiz.updateLoginInfo(userid,userLoign.getCrtHost());
         }
         return data;
     }
@@ -693,6 +710,8 @@ public class AppPermissionService {
         try {
             Long now = System.currentTimeMillis() / 1000;
             AppUserLogin appUserLogin = new AppUserLogin();
+            //主要是ip地址
+            EntityUtils.setCreatAndUpdatInfo(appUserLogin);
             appUserLogin.setUsername(username);
             appUserLogin.setPassword(password);
             appUserLogin.setIsdel(0);
@@ -773,4 +792,19 @@ public class AppPermissionService {
             return JsonResultUtil.createFailedResult(ResultCode.EXCEPTION_CODE, "出现异常");
         }
     }
+    public void  setCreateIPInfo(AppUserLogin appUserLogin){
+        String crtHost = appUserLogin.getCrtHost();
+        String ipinfo = restTemplate.getForObject(String.format("%s%s", BASE_IP_PARSING_URL, crtHost), String.class);
+        String base_data = JSONObject.parseObject(ipinfo).getString(IPCommon.BASE_DATA);
+        JSONObject ipJsonObject = JSONObject.parseObject(base_data);
+        Integer provinceCode = ipJsonObject.getInteger(IPCommon.PROVINCE_CODE);
+        Integer cityCode = ipJsonObject.getInteger(IPCommon.CITY_CODE);
+        appUserLogin.setProvinceCode(provinceCode);
+        appUserLogin.setCityCode(cityCode);
+    }
+    static class IPCommon{
+        public static final String BASE_DATA="data";
+        public static final String PROVINCE_CODE="region_id";
+        public static final String CITY_CODE="city_id";
+    }
 }

xx-tour/xx-tour-server/src/main/java/com/xxfc/platform/tour/biz/TourGoodDetailBiz.java

@@ -75,6 +75,9 @@ public class TourGoodDetailBiz extends BaseBiz<TourGoodMapper, TourGood> {
                     }
 
                 }
+                //获取banner
+                List<GoodBannerDTO> bannerList = bannerMapper.getBannerList(id);
+                detailVo.setBannerDTOS(bannerList);
                 //获取出行时间
                 List<TourDepartTimeVo> timelist = priceMapper.getAllByGoodId(id);
                 detailVo.setTourDepartTimeVo(timelist);