Merge branch 'master-order' into dev

xx-order/xx-order-api/src/main/java/com/xxfc/platform/order/pojo/dto/OrderActiveDto.java

+package com.xxfc.platform.order.pojo.dto;
+
+import com.github.wxiaoqi.security.common.vo.PageParam;
+import lombok.Data;
+
+@Data
+public class OrderActiveDto extends PageParam {
+	private String phone;
+	private Integer userId;
+
+	private Integer type;
+
+	private Integer status;
+	private String startTime;
+
+	private String endTime;
+
+	private String no;
+}

xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/biz/OrderActivityDetailBiz.java

 package com.xxfc.platform.order.biz;
 
+import com.github.wxiaoqi.security.admin.entity.AppUserLogin;
 import com.github.wxiaoqi.security.admin.feign.UserFeign;
 import com.github.wxiaoqi.security.admin.feign.dto.AppUserDTO;
 import com.github.wxiaoqi.security.admin.feign.dto.UserDTO;
@@ -11,8 +12,8 @@ import com.github.wxiaoqi.security.common.util.process.ResultCode;
 import com.github.wxiaoqi.security.common.vo.PageDataVO;
 import com.xxfc.platform.order.entity.OrderActiveDetail;
 import com.xxfc.platform.order.mapper.OrderActiveDetailMapper;
+import com.xxfc.platform.order.pojo.dto.OrderActiveDto;
 import com.xxfc.platform.order.pojo.vo.OrderActivityVo;
-import com.xxfc.platform.order.rest.BaseOrderController;
 import io.swagger.annotations.Api;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
@@ -20,7 +21,6 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import tk.mybatis.mapper.entity.Example;
 
-import java.util.Date;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -36,15 +36,16 @@ public class OrderActivityDetailBiz extends BaseBiz<OrderActiveDetailMapper, Ord
 		return userFeign;
 	}
 
-	public ObjectRestResponse getAll(BaseOrderController.QueryOrderList dto) {
+	public ObjectRestResponse getAll(OrderActiveDto dto) {
 		//判断token是否存在
 		UserDTO userDTO = getAdminUserInfo();
 		if (userDTO == null) {
 			return ObjectRestResponse.succ(new PageDataVO<>());
 		}
-		if (dto.getStartTime() != null) {
-			if (dto.getEndTime() == null) {
-				dto.setEndTime(new Date().getTime());
+		if (StringUtils.isNotBlank(dto.getPhone())) {
+			AppUserLogin appUserLogin = userFeign.one(dto.getPhone());
+			if (appUserLogin != null) {
+				dto.setUserId(appUserLogin.getId());
 			}
 		}
 		Query query = new Query(dto);

xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/rest/OrderActivityController.java

@@ -7,6 +7,7 @@ import com.github.wxiaoqi.security.common.rest.BaseController;
 import com.xxfc.platform.order.biz.OrderActivityDetailBiz;
 import com.xxfc.platform.order.entity.BaseOrder;
 import com.xxfc.platform.order.entity.OrderActiveDetail;
+import com.xxfc.platform.order.pojo.dto.OrderActiveDto;
 import com.xxfc.platform.order.pojo.dto.OrderActivityDto;
 import com.xxfc.platform.order.pojo.order.ActivityOrderBO;
 import com.xxfc.platform.order.service.OrderActivityService;
@@ -40,7 +41,7 @@ public class OrderActivityController extends BaseController<OrderActivityDetailB
 
 
 	@GetMapping(value = "/getAll")
-	public ObjectRestResponse getAll(BaseOrderController.QueryOrderList dto) {
+	public ObjectRestResponse getAll(OrderActiveDto dto) {
 		return baseBiz.getAll(dto);
 	}
 

xx-order/xx-order-server/src/main/resources/mapper/OrderActiveDetailMapper.xml

@@ -7,7 +7,7 @@
       LEFT JOIN base_order bo on bo.id = oad.order_id
       <where>
           <if test="oneNo != null and oneNo != ''">
-                and bo.no = #{oneNo}
+                and bo.no = #{no}
           </if>
           <if test="userId != null and userId > 0">
               and bo.user_id = #{userId}