From ef63b6568dac24ccc5c9d9a90e59fd299a8c6743 Mon Sep 17 00:00:00 2001 From: winter Date: Fri, 17 May 2024 08:44:11 +0800 Subject: [PATCH] fix --- .../iformall/domain/po/WxRaffleActivityRecord.java | 11 ++++++++--- .../service/impl/WxRaffleActivityServiceImpl.java | 2 ++ .../resources/mapper/WxRaffleActivityRecordMapper.xml | 3 ++- 3 files changed, 12 insertions(+), 4 deletions(-) diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxRaffleActivityRecord.java b/mallinkService/src/main/java/com/iformall/domain/po/WxRaffleActivityRecord.java index 596bf7d77..62791809b 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxRaffleActivityRecord.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxRaffleActivityRecord.java @@ -50,9 +50,12 @@ public class WxRaffleActivityRecord extends TenantEntity { @Excel(name="客户姓名",width = 20,orderNum = "6") @io.swagger.annotations.ApiModelProperty(value = "客户姓名", name = "cusName") private String cusName; - @Excel(name="身份证号",width = 20,orderNum = "6") - @io.swagger.annotations.ApiModelProperty(value = "身份证号", name = "cusCard") + @Excel(name="领奖人身份证号",width = 20,orderNum = "6") + @io.swagger.annotations.ApiModelProperty(value = "领奖人身份证号", name = "cusCard") private String cusCard; + @Excel(name="领奖人姓名",width = 20,orderNum = "6") + @io.swagger.annotations.ApiModelProperty(value = "领奖人姓名", name = "realCusName") + private String realCusName; @Excel(name="客户电话",width = 20,orderNum = "7") @io.swagger.annotations.ApiModelProperty(value = "客户电话", name = "phone") private String phone; @@ -208,7 +211,8 @@ public class WxRaffleActivityRecord extends TenantEntity { excelTitle.put("orderNo", "订单号"); excelTitle.put("orderMoney", "订单金额"); excelTitle.put("cusName", "客户姓名"); - excelTitle.put("cusCard", "身份证号"); + excelTitle.put("realCusName", "领奖人姓名"); + excelTitle.put("cusCard", "领奖人身份证号"); excelTitle.put("phone", "客户电话"); excelTitle.put("address", "客户地址"); excelTitle.put("createDate", "提交时间"); @@ -248,6 +252,7 @@ public class WxRaffleActivityRecord extends TenantEntity { excelObject.put("orderNo", orderNo); excelObject.put("orderMoney", orderMoney); excelObject.put("cusName", cusName); + excelObject.put("realCusName", realCusName); excelObject.put("cusCard", cusCard); excelObject.put("phone", phone); excelObject.put("address", address); diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxRaffleActivityServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxRaffleActivityServiceImpl.java index 46cbd02c2..cac4c5702 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxRaffleActivityServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxRaffleActivityServiceImpl.java @@ -461,6 +461,8 @@ public class WxRaffleActivityServiceImpl implements WxRaffleActivityService { ar.setUpdateDate(new Date()); ar.setSendTime(new Date()); ar.setSendBy(mallUserInfo.getId()); + ar.setCusCard(record.getCusCard()); + ar.setRealCusName(record.getRealCusName()); wxActivityRecordMapper.updateById(ar); diff --git a/mallinkService/src/main/resources/mapper/WxRaffleActivityRecordMapper.xml b/mallinkService/src/main/resources/mapper/WxRaffleActivityRecordMapper.xml index 934cb1e81..e9694d0a9 100644 --- a/mallinkService/src/main/resources/mapper/WxRaffleActivityRecordMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxRaffleActivityRecordMapper.xml @@ -9,6 +9,7 @@ + @@ -25,7 +26,7 @@ - `id`,`tenant_id`,`parent_tenant_id`,`activity_id`,`order_no`,`order_money`,`cus_name`,`cus_card`,`create_date`,`update_date`, + `id`,`tenant_id`,`parent_tenant_id`,`activity_id`,`order_no`,`order_money`,`cus_name`,`real_cus_name`,`cus_card`,`create_date`,`update_date`, `phone`,`address`,`audit_remark`,`audit_status`,`audit_by`,`audit_time`,`merchant_id`,`sign_img`,`send_by`,`send_time`