yujian
2020-07-01 b2e526370aaed3e20ebabd7ca494e0fb2b2ca73e
付款金额大于等于9.9
3个文件已修改
14 ■■■■ 已修改文件
fanli/src/main/java/com/yeshi/fanli/job/goods/PullNewJob.java 10 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
fanli/src/main/java/com/yeshi/fanli/service/impl/goods/PullNewGoodsServiceImpl.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
fanli/src/main/java/com/yeshi/fanli/service/impl/redpack/RedPackWinInviteServiceImpl.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
fanli/src/main/java/com/yeshi/fanli/job/goods/PullNewJob.java
@@ -8,7 +8,6 @@
import javax.annotation.Resource;
import org.apache.commons.beanutils.PropertyUtils;
import org.springframework.scheduling.annotation.Scheduled;
import org.springframework.stereotype.Component;
import org.yeshi.utils.DateUtil;
@@ -50,11 +49,6 @@
    }
    
    @Scheduled(cron = "0 0/2 * * * ? ")
    private void addPullNewGoods2() {
        addPullNewGoods();
    }
    /**
     * 拉新商品
     */
@@ -62,8 +56,6 @@
        // 商品比例限制
        double limitRate =  Double.valueOf(redPackConfigService.getValueByKey("goods_reate_limit"));    
        double limitPrice =  Double.valueOf(redPackConfigService.getValueByKey("goods_pay_ment_limit"));    
        Integer array[] = {3,4,5,6,7,8,9,10,11,12,15};
        for (Integer catId: array) {
            Integer minId = 1;
@@ -87,7 +79,7 @@
                    if (goods.getCouponmoney() == null || goods.getCouponmoney() <= 0)
                        continue;
                    // 商品券后价大于9.9元
                    if (goods.getItemendprice() == null || goods.getItemendprice() <= limitPrice)
                    if (goods.getItemendprice() == null || goods.getItemendprice() < limitPrice)
                        continue;
                    PullNewGoods pullNewGoods = new PullNewGoods();
fanli/src/main/java/com/yeshi/fanli/service/impl/goods/PullNewGoodsServiceImpl.java
@@ -61,7 +61,7 @@
        if (goods.getCouponmoney() == null || goods.getCouponmoney() <= 0)
            return;
        // 商品券后价大于9.9元
        if (goods.getItemendprice() == null || goods.getItemendprice() <= limitPrice)
        if (goods.getItemendprice() == null || goods.getItemendprice() < limitPrice)
            return;
        
        PullNewGoods pullNewGoods = new PullNewGoods();
fanli/src/main/java/com/yeshi/fanli/service/impl/redpack/RedPackWinInviteServiceImpl.java
@@ -533,7 +533,7 @@
                continue;
            // 付款金额限制
            BigDecimal payment = commonOrder.getPayment();
            if (payment == null || payment.compareTo(limitPayMent) <= 0)
            if (payment == null || payment.compareTo(limitPayMent) < 0)
                continue;
            
            // 商品佣金比例限制