Merge remote-tracking branch 'origin/master'

feifan-module-distri/feifan-module-distri-biz/src/main/java/cn/newfeifan/mall/module/distri/mq/message/order/DistriOrderMessage.java

@@ -79,6 +79,11 @@ public class DistriOrderMessage {
      */
     private Long increaseIntegral;
 
+    /**
+     * 推荐用户获得积分
+     */
+    private Long ancestorIncreaseIntegral;
+
 
     @Override
     public boolean equals(Object o) {

feifan-module-mall/feifan-module-trade-biz/src/main/java/cn/newfeifan/mall/module/trade/controller/admin/order/TradeOrderController.java

@@ -328,6 +328,7 @@ public class TradeOrderController {
                         .count(k.getCount())
                         .orderItemId(k.getOrderItemId())
                         .increaseIntegral(k.getIncreaseIntegral())
+                        .ancestorIncreaseIntegral(k.getAncestorIncreaseIntegral())
                         .totalPrice(k.getTotalPrice()).build())
                 .collect(Collectors.groupingBy(OrderItemMessage::getOrderId));
 

feifan-module-mall/feifan-module-trade-biz/src/main/java/cn/newfeifan/mall/module/trade/job/order/TradeOrderAutoCalcJob.java

@@ -42,6 +42,7 @@ public class TradeOrderAutoCalcJob implements JobHandler {
                         .count(k.getCount())
                         .orderItemId(k.getOrderItemId())
                         .increaseIntegral(k.getIncreaseIntegral())
+                        .ancestorIncreaseIntegral(k.getAncestorIncreaseIntegral())
                         .totalPrice(k.getTotalPrice()).build())
                 .collect(Collectors.groupingBy(OrderItemMessage::getOrderId));