Browse Source

fix

release_toaliyun_real
winter 2 years ago
parent
commit
ef63b6568d
3 changed files with 12 additions and 4 deletions
  1. +8
    -3
      mallinkService/src/main/java/com/iformall/domain/po/WxRaffleActivityRecord.java
  2. +2
    -0
      mallinkService/src/main/java/com/iformall/service/impl/WxRaffleActivityServiceImpl.java
  3. +2
    -1
      mallinkService/src/main/resources/mapper/WxRaffleActivityRecordMapper.xml

+ 8
- 3
mallinkService/src/main/java/com/iformall/domain/po/WxRaffleActivityRecord.java View File

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


+ 2
- 0
mallinkService/src/main/java/com/iformall/service/impl/WxRaffleActivityServiceImpl.java View File

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


+ 2
- 1
mallinkService/src/main/resources/mapper/WxRaffleActivityRecordMapper.xml View File

@@ -9,6 +9,7 @@
<result column="order_no" jdbcType="VARCHAR" property="orderNo" />
<result column="order_money" jdbcType="DECIMAL" property="orderMoney" />
<result column="cus_name" jdbcType="VARCHAR" property="cusName" />
<result column="real_cus_name" jdbcType="VARCHAR" property="realCusName" />
<result column="cus_card" jdbcType="VARCHAR" property="cusCard" />
<result column="create_date" jdbcType="TIMESTAMP" property="createDate" />
<result column="update_date" jdbcType="TIMESTAMP" property="updateDate" />
@@ -25,7 +26,7 @@
</resultMap>

<sql id="allColumns">
`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`
</sql>



Loading…
Cancel
Save