From e94e6721a4aeb8c21e97878239ec3429fc76d1ad Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Mon, 08 May 2023 14:23:45 +0800
Subject: [PATCH] 创建订单之前的判断修改

---
 src/main/resources/templates/febs/views/modules/mallMember/moneyFlow.html |   42 +++++++++++++++++++++++++++++++++++-------
 1 files changed, 35 insertions(+), 7 deletions(-)

diff --git a/src/main/resources/templates/febs/views/modules/mallMember/moneyFlow.html b/src/main/resources/templates/febs/views/modules/mallMember/moneyFlow.html
index 2250265..1e9fea5 100644
--- a/src/main/resources/templates/febs/views/modules/mallMember/moneyFlow.html
+++ b/src/main/resources/templates/febs/views/modules/mallMember/moneyFlow.html
@@ -55,7 +55,7 @@
                             } else if (d.type === 4) {
                                 return '<span>排名收益</span>'
                             }else if (d.type === 5) {
-                                return '<span>董事收益</span>'
+                                return '<span>总监收益</span>'
                             }else if (d.type === 6) {
                                 return '<span>社区店补</span>'
                             }else if (d.type === 7) {
@@ -73,11 +73,39 @@
                             }else if (d.type === 13) {
                                 return '<span>佣金转余额</span>'
                             }else if (d.type === 14) {
-                                return '<span>竞猜积分签到</span>'
+                                return '<span>签到</span>'
                             }else if (d.type === 15) {
                                 return '<span>感恩奖</span>'
                             }else if (d.type === 16) {
                                 return '<span>系统拨付</span>'
+                            }else if (d.type === 17) {
+                                return '<span>抽奖</span>'
+                            }else if (d.type === 18) {
+                                return '<span>积分池收益</span>'
+                            }else if (d.type === 19) {
+                                return '<span>1星合伙人补贴</span>'
+                            }else if (d.type === 20) {
+                                return '<span>2星合伙人补贴</span>'
+                            }else if (d.type === 21) {
+                                return '<span>3星合伙人补贴</span>'
+                            }else if (d.type === 22) {
+                                return '<span>4星合伙人补贴</span>'
+                            }else if (d.type === 23) {
+                                return '<span>5星合伙人补贴</span>'
+                            }else if (d.type === 24) {
+                                return '<span>6星合伙人补贴</span>'
+                            }else if (d.type === 25) {
+                                return '<span>贡献点</span>'
+                            }else if (d.type === 26) {
+                                return '<span>补贴额度</span>'
+                            }else if (d.type === 27) {
+                                return '<span>团队补贴</span>'
+                            }else if (d.type === 28) {
+                                return '<span>平级奖励补贴</span>'
+                            }else if (d.type === 29) {
+                                return '<span>线下服务中心补贴</span>'
+                            }else if (d.type === 30) {
+                                return '<span>代理商补贴</span>'
                             }else{
                                 return ''
                             }
@@ -86,17 +114,17 @@
                         templet: function (d) {
                             if (d.flowType === 1) {
                                 return '余额';
-                            } else if(d.flowType === 2) {
-                                return '赠送积分'
                             } else if(d.flowType === 3) {
-                                return '竞猜积分'
-                            } else if(d.flowType === 4) {
-                                return '佣金'
+                                return '现金积分'
+                            } else if(d.flowType === 5) {
+                                return '贡献点'
                             } else {
                                 return '-';
                             }
                         }, minWidth: 80,align:'center'},
+                    {field: 'fromMemberName', title: '来自', minWidth: 80,align:'center'},
                     {field: 'orderNo', title: '订单编号', minWidth: 150,align:'center'},
+                    {field: 'remark', title: '备注', minWidth: 150,align:'left'},
                     {field: 'createdTime', title: '时间', minWidth: 150,align:'left'}
                 ]]
             });

--
Gitblit v1.9.1