From 9581638e56f60e9af323468222bde9f640badcb1 Mon Sep 17 00:00:00 2001
From: yangqingyuan <yangqingyuan@163.com>
Date: Fri, 9 Aug 2024 13:15:10 +0800
Subject: [PATCH] =?UTF-8?q?feat=EF=BC=9A=E6=94=B6=E7=9B=8A=E5=88=97?=
 =?UTF-8?q?=E8=A1=A8-=E5=A4=87=E6=B3=A8=E5=AD=97=E6=AE=B5=E5=86=85?=
 =?UTF-8?q?=E5=AE=B9=E4=BF=AE=E6=94=B9=EF=BC=9A=E5=A2=9E=E5=8A=A0=E6=98=B5?=
 =?UTF-8?q?=E7=A7=B0=E8=B7=9F=E7=94=B5=E8=AF=9D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/gxwebsoft/apps/task/OrderTask.java    | 28 +++++++++++++++----
 .../com/gxwebsoft/shop/entity/ProfitLog.java  |  3 ++
 2 files changed, 26 insertions(+), 5 deletions(-)

diff --git a/src/main/java/com/gxwebsoft/apps/task/OrderTask.java b/src/main/java/com/gxwebsoft/apps/task/OrderTask.java
index d6dac77..53016fa 100644
--- a/src/main/java/com/gxwebsoft/apps/task/OrderTask.java
+++ b/src/main/java/com/gxwebsoft/apps/task/OrderTask.java
@@ -344,6 +344,10 @@ public class OrderTask {
                 Equipment equipment = equipmentMap.get(order.getEquipmentId());
                 // 投资人收益
                 String orderNo = order.getOrderNo();
+                String equipmentCode = "";
+                if(null != equipment) {
+                    equipment.getEquipmentCode();
+                }
                 if (touziProfit.compareTo(BigDecimal.ZERO) > 0 && equipment!= null) {
 
                     User touziUser = touziUserMap.get(equipment.getTouziUserId());
@@ -359,6 +363,7 @@ public class OrderTask {
                         profitLog.setOrderId(order.getId());
                         profitLog.setOrderNo(orderNo);
                         profitLog.setOrderUserName(orderUser.getNickname());
+                        profitLog.setOrderRealName(orderUser.getRealName());
                         profitLog.setComments("投资设备：" + equipment.getEquipmentCode());
                         profitLog.setEquipmentCode(equipment.getEquipmentCode());
                         profitLog.setOrderSource(order.getOrderSource());
@@ -383,8 +388,12 @@ public class OrderTask {
                         profitLog.setOrderId(order.getId());
                         profitLog.setOrderNo(orderNo);
                         profitLog.setOrderUserName(orderUser.getNickname());
-                        profitLog.setComments("推广收益：" + orderUser.getPhone());
-                        profitLog.setEquipmentCode(equipment.getEquipmentCode());
+                        profitLog.setOrderRealName(orderUser.getRealName());
+                        profitLog.setComments(new StringBuilder("推广收益：")
+                                .append("\n昵称："+tuijianUser.getNickname())
+                                .append("\n电话："+tuijianUser.getPhone())
+                                .toString());
+                        profitLog.setEquipmentCode(equipmentCode);
                         profitLog.setOrderSource(order.getOrderSource());
 //                        profitLog.setIsRenew(order.getIsRenew());
                         profitLogService.save(profitLog);
@@ -406,8 +415,13 @@ public class OrderTask {
                         profitLog.setOrderId(order.getId());
                         profitLog.setOrderNo(orderNo);
                         profitLog.setOrderUserName(orderUser.getNickname());
+                        profitLog.setOrderRealName(orderUser.getRealName());
                         profitLog.setComments("门店收益：" + merchant.getMerchantName());
-                        profitLog.setEquipmentCode(equipment.getEquipmentCode());
+                        profitLog.setComments(new StringBuilder("门店收益：" + merchant.getMerchantName())
+                                .append("\n昵称："+merchant.getNickname())
+                                .append("\n电话："+merchant.getPhone())
+                                .toString());
+                        profitLog.setEquipmentCode(equipmentCode);
                         profitLog.setMerchantName(merchant.getMerchantName());
                         profitLog.setOrderSource(order.getOrderSource());
 //                        profitLog.setIsRenew(order.getIsRenew());
@@ -439,8 +453,12 @@ public class OrderTask {
                         profitLog.setOrderId(order.getId());
                         profitLog.setOrderNo(orderNo);
                         profitLog.setOrderUserName(orderUser.getNickname());
-                        profitLog.setComments("区域经理收益：" + order.getMerchantName());
-                        profitLog.setEquipmentCode(equipment.getEquipmentCode());
+                        profitLog.setOrderRealName(orderUser.getRealName());
+                        profitLog.setComments(new StringBuilder("区域经理收益：" + merchant.getMerchantName())
+                                .append("\n昵称："+manager.getNickname())
+                                .append("\n电话："+manager.getPhone())
+                                .toString());
+                        profitLog.setEquipmentCode(equipmentCode);
                         profitLog.setMerchantName(merchant.getMerchantName());
                         profitLog.setOrderSource(order.getOrderSource());
 //                        profitLog.setIsRenew(order.getIsRenew());
diff --git a/src/main/java/com/gxwebsoft/shop/entity/ProfitLog.java b/src/main/java/com/gxwebsoft/shop/entity/ProfitLog.java
index 933e98a..d1575d6 100644
--- a/src/main/java/com/gxwebsoft/shop/entity/ProfitLog.java
+++ b/src/main/java/com/gxwebsoft/shop/entity/ProfitLog.java
@@ -95,6 +95,9 @@ public class ProfitLog implements Serializable {
     @ApiModelProperty(value = "订单用户手机号")
     private String orderUserPhone;
 
+    @ApiModelProperty(value = "订单用户实名")
+    private String orderRealName;
+
     @ApiModelProperty(value = "租户id")
     private Integer tenantId;