用户收益明细

dating-agency-mall-entity/src/main/java/com/qniao/dam/domain/aggregate/order/entity/Order.java

@@ -33,6 +33,9 @@ public class Order extends Entity<Order> {
     @ApiModelProperty("订单归属（客户、红娘）")
     private OrderBelongingEnum orderBelonging;
 
+    @ApiModelProperty("订单名称")
+    private String name;
+
     @ApiModelProperty("订单归属名称")
     private String orderBelongName;
 
@@ -80,12 +83,14 @@ public class Order extends Entity<Order> {
     public static Order build(Long userId,
                               Long miId,
                               OrderBelongingEnum orderBelonging,
+                              String name,
                               String orderBelongName,
                               OrderTypeEnum orderType) {
         Order order = new Order();
         order.setUserId(userId);
         order.setMiId(miId);
         order.setOrderBelonging(orderBelonging);
+        order.setName(name);
         order.setOrderBelongName(orderBelongName);
         order.setOrderType(orderType);
         return order;

dating-agency-mall-server/src/main/java/com/qniao/dam/application/handler/order/OrderEventHandler.java

@@ -157,7 +157,7 @@ public class OrderEventHandler extends BaseApplicationService {
                 // 道具
                 Product product = productQueryService.queryById(siteActivity.getVipActivityId());
                 if (Objects.nonNull(product)) {
-                    Order order = Order.build(userId, miId, OrderBelongingEnum.CUSTOMER, marriageInformation.getNickName(), OrderTypeEnum.NORMAL);
+                    Order order = Order.build(userId, miId, OrderBelongingEnum.CUSTOMER, null, marriageInformation.getNickName(), OrderTypeEnum.NORMAL);
                     ProductSpec productSpec = product.getProductSpecList().get(0);
                     OrderItem orderItem = OrderItem.build(productSpec.getProductId(), productSpec.getId(), product.getProductType(), product.getMainCategory(), product.getSubCategory(),
                             product.getProductTitle(), BigDecimal.ZERO, BigDecimal.ZERO, 1);

dating-agency-mall-server/src/main/java/com/qniao/dam/application/service/order/OrderApplicationService.java

@@ -37,6 +37,7 @@ import com.qniao.dam.domian.aggregate.rewardconfig.constant.RewardTypeEnum;
 import com.qniao.dam.infrastructure.persistent.dao.activity.ActivityProductDao;
 import com.qniao.dam.infrastructure.persistent.dao.domain.MarriageInformationDao;
 import com.qniao.dam.infrastructure.persistent.dao.domain.OrderDao;
+import com.qniao.dam.infrastructure.persistent.dao.domain.SiteActivityDao;
 import com.qniao.dam.infrastructure.utils.SnowFlakeUtil;
 import com.qniao.dam.query.marriagebounty.MarriageBountyOrderQueryService;
 import com.qniao.dam.query.matchmaker.MatchmakerQueryService;
@@ -51,6 +52,7 @@ import com.qniao.das.application.request.CalculateSiteActivityFeeDto;
 import com.qniao.das.application.response.CalculateSiteActivityFeeVo;
 import com.qniao.das.domian.aggregate.marriageinformation.MarriageInformation;
 import com.qniao.das.domian.aggregate.matchmakermarriage.MatchmakerMarriageInformation;
+import com.qniao.das.domian.aggregate.siteactivity.SiteActivity;
 import com.qniao.das.domian.aggregate.vip.VIPEnum;
 import com.qniao.dau.domain.aggregate.matchmaker.entity.Matchmaker;
 import com.qniao.dau.domain.aggregate.matchmakeraudit.entity.MatchmakerAudit;
@@ -101,7 +103,7 @@ public class OrderApplicationService extends BaseApplicationService {
     @Resource
     private MarriageBountyOrderAggregate marriageBountyOrderAggregate;
     @Resource
-    private RightQueryService rightQueryService;
+    private SiteActivityDao siteActivityDao;
     @Resource
     private DatingAgencyServiceApplicationService datingAgencyServiceApplicationService;
     @Resource
@@ -429,7 +431,8 @@ public class OrderApplicationService extends BaseApplicationService {
         //是否vip
         //boolean vip = rightQueryService.checkUserVipRight(userId, dto.getMiId()).getVip();
         //报名参加活动
-        order = Order.build(userId, dto.getMiId(), OrderBelongingEnum.CUSTOMER, marriageInformation.getNickName(), OrderTypeEnum.NORMAL);
+        SiteActivity siteActivity = siteActivityDao.selectById(dto.getSiteActivityId());
+        order = Order.build(userId, dto.getMiId(), OrderBelongingEnum.CUSTOMER, siteActivity.getName(), marriageInformation.getNickName(), OrderTypeEnum.NORMAL);
         ProductSpec productSpec = product.getProductSpecList().get(0);
         //todo feign 获取活动应付金额
         CalculateSiteActivityFeeDto calculateDto = new CalculateSiteActivityFeeDto(dto.getSiteActivityId(), userId,