fix

netflix-dao/src/main/java/com/cyksj/model/entity/GoodsDonQaRelate.java

@@ -17,4 +17,6 @@ public class GoodsDonQaRelate extends BaseEntity{
 	private Long questionId;
 
 	private Long goodsId;
+
+	private Boolean deleted;
 }

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

@@ -18,6 +18,7 @@ import java.util.Date;
 @SearchBean(tables = "goods_don_qa gq left join goods_don_qa_relate gqr on gqr.question_id = gq.id" +
 		" left join goods_don g on g.id = gqr.goods_id",
 		where = "gq.deleted is true",
+		orderBy = "ga.sorted is null asc,ga.sorted asc",
 		groupBy = "gq.id,gq.type,gq.problem,gq.status,gq.created_time,gq.update_time")
 public class GoodsDonQaView {
 	@DbField("gq.id")

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

@@ -204,4 +204,10 @@ public class RenewalView {
      */
     @DbIgnore
     private BigDecimal mjPackagePrice;
+
+    /**
+     * 是否有配置售后问题
+     */
+    @DbIgnore
+    private Boolean qa;
 }

netflix-service/src/main/java/com/cyksj/service/relation/impl/GroupRelationFrontServiceImpl.java

@@ -109,9 +109,10 @@ public class GroupRelationFrontServiceImpl implements GroupRelationFrontService
 
 	//脆球邮箱后缀
 	private final static String CUI_QIU_EMAIL_SUFFIX = "@kindvd.com";
+
 	private final UpgradePackageMapper upgradePackageMapper;
 
-	private final static String VERIFY_CODE_SECRET = "q1w2e3";
+	private final GoodsDonQaRelateMapper goodsDonQaRelateMapper;
 
 	@Override
 	public SearchResult<RenewalView> getMyTicket(long userId, Boolean isLoginPopularize, String customId, String account) {
@@ -247,6 +248,10 @@ public class GroupRelationFrontServiceImpl implements GroupRelationFrontService
 				Integer codeNum = getUserCodeNumBySkuId(ticket.getUserId(), ticket.getSkuId(), isHasVerifyCode);
 				ticket.setCodeNum(codeNum);
 			}
+			Integer qa = goodsDonQaRelateMapper.selectCount(Wrappers.lambdaQuery(GoodsDonQaRelate.class)
+					.eq(GoodsDonQaRelate::getGoodsId, ticket.getGoodsId())
+					.eq(GoodsDonQaRelate::getDeleted, 1));
+			ticket.setQa(qa > 0 ? true : false);
 		});
 		userLoginRecordService.saveUserLoginDayRecord(userId);
 		return list;

netflix-web/src/main/java/com/cyksj/web/controller/manage/goods/GoodsDonQuestionController.java

@@ -3,7 +3,9 @@ package com.cyksj.web.controller.manage.goods;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.cyksj.dto.Result;
 import com.cyksj.enums.GatewayResponse;
+import com.cyksj.mapper.GoodsDonQaRelateMapper;
 import com.cyksj.model.entity.GoodsDonQa;
+import com.cyksj.model.entity.GoodsDonQaRelate;
 import com.cyksj.model.views.GoodsDonQaView;
 import com.cyksj.service.mange.GoodsDonQaService;
 import com.cyksj.service.mange.RefreshCacheService;
@@ -35,6 +37,8 @@ public class GoodsDonQuestionController {
 
 	private final RefreshCacheService refreshCacheService;
 
+	private final GoodsDonQaRelateMapper goodsDonQaRelateMapper;
+
 
 	/**
 	 * 新增问题
@@ -56,6 +60,10 @@ public class GoodsDonQuestionController {
 		if (byId != null && byId.getDeleted()) {
 			byId.setDeleted(false);
 			goodsDonQaService.updateById(byId);
+			goodsDonQaRelateMapper.update(null, Wrappers.lambdaUpdate(GoodsDonQaRelate.class)
+					.set(GoodsDonQaRelate::getDeleted, 0)
+					.eq(GoodsDonQaRelate::getGoodsId, id)
+					.eq(GoodsDonQaRelate::getDeleted, 1));
 			refreshCacheService.goodsQuestionCache();
 		}
 		return GatewayResponse.SUCCESS.newBuilder().toResult();