Просмотр исходного кода

//offlineActivity

release_toaliyun_real
xiaohu 1 год назад
Родитель
Сommit
9788cb0ec5
2 измененных файлов: 16 добавлений и 5 удалений
  1. +3
    -2
      mallinkBApi/src/main/java/com/iformall/controller/WxOfflineActivityRecordController.java
  2. +13
    -3
      mallinkService/src/main/java/com/iformall/domain/po/WxOfflineActivityRecord.java

+ 3
- 2
mallinkBApi/src/main/java/com/iformall/controller/WxOfflineActivityRecordController.java Просмотреть файл

@@ -59,6 +59,9 @@ public class WxOfflineActivityRecordController extends BaseController {
if (null == wxOfflineActivityRecord.getOrderMoney() ) { if (null == wxOfflineActivityRecord.getOrderMoney() ) {
return new ResultData(Result.ERROR,"订单金额不能为空"); return new ResultData(Result.ERROR,"订单金额不能为空");
} }
TenantEntity tenantEntity = getTenantInfo();
wxOfflineActivityRecord.updateTenantInfo(tenantEntity);

if(wxOfflineActivityRecord.getId() != null){ if(wxOfflineActivityRecord.getId() != null){
WxOfflineActivityRecord record = wxOfflineActivityRecordService.getById(wxOfflineActivityRecord.getId(),wxOfflineActivityRecord.getTenantId()); WxOfflineActivityRecord record = wxOfflineActivityRecordService.getById(wxOfflineActivityRecord.getId(),wxOfflineActivityRecord.getTenantId());
if(!EnumOfflineActivityRecordStatus.AUDT_FAIL.getCode().equals(record.getAuditStatus())){ if(!EnumOfflineActivityRecordStatus.AUDT_FAIL.getCode().equals(record.getAuditStatus())){
@@ -66,8 +69,6 @@ public class WxOfflineActivityRecordController extends BaseController {
} }
wxOfflineActivityRecord.setAuditRemark(""); wxOfflineActivityRecord.setAuditRemark("");
} }
TenantEntity tenantEntity = getTenantInfo();
wxOfflineActivityRecord.updateTenantInfo(tenantEntity);
wxOfflineActivityRecord.setCreateBy(getMerchantBUserId()); wxOfflineActivityRecord.setCreateBy(getMerchantBUserId());
wxOfflineActivityRecord.setMerchantId(getLoginBUser().getMerchantId()); wxOfflineActivityRecord.setMerchantId(getLoginBUser().getMerchantId());
wxOfflineActivityRecord.setAuditStatus(EnumOfflineActivityRecordStatus.AUDTING.getCode()); wxOfflineActivityRecord.setAuditStatus(EnumOfflineActivityRecordStatus.AUDTING.getCode());


+ 13
- 3
mallinkService/src/main/java/com/iformall/domain/po/WxOfflineActivityRecord.java Просмотреть файл

@@ -103,10 +103,20 @@ public class WxOfflineActivityRecord extends TenantEntity {
} }
return lotteryNumList; return lotteryNumList;
} }
@Excel(name = "抽奖券编码", width = 20, orderNum = "9")
@TableField(exist = false)
private String lotteryNumStr;
public String getLotteryNumStr() {
if(lotteryNumList != null && !lotteryNumList.isEmpty()){
return String.join(",", lotteryNumList);
}
return lotteryNumStr;
}


/** /**
* 抽奖券数量 * 抽奖券数量
*/ */
@Excel(name = "抽奖券数量", width = 20, orderNum = "10")
@TableField(value = "lottery_count") @TableField(value = "lottery_count")
private Integer lotteryCount; private Integer lotteryCount;


@@ -164,14 +174,14 @@ public class WxOfflineActivityRecord extends TenantEntity {
/** /**
* 审批意见 * 审批意见
*/ */
@Excel(name = "审核意见", width = 20, orderNum = "10")
@Excel(name = "审核意见", width = 20, orderNum = "12")
@TableField(value = "audit_remark") @TableField(value = "audit_remark")
private String auditRemark; private String auditRemark;


/** /**
* 审批状态 * 审批状态
*/ */
@Excel(name = "审核状态", width = 20, orderNum = "9", replace = {"审核中_0", "已审批_1", "已驳回_2", "已退单_3", "已发奖_10"})
@Excel(name = "审核状态", width = 20, orderNum = "13", replace = {"审核中_0", "已审批_1", "已驳回_2", "已退单_3", "已发奖_10"})
@TableField(value = "audit_status") @TableField(value = "audit_status")
private Integer auditStatus; private Integer auditStatus;


@@ -187,7 +197,7 @@ public class WxOfflineActivityRecord extends TenantEntity {
@TableField(value = "audit_by") @TableField(value = "audit_by")
private Long auditBy; private Long auditBy;


@Excel(name = "审核人", width = 20, orderNum = "12")
@Excel(name = "审核人", width = 20, orderNum = "14")
@TableField(exist = false) @TableField(exist = false)
private String auditByName; private String auditByName;




Загрузка…
Отмена
Сохранить