Merge remote-tracking branch 'origin/master'

cash-common/cash-common-service/src/main/java/com/czg/account/service/ShopActivateService.java

@@ -24,11 +24,12 @@ public interface ShopActivateService extends IService<ShopActivate> {
 
     /**
      * @param memAmount  充值金额
+     * @param activateId 参加活动Id
      * @param relationId 关联Id
      *                   霸王餐时 订单id
      *                   充值奖励 的关联id 是tb_shop_user_flow的充值 记录id
      *                   支付/退款 tb_order_payment.id
      */
-    void giveActivate(ShopUser shopUser, BigDecimal memAmount, Long relationId);
+    void giveActivate(ShopUser shopUser, BigDecimal memAmount, Long activateId, Long relationId);
 
 }

cash-common/cash-common-service/src/main/java/com/czg/order/vo/OrderDetailSmallVO.java

@@ -24,6 +24,7 @@ public class OrderDetailSmallVO implements Serializable {
     @Serial
     private static final long serialVersionUID = 1L;
 
+    private Long id;
     private String productImg;
     private String productName;
     private String skuName;