fix

netflix-service/src/main/java/com/cyksj/service/exchange/impl/ExchangeCodeServiceImpl.java

@@ -309,6 +309,10 @@ public class ExchangeCodeServiceImpl extends ServiceImpl<ExchangeCodeMapper, Exc
 			//兑换码兑换
 			orderDon.setType(orderDonTye);
 			orderDon.setUserId(user.getId());
+			StringBuilder payTitle = new StringBuilder();
+			payTitle.append(goodsDon.getTitle());
+			payTitle.append(sku.getSpecVal());
+			orderDon.setPayTitle(payTitle.toString());
 			orderDonMapper.insert(orderDon);
 			log.info("用户{}兑换规格:{}车位成功", user.getId(), orderDon.getSkuId());
 		}

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

@@ -688,6 +688,13 @@ public class CmsOrderDonServiceImpl extends ServiceImpl<OrderDonMapper,OrderDon>
                         try {
                             log.info("关闭优惠加购orderId:{}关联实物订单", orderDon.getId());
                             List<Long> plusOrderIdList = Jsons.parseList(plusOrderIds, Long.class);
+                            List<OrderDon> relate_orderDons = orderDonMapper.selectList(Wrappers.lambdaQuery(OrderDon.class)
+                                    .in(OrderDon::getId, plusOrderIdList)
+                                    .in(OrderDon::getStatus, Constant.noOrderStatus));
+                            relate_orderDons.forEach(relate_o->{
+                                //扣除用户自身实物权益
+                                userRealOrderBenefitsService.deductUserRealGoodsBenefits(relate_o.getId());
+                            });
                             orderDonMapper.update(null, Wrappers.lambdaUpdate(OrderDon.class)
                                     .set(OrderDon::getStatus, OrderDon.Status.refund)
                                     .in(OrderDon::getId, plusOrderIdList)

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

@@ -1268,14 +1268,13 @@ public class OrderDonServiceImpl extends ServiceImpl<OrderDonMapper, OrderDon> i
 								}
 								GroupsRelation relationNoOrder = exchangeCodeService.getRelationNoOrder(plus_sku, order.getUserId());
 								dis_relation_ids.add(relationNoOrder.getId());
-								redisService.del(RedisService.key.PLUS_GOODS_ADDRESS_KEY.getName() + order.getId());
 							}
+							redisService.del(RedisService.key.PLUS_GOODS_ADDRESS_KEY.getName() + order.getId());
 							//保存订单关联优惠加购车票
 							orderDiscountPlusPurchaseSkuRelationMapper.update(null, Wrappers.lambdaUpdate(OrderDiscountPlusPurchaseSkuRelation.class)
-									.set(CollUtil.isNotEmpty(dis_relation_ids), OrderDiscountPlusPurchaseSkuRelation::getRelationIds, dis_relation_ids.toString())
-									.set(CollUtil.isNotEmpty(plus_order_ids), OrderDiscountPlusPurchaseSkuRelation::getPlusOrderIds, plus_order_ids.toString())
-									.eq(OrderDiscountPlusPurchaseSkuRelation::getOrderId, order.getId())
-									.isNull(OrderDiscountPlusPurchaseSkuRelation::getRelationIds));
+									.set(CollUtil.isNotEmpty(dis_relation_ids), OrderDiscountPlusPurchaseSkuRelation::getRelationIds, Jsons.toJson(dis_relation_ids))
+									.set(CollUtil.isNotEmpty(plus_order_ids), OrderDiscountPlusPurchaseSkuRelation::getPlusOrderIds, Jsons.toJson(plus_order_ids))
+									.eq(OrderDiscountPlusPurchaseSkuRelation::getOrderId, order.getId()));
 						} catch (Exception e) {
 						}
 					}

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

@@ -65,6 +65,7 @@ public class UserRealOrderBenefitsImpl implements UserRealOrderBenefitsService {
 			Long skuId = sku.getId();
 			sku = goodsDonSkuMapper.selectById(skuId);
 			Long goodsId = sku.getGoodsId();
+			log.info("开始发放实物订单orderId:{}权益规格:{}", orderId, skuId);
 //			List<GroupsRelationView> relationViewList = beanSearcher.searchAll(GroupsRelationView.class, MapUtils.builder()
 //					.field(GroupsRelationView::getGoodsId, goodsId)
 //					.field(GroupsRelationView::getUserId, userId)
@@ -86,6 +87,7 @@ public class UserRealOrderBenefitsImpl implements UserRealOrderBenefitsService {
 			} else if (relationViewList.size() == 1) {
 				//若有且只有一张增加时长
 				GroupsRelationView groupsRelationView = relationViewList.get(0);
+				log.info("存在对应规格:{}的车票,增加车票:relationId:{}时长", sku.getId(), groupsRelationView.getId());
 				Date expiryTime = groupsRelationView.getExpiryTime();
 				if (expiryTime == null) {
 					throw BusinessRuntimeException.getInstance("用户存在未发车的车票,请发车后再进行发货");