瀏覽代碼

fix 添加电影推广下单订单来源

zoujiajian 3 年之前
父節點
當前提交
b445110b69

+ 17 - 0
netflix-dao/src/main/java/com/cyksj/model/entity/OrderDon.java

@@ -86,6 +86,11 @@ public class OrderDon extends BaseEntity implements Serializable {
      */
     private Integer orderType;
 
+    /**
+     * 订单来源
+     */
+    private Source source;
+
     /**
      * 支付时间
      */
@@ -170,4 +175,16 @@ public class OrderDon extends BaseEntity implements Serializable {
             return Arrays.stream(Type.values()).filter(tp -> tp.getType().equals(type)).findFirst().orElse(WeChat);
         }
     }
+
+    @Getter
+	public enum Source {
+        yinHe("银河官网"),
+        movies("银河电影"),
+        ;
+        String desc;
+
+        Source(String desc) {
+            this.desc = desc;
+        }
+    }
 }

+ 4 - 0
netflix-dao/src/main/java/com/cyksj/model/excel/ExcelOrderDonData.java

@@ -112,6 +112,10 @@ public class ExcelOrderDonData {
 	@ExcelIgnore
 	private OrderDon.Type type;
 
+	@DbField("o.source")
+	@ExcelIgnore
+	private OrderDon.Source source;
+
 	@ExcelProperty("支付方式")
 	private String typeStr;
 

+ 3 - 0
netflix-dao/src/main/java/com/cyksj/model/manage/views/OrderDonView.java

@@ -82,6 +82,9 @@ public class OrderDonView {
     @DbField("o.order_type")
     private Integer orderType;
 
+    @DbField("o.source")
+    private OrderDon.Source source;
+
     @DbField("o.num")
     private Integer num;
 

+ 6 - 0
netflix-dao/src/main/java/com/cyksj/model/request/OrderPayRequest.java

@@ -1,5 +1,6 @@
 package com.cyksj.model.request;
 
+import com.cyksj.model.entity.OrderDon;
 import lombok.Getter;
 import lombok.Setter;
 import lombok.ToString;
@@ -83,4 +84,9 @@ public class OrderPayRequest {
      * 是否是网页端支付 默认0移动端支付
      */
     private Boolean isWebPay;
+
+    /**
+     * 订单来源
+     */
+    private OrderDon.Source source;
 }

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

@@ -291,6 +291,7 @@ public class OrderDonServiceImpl extends ServiceImpl<OrderDonMapper, OrderDon> i
 		orderDon.setUserId(user.getId());
 		orderDon.setType(OrderDon.Type.getType(payRequest.getType()));
 		orderDon.setIsWebPay(payRequest.getIsWebPay());
+		orderDon.setSource(payRequest.getSource());
 		if (isNoLogin == null || !isNoLogin) {
 			//虚拟商品订单,是否是分销订单
 			if (goodsDon.getType() == 1) {