表不存在问题
This commit is contained in:
parent
1510493305
commit
7e0be5f7db
|
|
@ -4,7 +4,6 @@ import cn.hutool.core.bean.BeanUtil;
|
||||||
import cn.hutool.core.date.DateUtil;
|
import cn.hutool.core.date.DateUtil;
|
||||||
import cn.hutool.core.util.RandomUtil;
|
import cn.hutool.core.util.RandomUtil;
|
||||||
import cn.hutool.core.util.StrUtil;
|
import cn.hutool.core.util.StrUtil;
|
||||||
import cn.hutool.log.Log;
|
|
||||||
import com.czg.account.dto.shopuser.*;
|
import com.czg.account.dto.shopuser.*;
|
||||||
import com.czg.account.entity.ShopUser;
|
import com.czg.account.entity.ShopUser;
|
||||||
import com.czg.account.entity.UserInfo;
|
import com.czg.account.entity.UserInfo;
|
||||||
|
|
@ -33,13 +32,10 @@ import jakarta.annotation.Resource;
|
||||||
import lombok.extern.slf4j.Slf4j;
|
import lombok.extern.slf4j.Slf4j;
|
||||||
import org.apache.dubbo.config.annotation.DubboReference;
|
import org.apache.dubbo.config.annotation.DubboReference;
|
||||||
import org.apache.dubbo.config.annotation.DubboService;
|
import org.apache.dubbo.config.annotation.DubboService;
|
||||||
import org.springframework.stereotype.Service;
|
|
||||||
import org.springframework.transaction.annotation.Transactional;
|
import org.springframework.transaction.annotation.Transactional;
|
||||||
|
|
||||||
import java.math.BigDecimal;
|
import java.math.BigDecimal;
|
||||||
import java.util.Arrays;
|
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
import java.util.stream.Collectors;
|
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|
@ -107,7 +103,7 @@ public class AShopUserServiceImpl implements AShopUserService {
|
||||||
return PageUtil.convert(new PageInfo<>(shopUsers));
|
return PageUtil.convert(new PageInfo<>(shopUsers));
|
||||||
}catch (Exception e){
|
}catch (Exception e){
|
||||||
log.info("获取营销推送任务用户列表失败{},{}", smsPushEventUser, e.getMessage());
|
log.info("获取营销推送任务用户列表失败{},{}", smsPushEventUser, e.getMessage());
|
||||||
return new Page<>();
|
return PageUtil.convert(new PageInfo<>());
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -141,12 +141,12 @@
|
||||||
0 AS earlier_orders
|
0 AS earlier_orders
|
||||||
</otherwise>
|
</otherwise>
|
||||||
</choose>
|
</choose>
|
||||||
FROM shop_user u
|
FROM tb_shop_user u
|
||||||
<!-- 只有当有筛选条件时才关联order表 -->
|
<!-- 只有当有筛选条件时才关联order表 -->
|
||||||
<if test="param.orderTimeToday == 1 or param.orderTimeYesterday == 1 or
|
<if test="param.orderTimeToday == 1 or param.orderTimeYesterday == 1 or
|
||||||
param.orderTimeTwoWeeks == 1 or param.orderTimeMoreThanTwoWeeks == 1 or
|
param.orderTimeTwoWeeks == 1 or param.orderTimeMoreThanTwoWeeks == 1 or
|
||||||
param.noOrder == 1 or param.oneOrder == 1 or param.fiveOrder == 1">
|
param.noOrder == 1 or param.oneOrder == 1 or param.fiveOrder == 1">
|
||||||
LEFT JOIN `order` o ON u.user_id = o.user_id and o.user_id is not null AND o.shop_id = #{shopId} AND o.status = 'done'
|
LEFT JOIN `tb_order_info` o ON u.user_id = o.user_id and o.user_id is not null AND o.shop_id = #{shopId} AND o.status = 'done'
|
||||||
</if>
|
</if>
|
||||||
WHERE u.main_shop_id = #{mainShopId} and u.phone is not null
|
WHERE u.main_shop_id = #{mainShopId} and u.phone is not null
|
||||||
<!-- 性别筛选条件 -->
|
<!-- 性别筛选条件 -->
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue