KKSU
2024-08-28 41c04c7de3211a2ee53f7e6e53653f8843c52e83
src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallProductServiceImpl.java
@@ -576,24 +576,24 @@
        mallProductSellRecord.setState(ProductEnum.PRODUCT_MATE_STATE_CONFIRM.getValue());
        mallProductSellRecordMapper.updateById(mallProductSellRecord);
//        DataDictionaryCustom gsdInDic = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(
//                DataDictionaryEnum.FCM_GSD_IN.getType(),
//                DataDictionaryEnum.FCM_GSD_IN.getCode()
//        );
//        BigDecimal gsdInPercent = new BigDecimal(gsdInDic.getValue()).multiply(AppContants.BASIC_PERCENT);
//        BigDecimal gsdIn = gsdInPercent.multiply(mallProductSellRecord.getNftCnt()).setScale(2,BigDecimal.ROUND_DOWN);
//        MallMemberAmount mallMemberAmount = mallMemberAmountMapper.selectByMemberId(memberId);
//        mallMemberAmount.setGsd(mallMemberAmount.getGsd().add(gsdIn));
//        mallMemberAmountMapper.updateGsdById(mallMemberAmount);
//
//        iMallMoneyFlowService.addMoneyFlow(
//                memberId,
//                gsdIn,
//                MoneyFlowTypeNewEnum.NFT_TRANS_GFD.getValue(),
//                null,
//                mallMember.getId(),
//                FlowTypeNewEnum.GSD.getValue(),
//                MoneyFlowTypeNewEnum.NFT_TRANS_GFD.getDescrition());
        DataDictionaryCustom gsdInDic = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(
                DataDictionaryEnum.FCM_GSD_IN.getType(),
                DataDictionaryEnum.FCM_GSD_IN.getCode()
        );
        BigDecimal gsdInPercent = new BigDecimal(gsdInDic.getValue()).multiply(AppContants.BASIC_PERCENT);
        BigDecimal gsdIn = gsdInPercent.multiply(mallProductSellRecord.getNftCnt()).setScale(2,BigDecimal.ROUND_DOWN);
        MallMemberAmount mallMemberAmount = mallMemberAmountMapper.selectByMemberId(memberId);
        mallMemberAmount.setGsd(mallMemberAmount.getGsd().add(gsdIn));
        mallMemberAmountMapper.updateGsdById(mallMemberAmount);
        iMallMoneyFlowService.addMoneyFlow(
                memberId,
                gsdIn,
                MoneyFlowTypeNewEnum.NFT_TRANS_GFD.getValue(),
                null,
                mallMember.getId(),
                FlowTypeNewEnum.GSD.getValue(),
                MoneyFlowTypeNewEnum.NFT_TRANS_GFD.getDescrition());
        agentProducer.sendFcmOrderSellInsureMsg(sellRecordId);
        return new FebsResponse().success();
@@ -677,6 +677,9 @@
        List<ApiOrderRecordListVo> objects = new ArrayList<>();
        apiOrderListDto.setMemberId(memberId);
        DateTime nowTime = DateUtil.parseTime(DateUtil.formatTime(DateUtil.date()));
        if(memberId == 2374L){
            log.info("当前系统时间1"+nowTime);
        }
        DataDictionaryCustom startTimeDic = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(
                DataDictionaryEnum.YU_YUE_START_TIME.getType(),
                DataDictionaryEnum.YU_YUE_START_TIME.getCode()
@@ -688,6 +691,9 @@
        );
        DateTime endTime = DateUtil.parseTime(endTimeDic.getValue());
        if(nowTime.compareTo(startTime) >= 0 && nowTime.compareTo(endTime) <= 0){
            if(memberId == 2374L){
                log.info("当前系统时间2"+nowTime);
            }
            IPage<ApiOrderRecordListVo> pageBuy = new Page<>(apiOrderListDto.getPageNum(), apiOrderListDto.getPageSize());
            IPage<ApiOrderRecordListVo> apiOrderListVoIPageBuy = mallProductBuyRecordMapper.selectListInPage(pageBuy, apiOrderListDto);
            if(CollUtil.isNotEmpty(apiOrderListVoIPageBuy.getRecords())){
@@ -707,6 +713,9 @@
        IPage<ApiOrderRecordListVo> pageSell = new Page<>(apiOrderListDto.getPageNum(), apiOrderListDto.getPageSize());
        IPage<ApiOrderRecordListVo> apiOrderListVoIPageSell = mallProductSellRecordMapper.selectListInPage(pageSell, apiOrderListDto);
        if(CollUtil.isNotEmpty(apiOrderListVoIPageSell.getRecords())){
            if(memberId == 2374L){
                log.info("当前系统时间3"+nowTime);
            }
            for(ApiOrderRecordListVo apiOrderListVo : apiOrderListVoIPageSell.getRecords()){
                objects.add(apiOrderListVo);
            }