提现后台bug显示修改

admin

2019-06-26 eb36f728d04f35b06dd03310323d0190b97446d7

提现后台bug显示修改

 fanli/src/main/java/com/yeshi/fanli/controller/admin/ExtractAdminController.java

@@ -390,7 +390,8 @@
                    if (extractState != null && extractState == Extract.STATE_NOT_PROCESS) {

                        UserInfo userInfo = extract.getUserInfo();

                        if (userInfo != null) {

                            BigDecimal countTodayMoney = extractService.sumTodayApplyMoney(userInfo.getId());

                            BigDecimal countTodayMoney = extractService.sumTodayApplyMoney(userInfo.getId(),

                                    TimeUtil.getGernalTime(extract.getExtractTime()));

                            if (countTodayMoney.compareTo(new BigDecimal(100)) > 0) {

                                warnLevel = 1;

                            }

@@ -403,9 +404,9 @@
                    if (System.currentTimeMillis() > TimeUtil.convertToTimeTemp("2019-06-21", "yyyy-MM-dd")) {

                        desc.append("大笔订单数:" + record.getExtraInfo().getOrderCount50More() + "\n#");

                        desc.append("维权订单数:" + record.getExtraInfo().getWeiQuanOrderCount() + "\n#");

                        desc.append("维权订单佣金:" + record.getExtraInfo().getWeiQuanOrderFanAmount() + "\n#");	
                        desc.append("维权订单佣金:" + record.getExtraInfo().getWeiQuanOrderFanAmount() + "\n#");

                        if (record.getExtraInfo().getOrderCount50More() > 0

                                || record.getExtraInfo().getWeiQuanOrderCount() >1

                                || record.getExtraInfo().getWeiQuanOrderCount() > 1

                                || record.getExtraInfo().getWeiQuanOrderFanAmount().compareTo(new BigDecimal(10)) >= 0)

                            warnLevel = 2;

                    } else {


 fanli/src/main/java/com/yeshi/fanli/controller/admin/OrderAdminController.java

@@ -169,7 +169,7 @@
                        // 计算退款资金

                        UserMoneyDetail detail = null;

                        switch (order.getHongBaoType()) {

                        case HongBaoV2.TYPE_ZIGOU:

                        case 1:

                            detail = userMoneyDetailService.selectByTypeAndUidAndIdentifyCode(

                                    UserMoneyDetailTypeEnum.fanliWeiQuan, Long.parseLong(order.getUserId()),

                                    drawBack.getId());

@@ -178,16 +178,12 @@
                                        UserMoneyDetailTypeEnum.weiQuan, Long.parseLong(order.getUserId()),

                                        drawBack.getId());

                            break;

                        case HongBaoV2.TYPE_YIJI:

                        case HongBaoV2.TYPE_ERJI:

                        case HongBaoV2.TYPE_SHARE_YIJI:

                        case HongBaoV2.TYPE_SHARE_ERJI:

                        case 3:

                            detail = userMoneyDetailService.selectByTypeAndUidAndIdentifyCode(

                                    UserMoneyDetailTypeEnum.inviteWeiQuan, Long.parseLong(order.getUserId()),

                                    drawBack.getId());

                            break;



                        case HongBaoV2.TYPE_SHARE_GOODS:

                        case 2:

                            detail = userMoneyDetailService.selectByTypeAndUidAndIdentifyCode(

                                    UserMoneyDetailTypeEnum.shareWeiQuan, Long.parseLong(order.getUserId()),

                                    drawBack.getId());


 fanli/src/main/java/com/yeshi/fanli/dao/goods/taobao/dataoke/DaTaoKeGoodsDetailV2Dao.java

@@ -131,4 +131,17 @@
        return mongoTemplate.find(query, getEntityClass());

    }



    /**

     * 爆款商品备选库

     * 
     * @return

     */

    public List<DaTaoKeDetailV2> listPreShareHotGoods(int count) {

        //TODO 
        Query query = new Query();

        query.addCriteria(new Criteria().andOperator(Criteria.where("commissionRate")));

        query.limit(count);

        return mongoTemplate.find(query, getEntityClass());

    }



}


 fanli/src/main/java/com/yeshi/fanli/dao/mybatis/ExtractMapper.java

@@ -102,11 +102,18 @@
     * @return

     */

    BigDecimal computeCompensateByUid(Long uid);

	


    /**

     * 统计今日申请提现的金额（根据用户ID）

     * 
     * @param uid

     * @return

     */

    BigDecimal sumToadyApplyByUid(Long uid);

    /**

     * 统计当日提现

     * @param uid

     * @param day

     * @return

     */

    BigDecimal sumToadyApplyByUid(@Param("uid") Long uid, @Param("day") String day);

}

 fanli/src/main/java/com/yeshi/fanli/dto/common/CommonContentTypeEnum.java

@@ -4,7 +4,7 @@


    _9k9("9块9"), haoQuan("高额好券"), chaoSheng("超级省钱"), muYin("母婴精选"), reMai("潮品热卖"), meiShi("优选美食"), juJia(

            "居家生活"), chuanYiDaPei("穿衣搭配"), meiZhuangGehu("美妆个护"), jingPinXieBao("精品鞋包"), chaoNanReMai(

                    "潮男热卖"), shuMaShouJi("数码手机"), yunDongKuXie("运动酷鞋"), qiCheHuWai("汽车户外"), chaoPinReMai("潮品热卖");

                    "潮男热卖"), shuMaShouJi("数码手机"), yunDongKuXie("运动酷鞋"), qiCheHuWai("汽车户外"), chaoPinReMai("新款潮品");

    private final String desc;



    private CommonContentTypeEnum(String desc) {


 fanli/src/main/java/com/yeshi/fanli/job/UpdateDaTaoKeJob.java

@@ -35,7 +35,7 @@


    @Resource

    private DaTaoKeGoodsDetailService daTaoKeGoodsService;

	


    @Resource

    private DaTaoKeGoodsDetailV2Service daTaoKeGoodsDetailV2Service;



@@ -126,4 +126,40 @@
        }

    }



    @Scheduled(cron = "0 0/10 * * * ? ")

    public void doUpdateJobNew() {

        if (!Constant.IS_TASK)

            return;

        try {

            new Thread(new Runnable() {



                @Override

                public void run() {

                    daTaoKeGoodsDetailV2Service.updateNewGoods();

                }

            }).start();



        } catch (Exception e) {

            LogHelper.errorDetailInfo(e);

        }

    }



    @Scheduled(cron = "0 0/10 * * * ? ")

    public void doDeleteJobNew() {

        if (!Constant.IS_TASK)

            return;

        try {

            new Thread(new Runnable() {



                @Override

                public void run() {

                    daTaoKeGoodsDetailV2Service.deleteInvalid();

                }

            }).start();



        } catch (Exception e) {

            LogHelper.errorDetailInfo(e);

        }

    }



}


 fanli/src/main/java/com/yeshi/fanli/mapping/ExtractMapper.xml

@@ -412,8 +412,8 @@
    

    <select id="sumToadyApplyByUid" resultType="java.math.BigDecimal">

        SELECT IFNULL(SUM(t.`money`),0) FROM yeshi_ec_extract t

        WHERE t.`uid` = #{0}

        AND <![CDATA[TO_DAYS( FROM_UNIXTIME(t.extractTime/1000)) = TO_DAYS(NOW())]]>

        WHERE t.`uid` = #{uid}

        AND  FROM_UNIXTIME(t.extractTime/1000,'%Y-%m-%d') = #{day}

    </select>

    

</mapper>

 fanli/src/main/java/com/yeshi/fanli/service/impl/goods/CommonTemplateContentServiceImpl.java

@@ -112,6 +112,8 @@
            navList = getCommonNav();

        } else if (type == CommonContentTypeEnum.qiCheHuWai) {

            navList = getCommonNav();

        } else if (type == CommonContentTypeEnum.chaoPinReMai) {

            navList = getCommonNav();

        }



        return navList;


 fanli/src/main/java/com/yeshi/fanli/service/impl/taobao/dataoke/DaTaoKeGoodsDetailV2ServiceImpl.java

@@ -184,4 +184,12 @@
        return daTaoKeGoodsDetailV2Dao.getGoodsNotInList(cid, listId, count);

    }



    @Override

    public List<DaTaoKeDetailV2> listPreShareHotGoods() {

		
		
		
        return null;

    }



}


 fanli/src/main/java/com/yeshi/fanli/service/impl/user/ExtractServiceImpl.java

@@ -734,7 +734,7 @@
    }



    @Override

    public BigDecimal sumTodayApplyMoney(Long uid) {

        return extractMapper.sumToadyApplyByUid(uid);

    public BigDecimal sumTodayApplyMoney(Long uid,String day) {

        return extractMapper.sumToadyApplyByUid(uid,day);

    }

}


 fanli/src/main/java/com/yeshi/fanli/service/inter/taobao/dataoke/DaTaoKeGoodsDetailV2Service.java

@@ -105,4 +105,11 @@
     */

    public Long countSearchByTitleWithCid(String title, Long cid);



    /**

     * 拉取分享爆款备选商品

     * 
     * @return

     */

    public List<DaTaoKeDetailV2> listPreShareHotGoods();



}


 fanli/src/main/java/com/yeshi/fanli/service/inter/user/ExtractService.java

@@ -20,8 +20,8 @@
     * @return 返回如果为null，则提现申请提交成功。如果为1�?，已超过当日提现次数或提现金额！如果�?，提现金额大于我的红包！

     */

    public Integer addExtract(Extract extract);

	
//    public int getCount();



    // public int getCount();



    /**

     * 通过

@@ -58,7 +58,7 @@
     * @param uid

     * @return

     */

    public void checkExtract(Long uid) throws ExtractException ;

    public void checkExtract(Long uid) throws ExtractException;



    public Extract selectByPrimaryKey(Long id);



@@ -85,17 +85,16 @@
     * @param info

     */

    public void processExtractResult(AlipayTransferResultInfo info);

	
	


    public void testExtractSuccess(Long id);



    /**

     * 统计今日提现

     * 统计当日提现

     * 
     * @param uid

     * @param day  yyyy-MM-dd

     * @return

     */

    public BigDecimal sumTodayApplyMoney(Long uid);

	
	
    public BigDecimal sumTodayApplyMoney(Long uid, String day);



}