20221220

xiaoyong931011

2022-12-20 0b08cd9c6e53dc1b7efffdc81e80cd205efc651e

20221220

 src/main/java/cc/mrbird/febs/mall/quartz/OrderSettlementJob.java

@@ -61,41 +61,41 @@
     * 普通商品结算 -- 10天结算一次
     */
//    @Scheduled(cron = "0 0 0 * * ?")
    @Transactional(rollbackFor = Exception.class)
    public void normalGoodsSettlementJob() {
        log.info("普通商品结算");
        List<MallOrderInfo> orderInfos = mallOrderInfoMapper.selectOrderInfoWithNormalGoods(DateUtil.offsetDay(new Date(), -10));
        if (CollUtil.isEmpty(orderInfos)) {
            return;
        }

        for (MallOrderInfo orderInfo : orderInfos) {
            MallMember member = mallMemberMapper.selectById(orderInfo.getMemberId());
            if (AgentLevelEnum.ZERO_LEVEL.name().equals(member.getLevel())) {
                continue;
            }

            for (MallOrderItem item : orderInfo.getItems()) {
                MallGoodsSku sku = mallGoodsSkuMapper.selectById(item.getSkuId());
                BigDecimal score = sku.getPresentPrice();

                memberWalletService.add(score, member.getId(), "score");
                mallMoneyFlowService.addMoneyFlow(member.getId(), score, MoneyFlowTypeEnum.STATIC_BONUS.getValue(), orderInfo.getOrderNo(), FlowTypeEnum.SCORE.getValue());

                mallAchieveService.add(item.getId());
            }

            // 普通商品动态分红结算
            memberProfitService.dynamicProfit(orderInfo.getId(), 1);
        }
    }
//    @Transactional(rollbackFor = Exception.class)
//    public void normalGoodsSettlementJob() {
//        log.info("普通商品结算");
//        List<MallOrderInfo> orderInfos = mallOrderInfoMapper.selectOrderInfoWithNormalGoods(DateUtil.offsetDay(new Date(), -10));
//        if (CollUtil.isEmpty(orderInfos)) {
//            return;
//        }
//
//        for (MallOrderInfo orderInfo : orderInfos) {
//            MallMember member = mallMemberMapper.selectById(orderInfo.getMemberId());
//            if (AgentLevelEnum.ZERO_LEVEL.name().equals(member.getLevel())) {
//                continue;
//            }
//
//            for (MallOrderItem item : orderInfo.getItems()) {
//                MallGoodsSku sku = mallGoodsSkuMapper.selectById(item.getSkuId());
//                BigDecimal score = sku.getPresentPrice();
//
//                memberWalletService.add(score, member.getId(), "score");
//                mallMoneyFlowService.addMoneyFlow(member.getId(), score, MoneyFlowTypeEnum.STATIC_BONUS.getValue(), orderInfo.getOrderNo(), FlowTypeEnum.SCORE.getValue());
//
//                mallAchieveService.add(item.getId());
//            }
//
//            // 普通商品动态分红结算
//            memberProfitService.dynamicProfit(orderInfo.getId(), 1);
//        }
//    }

    /**
     * 自动确认收货
     */
    @Scheduled(cron = "0 0 0 * * ?")
    public void orderAutoConfirmJob() {
        log.info("自动确认收货");
        mallOrderInfoMapper.updateOrderConfirmStatus(DateUtil.offsetDay(new Date(), -7));
    }
//    @Scheduled(cron = "0 0 0 * * ?")
//    public void orderAutoConfirmJob() {
//        log.info("自动确认收货");
//        mallOrderInfoMapper.updateOrderConfirmStatus(DateUtil.offsetDay(new Date(), -7));
//    }
}

 src/main/java/cc/mrbird/febs/mall/quartz/ProfitJob.java

@@ -34,53 +34,53 @@
@Component
public class ProfitJob {

    @Autowired
    private IMemberProfitService memberProfitService;

    /**
     * 代理分红
     */
    @Scheduled(cron = "0 30 0 * * ?")
    public void profitJob() {
        memberProfitService.agentProfit(null);
    }

    @Scheduled(cron = "0 30 1 * * ?")
    public void storeAndDirectorJob() {
        memberProfitService.storeAndDirectorProfit(null);
    }

    /**
     * 感恩奖
     */
    @Scheduled(cron = "0 0 1 * * ?")
    public void thankfulJob() {
        memberProfitService.thankfulProfit(null);
    }


    /**
     * 静态分红
     */
//    @Scheduled(cron = "0 0 0 * * ?")
//    public void staticProfitJob() {
//        memberProfitService.staticProfit(null);
//    @Autowired
//    private IMemberProfitService memberProfitService;
//
//    /**
//     * 代理分红
//     */
//    @Scheduled(cron = "0 30 0 * * ?")
//    public void profitJob() {
//        memberProfitService.agentProfit(null);
//    }

    /**
     * 排名奖 每月1号
     */
    @Scheduled(cron = "0 30 0 1 * ?")
    public void rankJob() {
        memberProfitService.rankProfit();
    }

    /**
     * 积分池，所有消费拿出10%放到积分池，然后按1%每天释放加权平分
     */
    @Scheduled(cron = "0 0 2 * * ?")
//    @Scheduled(cron = "0 0/5 * * * ? ")
    public void scorePool() {
        memberProfitService.scorePool();
    }
//
//    @Scheduled(cron = "0 30 1 * * ?")
//    public void storeAndDirectorJob() {
//        memberProfitService.storeAndDirectorProfit(null);
//    }
//
//    /**
//     * 感恩奖
//     */
//    @Scheduled(cron = "0 0 1 * * ?")
//    public void thankfulJob() {
//        memberProfitService.thankfulProfit(null);
//    }
//
//
//    /**
//     * 静态分红
//     */
////    @Scheduled(cron = "0 0 0 * * ?")
////    public void staticProfitJob() {
////        memberProfitService.staticProfit(null);
////    }
//
//    /**
//     * 排名奖 每月1号
//     */
//    @Scheduled(cron = "0 30 0 1 * ?")
//    public void rankJob() {
//        memberProfitService.rankProfit();
//    }
//
//    /**
//     * 积分池，所有消费拿出10%放到积分池，然后按1%每天释放加权平分
//     */
//    @Scheduled(cron = "0 0 2 * * ?")
////    @Scheduled(cron = "0 0/5 * * * ? ")
//    public void scorePool() {
//        memberProfitService.scorePool();
//    }
}

 src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallOrderInfoServiceImpl.java

@@ -287,10 +287,11 @@
        if (OrderStatusEnum.WAIT_PAY.getValue() != orderInfo.getStatus()) {
            throw new FebsException("订单状态不能支付");
        }

        String type = payOrderDto.getType();
        type = type == "3" ? type : "3";
        String payResultStr = "";
        String rcResult = "";
        switch (payOrderDto.getType()) {
        switch (type) {
            case "1":
                UnipayDto unipayDtoWx = new UnipayDto();
//                unipayDto.setAmount(new BigDecimal("0.01"));

 src/main/resources/application-prod.yml

@@ -15,20 +15,20 @@
      datasource:
        # 数据源-1，名称为 base
        base:
          username: db_mall
          password: mall!@#123
          username: db_mall_coin
          password: db_mall_coin!@#123
          driver-class-name: com.mysql.cj.jdbc.Driver
          url: jdbc:mysql://127.0.0.1:3306/db_mall?useUnicode=true&characterEncoding=UTF-8&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=GMT%2b8
          url: jdbc:mysql://127.0.0.1:3306/db_mall_coin?useUnicode=true&characterEncoding=UTF-8&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=GMT%2b8

  redis:
    # Redis数据库索引（默认为 0）
    database: 0
    database: 12
    # Redis服务器地址
    host: 127.0.0.1
    # Redis服务器连接端口
    port: 6379
    # Redis 密码
    password: zhongji-mall=-0
    password: dapp!@#123
    lettuce:
      pool:
        # 连接池中的最小空闲连接
@@ -44,8 +44,8 @@
  rabbitmq:
    host: 127.0.0.1
    port: 5672
    username: zj_mall
    password: zj_mall123
    username: xc_rabbit
    password: xuncong123
    publisher-confirm-type: correlated

pay:

 src/main/resources/application.yml

@@ -1,5 +1,5 @@
server:
  port: 8083
  port: 8098
  tomcat:
    uri-encoding: utf-8