gxwebsoft/yunxinwei-java
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat：收益列表-备注字段内容修改：增加昵称跟电话

Browse Source
This commit is contained in:
yangqingyuan
2024-08-09 13:15:10 +08:00
parent baf25eef03
commit 9581638e56
2 changed files with 26 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
src/main/java/com/gxwebsoft/apps/task/OrderTask.java
View File

@@ -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());

3
src/main/java/com/gxwebsoft/shop/entity/ProfitLog.java
View File

@@ -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;