跨城推广

liujie

21 小时以前 1d1dbcdb6382b6c09fa0cdb6b0fbcbbea9e43e85

跨城推广

 UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/crossCity/model/OrderCrossCity.java

@@ -388,6 +388,25 @@
    private Integer responsibilityType;

    private Long promotionActivityId;
    private String promotionUser;

    private String promotionPhone;

    public String getPromotionUser() {
        return promotionUser;
    }

    public void setPromotionUser(String promotionUser) {
        this.promotionUser = promotionUser;
    }

    public String getPromotionPhone() {
        return promotionPhone;
    }

    public void setPromotionPhone(String promotionPhone) {
        this.promotionPhone = promotionPhone;
    }

    public Long getPromotionActivityId() {
        return promotionActivityId;

 UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/crossCity/server/impl/OrderCrossCityServiceImpl.java

@@ -1293,7 +1293,15 @@

        // 是否推广订单
        Integer promotion = isPromotion(uid);
        orderCrossCity.setPromotion(promotion);
        if(promotion!=null){
            orderCrossCity.setPromotion(2);
            Driver driver1 = driverService.selectById(promotion);
            orderCrossCity.setPromotionUser(driver1.getName());
            orderCrossCity.setPromotionPhone(driver1.getPhone());
            orderCrossCity.setPromotionDriverId(promotion);
        }else{
            orderCrossCity.setPromotion(1);
        }

        this.insert(orderCrossCity);
        
@@ -1388,17 +1396,17 @@
        return ResultUtil.success(baseWarpper);
    }


    private Integer isPromotion(Integer userId){
        UserInfo userInfo = userInfoService.selectById(userId);
        if(userInfo.getBindDriverId()!=null && userInfo.getBindExpireDate().getTime()<=System.currentTimeMillis()){
            String registAreaCode = userInfo.getRegistAreaCode();
            TDriverPromotionActivity tDriverPromotionActivity = driverPromotionActivityService.selectOne(new EntityWrapper<TDriverPromotionActivity>().eq("districtCode", registAreaCode).ge("startTime", new Date()).lt("endTime", new Date()).last("AND FIND_IN_SET(" + 3 + ", bizType) limit 1"));
            TDriverPromotionActivity tDriverPromotionActivity = driverPromotionActivityService.selectOne(new EntityWrapper<TDriverPromotionActivity>().eq("state",1).eq("districtCode", registAreaCode).le("startTime", new Date()).ge("endTime", new Date()).last("AND FIND_IN_SET(" + 3 + ", bizType) limit 1"));
            if(tDriverPromotionActivity!=null){
                return 2;
                return userInfo.getBindDriverId();
            }
        }
        return null;

    }
    /**
     * 获取订单