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

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

 package com.github.wxiaoqi.security.admin.entity;
 
-import java.io.Serializable;
-import java.math.BigDecimal;
-import java.util.Date;
-import javax.persistence.*;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import javax.persistence.Column;
+import javax.persistence.GeneratedValue;
+import javax.persistence.Id;
+import javax.persistence.Table;
+import java.io.Serializable;
+import java.math.BigDecimal;
+
 
 /**
  * 会员等级表
@@ -75,6 +78,9 @@ public class BaseUserMemberLevel implements Serializable {
 	@Column(name = "number")
 	@ApiModelProperty(value = "赠送免费天数")
 	private Integer number;
-	
+
+	@Column(name = "big_icon")
+	@ApiModelProperty(value = "大图标")
+	private String bigIcon;
 
 }

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

@@ -4,10 +4,8 @@ import com.github.wxiaoqi.security.admin.dto.BaseUserMemberExportDTO;
 import com.github.wxiaoqi.security.admin.dto.BaseUserMemberExportDataFindDTO;
 import com.github.wxiaoqi.security.admin.dto.UserMemberDTO;
 import com.github.wxiaoqi.security.admin.dto.UserMemberSaveDTO;
-import com.github.wxiaoqi.security.admin.entity.BaseUserMember;
 import com.github.wxiaoqi.security.admin.entity.BaseUserMemberExport;
 import com.github.wxiaoqi.security.admin.entity.BaseUserMemberLevel;
-import com.github.wxiaoqi.security.admin.entity.UserMemberLevel;
 import com.github.wxiaoqi.security.admin.mapper.BaseUserMemberExportMapper;
 import com.github.wxiaoqi.security.admin.vo.BaseUserMemberExportVo;
 import com.github.wxiaoqi.security.common.biz.BaseBiz;
@@ -121,9 +119,9 @@ public class BaseUserMemberExportBiz extends BaseBiz<BaseUserMemberExportMapper,
             List<String[]> subResultDate = userMemberData.subList(startIndex,endIndex);
             threadPoolTaskExecutor.execute(()->{
                 wrapperData(subResultDate, userId, userName, baseUserMemberExports, levelAndbaseUserMemberMap, phoneAndUserIdMap, leaveNameAndLeaveEntry, memberLevel, discount, counter, numAndUserMemberMap);
-                 latch.countDown();
-                });
-         }
+                latch.countDown();
+            });
+        }
         try {
             latch.await();
         } catch (InterruptedException e) {

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

@@ -2,9 +2,9 @@ package com.github.wxiaoqi.security.admin.biz;
 
 import com.ace.cache.annotation.Cache;
 import com.github.wxiaoqi.security.admin.entity.BaseUserMemberLevel;
-import com.github.wxiaoqi.security.admin.entity.UserMemberLevel;
 import com.github.wxiaoqi.security.admin.mapper.BaseUserMemberLevelMapper;
 import com.github.wxiaoqi.security.common.biz.BaseBiz;
+import com.github.wxiaoqi.security.common.exception.BaseException;
 import org.apache.commons.collections.CollectionUtils;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Propagation;
@@ -51,4 +51,11 @@ public class UserMemberLevelBiz extends BaseBiz<BaseUserMemberLevelMapper,BaseUs
        }
        return levelAndDiscountMap;
     }
+
+    public void updateMemberBaseInfo(BaseUserMemberLevel baseUserMemberLevel) {
+        int affectRows = mapper.updateByPrimaryKeySelective(baseUserMemberLevel);
+        if (affectRows==0){
+            throw new BaseException("更新会员等级失败");
+        }
+    }
 }

ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/rest/MemberLevelController.java

@@ -74,4 +74,8 @@ public class MemberLevelController extends BaseController<UserMemberLevelBiz, Ba
         return ObjectRestResponse.succ();
     }
 
+    @PutMapping("/update")
+    public void updateMemberBaseInfo(@RequestBody BaseUserMemberLevel baseUserMemberLevel){
+        getBaseBiz().updateMemberBaseInfo(baseUserMemberLevel);
+    }
 }

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

@@ -254,5 +254,19 @@ public class AppUserRest {
         return ObjectRestResponse.succ();
 }
 
+    @ApiModelProperty("检查手机号验证码")
+    @GetMapping("/unauth/checkMobilecode")
+    public ObjectRestResponse checkMobilecode(@RequestParam(value = "phone") String phone,
+                                    @RequestParam(value = "mobilecode") String mobilecode){
+        if (StringUtils.isBlank(phone)||StringUtils.isBlank(mobilecode)){
+            return ObjectRestResponse.createFailedResult(ResultCode.NULL_CODE, "参数为空");
+        }
+        String redisKey=appPermissionService.checkCodeByUsername(phone,mobilecode);
+        if (StringUtils.isBlank(redisKey)){
+            return ObjectRestResponse.createFailedResult(ResultCode.NOTEXIST_CODE, "验证码错误");
+        }
+        return ObjectRestResponse.succ();
+    }
+
 
 }

xx-im/xx-im-server/src/main/java/com/xxfc/platform/im/biz/MsgBiz.java

@@ -324,11 +324,11 @@ public class MsgBiz {
 
     public Integer getNumber() {
         Integer number = 0;
-            Dictionary dictionary =  thirdFeign.findDictionaryByTypeAndCode(IM_TYPE, DictionaryKey.MSG_LIMIT_NUMBER);
-            if (dictionary != null && StringUtils.isNotBlank(dictionary.getDetail())) {
-                log.info("查询IM限制数为字典表的结果为： dictionary = {}", dictionary.toString());
-                number = Integer.parseInt(dictionary.getDetail());
-            }
+        Dictionary dictionary =  thirdFeign.findDictionaryByTypeAndCode(IM_TYPE, DictionaryKey.MSG_LIMIT_NUMBER);
+        if (dictionary != null && StringUtils.isNotBlank(dictionary.getDetail())) {
+            log.info("查询IM限制数为字典表的结果为： dictionary = {}", dictionary.toString());
+            number = Integer.parseInt(dictionary.getDetail());
+        }
         log.info("IM消息数限制为： number = {}", number);
         return number;
     }

xx-order/xx-order-api/src/main/java/com/xxfc/platform/order/entity/DailyVehicleOrderStatistics.java

@@ -56,6 +56,7 @@ public class DailyVehicleOrderStatistics extends DailyOrderStatistics {
     @Column(name = "return_gmv")
     private BigDecimal returnGmv;
 
+
     /**
      *  违约总额
      */
@@ -68,4 +69,5 @@ public class DailyVehicleOrderStatistics extends DailyOrderStatistics {
     @Column(name = "total_expenditure")
     private BigDecimal totalExpenditure;
 
+
 }

xx-summit/xx-summit-api/src/main/java/com/xxfc/platform/summit/util/HttpRequestUtil.java

@@ -34,7 +34,7 @@ public class HttpRequestUtil {
                     str = EntityUtils.toString(result.getEntity(),"UTF-8");
                 } catch (Exception e) {
                     log.error("post请求提交失败:" + url, e);
-                }
+                 }
             }
         } catch (IOException e) {
             log.error("post请求提交失败:" + url, e);

xx-summit/xx-summit-server/src/main/java/com/xxfc/platform/summit/biz/ActivityBiz.java

@@ -13,8 +13,6 @@ import org.springframework.transaction.annotation.Transactional;
 import org.springframework.transaction.interceptor.TransactionAspectSupport;
 import tk.mybatis.mapper.entity.Example;
 
-import javax.xml.crypto.Data;
-import java.util.Date;
 import java.util.List;
 
 /**

xx-summit/xx-summit-server/src/main/java/com/xxfc/platform/summit/config/WebConfiguration.java

@@ -2,7 +2,7 @@ package com.xxfc.platform.summit.config;
 
 
 import com.github.wxiaoqi.security.common.handler.GlobalExceptionHandler;
-import com.xxfc.platform.summit.interceptor.WeChatH5LoginInterceoptor;
+import com.xxfc.platform.summit.interceptor.WeChatH5LoginInterceptor;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Primary;
@@ -27,8 +27,8 @@ public class WebConfiguration implements WebMvcConfigurer {
     }
 
     @Bean
-    WeChatH5LoginInterceoptor  getWeChatH5LoginRestInterceptor() {
-        return new WeChatH5LoginInterceoptor();
+    WeChatH5LoginInterceptor getWeChatH5LoginRestInterceptor() {
+        return new WeChatH5LoginInterceptor();
     }
 
     /**
@@ -38,7 +38,7 @@ public class WebConfiguration implements WebMvcConfigurer {
     private ArrayList<String> getIncludePathPatterns() {
         ArrayList<String> list = new ArrayList<>();
         String[] urls = {
-                "/activity/**"
+                "/auth/activity/**"
         };
         Collections.addAll(list, urls);
         return list;

xx-summit/xx-summit-server/src/main/java/com/xxfc/platform/summit/interceptor/WeChatH5LoginInterceoptor.java → xx-summit/xx-summit-server/src/main/java/com/xxfc/platform/summit/interceptor/WeChatH5LoginInterceptor.java

@@ -29,7 +29,7 @@ import java.util.concurrent.TimeUnit;
  *
  */
 @Slf4j
-public class WeChatH5LoginInterceoptor extends HandlerInterceptorAdapter {
+public class WeChatH5LoginInterceptor extends HandlerInterceptorAdapter {
 
 
 	@Autowired

xx-vehicle/xx-vehicle-server/src/main/java/com/xxfc/platform/vehicle/biz/VehicleModelBiz.java

@@ -55,7 +55,6 @@ public class VehicleModelBiz extends BaseBiz<VehicleModelMapper, VehicleModel> {
         try {
             PageDataVO<VehicleModelVo> mPageDataVO = PageDataVO.pageInfo(vmqc.getPage(),
                     vmqc.getLimit(), () -> mapper.findVehicleModelPage(vmqc));
-
             return ObjectRestResponse.succ(mPageDataVO);
         } catch (Exception e) {
             e.printStackTrace();

xx-vehicle/xx-vehicle-server/src/main/java/com/xxfc/platform/vehicle/biz/VehicleUserReserveBiz.java

@@ -10,9 +10,13 @@ import com.xxfc.platform.vehicle.mapper.VehicleUserReserveMapper;
 import com.xxfc.platform.vehicle.pojo.dto.VehicleUserReserveDTO;
 import com.xxfc.platform.vehicle.pojo.vo.VehicleUserReserveVo;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.collections.CollectionUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.BeanUtils;
 import org.springframework.stereotype.Service;
 
+import java.util.Collections;
+import java.util.List;
 
 
 @Service
@@ -30,7 +34,24 @@ public class VehicleUserReserveBiz extends BaseBiz<VehicleUserReserveMapper, Veh
         if (reserveDTO.getLimit()!=null&&reserveDTO.getLimit()>0){
             limit=reserveDTO.getLimit();
         }
-        return  ObjectRestResponse.succ(PageDataVO.pageInfo(page, limit, ()->mapper.getList(reserveDTO,userId)));
+
+        PageDataVO<VehicleUserReserveVo> dataVO = PageDataVO.pageInfo(page, limit, () -> mapper.getList(reserveDTO, userId));
+        if (CollectionUtils.isEmpty(dataVO.getData())){
+             dataVO.setData(Collections.EMPTY_LIST);
+             dataVO.setPageNum(reserveDTO.getPage());
+             dataVO.setPageSize(reserveDTO.getLimit());
+            return ObjectRestResponse.succ(dataVO);
+        }
+        List<VehicleUserReserveVo> data = dataVO.getData();
+        for (VehicleUserReserveVo userReserveVo : data) {
+            String vehiclePic = userReserveVo.getVehiclePic();
+            if (StringUtils.isNotEmpty(vehiclePic)){
+                String[] imgs = vehiclePic.split(",");
+                userReserveVo.setVehiclePic(imgs[0]);
+            }
+        }
+        dataVO.setData(data);
+        return  ObjectRestResponse.succ(dataVO);
     }
 
     //新增预定

xx-vehicle/xx-vehicle-server/src/main/resources/mapper/VehicleUserReserveMapper.xml

@@ -17,16 +17,16 @@
         r.addr_city AS addrCity,
         r.city_name AS cityName,
         r.company_id AS companyId,
-        CONCAT(bct.province_name,bct.city_name,bct.town_name,bct.addr_detail) AS `companyAddress`,
+        CONCAT(IFNULL(bct.province_name," "),IFNULL(bct.city_name," "),IFNULL(bct.town_name," "),IFNULL(bct.addr_detail," ")) AS `companyAddress`,
         r.arrival_companyId AS arrivalCompanyId,
-        CONCAT(bcr.province_name,bcr.city_name,bcr.town_name,bcr.addr_detail) AS `arrivalcompanyAddress`,
+        CONCAT(IFNULL(bcr.province_name," "),IFNULL(bcr.city_name," "),IFNULL(bcr.town_name," "),IFNULL(bcr.addr_detail," ")) AS `arrivalcompanyAddress`,
         bct.NAME AS `companyName`,
         bcr.NAME AS `arrivalCompanyName`,
         r.crt_time AS crtTime,
         r.upd_time AS updTime,
         r.`status`,
         m.`name` AS modelName,
-        m.`cover_pic` AS `vehiclePic`
+        m.`picture` AS `vehiclePic`
         FROM
         vehicle_user_reserve r
         LEFT JOIN vehicle_model m ON r.mode_id = m.id