Merge branch 'master-new-activity' into dev

xx-activity/xx-activity-server/src/main/java/com/xxfc/platform/activity/biz/TicketCollectionRecordBiz.java

@@ -2,20 +2,31 @@ package com.xxfc.platform.activity.biz;
 
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.bean.copier.CopyOptions;
+import com.github.wxiaoqi.security.admin.feign.UserFeign;
+import com.github.wxiaoqi.security.admin.feign.dto.AppUserDTO;
 import com.github.wxiaoqi.security.common.biz.BaseBiz;
 import com.github.wxiaoqi.security.common.msg.ObjectRestResponse;
 import com.xxfc.platform.activity.entity.TicketCollectionRecord;
 import com.xxfc.platform.activity.mapper.TicketCollectionRecordMapper;
 import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import tk.mybatis.mapper.entity.Example;
 
+import javax.servlet.http.HttpServletRequest;
 import java.util.List;
 
 @Service
 @Slf4j
 public class TicketCollectionRecordBiz extends BaseBiz<TicketCollectionRecordMapper, TicketCollectionRecord> {
 
+
+	@Autowired
+	UserFeign userFeign;
+
+	@Autowired
+	HttpServletRequest request;
+
 	public ObjectRestResponse<List<TicketCollectionRecord>> selectAllByType(Integer type) {
 		Integer newType = type == null ? 1 : type;
 		List<TicketCollectionRecord> list = mapper.selectAllByType(new TicketCollectionRecord() {{
@@ -25,9 +36,15 @@ public class TicketCollectionRecordBiz extends BaseBiz<TicketCollectionRecordMap
 	}
 
 	public ObjectRestResponse add(TicketCollectionRecord ticketCollectionRecord) {
-		if (ticketCollectionRecord == null || ticketCollectionRecord.getPhone() == null) {
+		if (ticketCollectionRecord == null) {
 			return ObjectRestResponse.paramIsEmpty();
 		}
+		if (ticketCollectionRecord.getPhone() == null && request.getHeader("Authorization") != null) {
+			AppUserDTO appUserDTO = userFeign.userDetailByToken(request.getHeader("Authorization")).getData();
+			if (appUserDTO != null) {
+				ticketCollectionRecord.setPhone(appUserDTO.getUsername());
+			}
+		}
 		if (ticketCollectionRecord.getType() == null){
 			ticketCollectionRecord.setType(1);
 		}