parent: 26f41e1a | 补丁 | 提交 | show whitespace
admin
2020-01-18 43a00f6b852dcf91cf51fb8f1a5c1386ee437a35 
增加订单商品分类日志
3个文件已修改
1个文件已添加
171 ■■■■■ 已修改文件
fanli/src/main/java/com/yeshi/fanli/log/LogType.java 1 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
fanli/src/main/java/com/yeshi/fanli/service/impl/order/CommonOrderServiceImpl.java 31 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
fanli/src/main/java/com/yeshi/fanli/util/taobao/TaoKeApiUtil.java 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
fanli/src/main/resource/log4j2.xml 137 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 
 fanli/src/main/java/com/yeshi/fanli/log/LogType.java


@@ -7,6 +7,7 @@


    taobaoTaoke("淘客api"),



    taobaoTrade("淘宝交易（分享/自购）"),



    taobaoAuth("淘宝授权"),



    taobaoGoods("淘宝商品信息"),



    userLogin("用户登录");







    private String desc;





 fanli/src/main/java/com/yeshi/fanli/service/impl/order/CommonOrderServiceImpl.java


@@ -45,6 +45,8 @@


import com.yeshi.fanli.exception.order.CommonOrderException;



import com.yeshi.fanli.exception.taobao.TaobaoGoodsDownException;



import com.yeshi.fanli.log.LogHelper;



import com.yeshi.fanli.log.LogManager;



import com.yeshi.fanli.log.LogType;



import com.yeshi.fanli.service.inter.common.JumpDetailV2Service;



import com.yeshi.fanli.service.inter.config.ConfigService;



import com.yeshi.fanli.service.inter.config.SystemCouponService;



@@ -187,12 +189,12 @@






    @Override



    public List<CommonOrderVO> getOrderByUid(AcceptData acceptData, Integer page, Long uid, Integer state, Integer type,



            Integer orderState, String orderNo, String startTime, String endTime, Integer dateType, List<Integer> listSource)



            throws CommonOrderException, Exception {



            Integer orderState, String orderNo, String startTime, String endTime, Integer dateType,



            List<Integer> listSource) throws CommonOrderException, Exception {







        int pageSize = Constant.PAGE_SIZE;



        List<CommonOrderVO> listOrder = commonOrderMapper.listUserOrder((page - 1) * pageSize, pageSize, uid, state, type, 


                orderState, orderNo, startTime, endTime,    dateType, listSource);



        List<CommonOrderVO> listOrder = commonOrderMapper.listUserOrder((page - 1) * pageSize, pageSize, uid, state,



                type, orderState, orderNo, startTime, endTime, dateType, listSource);







        // 订单信息为空



        if (listOrder == null || listOrder.size() == 0) {



@@ -914,11 +916,15 @@


                TaoBaoGoodsBrief taoBaoGoods = null;



                try {



                    taoBaoGoods = TaoKeApiUtil.getSimpleGoodsInfo(taoBaoOrder.getAuctionId());



                    LogManager.getLogger(LogType.taobaoGoods).info(String.format("订单商品分类:%s#%s#%s",



                            taoBaoGoods.getAuctionId(), taoBaoGoods.getRootCategoryName(), taoBaoGoods.getLeafName()));



                } catch (TaobaoGoodsDownException e) {



                    e.printStackTrace();



                    LogHelper.errorDetailInfo(e, "AUCTIONID:" + taoBaoOrder.getAuctionId(), "");



                    try {



                        taoBaoGoods = TaoBaoUtil.getSimpleGoodsBrief(taoBaoOrder.getAuctionId());



                        // 记录商品分类







                    } catch (Exception e1) {



                        CommonGoods commonGoods = commonGoodsService.getCommonGoodsByGoodsIdAndGoodsType(



                                taoBaoOrder.getAuctionId(), Constant.SOURCE_TYPE_TAOBAO);



@@ -1661,7 +1667,6 @@


        return commonOrderMapper.count24HValidOrderByUid(uid, minTime);



    }



    



	


    @Override



    public long countSearchOrderByUid(Long uid, List<ESOrder> list) {



        return commonOrderMapper.countSearchOrderByUid(uid, list);



@@ -1690,7 +1695,6 @@


        return listVO;



    }



    



	


    /**



     * 订单信息加工



     * 



@@ -1699,7 +1703,8 @@


     * @param listGoods



     * @param uid



     */



    private void orderVOFactoryNew(List<CommonOrderVO> listOrder, List<CommonOrderVO> listGoods, Long uid) throws Exception {



    private void orderVOFactoryNew(List<CommonOrderVO> listOrder, List<CommonOrderVO> listGoods, Long uid)



            throws Exception {



        List<String> listTB = new ArrayList<String>();



        List<String> listJD = new ArrayList<String>();



        List<String> listPDD = new ArrayList<String>();



@@ -1896,8 +1901,7 @@


                        orderStateContent = "售后成功";



                        WeiQuanInfo weiQuanInfo = new WeiQuanInfo();



                        weiQuanInfo.setOldHongBao("¥" + hongBao.setScale(2, BigDecimal.ROUND_DOWN).toString());



                        weiQuanInfo



                                .setWqHongBao("售后：-¥" + weiQuanMoney.setScale(2, BigDecimal.ROUND_DOWN).toString());



                        weiQuanInfo.setWqHongBao("售后：-¥" + weiQuanMoney.setScale(2, BigDecimal.ROUND_DOWN).toString());



                        hongBao = MoneyBigDecimalUtil.sub(hongBao, weiQuanMoney);



                        order.setWeiQuanInfo(weiQuanInfo);



                    }



@@ -1941,8 +1945,8 @@


                signList.add(CommonOrder.TYPE_INVITE);







                // 超级会员补贴信息



                InviteOrderSubsidy orderSubsidy = inviteOrderSubsidyService.getByOrderNoAndType(uid,



                        order.getOrderNo(), sourceType);



                InviteOrderSubsidy orderSubsidy = inviteOrderSubsidyService.getByOrderNoAndType(uid, order.getOrderNo(),



                        sourceType);



                if (orderSubsidy != null) {



                    ClientTextStyleVO subsidyInfo = new ClientTextStyleVO();



                    subsidyInfo.setContent("(补贴¥" + orderSubsidy.getMoney() + ")");



@@ -2055,8 +2059,8 @@


     * @param list



     * @param signList



     */



    private void couponFactoryNew(CommonOrderVO order, boolean hasRewardCoupon, Integer hongBaoState, Integer hongBaoType,



            List<UserSystemCouponRecord> list, Long uid, boolean vip) throws Exception {



    private void couponFactoryNew(CommonOrderVO order, boolean hasRewardCoupon, Integer hongBaoState,



            Integer hongBaoType, List<UserSystemCouponRecord> list, Long uid, boolean vip) throws Exception {



        // 是否免单商品



        boolean freeOrder = false;



        // 是否奖励成功



@@ -2179,6 +2183,5 @@


            }



        }



    }











}





 fanli/src/main/java/com/yeshi/fanli/util/taobao/TaoKeApiUtil.java


@@ -169,6 +169,8 @@


        goods.setPictUrl(item.optString("pict_url"));



        goods.setShopTitle(item.optString("nick"));



        goods.setSellerId(item.optLong("seller_id"));



        goods.setRootCategoryName(item.optString("cat_name"));



        goods.setLeafName(item.optString("cat_leaf_name"));







        String optString = item.optString("shop_dsr");



        if (!StringUtil.isNullOrEmpty(optString)) {





 fanli/src/main/resource/log4j2.xml


New file


@@ -0,0 +1,137 @@


<?xml version="1.0" encoding="UTF-8"?>



<Configuration status="INFO">







    <properties>



        <property name="LOG_HOME">logs</property>



    </properties>







    <Appenders>



        <Console name="Console" target="SYSTEM_OUT">



            <PatternLayout pattern="%date{yyyy-MM-dd HH:mm:ss.SSS} %level [%thread][%file:%line] - %msg%n" />



        </Console>







        <RollingRandomAccessFile name="running-log"



            fileName="${LOG_HOME}/${FILE_NAME}.log"



            filePattern="${LOG_HOME}/$${date:yyyy-MM}/${FILE_NAME}-%d{yyyy-MM-dd}-%i.log.gz">



            <PatternLayout



                pattern="%date{yyyy-MM-dd HH:mm:ss.SSS} %level [%thread][%file:%line] - %msg%n" />



            <Policies>



                <TimeBasedTriggeringPolicy />



                <SizeBasedTriggeringPolicy size="10 MB" />



            </Policies>



            <DefaultRolloverStrategy max="20" />



        </RollingRandomAccessFile>







        <!-- 消息 -->



        <File name="mqSend" fileName="D:/logs/mq/mqSend.log" append="true">



            <PatternLayout



                pattern="%date{yyyy-MM-dd HH:mm:ss.SSS} %level [%thread][%file:%line] - %msg%n" />



        </File>







        <File name="mqConsume" fileName="logs/mq/mqConsume.log" append="true">



            <PatternLayout



                pattern="%date{yyyy-MM-dd HH:mm:ss.SSS} %level [%thread][%file:%line] - %msg%n" />



        </File>







        <!-- 淘宝相关 -->



        <File name="taobaoTaoke" fileName="logs/taobao/taobaoTaoke.log"



            append="true">



            <PatternLayout



                pattern="%date{yyyy-MM-dd HH:mm:ss.SSS} %level [%thread][%file:%line] - %msg%n" />



        </File>







        <File name="taobaoAuth" fileName="logs/taobao/taobaoAuth.log"



            append="true">



            <PatternLayout



                pattern="%date{yyyy-MM-dd HH:mm:ss.SSS} %level [%thread][%file:%line] - %msg%n" />



        </File>







        <File name="taobaoTrade" fileName="logs/taobao/taobaoTrade.log"



            append="true">



            <PatternLayout



                pattern="%date{yyyy-MM-dd HH:mm:ss.SSS} %level [%thread][%file:%line] - %msg%n" />



        </File>



		


		


        <File name="taobaoGoods" fileName="logs/taobao/taobaoGoods.log"



            append="true">



            <PatternLayout



                pattern="%date{yyyy-MM-dd HH:mm:ss.SSS} %level [%thread][%file:%line] - %msg%n" />



        </File>



		


		






        <!-- 用户相关 -->



        <File name="userLogin" fileName="logs/user/userLogin.log" append="true">



            <PatternLayout



                pattern="%date{yyyy-MM-dd HH:mm:ss.SSS} %level [%thread][%file:%line] - %msg%n" />



        </File>







    </Appenders>







    <Loggers>



        <Logger name="mqSend" level="INFO" additivity="true">



            <AppenderRef ref="mqSend" />



        </Logger>



        <Root level="INFO">



            <AppenderRef ref="Console" />



        </Root>



    </Loggers>







    <Loggers>



        <Logger name="mqConsume" level="INFO" additivity="true">



            <AppenderRef ref="mqConsume" />



        </Logger>



        <Root level="INFO">



            <AppenderRef ref="Console" />



        </Root>



    </Loggers>











    <Loggers>



        <Logger name="taobaoTaoke" level="INFO" additivity="true">



            <AppenderRef ref="taobaoTaoke" />



        </Logger>



        <Root level="INFO">



            <AppenderRef ref="Console" />



        </Root>



    </Loggers>







    <Loggers>



        <Logger name="taobaoAuth" level="INFO" additivity="true">



            <AppenderRef ref="taobaoAuth" />



        </Logger>



        <Root level="INFO">



            <AppenderRef ref="Console" />



        </Root>



    </Loggers>







    <Loggers>



        <Logger name="taobaoTrade" level="INFO" additivity="true">



            <AppenderRef ref="taobaoTrade" />



        </Logger>



        <Root level="INFO">



            <AppenderRef ref="Console" />



        </Root>



    </Loggers>



	


    <Loggers>



        <Logger name="taobaoGoods" level="INFO" additivity="true">



            <AppenderRef ref="taobaoGoods" />



        </Logger>



        <Root level="INFO">



            <AppenderRef ref="Console" />



        </Root>



    </Loggers>







    <Loggers>



        <Logger name="userLogin" level="INFO" additivity="true">



            <AppenderRef ref="userLogin" />



        </Logger>



        <Root level="INFO">



            <AppenderRef ref="Console" />



        </Root>



    </Loggers>











</Configuration>