fix 优惠加购

netflix-dao/src/main/java/com/cyksj/mapper/GoodsDiscountPlusPurchaseRelationMapper.java

@@ -1,12 +1,7 @@
 package com.cyksj.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.cyksj.model.dto.GoodsDiscountPlusPurchaseRelationDto;
 import com.cyksj.model.entity.GoodsDiscountPlusPurchaseRelation;
-import com.cyksj.model.entity.GoodsDonSku;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
 
 /*
  *项目名: netflix
@@ -15,7 +10,4 @@ import java.util.List;
  *创建时间:2023/7/19 11:42
  */
 public interface GoodsDiscountPlusPurchaseRelationMapper extends BaseMapper<GoodsDiscountPlusPurchaseRelation> {
-	GoodsDiscountPlusPurchaseRelationDto countDiscountGoodsRelation(@Param("list") List<Long> dpSIds, @Param("skuId") Long skuId);
-
-	List<GoodsDonSku> selectRelationSkuByDpId(@Param("list") List<Long> dpSIds, @Param("skuId") Long skuId);
 }

netflix-dao/src/main/java/com/cyksj/mapper/OrderDiscountPlusPurchaseSkuRelationMapper.java

@@ -0,0 +1,13 @@
+package com.cyksj.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.cyksj.model.entity.OrderDiscountPlusPurchaseSkuRelation;
+
+/*
+ *项目名: netflix
+ *文件名: OrderDiscountPlusPurchaseSkuRelationMapper
+ *创建者: JavaZou
+ *创建时间:2023/7/21 9:56
+ */
+public interface OrderDiscountPlusPurchaseSkuRelationMapper extends BaseMapper<OrderDiscountPlusPurchaseSkuRelation> {
+}

netflix-dao/src/main/java/com/cyksj/mapper/OrderDiscountPlusPurchaseTicketRelationMapper.java

@@ -1,13 +0,0 @@
-package com.cyksj.mapper;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.cyksj.model.entity.OrderDiscountPlusPurchaseTicketRelation;
-
-/*
- *项目名: netflix
- *文件名: OrderDiscountPlusPurchaseTicketRelationMapper
- *创建者: JavaZou
- *创建时间:2023/7/19 11:43
- */
-public interface OrderDiscountPlusPurchaseTicketRelationMapper extends BaseMapper<OrderDiscountPlusPurchaseTicketRelation> {
-}

netflix-dao/src/main/java/com/cyksj/model/dto/GoodsDiscountPlusPurchaseRelationDto.java

@@ -1,20 +0,0 @@
-package com.cyksj.model.dto;
-
-import lombok.Getter;
-import lombok.Setter;
-
-import java.math.BigDecimal;
-
-/*
- *项目名: netflix
- *文件名: GoodsDiscountPlusPurchaseRelationDto
- *创建者: JavaZou
- *创建时间:2023/7/19 15:21
- */
-@Getter
-@Setter
-public class GoodsDiscountPlusPurchaseRelationDto {
-	private Integer count;
-
-	private BigDecimal totalMoney;
-}

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

@@ -1,5 +1,6 @@
 package com.cyksj.model.entity;
 
+import com.fasterxml.jackson.annotation.JsonIgnore;
 import lombok.Getter;
 import lombok.Setter;
 
@@ -14,8 +15,10 @@ import java.math.BigDecimal;
 @Getter
 @Setter
 public class GoodsDiscountPlusPurchaseRelation extends BaseEntity{
+	@JsonIgnore
 	private Long goodsId;
 
+	@JsonIgnore
 	private Long skuId;
 
 	private Long disGid;
@@ -23,6 +26,4 @@ public class GoodsDiscountPlusPurchaseRelation extends BaseEntity{
 	private Long disSid;
 
 	private BigDecimal disPrice;
-
-	private Boolean deleted;
 }

netflix-dao/src/main/java/com/cyksj/model/entity/OrderDiscountPlusPurchaseTicketRelation.java → netflix-dao/src/main/java/com/cyksj/model/entity/OrderDiscountPlusPurchaseSkuRelation.java

@@ -7,17 +7,19 @@ import java.util.List;
 
 /*
  *项目名: netflix
- *文件名: OrderDiscountPlusPurchaseTicketRelation
+ *文件名: OrderDiscountPlusPurchaseSkuRelation
  *创建者: JavaZou
- *创建时间:2023/7/19 11:40
+ *创建时间:2023/7/21 9:47
  */
 @Getter
 @Setter
-public class OrderDiscountPlusPurchaseTicketRelation extends BaseEntity{
-
+public class OrderDiscountPlusPurchaseSkuRelation extends BaseEntity{
 	private Long orderId;
 
-	private Long userId;
+	/**
+	 * 优惠加购规格id
+	 */
+	private List<Long> plusSkuIds;
 
 	private List<Long> relationIds;
 }

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

@@ -10,7 +10,6 @@ import java.io.Serializable;
 import java.math.BigDecimal;
 import java.util.Arrays;
 import java.util.Date;
-import java.util.List;
 
 /**
  * @author chan
@@ -220,12 +219,6 @@ public class OrderDon extends BaseEntity implements Serializable {
      */
     private Boolean isDp;
 
-    /**
-     * 优惠加购规格id
-     */
-    private List<Long> dpIds;
-
-    @TableField(exist = false)
     private String payTitle;
 
     public enum Status {

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

@@ -80,4 +80,7 @@ public class CorpWxOrderDonView {
 
 	@DbField("o.pay_time")
 	private Date payTime;
+
+	@DbField("o.pay_title")
+	private String payTitle;
 }

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

@@ -138,6 +138,9 @@ public class OrderDonBackView {
 	@DbField("o.pay_time")
 	private Date payTime;
 
+	@DbField("o.pay_title")
+	private String payTitle;
+
 	@DbField("o.ex_code")
 	private String exCode;
 

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

@@ -101,6 +101,9 @@ public class OrderDonView {
     @DbField("o.pay_time")
     private Date payTime;
 
+    @DbField("o.pay_title")
+    private String payTitle;
+
     /**
      * 收货人
      */

netflix-dao/src/main/java/com/cyksj/model/request/OrderPayRequest.java

@@ -94,7 +94,7 @@ public class OrderPayRequest {
     /**
      * 优惠加购规格id
      */
-    private List<Long> dpIds;
+    private List<Long> dpSkuIds;
 
     /**
      * 余额支付

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

@@ -15,7 +15,7 @@ import java.math.BigDecimal;
  */
 @Getter
 @Setter
-@SearchBean(tables = "(select dis_gid,dis_sid,dis_price from goods_discount_plus_purchase_relation where deleted is true :skuId: group by dis_gid,dis_sid) gpr" +
+@SearchBean(tables = "goods_discount_plus_purchase_relation gpr" +
 		" left join goods_don g on g.id = gpr.dis_gid" +
 		" left join goods_don_sku sku on sku.id = gpr.dis_sid",
 		where = "g.deleted is true and g.status is true and sku.status is true")

netflix-dao/src/main/resources/mapper/GoodsDiscountPlusPurchaseRelationMapper.xml

@@ -2,20 +2,4 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 
 <mapper namespace="com.cyksj.mapper.GoodsDiscountPlusPurchaseRelationMapper">
-
-    <select id="countDiscountGoodsRelation" resultType="com.cyksj.model.dto.GoodsDiscountPlusPurchaseRelationDto">
-        select count(*) as 'count', sum(price) as totalMoney from goods_discount_plus_purchase_relation
-        where sku_id = #{skuId} and id in
-        <foreach collection="list" open="(" separator="," close=")">
-            #{item}
-        </foreach>
-    </select>
-
-    <select id="selectRelationSkuByDpId" resultType="com.cyksj.model.entity.GoodsDonSku">
-        select sku.* from (select dis_sid from goods_discount_plus_purchase_relation
-        where sku_id = #{skuId} and id in
-        <foreach collection="list" open="(" separator="," close=")">
-            #{item}
-        </foreach>) s inner join goods_don_sku sku on sku.id = s.dis_sid
-    </select>
 </mapper>

netflix-service/src/main/java/com/cyksj/service/mange/goods/CmsGoodsDonSkuServiceImpl.java

@@ -37,7 +37,6 @@ public class CmsGoodsDonSkuServiceImpl extends ServiceImpl<GoodsDonSkuMapper,Goo
 		Long skuId = sku.getId();
 		Long goodsId = sku.getGoodsId();
 		List<GoodsDiscountPlusPurchaseRelation> dbDiscountPlusGoodsList = discountPlusPurchaseRelationMapper.selectList(Wrappers.lambdaQuery(GoodsDiscountPlusPurchaseRelation.class)
-				.eq(GoodsDiscountPlusPurchaseRelation::getDeleted, true)
 				.eq(GoodsDiscountPlusPurchaseRelation::getSkuId, skuId));
 		if (CollUtil.isEmpty(dbDiscountPlusGoodsList)) {
 			discountPlusPurchaseGoods.forEach(discountGoods -> {
@@ -48,8 +47,7 @@ public class CmsGoodsDonSkuServiceImpl extends ServiceImpl<GoodsDonSkuMapper,Goo
 		}
 		//优惠加购为空
 		if (CollUtil.isEmpty(discountPlusPurchaseGoods)) {
-			discountPlusPurchaseRelationMapper.update(null, Wrappers.lambdaUpdate(GoodsDiscountPlusPurchaseRelation.class)
-					.set(GoodsDiscountPlusPurchaseRelation::getDeleted, false)
+			discountPlusPurchaseRelationMapper.delete(Wrappers.lambdaQuery(GoodsDiscountPlusPurchaseRelation.class)
 					.eq(GoodsDiscountPlusPurchaseRelation::getSkuId, skuId));
 			sku.setIsDp(false);
 			return;
@@ -82,9 +80,7 @@ public class CmsGoodsDonSkuServiceImpl extends ServiceImpl<GoodsDonSkuMapper,Goo
 			GoodsDiscountPlusPurchaseRelation exists = skuIdMap.get(dbDiscountPlusGoods.getDisGid());
 			//不存在
 			if (exists == null) {
-				discountPlusPurchaseRelationMapper.update(null, Wrappers.lambdaUpdate(GoodsDiscountPlusPurchaseRelation.class)
-						.set(GoodsDiscountPlusPurchaseRelation::getDeleted, false)
-						.eq(GoodsDiscountPlusPurchaseRelation::getId, dbDiscountPlusGoods.getId()));
+				discountPlusPurchaseRelationMapper.deleteById(dbDiscountPlusGoods.getId());
 			}
 		});
 	}

netflix-service/src/main/java/com/cyksj/service/mange/impl/CmsOrderDonServiceImpl.java

@@ -132,9 +132,7 @@ public class CmsOrderDonServiceImpl extends ServiceImpl<OrderDonMapper,OrderDon>
 
     private final StripeService stripeService;
 
-    private final GoodsDiscountPlusPurchaseRelationMapper discountPlusPurchaseRelationMapper;
-
-    private final OrderDiscountPlusPurchaseTicketRelationMapper orderRelationTicketRelationMapper;
+    private final OrderDiscountPlusPurchaseSkuRelationMapper orderDiscountPlusPurchaseSkuRelationMapper;
 
     private static final GlobalThreadPoolTaskExecutor TASK_POOL = GlobalThreadPoolTaskExecutor.getInstance();
 
@@ -601,14 +599,14 @@ public class CmsOrderDonServiceImpl extends ServiceImpl<OrderDonMapper,OrderDon>
             }
             //是否是优惠加购关联订单
             if (orderDon.getIsDp()) {
-                OrderDiscountPlusPurchaseTicketRelation discountPlusPurchaseTicketRelation = orderRelationTicketRelationMapper.selectOne(Wrappers.lambdaQuery(OrderDiscountPlusPurchaseTicketRelation.class)
-                        .eq(OrderDiscountPlusPurchaseTicketRelation::getOrderId, orderDon.getId()).last("limit 1"));
-                if (discountPlusPurchaseTicketRelation != null) {
-                    List<Long> relationIds = discountPlusPurchaseTicketRelation.getRelationIds();
+                OrderDiscountPlusPurchaseSkuRelation discountPlusPurchaseSkuRelation = orderDiscountPlusPurchaseSkuRelationMapper.selectOne(Wrappers.lambdaQuery(OrderDiscountPlusPurchaseSkuRelation.class)
+                        .eq(OrderDiscountPlusPurchaseSkuRelation::getOrderId, orderDon.getId()).last("limit 1"));
+                if (discountPlusPurchaseSkuRelation != null) {
+                    List<Long> relationIds = discountPlusPurchaseSkuRelation.getRelationIds();
                     if (CollUtil.isNotEmpty(relationIds)) {
                         List<GroupsRelation> groupsRelations = relationMapper.selectList(Wrappers.lambdaQuery(GroupsRelation.class)
                                 .in(GroupsRelation::getId, relationIds));
-                        log.info("优惠加购订单orderId:{}退款,清除相关车票", orderDon.getId());
+                        log.info("优惠加购订单orderId:{}退款,清除相关车票relation_ids:{}", orderDon.getId(), relationIds);
                         groupsRelations.forEach(relation -> relationClearService.clearTicket(relation, UserTicketClearedRecord.Source.dp));
                     }
                 }

netflix-service/src/main/java/com/cyksj/service/order/impl/OrderDonServiceImpl.java

@@ -201,7 +201,7 @@ public class OrderDonServiceImpl extends ServiceImpl<OrderDonMapper, OrderDon> i
 
 	private final GoodsDiscountPlusPurchaseRelationMapper discountPlusPurchaseRelationMapper;
 
-	private final OrderDiscountPlusPurchaseTicketRelationMapper orderRelationTicketRelationMapper;
+	private final OrderDiscountPlusPurchaseSkuRelationMapper orderDiscountPlusPurchaseSkuRelationMapper;
 
 	private final List<String> noChekGoodsTemp = List.of("Apple One", "Youtube", "Spotify");
 
@@ -258,22 +258,29 @@ public class OrderDonServiceImpl extends ServiceImpl<OrderDonMapper, OrderDon> i
 			payRequest.setDonMoney(sku.getPrice());
 		}
 
-		List<Long> dpIds = payRequest.getDpIds();
-		if (dpIds.size() > 1) {
+		List<Long> dpSkuIds = payRequest.getDpSkuIds();
+		if (dpSkuIds.size() > 1) {
 			throw BusinessRuntimeException.getInstance("暂只支持优惠加购一件商品");
 		}
-		if (CollUtil.isNotEmpty(dpIds)) {
+		if (CollUtil.isNotEmpty(dpSkuIds)) {
 			//是否满足关联
-			GoodsDiscountPlusPurchaseRelationDto purchaseRelationDto = discountPlusPurchaseRelationMapper.countDiscountGoodsRelation(dpIds, sku.getId());
-			if (purchaseRelationDto.getCount() != dpIds.size()) {
-				throw BusinessRuntimeException.getInstance("下单异常,请重新下单");
+			List<GoodsDiscountPlusPurchaseRelation> ds_relations = discountPlusPurchaseRelationMapper.selectList(Wrappers.lambdaQuery(GoodsDiscountPlusPurchaseRelation.class)
+					.eq(GoodsDiscountPlusPurchaseRelation::getSkuId, sku.getId())
+					.in(GoodsDiscountPlusPurchaseRelation::getDisSid, dpSkuIds));
+			if (ds_relations.size() != dpSkuIds.size()) {
+				throw BusinessRuntimeException.getInstance("系统异常,请刷新页面重新下单");
 			}
-			BigDecimal pay_money = sku.getPrice().add(purchaseRelationDto.getTotalMoney());
+			BigDecimal goods_discount_plus_pay = BigDecimal.ZERO;
+			List<Long> dsSkuIds = new ArrayList<>();
+			ds_relations.forEach(re -> {
+				goods_discount_plus_pay.add(re.getDisPrice());
+				dsSkuIds.add(re.getDisSid());
+			});
+			BigDecimal pay_money = sku.getPrice().add(goods_discount_plus_pay);
 			if (pay_money.compareTo(orderDon.getMoney()) < 0) {
 				orderDon.setMoney(pay_money);
 			}
 			orderDon.setIsDp(true);
-			orderDon.setDpIds(dpIds);
 		}
 
 		orderDon.setMoney(payRequest.getDonMoney());
@@ -321,8 +328,31 @@ public class OrderDonServiceImpl extends ServiceImpl<OrderDonMapper, OrderDon> i
 			}
 		}
 		orderDon.setPayDesc(goodsDon.getPayDesc());
+		StringBuilder payTitle = new StringBuilder();
+		payTitle.append(goodsDon.getTitle());
+		payTitle.append(sku.getSpecVal());
+		if (orderDon.getIsDp()) {
+			List<GoodsDonSkuView> dp_skuViewList = beanSearcher.searchAll(GoodsDonSkuView.class, MapUtils.builder().field(GoodsDonSkuView::getSkuId, dpSkuIds).op(Operator.InList).build());
+			if (dp_skuViewList.size() != dpSkuIds.size()) {
+				throw BusinessRuntimeException.getInstance("系统异常,请刷新页面重新下单");
+			}
+			dp_skuViewList.forEach(dp_SkuView -> {
+				payTitle.append(" + ");
+				payTitle.append(dp_SkuView.getGoodsTitle());
+				payTitle.append(dp_SkuView.getSpecVal());
+			});
+		}
+		orderDon.setPayTitle(payTitle.toString());
 		this.saveOrUpdate(orderDon);
 
+		if (orderDon.getIsDp()) {
+			//保存订单优惠加购规格 关系
+			OrderDiscountPlusPurchaseSkuRelation orderDiscountPlusPurchaseSkuRelation = new OrderDiscountPlusPurchaseSkuRelation();
+			orderDiscountPlusPurchaseSkuRelation.setOrderId(orderDon.getId());
+			orderDiscountPlusPurchaseSkuRelation.setPlusSkuIds(dpSkuIds);
+			orderDiscountPlusPurchaseSkuRelationMapper.insert(orderDiscountPlusPurchaseSkuRelation);
+		}
+
 		if (Constant.realGoodsType.contains(goodsDon.getType()) && !goodsDon.getId().equals(27l)) {
 			saveTransport(payRequest.getAddressId(), orderDon.getId());
 		}
@@ -352,13 +382,6 @@ public class OrderDonServiceImpl extends ServiceImpl<OrderDonMapper, OrderDon> i
 			}
 		}
 		orderDon.setSpecialType(goodsDon.getSpecialType());
-		StringBuilder payTitle = new StringBuilder();
-		payTitle.append(goodsDon.getTitle());
-		payTitle.append(sku.getSpecVal());
-		if (orderDon.getIsDp()) {
-			List<Long> dpIds1 = orderDon.getDpIds();
-			orderDon.setPayTitle();
-		}
 		return orderDon;
 	}
 
@@ -1154,26 +1177,28 @@ public class OrderDonServiceImpl extends ServiceImpl<OrderDonMapper, OrderDon> i
 			log.info("虚物订单orderNo:{}开始更新车票信息", order.getOrderNo());
 			//修改车位状态
 			GroupsRelation relation = groupsRelationMapper.selectById(order.getRelationId());
-			if (CollUtil.isNotEmpty(order.getDpIds())) {
+			if (order.getIsDp()) {
 				//是否已经发送优惠加购车票
-				Integer count = orderRelationTicketRelationMapper.selectCount(Wrappers.lambdaQuery(OrderDiscountPlusPurchaseTicketRelation.class)
-						.eq(OrderDiscountPlusPurchaseTicketRelation::getOrderId, order.getId()));
-				if (count > 0) {
-					return;
+				OrderDiscountPlusPurchaseSkuRelation purchaseSkuRelation = orderDiscountPlusPurchaseSkuRelationMapper.selectOne(Wrappers.lambdaQuery(OrderDiscountPlusPurchaseSkuRelation.class)
+						.eq(OrderDiscountPlusPurchaseSkuRelation::getOrderId, order.getId()));
+				if (purchaseSkuRelation != null && CollUtil.isNotEmpty(purchaseSkuRelation.getPlusSkuIds()) && CollUtil.isEmpty(purchaseSkuRelation.getRelationIds())) {
+					//发送优惠加购 规格车票
+					List<Long> dis_relation_ids = new ArrayList<>();
+					purchaseSkuRelation.getPlusSkuIds().forEach(plus_skuId -> {
+						GoodsDonSku plus_sku = goodsDonSkuMapper.selectById(plus_skuId);
+						if (plus_sku == null) {
+							log.error("订单id:{}优惠加购规格已被删除 skuId:{},车票未发送", order.getId(), plus_skuId);
+							return;
+						}
+						GroupsRelation relationNoOrder = exchangeCodeService.getRelationNoOrder(plus_sku, order.getUserId());
+						dis_relation_ids.add(relationNoOrder.getId());
+					});
+					//保存订单关联优惠加购车票
+					orderDiscountPlusPurchaseSkuRelationMapper.update(null, Wrappers.lambdaUpdate(OrderDiscountPlusPurchaseSkuRelation.class)
+							.set(OrderDiscountPlusPurchaseSkuRelation::getRelationIds, dis_relation_ids)
+							.eq(OrderDiscountPlusPurchaseSkuRelation::getOrderId, order.getId())
+							.isNull(OrderDiscountPlusPurchaseSkuRelation::getRelationIds));
 				}
-				//发送优惠加购 规格车票
-				List<GoodsDonSku> relationSkus = discountPlusPurchaseRelationMapper.selectRelationSkuByDpId(order.getDpIds(), sku.getId());
-				List<Long> dis_relation_ids = new ArrayList<>();
-				relationSkus.forEach(reSku -> {
-					GroupsRelation relationNoOrder = exchangeCodeService.getRelationNoOrder(reSku, order.getUserId());
-					dis_relation_ids.add(relationNoOrder.getId());
-				});
-				//保存订单关联优惠加购车票
-				OrderDiscountPlusPurchaseTicketRelation purchaseTicketRelation = new OrderDiscountPlusPurchaseTicketRelation();
-				purchaseTicketRelation.setUserId(order.getUserId());
-				purchaseTicketRelation.setOrderId(order.getId());
-				purchaseTicketRelation.setRelationIds(dis_relation_ids);
-				orderRelationTicketRelationMapper.insert(purchaseTicketRelation);
 			}
 			if (order.getRelationId() != 0 && !relation.getUserId().equals(order.getUserId()) && order.getOrderType() == 1) {
 				GroupsRelation relationNoOrder = exchangeCodeService.getRelationNoOrder(sku, order.getUserId());

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

@@ -182,7 +182,7 @@ public class GoodsDonController {
             data.setSkuList(beanSearcher.searchAll(GoodsDonFrontSkuView.class, MapUtils.builder().field(GoodsDonFrontSkuView::getGoodsId, data.getId()).field(GoodsDonFrontSkuView::getStatus, true).orderBy(GoodsDonFrontSkuView::getPrice).asc().build()));
             data.getSkuList().forEach(sku -> {
                 if (sku.getIsDp()) {
-                    sku.setDpGoods(beanSearcher.searchAll(GoodsDiscountPlusPurchaseRelationFrontView.class, MapUtils.builder().put("sku_id", String.format("and sku_id = %s", sku.getId())).build()));
+                    sku.setDpGoods(beanSearcher.searchAll(GoodsDiscountPlusPurchaseRelationFrontView.class, MapUtils.builder().field(GoodsDiscountPlusPurchaseRelationFrontView::getSkuId, sku.getId()).build()));
                 }
             });
             Integer sold = orderDonMapper.selectCount(Wrappers.lambdaQuery(OrderDon.class)
@@ -299,7 +299,7 @@ public class GoodsDonController {
         goodsDonSkus.forEach(sku -> {
             if (sku.getIsDp()) {
                 sku.setDpGoods(beanSearcher.searchAll(GoodsDiscountPlusPurchaseRelationFrontView.class, MapUtils.builder()
-                        .put("sku_id", String.format("and sku_id = %s", sku.getId()))
+                        .field(GoodsDiscountPlusPurchaseRelationFrontView::getSkuId, sku.getId())
                         .build()));
             }
         });

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

@@ -65,7 +65,6 @@ public class CmsGoodsDonController {
                 if (sku.getIsDp()) {
                     sku.setDiscountPlusPurchaseGoods(beanSearcher.searchAll(GoodsDiscountPlusPurchaseRelation.class, MapUtils.builder()
                             .field(GoodsDiscountPlusPurchaseRelation::getSkuId, sku.getId())
-                            .field(GoodsDiscountPlusPurchaseRelation::getDeleted, true)
                             .build()));
                 }
             });