Merge branch 'master' into pre

# Conflicts:
#	netflix-dao/src/main/java/com/cyksj/model/views/UpgradePackageView.java

netflix-common/src/main/java/com/cyksj/common/util/TicketCodeCommonUtil.java

@@ -32,6 +32,9 @@ public class TicketCodeCommonUtil {
 			if (goodsId == 33l) {
 				str = "X-Report-Abuse: abuse@adobe.com";
 			}
+			if (goodsId == 3l) {
+				str = "Noto Sans Display', Helvetica, Arial, sans-serif; font-weight: 600;text-align: center;";
+			}
 			index = body.indexOf(str);
 		}
 		String code = StrUtil.subWithLength(body, index, 512);

netflix-dao/src/main/java/com/cyksj/model/views/UpgradePackageView.java

@@ -13,8 +13,8 @@ import java.math.BigDecimal;
  */
 @Data
 @SearchBean(tables = "upgrade_package up left join goods_don g on up.goods_id = g.id "
-		, where = "up.deleted = true :sku:",
-		orderBy = "up.num asc")
+        , where = "up.deleted = true :sku:",
+        orderBy = "up.num asc")
 public class UpgradePackageView {
     @DbField("up.id")
     private Long id;

netflix-dao/src/main/java/com/cyksj/model/views/UserInfoView.java

@@ -18,4 +18,9 @@ public class UserInfoView {
 	private String img;
 
 	private String nickname;
+
+	/**
+	 * 是否是设备分销
+	 */
+	private Boolean isEp;
 }

netflix-web/src/main/java/com/cyksj/web/controller/cps/CpsBackLoginController.java

@@ -17,15 +17,13 @@ import com.cyksj.enums.GatewayResponse;
 import com.cyksj.mapper.UserMapper;
 import com.cyksj.mapper.manage.cps.CpsUserAdRecordMapper;
 import com.cyksj.mapper.manage.distribute.UserDistributeMapper;
+import com.cyksj.mapper.manage.distribute.equipment.UserDistributeEquipmentMapper;
 import com.cyksj.mapper.sys.SysConfigMapper;
 import com.cyksj.model.dto.AuthRedirect;
 import com.cyksj.model.dto.AuthToken;
 import com.cyksj.model.dto.CpsAuthDto;
 import com.cyksj.model.dto.GzhOAuth2UserInfo;
-import com.cyksj.model.entity.CpsUserAdRecord;
-import com.cyksj.model.entity.SysConfig;
-import com.cyksj.model.entity.User;
-import com.cyksj.model.entity.UserDistribute;
+import com.cyksj.model.entity.*;
 import com.cyksj.model.request.LoginReq;
 import com.cyksj.model.views.UserInfoView;
 import com.cyksj.redis.RedisService;
@@ -66,6 +64,8 @@ public class CpsBackLoginController {
 
 	private final UserDistributeMapper userDistributeMapper;
 
+	private final UserDistributeEquipmentMapper userDistributeEquipmentMapper;
+
 	private final CpsUserAdRecordMapper cpsUserAdRecordMapper;
 
 	private final SysConfigMapper sysConfigMapper;
@@ -188,6 +188,9 @@ public class CpsBackLoginController {
 		UserInfoView userInfoView = new UserInfoView();
 		userInfoView.setImg(user.getHeadimgurl());
 		userInfoView.setNickname(user.getNickname());
+		Integer selectCount = userDistributeEquipmentMapper.selectCount(Wrappers.lambdaQuery(UserDistributeEquipment.class)
+				.eq(UserDistributeEquipment::getUserId, cpsUserId));
+		userInfoView.setIsEp(selectCount > 0 ? true : false);
 		return GatewayResponse.SUCCESS.newBuilder().toResult(userInfoView);
 	}
 }