Merge remote-tracking branch 'origin/master'

cash-common/cash-common-service/src/main/java/com/czg/order/entity/OrderPayment.java

@@ -41,6 +41,10 @@ public class OrderPayment implements Serializable {
      * 来源Id 订单Id或充值id 
      */
     private Long sourceId;
+    /**
+     * 霸王餐充值为 订单id 会员充值为 活动id
+     */
+    private Long relatedId;
 
     /**
      * 支付方式：order,refund, memberIn,memberRefund, free
@@ -93,4 +97,15 @@ public class OrderPayment implements Serializable {
         this.authCode = authCode;
         this.amount = amount;
     }
+
+    public OrderPayment(@NonNull Long shopId,@NonNull Long sourceId, @NotBlank String payType, @NotBlank String orderNo,
+                        String authCode, @NonNull BigDecimal amount, Long relatedId) {
+        this.shopId = shopId;
+        this.sourceId = sourceId;
+        this.payType = payType;
+        this.orderNo = orderNo;
+        this.authCode = authCode;
+        this.amount = amount;
+        this.relatedId = relatedId;
+    }
 }