Merge branch 'IGT-dev' of http://120.27.238.55:7000/r/sys-dapp into IGT-dev

wzy

2022-10-29 2c03637a70a51b747db9fa02c10f5de7a32b2df1

Merge branch 'IGT-dev' of http://120.27.238.55:7000/r/sys-dapp into IGT-dev

 src/main/java/cc/mrbird/febs/dapp/mapper/IgtOnHookPlanOrderItemDao.java

@@ -28,4 +28,6 @@
    BigDecimal selectTotalAmountByCreateTimeAndOrderId(@Param("startTime")Date startTime, @Param("endTime")Date endTime, @Param("orderId")Long id);

    Long selectByIsgoalAndOrderId(@Param("isGoal")int i, @Param("orderId")Long orderId);

    IgtOnHookPlanOrderItem selectByCreateTimeAndIsgoaAndOrderId(@Param("endTime")Date endTime, @Param("isGoal")int i, @Param("orderId")Long orderId);
}

 src/main/java/cc/mrbird/febs/dapp/service/impl/DappWalletServiceImpl.java

@@ -1112,6 +1112,7 @@
    @Override
    public Integer isGoal(String num) {
        Set set = new HashSet();
        num = StrUtil.subSuf(num,1);
        char[] chars = num.toCharArray();
        for(char c:chars) {
            set.add(c);
@@ -1123,6 +1124,12 @@
        }
    }

    public static void main(String[] args) {

        String num = StrUtil.subSuf("01234",1);
        System.out.print(num);
    }

    private String isIdentity(List<String> refererIds,String levelCode){
        String flag = levelCode;
        for(String str : refererIds){

 src/main/java/cc/mrbird/febs/job/OnHookPlanJob.java

@@ -238,14 +238,16 @@
                        igtOnHookPlanOrderItemDao.insert(igtOnHookPlanOrderItem);

                        if(2 == igtOnHookPlanOrderItem.getIsGoal()){

                            //返还两次中奖之间的本金
                            Date startTime = igtOnHookPlanOrderItemsOld.get(0).getCreateTime();
                            Date endTime = igtOnHookPlanOrderItem.getCreateTime();
                            Date startTime = null;
                            //返回上次中奖的记录
                            IgtOnHookPlanOrderItem igtOld = igtOnHookPlanOrderItemDao.selectByCreateTimeAndIsgoaAndOrderId(endTime,2,igtOnHookPlanOrder.getId());
                            if(ObjectUtil.isNotEmpty(igtOld)){
                                startTime = igtOld.getCreateTime();
                            }
                            BigDecimal totalAmount = igtOnHookPlanOrderItemDao.selectTotalAmountByCreateTimeAndOrderId(startTime,endTime,igtOnHookPlanOrder.getId());
                            //如果中奖，增加挂机主表的挂机总收益,返还两次中奖之间的本金
                            igtOnHookPlanOrderDao.AddProfitById(igtOnHookPlanOrder.getId()
                                    ,igtOnHookPlanOrderItem.getProfit());
                            igtOnHookPlanOrderDao.addAvaAmountById(igtOnHookPlanOrder.getId()
                                    ,totalAmount);
                        }else{

 src/main/resources/application-prod.yml

@@ -24,11 +24,11 @@
    # Redis数据库索引（默认为 0）
    database: 10
    # Redis服务器地址
    host: 120.27.238.55
    host: 127.0.0.1
    # Redis服务器连接端口
    port: 6379
    # Redis 密码
    password: xcong123
    password: dapp!@#123
    lettuce:
      pool:
        # 连接池中的最小空闲连接
@@ -42,10 +42,10 @@
    # 连接超时时间（毫秒）
    timeout: 5000
  rabbitmq:
    host: 120.27.238.55
    host: 127.0.0.1
    port: 5672
    username: ct_rabbit
    password: 123456
    username: xc_rabbit
    password: xuncong123
    publisher-confirm-type: correlated

  jackson:

 src/main/resources/mapper/dapp/IgtOnHookPlanOrderItemDao.xml

@@ -65,9 +65,13 @@
        SELECT
            ifnull(sum(a.amount),0)
        FROM igt_on_hook_plan_order_item a
        where a.order_id = #{orderId}
          and a.create_time &gt; #{startTime}
          and a.create_time &lt; #{endTime}
        <where>
            a.order_id = #{orderId}
            and a.create_time &lt; #{endTime}
            <if test="startTime != null">
                and a.create_time >= #{startTime}
            </if>
        </where>
        order by create_time desc
    </select>

@@ -80,5 +84,16 @@
        order by create_time desc
    </select>

    <select id="selectByCreateTimeAndIsgoaAndOrderId" resultType="cc.mrbird.febs.dapp.entity.IgtOnHookPlanOrderItem">
        SELECT
            a.*
        FROM igt_on_hook_plan_order_item a
        where a.order_id = #{orderId}
          and a.is_goal = #{isGoal}
          and a.create_time &lt; #{endTime}
        order by create_time asc
        limit 1
    </select>


</mapper>

 src/test/java/cc/mrbird/febs/JunitTest.java

@@ -249,193 +249,16 @@
    }

    @Test
    public void testUpdateIgt(){
        Log.info("开始更新挂机子表状态");
        List<IgtOnHookPlanOrder> igtOnHookPlanOrders = igtOnHookPlanOrderDao.selectByState(1);
        if(CollUtil.isEmpty(igtOnHookPlanOrders)){
            return;
    public void testUpdateIgt(){//返还两次中奖之间的本金
        IgtOnHookPlanOrderItem igtOnHookPlanOrderItem = igtOnHookPlanOrderItemDao.selectById(3758);
        Date endTime = igtOnHookPlanOrderItem.getCreateTime();
        Date startTime = null;
        //返回上次中奖的记录
        IgtOnHookPlanOrderItem igtOld = igtOnHookPlanOrderItemDao.selectByCreateTimeAndIsgoaAndOrderId(endTime,1,188L);
        if(ObjectUtil.isNotEmpty(igtOld)){
            startTime = igtOld.getCreateTime();
        }
        for(IgtOnHookPlanOrder igtOnHookPlanOrder : igtOnHookPlanOrders){
            BigDecimal avaAmount = igtOnHookPlanOrder.getAvaAmount();
            if(avaAmount.compareTo(BigDecimal.ZERO) > 0){
                /**
                 * 获取下一个开奖记录
                 * 生成一条开奖字表记录
                 * 计算收益
                 */
                String redisKey = "";
                if("prod".equals(active)){
                    redisKey = "on_hook_award_id";
                }else{
                    redisKey = "on_hook_award_id_test";
                }
                String onHookAwardRedisId = redisUtils.getString(redisKey);
                DappOnHookAward dappOnHookAward = dappOnHookAwardDao.selectById(Long.parseLong(onHookAwardRedisId));
                Date awardTime = dappOnHookAward.getAwardTime();
                DateTime dateTime = DateUtil.offsetMinute(awardTime, 5);
                SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm");
                String yyyyMMddHHMM = sdf.format(dateTime);
                DappOnHookAward dappOnHookAwardNext = dappOnHookAwardDao.selectByByAwardTime(yyyyMMddHHMM);

                //系统挂机总次数 = 时长 * 60 / 5
                DataDictionaryCustom maxHoursDic = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(DataDictionaryEnum.MAX_HOURS.getType(), DataDictionaryEnum.MAX_HOURS.getCode());
                Float maxHours = Float.parseFloat(maxHoursDic.getValue());
                maxHours = maxHours * 60 / 5;
                List<IgtOnHookPlanOrderItem> igtOnHookPlanOrderItemsOld = igtOnHookPlanOrderItemDao.selectByIgtIdAndMemberId(igtOnHookPlanOrder.getId(),igtOnHookPlanOrder.getMemberId());
                //如果没有中奖记录则是新增一条1挂机方案的挂机子表记录
                if(CollUtil.isEmpty(igtOnHookPlanOrderItemsOld)){

                    IgtOnHookPlanOrderItem igtOnHookPlanOrderItem = new IgtOnHookPlanOrderItem();
                    igtOnHookPlanOrderItem.setMemberId(igtOnHookPlanOrder.getMemberId());
                    igtOnHookPlanOrderItem.setOrderId(igtOnHookPlanOrder.getId());
                    //获取挂机方案
                    DataDictionaryCustom dataDictionaryCustom = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(DataDictionaryEnum.PLAN_A.getType(), DataDictionaryEnum.PLAN_A.getCode());
                    String dataDictionaryCustomValue = dataDictionaryCustom.getValue();
                    JSONObject levelMemberValueParse = JSONUtil.parseObj(dataDictionaryCustomValue);
                    BigDecimal amountPlanA = new BigDecimal(levelMemberValueParse.get("amount").toString())
                            .multiply(new BigDecimal(igtOnHookPlanOrder.getPlanCode())).setScale(4,BigDecimal.ROUND_DOWN);
                    igtOnHookPlanOrderItem.setAmount(amountPlanA);
                    //获取收益率
                    DappMemberEntity dappMemberEntity = dappMemberDao.selectById(igtOnHookPlanOrder.getMemberId());
                    DataDictionaryCustom identityDic = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(DataDictionaryEnum.LEVEL_MB.getType(), dappMemberEntity.getIdentity());
                    String identityDicValue = identityDic.getValue();
                    JSONObject identityDicValueParse = JSONUtil.parseObj(identityDicValue);
                    BigDecimal hangingRevenueLevel = new BigDecimal(identityDicValueParse.get("hangingRevenue").toString())
                            .multiply(new BigDecimal(0.01)).setScale(4,BigDecimal.ROUND_DOWN);
                    //获取收益
                    BigDecimal profit = amountPlanA.multiply(hangingRevenueLevel).setScale(4,BigDecimal.ROUND_DOWN);
                    igtOnHookPlanOrderItem.setProfit(profit.setScale(4,BigDecimal.ROUND_DOWN));

                    igtOnHookPlanOrderItem.setState(1);
                    igtOnHookPlanOrderItem.setPlanCode(igtOnHookPlanOrder.getPlanCode());

                    Integer isGoal = dappWalletService.isGoal(dappOnHookAwardNext.getAwardNum());
                    igtOnHookPlanOrderItem.setIsGoal(isGoal);
                    igtOnHookPlanOrderItem.setBelongNum(dappOnHookAwardNext.getRecordNum());
                    igtOnHookPlanOrderItem.setOrderNum(1);
                    igtOnHookPlanOrderItem.setPlan(dataDictionaryCustom.getDescription());
                    igtOnHookPlanOrderItemDao.insert(igtOnHookPlanOrderItem);

                    if(2 == igtOnHookPlanOrderItem.getIsGoal()){
                        //如果中奖，增加挂机主表的挂机总收益
                        Integer updateCount = igtOnHookPlanOrderDao.AddProfitById(igtOnHookPlanOrder.getId()
                                ,igtOnHookPlanOrderItem.getProfit());
                    }else{
                        //如果不中奖，减少挂机剩余金额即减少本金
                        Integer updateCount = igtOnHookPlanOrderDao.updateAvaAmountById(igtOnHookPlanOrder.getId()
                                ,igtOnHookPlanOrderItem.getAmount());
                    }
                }else if(2 == igtOnHookPlanOrderItemsOld.get(0).getIsGoal()){
                    //第一条中奖记录为中奖则是新增一条1挂机方案的挂机子表记录
                    IgtOnHookPlanOrderItem igtOnHookPlanOrderItem = new IgtOnHookPlanOrderItem();
                    igtOnHookPlanOrderItem.setMemberId(igtOnHookPlanOrder.getMemberId());
                    igtOnHookPlanOrderItem.setOrderId(igtOnHookPlanOrder.getId());
                    //获取挂机方案
                    DataDictionaryCustom dataDictionaryCustom = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(DataDictionaryEnum.PLAN_A.getType(), DataDictionaryEnum.PLAN_A.getCode());
                    String dataDictionaryCustomValue = dataDictionaryCustom.getValue();
                    JSONObject levelMemberValueParse = JSONUtil.parseObj(dataDictionaryCustomValue);
                    BigDecimal amountPlanA = new BigDecimal(levelMemberValueParse.get("amount").toString())
                            .multiply(new BigDecimal(igtOnHookPlanOrder.getPlanCode())).setScale(4,BigDecimal.ROUND_DOWN);
                    //此次下注金额不足，则更新主表信息为结算中
                    //挂机次数超过系统规定的时间，则更新主表信息为结算中
                    if(avaAmount.compareTo(amountPlanA) < 0 || igtOnHookPlanOrderItemsOld.get(0).getOrderNum() >= maxHours){
                        igtOnHookPlanOrder.setState(3);
                        igtOnHookPlanOrderDao.updateById(igtOnHookPlanOrder);
                    }else{
                        igtOnHookPlanOrderItem.setAmount(amountPlanA);
                        //获取收益率
                        DappMemberEntity dappMemberEntity = dappMemberDao.selectById(igtOnHookPlanOrder.getMemberId());
                        DataDictionaryCustom identityDic = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(DataDictionaryEnum.LEVEL_MB.getType(), dappMemberEntity.getIdentity());
                        String identityDicValue = identityDic.getValue();
                        JSONObject identityDicValueParse = JSONUtil.parseObj(identityDicValue);
                        BigDecimal hangingRevenueLevel = new BigDecimal(identityDicValueParse.get("hangingRevenue").toString())
                                .multiply(new BigDecimal(0.01)).setScale(4,BigDecimal.ROUND_DOWN);
                        //获取收益
                        BigDecimal profit = amountPlanA.multiply(hangingRevenueLevel).setScale(4,BigDecimal.ROUND_DOWN);
                        igtOnHookPlanOrderItem.setProfit(profit.setScale(4,BigDecimal.ROUND_DOWN));

                        igtOnHookPlanOrderItem.setState(1);
                        igtOnHookPlanOrderItem.setPlanCode(igtOnHookPlanOrder.getPlanCode());

                        Integer isGoal = dappWalletService.isGoal(dappOnHookAwardNext.getAwardNum());
                        igtOnHookPlanOrderItem.setIsGoal(isGoal);
                        igtOnHookPlanOrderItem.setBelongNum(dappOnHookAwardNext.getRecordNum());
                        igtOnHookPlanOrderItem.setOrderNum(igtOnHookPlanOrderItemsOld.get(0).getOrderNum() + 1);
                        igtOnHookPlanOrderItem.setPlan(dataDictionaryCustom.getDescription());
                        igtOnHookPlanOrderItemDao.insert(igtOnHookPlanOrderItem);

                        if(2 == igtOnHookPlanOrderItem.getIsGoal()){

                            //如果中奖，增加挂机主表的挂机总收益
                            Integer updateCount = igtOnHookPlanOrderDao.AddProfitById(igtOnHookPlanOrder.getId()
                                    ,igtOnHookPlanOrderItem.getProfit());
                        }else{
                            //如果不中奖，减少挂机剩余金额即减少本金
                            Integer updateCount = igtOnHookPlanOrderDao.updateAvaAmountById(igtOnHookPlanOrder.getId()
                                    ,igtOnHookPlanOrderItem.getAmount());
                        }
                    }
                }else{
                    //第一条没中奖则是新增一条n+1挂机方案的挂机子表记录
                    String plan = igtOnHookPlanOrderItemsOld.get(0).getPlan();
                    IgtOnHookPlanOrderItem igtOnHookPlanOrderItem = new IgtOnHookPlanOrderItem();
                    igtOnHookPlanOrderItem.setMemberId(igtOnHookPlanOrder.getMemberId());
                    igtOnHookPlanOrderItem.setOrderId(igtOnHookPlanOrder.getId());
                    //获取挂机方案
                    DataDictionaryCustom dataDictionaryCustom = dataDictionaryCustomMapper.selectDicDataByTypeAndCodeAndDesc(
                            DataDictionaryEnum.PLAN_A.getType(),
                            Integer.toString(Integer.parseInt(plan)+1));
                    String dataDictionaryCustomValue = dataDictionaryCustom.getValue();
                    JSONObject levelMemberValueParse = JSONUtil.parseObj(dataDictionaryCustomValue);
                    BigDecimal amountPlanA = new BigDecimal(levelMemberValueParse.get("amount").toString())
                            .multiply(new BigDecimal(igtOnHookPlanOrder.getPlanCode())).setScale(4,BigDecimal.ROUND_DOWN);
                    igtOnHookPlanOrderItem.setAmount(amountPlanA);
                    //此次下注金额不足，则更新主表信息为结算中
                    if(avaAmount.compareTo(amountPlanA) < 0 || igtOnHookPlanOrderItemsOld.get(0).getOrderNum() >= maxHours){
                        igtOnHookPlanOrder.setState(3);
                        igtOnHookPlanOrderDao.updateById(igtOnHookPlanOrder);
                    }else{
                        //获取收益率
                        DappMemberEntity dappMemberEntity = dappMemberDao.selectById(igtOnHookPlanOrder.getMemberId());
                        DataDictionaryCustom identityDic = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(DataDictionaryEnum.LEVEL_MB.getType(), dappMemberEntity.getIdentity());
                        String identityDicValue = identityDic.getValue();
                        JSONObject identityDicValueParse = JSONUtil.parseObj(identityDicValue);
                        BigDecimal hangingRevenueLevel = new BigDecimal(identityDicValueParse.get("hangingRevenue").toString())
                                .multiply(new BigDecimal(0.01)).setScale(4,BigDecimal.ROUND_DOWN);
                        //获取收益
                        BigDecimal profit = amountPlanA.multiply(hangingRevenueLevel).setScale(4,BigDecimal.ROUND_DOWN);
                        igtOnHookPlanOrderItem.setProfit(profit.setScale(4,BigDecimal.ROUND_DOWN));

                        igtOnHookPlanOrderItem.setState(1);
                        igtOnHookPlanOrderItem.setPlanCode(igtOnHookPlanOrder.getPlanCode());

                        Integer isGoal = dappWalletService.isGoal(dappOnHookAwardNext.getAwardNum());
                        igtOnHookPlanOrderItem.setIsGoal(isGoal);
                        igtOnHookPlanOrderItem.setBelongNum(dappOnHookAwardNext.getRecordNum());
                        igtOnHookPlanOrderItem.setOrderNum(igtOnHookPlanOrderItemsOld.get(0).getOrderNum() + 1);
                        igtOnHookPlanOrderItem.setPlan(dataDictionaryCustom.getDescription());
                        igtOnHookPlanOrderItemDao.insert(igtOnHookPlanOrderItem);

                        if(2 == igtOnHookPlanOrderItem.getIsGoal()){

                            //返还两次中奖之间的本金
                            Date startTime = igtOnHookPlanOrderItemsOld.get(0).getCreateTime();
                            Date endTime = igtOnHookPlanOrderItem.getCreateTime();
                            BigDecimal totalAmount = igtOnHookPlanOrderItemDao.selectTotalAmountByCreateTimeAndOrderId(startTime,endTime,igtOnHookPlanOrder.getId());
                            //如果中奖，增加挂机主表的挂机总收益,返还两次中奖之间的本金
                            igtOnHookPlanOrderDao.AddProfitById(igtOnHookPlanOrder.getId()
                                    ,igtOnHookPlanOrderItem.getProfit());
                            igtOnHookPlanOrderDao.addAvaAmountById(igtOnHookPlanOrder.getId()
                                    ,totalAmount);
                        }else{
                            //如果不中奖，减少挂机剩余金额即减少本金
                            Integer updateCount = igtOnHookPlanOrderDao.updateAvaAmountById(igtOnHookPlanOrder.getId()
                                    ,igtOnHookPlanOrderItem.getAmount());
                        }
                    }
                }
            }
        }
        BigDecimal totalAmount = igtOnHookPlanOrderItemDao.selectTotalAmountByCreateTimeAndOrderId(startTime,endTime,188L);
    }

    @Test