Merge branch 'dev' of http://113.105.137.151:22280/youjj/cloud-platform into dev

ace-modules/ace-admin-api/src/main/java/com/github/wxiaoqi/security/admin/dto/AppUserManageDTO.java

 package com.github.wxiaoqi.security.admin.dto;
 
+import lombok.AllArgsConstructor;
 import lombok.Data;
+import lombok.NoArgsConstructor;
 
 import java.util.Set;
 
@@ -8,6 +10,8 @@ import java.util.Set;
  * 用户信息表
  */
 @Data
+@AllArgsConstructor
+@NoArgsConstructor
 public class AppUserManageDTO {
     /**
      * 每页条数

ace-modules/ace-admin-api/src/main/java/com/github/wxiaoqi/security/admin/feign/UserFeign.java

@@ -192,4 +192,5 @@ public interface UserFeign {
 
     @GetMapping("/public/getUsersByUserIdList")
     ObjectRestResponse<List<AppUserVo>> getByUserIdList(@RequestParam("userIds") List<Integer> userIds);
+
 }

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

@@ -7,7 +7,6 @@ import com.github.wxiaoqi.security.admin.entity.AppUserDetail;
 import com.github.wxiaoqi.security.admin.entity.AppUserLogin;
 import com.github.wxiaoqi.security.admin.mapper.AppUserDetailMapper;
 import com.github.wxiaoqi.security.admin.mapper.AppUserLoginMapper;
-import com.github.wxiaoqi.security.admin.mapper.BaseUserMemberMapper;
 import com.github.wxiaoqi.security.admin.vo.AppUserManageVo;
 import com.github.wxiaoqi.security.admin.vo.AppUserVo;
 import com.github.wxiaoqi.security.common.biz.BaseBiz;
@@ -26,7 +25,7 @@ import tk.mybatis.mapper.entity.Example;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.List;
-import java.util.Set;
+import java.util.Objects;
 import java.util.stream.Collectors;
 
 
@@ -55,6 +54,10 @@ public class AppUserManageBiz extends BaseBiz<AppUserDetailMapper, AppUserDetail
      * @return
      */
     public PageInfo<AppUserManageVo> findAllByQuery(AppUserManageDTO appUserManageDTO) {
+          if (Objects.nonNull(appUserManageDTO.getRegistrationTimeEnd())){
+              long registerEndTime = appUserManageDTO.getRegistrationTimeEnd()+(24*60*60);
+              appUserManageDTO.setRegistrationTimeEnd(registerEndTime);
+          }
          PageHelper.startPage(appUserManageDTO.getPage(), appUserManageDTO.getLimit());
         List<AppUserManageVo> appUserManageVos = mapper.selectAppUser(appUserManageDTO);
         PageInfo<AppUserManageVo> pageInfo = PageInfo.of(appUserManageVos);

xx-campsite/xx-campsite-server/src/main/resources/mapper/CampsiteShopMapper.xml

@@ -70,16 +70,16 @@
             and cst.tag_id=#{type}
         </if>
         <if test="addrProvince != null">
-            and cs.`province`=#{proviceCode}
+            and cs.`province`=#{addrProvince}
         </if>
         <if test="addrCity != null">
-            and cs.`city`=#{cityCode}
+            and cs.`city`=#{addrCity}
         </if>
         <if test="name!=null and name!=''">
             and cs.`name` like concat('%',#{name},'%')
         </if>
         <if test="keyWord!=null and keyWord!=''">
-            and (cs.`name` like concat('%',#{keyWord},'%') or cs.address like concat('%',#{keyWord},'%') or `ct`.name like concat('%',#{keyWord},'%') )
+            and cs.`name` like concat('%',#{keyWord},'%')
         </if>
         GROUP BY cs.id
         order by cs.hot DESC,cs.crt_time DESC

xx-order/xx-order-server/src/test/java/ServiceTest.java

@@ -129,7 +129,7 @@ public class ServiceTest {
      //   cn.hutool.core.date.DateTime offset = DateUtil.offset(dateTime, DateField.DAY_OF_MONTH, 1);
 //        orderReceivedStatisticsJobHandler.execute("2019-10-08");
         LocalDate startLocalDate = LocalDate.of(2019, 10, 01);
-        LocalDate endLocalDate = LocalDate.of(2019,12,19);
+        LocalDate endLocalDate = LocalDate.of(2019,12,20);
         while (startLocalDate.isBefore(endLocalDate)){
             String dateStr = startLocalDate.format(DateTimeFormatter.ofPattern("yyyy-MM-dd"));
             startLocalDate = startLocalDate.plusDays(1);