Merge branch 'mj_upgrade' into pre

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

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

@@ -24,7 +24,7 @@ public class UpgradePackage extends BaseEntity{
     /**
      * 商品规格id
      */
-    private Long skuId;
+    private String skuId;
 
     /**
      * 套餐价格

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

@@ -1,7 +1,7 @@
 package com.cyksj.model.views;
 
-import com.baomidou.mybatisplus.annotation.TableId;
 import com.ejlchina.searcher.bean.DbField;
+import com.ejlchina.searcher.bean.DbIgnore;
 import com.ejlchina.searcher.bean.SearchBean;
 import lombok.Data;
 
@@ -12,8 +12,8 @@ import java.math.BigDecimal;
  * @date 2024/4/24 15:20
  */
 @Data
-@SearchBean(tables = "upgrade_package up left join goods_don g on up.goods_id = g.id " +
-        "left join goods_don_sku s on up.sku_id = s.id", where = "up.deleted = true")
+@SearchBean(tables = "upgrade_package up left join goods_don g on up.goods_id = g.id "
+        , where = "up.deleted = true :sku:")
 public class UpgradePackageView {
     @DbField("up.id")
     private Long id;
@@ -45,7 +45,7 @@ public class UpgradePackageView {
     /**
      * 商品规格名称
      */
-    @DbField("s.spec_val")
+    @DbIgnore
     private String specVal;
 
     /**

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

@@ -238,21 +238,24 @@ public class GroupRelationFrontServiceImpl implements GroupRelationFrontService
 				ticket.setPayTime(payTime);
 			}
 			if (ticket.getGoodsId() == 26 && ticket.getIsMirror()){
-				List<UpgradePackage> upgradePackages = upgradePackageMapper.selectList(Wrappers.lambdaQuery(UpgradePackage.class).eq(UpgradePackage::getSkuId, ticket.getSkuId()).eq(UpgradePackage::getStatus, Boolean.TRUE));
+				List<UpgradePackage> upgradePackages = upgradePackageMapper.selectList(Wrappers.lambdaQuery(UpgradePackage.class).apply("JSON_CONTAINS(sku_id,'\""+ticket.getSkuId()+"\"')").eq(UpgradePackage::getStatus, Boolean.TRUE));
 				if (CollectionUtil.isNotEmpty(upgradePackages)){
 					upgradePackages.stream().map(e -> e.getPrice().divide(BigDecimal.valueOf(e.getNum()), 2, RoundingMode.HALF_UP)).min(BigDecimal::compareTo).ifPresent(ticket::setMjPackagePrice);
 				}
-				MidjourneyUserView search = beanSearcher.searchFirst(MidjourneyUserView.class, MapUtils.flatBuilder(request.getParameterMap())
-						.field(MidjourneyUserView::getUserId, ticket.getUserId()).field(MidjourneyUserView::getRelationId, ticket.getRelationId())
-						.onlySelect(MidjourneyUserView::getMjFastNum, MidjourneyUserView::getMjRelaxNum)
-						.build());
-				if (search == null) {
-					MidjourneyUser midjourneyUser = midjourneyAccountService.getMidjourneyUserToken(ticket.getUserId(), ticket.getRelationId());
-					ticket.setMjUserFastNum(midjourneyUser.getMjFastNum());
-					ticket.setMjUserRelaxNum(midjourneyUser.getMjRelaxNum());
-				} else {
-					ticket.setMjUserFastNum(search.getMjFastNum());
-					ticket.setMjUserRelaxNum(search.getMjRelaxNum());
+				try {
+					MidjourneyUserView search = beanSearcher.searchFirst(MidjourneyUserView.class, MapUtils.flatBuilder(request.getParameterMap())
+							.field(MidjourneyUserView::getUserId, ticket.getUserId()).field(MidjourneyUserView::getRelationId, ticket.getRelationId())
+							.onlySelect(MidjourneyUserView::getMjFastNum, MidjourneyUserView::getMjRelaxNum)
+							.build());
+					if (search == null) {
+						MidjourneyUser midjourneyUser = midjourneyAccountService.getMidjourneyUserToken(ticket.getUserId(), ticket.getRelationId());
+						ticket.setMjUserFastNum(midjourneyUser.getMjFastNum());
+						ticket.setMjUserRelaxNum(midjourneyUser.getMjRelaxNum());
+					} else {
+						ticket.setMjUserFastNum(search.getMjFastNum());
+						ticket.setMjUserRelaxNum(search.getMjRelaxNum());
+					}
+				} catch (Exception e) {
 				}
 			}
 			List<GroupsRelationUserView> relationUserViews = groupsRelationMapper.getUserRelationUserViews(ticket.getGroupId(), ticket.getRelationId(), ticket.getUserId(), List.of(GroupsRelation.Status.validity, GroupsRelation.Status.outside));

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

@@ -1254,9 +1254,12 @@ public class GoodsDonController {
 	 * 获取套餐列表
 	 */
 	@GetMapping("/get/upgradePackage")
-	public Result<SearchResult<UpgradePackageView>> list() {
+	public Result<SearchResult<UpgradePackageView>> list(Long skuId) {
 		log.info("获取套餐列表");
 		Map<String, Object> build = MapUtils.flatBuilder(request.getParameterMap()).build();
+		if (skuId != null) {
+			build.put("sku", String.format(" and JSON_CONTAINS(up.sku_id,'\"%s\"')", skuId));
+		}
 		SearchResult<UpgradePackageView> search = beanSearcher.search(UpgradePackageView.class, build);
 		return GatewayResponse.SUCCESS.newBuilder().toResult(search);
 	}

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

@@ -16,7 +16,6 @@ import com.cyksj.model.entity.GoodsDonSku;
 import com.cyksj.model.manage.request.ReqGoodsSpuInsert;
 import com.cyksj.model.manage.views.GoodsDonViewer;
 import com.cyksj.model.views.GoodsDonCategoryDetailView;
-import com.cyksj.model.views.UpgradePackageView;
 import com.cyksj.service.mange.CmsGoodsDonService;
 import com.cyksj.service.mange.GoodsDonCategoryService;
 import com.cyksj.service.mange.RefreshCacheService;
@@ -33,7 +32,6 @@ import org.springframework.web.bind.annotation.*;
 import javax.servlet.http.HttpServletRequest;
 import java.util.HashSet;
 import java.util.List;
-import java.util.Map;
 import java.util.Set;
 import java.util.stream.Collectors;
 

netflix-web/src/main/java/com/cyksj/web/controller/manage/upgrade/UpgradePackageController.java

@@ -110,9 +110,12 @@ public class UpgradePackageController {
      * 获取套餐列表
      */
     @GetMapping
-    public Result<SearchResult<UpgradePackageView>> list() {
+    public Result<SearchResult<UpgradePackageView>> list(Long skuId) {
         log.info("获取套餐列表");
         Map<String, Object> build = MapUtils.flatBuilder(request.getParameterMap()).build();
+        if (skuId != null) {
+            build.put("sku", String.format(" and JSON_CONTAINS(up.sku_id,'\"%s\"')", skuId));
+        }
         SearchResult<UpgradePackageView> search = beanSearcher.search(UpgradePackageView.class, build);
         return GatewayResponse.SUCCESS.newBuilder().toResult(search);
     }