Kaynağa Gözat

Merge branch 'release_toaliyun_real' of https://git.malls.iformall.com/server/formallProject into release_toaliyun_real

release_toaliyun_real
winter 1 yıl önce
ebeveyn
işleme
de1c97d80a
7 değiştirilmiş dosya ile 84 ekleme ve 8 silme
  1. +1
    -0
      mallinkAdmin/src/main/java/com/iformall/controller/market/WxLegionActivityOrderController.java
  2. +34
    -0
      mallinkService/src/main/java/com/iformall/domain/po/WxLegionActivityOrder.java
  3. +2
    -0
      mallinkService/src/main/java/com/iformall/mapper/WxLegionActivityUserMapper.java
  4. +4
    -0
      mallinkService/src/main/java/com/iformall/service/impl/WxLegionActivityOfflineConfigServiceImpl.java
  5. +4
    -0
      mallinkService/src/main/java/com/iformall/service/impl/WxLegionActivityOrderServiceImpl.java
  6. +12
    -8
      mallinkService/src/main/java/com/iformall/service/impl/WxLegionActivityUserServiceImpl.java
  7. +27
    -0
      mallinkService/src/main/resources/mapper/WxLegionActivityUserMapper.xml

+ 1
- 0
mallinkAdmin/src/main/java/com/iformall/controller/market/WxLegionActivityOrderController.java Dosyayı Görüntüle

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


+ 34
- 0
mallinkService/src/main/java/com/iformall/domain/po/WxLegionActivityOrder.java Dosyayı Görüntüle

@@ -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<String> lotteryNumList;
public List<String> getLotteryNumList() {
if(StringUtils.isNotBlank(lotteryNum)){
try {
List<String> 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;
}

+ 2
- 0
mallinkService/src/main/java/com/iformall/mapper/WxLegionActivityUserMapper.java Dosyayı Görüntüle

@@ -26,6 +26,8 @@ public interface WxLegionActivityUserMapper extends CommonMapper<WxLegionActivit
List<LegionActivityUserStatistics> merchantCountStatistics(WxLegionActivityUser wxLegionActivityUser);

void updateStatus(WxLegionActivityUser activityUser);

Integer selectOnlyCount(WxLegionActivityUser wxLegionActivityUser);
}




+ 4
- 0
mallinkService/src/main/java/com/iformall/service/impl/WxLegionActivityOfflineConfigServiceImpl.java Dosyayı Görüntüle

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


+ 4
- 0
mallinkService/src/main/java/com/iformall/service/impl/WxLegionActivityOrderServiceImpl.java Dosyayı Görüntüle

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



+ 12
- 8
mallinkService/src/main/java/com/iformall/service/impl/WxLegionActivityUserServiceImpl.java Dosyayı Görüntüle

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


+ 27
- 0
mallinkService/src/main/resources/mapper/WxLegionActivityUserMapper.xml Dosyayı Görüntüle

@@ -164,4 +164,31 @@
</foreach>
</if>
</update>

<select id="selectOnlyCount" parameterType="com.iformall.domain.po.WxLegionActivityUser" resultType="Integer">
select count(1) from wx_legion_activity_user
where 1 = 1
<if test=" null != id ">
and `id` != #{id}
</if>
<if test=" null != tenantId and '' != tenantId">
and `tenant_id` = #{tenantId}
</if>
<if test=" null != parentTenantId and '' != parentTenantId">
and `parent_tenant_id` = #{parentTenantId}
</if>
<if test=" null != activityId ">
and `activity_id` = #{activityId}
</if>
<if test=" null != phone and phone != '' ">
and `phone` = #{phone}
</if>
<if test=" null != vipNum and vipNum != '' ">
and `vip_num` = #{vipNum}
</if>
<if test=" null != status ">
and `status` = #{status}
</if>
</select>

</mapper>

Yükleniyor…
İptal
Kaydet