diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxLegionActivityOrderController.java b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxLegionActivityOrderController.java index 450fb0516..abca22ed3 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxLegionActivityOrderController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxLegionActivityOrderController.java @@ -85,6 +85,7 @@ public class WxLegionActivityOrderController extends BaseController { if(wxLegionActivityOrder == null){ return new ResultData(Result.ERROR,"id 不能为空"); } + TenantEntity tenantEntity = getTenantInfo(); wxLegionActivityOrder.updateTenantInfo(tenantEntity); wxLegionActivityOrder.setAuditStatus(EnumLegionActivityOrderStatus.AUDI_SUCCESS.getCode()); diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxLegionActivityOrder.java b/mallinkService/src/main/java/com/iformall/domain/po/WxLegionActivityOrder.java index eb473681e..e63a538e4 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxLegionActivityOrder.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxLegionActivityOrder.java @@ -1,6 +1,8 @@ package com.iformall.domain.po; import cn.afterturn.easypoi.excel.annotation.Excel; +import com.alibaba.fastjson.JSON; +import com.aliyun.openservices.shade.org.apache.commons.lang3.StringUtils; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; @@ -196,6 +198,7 @@ public class WxLegionActivityOrder extends TenantEntity { * 审核时间 */ @io.swagger.annotations.ApiModelProperty(value="审核时间",name="auditTime") + @Excel(name = "审核时间", format = "yyyy-MM-dd HH:mm:ss", width = 20, orderNum = "12") @TableField(value = "audit_time") private Date auditTime; @@ -203,4 +206,35 @@ public class WxLegionActivityOrder extends TenantEntity { private Date auditTimeBegin; @TableField(exist = false) private Date auditTimeEnd; + + + /** + * 抽奖券编码 + */ + @TableField(exist = false) + private String lotteryNum; + @TableField(exist = false) + private List lotteryNumList; + public List getLotteryNumList() { + if(StringUtils.isNotBlank(lotteryNum)){ + try { + List stringList = JSON.parseArray(lotteryNum, String.class); + stringList.removeIf(String::isEmpty); + lotteryNumList = stringList.isEmpty() ? null : stringList; + }catch(Exception e){} + } + return lotteryNumList; + } + + /** + * 抽奖券数量 + */ + @TableField(exist = false) + private Integer lotteryCount; + + /** + * 周年庆抽奖编码 + */ + @TableField(exist = false) + private String anniversaryLotteryNum; } \ No newline at end of file diff --git a/mallinkService/src/main/java/com/iformall/mapper/WxLegionActivityUserMapper.java b/mallinkService/src/main/java/com/iformall/mapper/WxLegionActivityUserMapper.java index 37f56d0c2..c0dcb1442 100644 --- a/mallinkService/src/main/java/com/iformall/mapper/WxLegionActivityUserMapper.java +++ b/mallinkService/src/main/java/com/iformall/mapper/WxLegionActivityUserMapper.java @@ -26,6 +26,8 @@ public interface WxLegionActivityUserMapper extends CommonMapper merchantCountStatistics(WxLegionActivityUser wxLegionActivityUser); void updateStatus(WxLegionActivityUser activityUser); + + Integer selectOnlyCount(WxLegionActivityUser wxLegionActivityUser); } diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxLegionActivityOfflineConfigServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxLegionActivityOfflineConfigServiceImpl.java index 545d8b27e..c78da59d5 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxLegionActivityOfflineConfigServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxLegionActivityOfflineConfigServiceImpl.java @@ -94,6 +94,10 @@ public class WxLegionActivityOfflineConfigServiceImpl implements WxLegionActivit WxMerchant merchant = wxMerchantService.selectById(activityRecord.getMerchantId()); activityRecord.setBusinessId(merchant.getBusinessId()); } + activityRecord.setLotteryNum(legionActivityOrder.getLotteryNum()); + activityRecord.setLotteryCount(legionActivityOrder.getLotteryCount()); + activityRecord.setAnniversaryLotteryNum(legionActivityOrder.getAnniversaryLotteryNum()); + activityRecord.setCreateDate(legionActivityOrder.getCreateDate()); activityRecord.setUpdateDate(legionActivityOrder.getUpdateDate()); // activityRecord.setAuditRemark(legionActivityOrder.getAuditRemark()); diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxLegionActivityOrderServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxLegionActivityOrderServiceImpl.java index 156a941b4..56cf7b54b 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxLegionActivityOrderServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxLegionActivityOrderServiceImpl.java @@ -309,6 +309,10 @@ public class WxLegionActivityOrderServiceImpl implements WxLegionActivityOrderSe legionActivityOrder.setCusPhone(user.getPhone()); legionActivityOrder.setCusVipNum(user.getVipNum()); + legionActivityOrder.setLotteryNum(wxLegionActivityOrder.getLotteryNum()); + legionActivityOrder.setLotteryCount(wxLegionActivityOrder.getLotteryCount()); + legionActivityOrder.setAnniversaryLotteryNum(wxLegionActivityOrder.getAnniversaryLotteryNum()); + wxLegionActivityOfflineConfigService.syncOfflineActivityRecord(legionActivityOrder); } diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxLegionActivityUserServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxLegionActivityUserServiceImpl.java index a30056f02..17d81fbce 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxLegionActivityUserServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxLegionActivityUserServiceImpl.java @@ -59,19 +59,23 @@ public class WxLegionActivityUserServiceImpl implements WxLegionActivityUserServ @Override public void saveOrUpdate(WxLegionActivityUser wxLegionActivityUser) { + //手就号唯一 WxLegionActivityUser userQ = new WxLegionActivityUser(); + userQ.setId(wxLegionActivityUser.getId()); userQ.updateTenantInfo(wxLegionActivityUser); userQ.setActivityId(wxLegionActivityUser.getActivityId()); userQ.setPhone(wxLegionActivityUser.getPhone()); userQ.setStatus(EnumLegionActivityUserStatus.VALID.getCode()); - WxLegionActivityUser user = this.selectOne(userQ); - if(user != null) { - if(wxLegionActivityUser.getId() == null){ - throw new MallinkException(Result.ERROR,"该用户已绑定"); - } - if(!wxLegionActivityUser.getId().equals(user.getId())){ - throw new MallinkException(Result.ERROR,"该用户已绑定"); - } + Integer phoneCount = wxLegionActivityUserMapper.selectOnlyCount(userQ); + if(phoneCount > 0) { + throw new MallinkException(Result.ERROR,"手机号已绑定"); + } + //vip卡号唯一 + userQ.setPhone(null); + userQ.setVipNum(wxLegionActivityUser.getVipNum()); + Integer vipCount = wxLegionActivityUserMapper.selectOnlyCount(userQ); + if(vipCount > 0) { + throw new MallinkException(Result.ERROR,"vip卡已绑定"); } WxLegionActivityMerchantConfig merchantConfigQuery = new WxLegionActivityMerchantConfig(); diff --git a/mallinkService/src/main/resources/mapper/WxLegionActivityUserMapper.xml b/mallinkService/src/main/resources/mapper/WxLegionActivityUserMapper.xml index 0f7a23566..814d9cac0 100644 --- a/mallinkService/src/main/resources/mapper/WxLegionActivityUserMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxLegionActivityUserMapper.xml @@ -164,4 +164,31 @@ + + +