parent: 418678a2 | 补丁 | 提交 | ignore whitespace
yujian
2019-05-23 31a566a0f1e2d69662dfcbce8a1418c3cbe42ad3 
Merge remote-tracking branch 'origin/master'
4个文件已修改
122 ■■■■■ 已修改文件
fanli/src/main/java/com/yeshi/fanli/controller/client/v1/GoodsController.java 48 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
fanli/src/main/java/com/yeshi/fanli/entity/system/SystemCoupon.java 8 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
fanli/src/main/java/com/yeshi/fanli/util/factory/msg/UserMsgVOFactory.java 53 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
fanli/src/main/java/com/yeshi/fanli/util/taobao/TaoKeOrderApiUtil.java 13 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 
 fanli/src/main/java/com/yeshi/fanli/controller/client/v1/GoodsController.java


@@ -70,7 +70,7 @@


     * @param out



     */



    @RequestMapping(value = "gettaobaolink")



    public void getTaoBaoLink(AcceptData acceptData, Long uid, Long auctionId,String from, HttpServletRequest request,



    public void getTaoBaoLink(AcceptData acceptData, Long uid, Long auctionId, String from, HttpServletRequest request,



            PrintWriter out) {



        if (uid == null || uid <= 0) {



            out.print(JsonUtil.loadFalseResult(1, "用户ID不能为空"));



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


        if (acceptData.getPlatform().equalsIgnoreCase("ios"))



            pidType = PidUser.TYPE_FANLI_IOS;



        try {







            TaoBaoLink taoBaoLink = null;



            // 是返利商品库的商品



            if (specialConvert) {



@@ -155,10 +154,10 @@


                        else



                            taoBaoLink = shareGoodsService.getTaoBaoLink(uid, auctionId,



                                    tbPidService.getIOSDefault().getPid());



						






                    } else



                        taoBaoLink = shareGoodsService.getTaoBaoLinkForBuy(uid, auctionId, pidType);



                    LogHelper.test("购买转链:默认PID转链-"+uid+"："+auctionId);



                    LogHelper.test("购买转链:默认PID转链-" + uid + "：" + auctionId);



                }



            } else {// 不是返利库的商品，用特殊PID替代



                try {



@@ -177,8 +176,8 @@


                    else



                        taoBaoLink = shareGoodsService.getTaoBaoLink(uid, auctionId,



                                tbPidService.getIOSDefault().getPid());



					


                    LogHelper.test("购买转链:默认PID转链-非返利库商品-"+uid+"："+auctionId);







                    LogHelper.test("购买转链:默认PID转链-非返利库商品-" + uid + "：" + auctionId);



                }



            }



            JSONObject link = new JSONObject();



@@ -202,18 +201,39 @@


            } else {



                tbPid = tbPidService.getTBPid(uid, PidUser.TYPE_FANLI_IOS);



            }



			


            LogHelper.test("购买转链:默认PID转链-异常商品-"+uid+"："+auctionId);







            LogHelper.test("购买转链:默认PID转链-异常商品-" + uid + "：" + auctionId);







            data.put("native", isNative);







            if (tbPid != null) {



                String siteId = tbPid.getPid().split("_")[2];



                String adzoneId = tbPid.getPid().split("_")[3];



                TaoBaoUnionConfig config = taoBaoUnionConfigService.getConfigByAppIdCache(siteId);



                ClientTBPid clientTBPid = new ClientTBPid(config.getAppKey(), tbPid.getPid(), siteId, adzoneId);



                data.put("type", 2);



                data.put("tbPidInfo", clientTBPid);







                try {



                    TaoBaoLink taoBaoLink = null;



                    if (pidType == PidUser.TYPE_FANLI_ANDROID)



                        taoBaoLink = shareGoodsService.getTaoBaoLink(uid, auctionId,



                                tbPidService.getAndroidDefault().getPid());



                    else



                        taoBaoLink = shareGoodsService.getTaoBaoLink(uid, auctionId,



                                tbPidService.getIOSDefault().getPid());







                    JSONObject link = new JSONObject();



                    link.put("clickUrl", taoBaoLink.getClickUrl());



                    link.put("couponUrl", taoBaoLink.getCouponLink());



                    data.put("type", 1);



                    data.put("link", link);



                    data.put("native", true);







                } catch (Exception e1) {



                    String siteId = tbPid.getPid().split("_")[2];



                    String adzoneId = tbPid.getPid().split("_")[3];



                    TaoBaoUnionConfig config = taoBaoUnionConfigService.getConfigByAppIdCache(siteId);



                    ClientTBPid clientTBPid = new ClientTBPid(config.getAppKey(), tbPid.getPid(), siteId, adzoneId);



                    data.put("type", 2);



                    data.put("tbPidInfo", clientTBPid);



                    data.put("native", true);



                }



				


                out.print(JsonUtil.loadTrueResult(data));



            } else {



                out.print(JsonUtil.loadFalseResult(1, "请求失败"));





 fanli/src/main/java/com/yeshi/fanli/entity/system/SystemCoupon.java


@@ -1,5 +1,6 @@


package com.yeshi.fanli.entity.system;







import java.io.Serializable;



import java.math.BigDecimal;



import java.util.Date;







@@ -12,7 +13,12 @@


 *



 */



@Table("yeshi_ec_system_coupon")



public class SystemCoupon {



public class SystemCoupon implements Serializable{







    /**



     * 


     */



    private static final long serialVersionUID = 1L;







    // 券类型



    public enum CouponTypeEnum {





 fanli/src/main/java/com/yeshi/fanli/util/factory/msg/UserMsgVOFactory.java


@@ -1,5 +1,6 @@


package com.yeshi.fanli.util.factory.msg;







import java.math.BigDecimal;



import java.util.ArrayList;



import java.util.Calendar;



import java.util.List;



@@ -17,7 +18,6 @@


import com.yeshi.fanli.entity.bus.user.BindingAccount;



import com.yeshi.fanli.entity.bus.user.Extract;



import com.yeshi.fanli.log.LogHelper;



import com.yeshi.fanli.util.MoneyBigDecimalUtil;



import com.yeshi.fanli.util.StringUtil;



import com.yeshi.fanli.util.TimeUtil;



import com.yeshi.fanli.util.account.UserUtil;



@@ -30,6 +30,13 @@


    private final static String COLOR_TITLE = "#888888";



    private final static String COLOR_CONTENT = "#000000";



    private final static String COLOR_HIGHLIGHT_CONTENT = "#E5005C";







    private static BigDecimal filterMoney(BigDecimal money) {



        if (money == null)



            return null;



        else



        return    money.setScale(2);



    }







    /**



     * 订单消息



@@ -50,7 +57,8 @@


            items.add(new CommonMsgItemVO(new ClientTextStyleVO("订单号", COLOR_TITLE), contentList));







            contentList = new ArrayList<>();



            contentList.add(new ClientTextStyleVO(TimeUtil.getGernalTime(msg.getHappendDate().getTime(),"yyyy.MM.dd HH:mm"), COLOR_CONTENT));



            contentList.add(new ClientTextStyleVO(



                    TimeUtil.getGernalTime(msg.getHappendDate().getTime(), "yyyy.MM.dd HH:mm"), COLOR_CONTENT));



            items.add(new CommonMsgItemVO(new ClientTextStyleVO("提交时间", COLOR_TITLE), contentList));







            contentList = new ArrayList<>();



@@ -58,7 +66,8 @@


            items.add(new CommonMsgItemVO(new ClientTextStyleVO("找回状态", COLOR_TITLE), contentList));







            contentList = new ArrayList<>();



            contentList.add(new ClientTextStyleVO(msg.getState() == 1 ? "¥" + msg.getPayMoney() : "无", COLOR_HIGHLIGHT_CONTENT));



            contentList.add(new ClientTextStyleVO(msg.getState() == 1 ? "¥" +filterMoney( msg.getPayMoney()) : "无",



                    COLOR_HIGHLIGHT_CONTENT));



            items.add(new CommonMsgItemVO(new ClientTextStyleVO("找回金额", COLOR_TITLE), contentList));







        } else {



@@ -88,12 +97,12 @@


            items.add(new CommonMsgItemVO(new ClientTextStyleVO("订单状态", COLOR_TITLE), contentList));







            contentList = new ArrayList<>();



            contentList.add(new ClientTextStyleVO("¥" + MoneyBigDecimalUtil.getWithNoZera(msg.getPayMoney()),



            contentList.add(new ClientTextStyleVO("¥" +filterMoney(msg.getPayMoney()),



                    COLOR_HIGHLIGHT_CONTENT));



            items.add(new CommonMsgItemVO(new ClientTextStyleVO("付款金额", COLOR_TITLE), contentList));







            contentList = new ArrayList<>();



            contentList.add(new ClientTextStyleVO("¥" + MoneyBigDecimalUtil.getWithNoZera(msg.getHongBaoMoney()),



            contentList.add(new ClientTextStyleVO("¥" + filterMoney(msg.getHongBaoMoney()),



                    COLOR_HIGHLIGHT_CONTENT));







            if (msg.getType() == MsgTypeOrderTypeEnum.fanli)



@@ -136,7 +145,7 @@


            items.add(new CommonMsgItemVO(new ClientTextStyleVO("提现账号", COLOR_TITLE), contentList));







            contentList = new ArrayList<>();



            contentList.add(new ClientTextStyleVO("¥" + MoneyBigDecimalUtil.getWithNoZera(msg.getExtract().getMoney()),



            contentList.add(new ClientTextStyleVO("¥" +filterMoney(msg.getExtract().getMoney()),



                    COLOR_HIGHLIGHT_CONTENT));



            items.add(new CommonMsgItemVO(new ClientTextStyleVO("提现金额", COLOR_TITLE), contentList));







@@ -191,7 +200,7 @@


            items.add(new CommonMsgItemVO(new ClientTextStyleVO("提现账号", COLOR_CONTENT), contentList));







            contentList = new ArrayList<>();



            contentList.add(new ClientTextStyleVO("¥" + MoneyBigDecimalUtil.getWithNoZera(msg.getMoney()),



            contentList.add(new ClientTextStyleVO("¥" + filterMoney(msg.getMoney()),



                    COLOR_HIGHLIGHT_CONTENT));



            items.add(new CommonMsgItemVO(new ClientTextStyleVO("提现金额", COLOR_TITLE), contentList));







@@ -222,12 +231,12 @@


            items.add(new CommonMsgItemVO(new ClientTextStyleVO("商品数量", COLOR_TITLE), contentList));







            contentList = new ArrayList<>();



            contentList.add(new ClientTextStyleVO("¥" + MoneyBigDecimalUtil.getWithNoZera(msg.getMoney()) + "",



            contentList.add(new ClientTextStyleVO("¥" + filterMoney(msg.getMoney()) + "",



                    COLOR_HIGHLIGHT_CONTENT));



            items.add(new CommonMsgItemVO(new ClientTextStyleVO("返利金额", COLOR_TITLE), contentList));







            contentList = new ArrayList<>();



            contentList.add(new ClientTextStyleVO("¥" + MoneyBigDecimalUtil.getWithNoZera(msg.getBalance()) + "",



            contentList.add(new ClientTextStyleVO("¥" + filterMoney(msg.getBalance()) + "",



                    COLOR_CONTENT));



            items.add(new CommonMsgItemVO(new ClientTextStyleVO("账号余额", COLOR_TITLE), contentList));







@@ -253,12 +262,12 @@


            items.add(new CommonMsgItemVO(new ClientTextStyleVO("奖金商品", COLOR_TITLE), contentList));







            contentList = new ArrayList<>();



            contentList.add(new ClientTextStyleVO("¥" + MoneyBigDecimalUtil.getWithNoZera(msg.getMoney()) + "",



            contentList.add(new ClientTextStyleVO("¥" + filterMoney(msg.getMoney()) + "",



                    COLOR_HIGHLIGHT_CONTENT));



            items.add(new CommonMsgItemVO(new ClientTextStyleVO("到账金额", COLOR_TITLE), contentList));







            contentList = new ArrayList<>();



            contentList.add(new ClientTextStyleVO("¥" + MoneyBigDecimalUtil.getWithNoZera(msg.getBalance()) + "",



            contentList.add(new ClientTextStyleVO("¥" + filterMoney(msg.getBalance()) + "",



                    COLOR_CONTENT));



            items.add(new CommonMsgItemVO(new ClientTextStyleVO("账号余额", COLOR_TITLE), contentList));







@@ -290,12 +299,12 @@


            items.add(new CommonMsgItemVO(new ClientTextStyleVO("扣除说明", COLOR_TITLE), contentList));







            contentList = new ArrayList<>();



            contentList.add(new ClientTextStyleVO("¥" + MoneyBigDecimalUtil.getWithNoZera(msg.getMoney()) + "",



            contentList.add(new ClientTextStyleVO("¥" + filterMoney(msg.getMoney()) + "",



                    COLOR_HIGHLIGHT_CONTENT));



            items.add(new CommonMsgItemVO(new ClientTextStyleVO("返利扣除", COLOR_TITLE), contentList));







            contentList = new ArrayList<>();



            contentList.add(new ClientTextStyleVO("¥" + MoneyBigDecimalUtil.getWithNoZera(msg.getBalance()) + "",



            contentList.add(new ClientTextStyleVO("¥" + filterMoney(msg.getBalance()) + "",



                    COLOR_CONTENT));



            items.add(new CommonMsgItemVO(new ClientTextStyleVO("账号余额", COLOR_TITLE), contentList));







@@ -315,12 +324,12 @@


            items.add(new CommonMsgItemVO(new ClientTextStyleVO("扣除说明", COLOR_TITLE), contentList));







            contentList = new ArrayList<>();



            contentList.add(new ClientTextStyleVO("¥" + MoneyBigDecimalUtil.getWithNoZera(msg.getMoney()) + "",



            contentList.add(new ClientTextStyleVO("¥" + filterMoney(msg.getMoney()) + "",



                    COLOR_HIGHLIGHT_CONTENT));



            items.add(new CommonMsgItemVO(new ClientTextStyleVO("奖金扣除", COLOR_TITLE), contentList));







            contentList = new ArrayList<>();



            contentList.add(new ClientTextStyleVO("¥" + MoneyBigDecimalUtil.getWithNoZera(msg.getBalance()) + "",



            contentList.add(new ClientTextStyleVO("¥" + filterMoney(msg.getBalance()) + "",



                    COLOR_CONTENT));



            items.add(new CommonMsgItemVO(new ClientTextStyleVO("账号余额", COLOR_TITLE), contentList));







@@ -341,12 +350,12 @@


            items.add(new CommonMsgItemVO(new ClientTextStyleVO("扣除说明", COLOR_TITLE), contentList));







            contentList = new ArrayList<>();



            contentList.add(new ClientTextStyleVO("¥" + MoneyBigDecimalUtil.getWithNoZera(msg.getMoney()) + "",



            contentList.add(new ClientTextStyleVO("¥" + filterMoney(msg.getMoney()) + "",



                    COLOR_HIGHLIGHT_CONTENT));



            items.add(new CommonMsgItemVO(new ClientTextStyleVO("奖金扣除", COLOR_TITLE), contentList));







            contentList = new ArrayList<>();



            contentList.add(new ClientTextStyleVO("¥" + MoneyBigDecimalUtil.getWithNoZera(msg.getBalance()) + "",



            contentList.add(new ClientTextStyleVO("¥" + filterMoney(msg.getBalance()) + "",



                    COLOR_CONTENT));



            items.add(new CommonMsgItemVO(new ClientTextStyleVO("账号余额", COLOR_TITLE), contentList));







@@ -363,12 +372,12 @@


            items.add(new CommonMsgItemVO(new ClientTextStyleVO("奖励订单", COLOR_TITLE), contentList));







            contentList = new ArrayList<>();



            contentList.add(new ClientTextStyleVO("¥" + MoneyBigDecimalUtil.getWithNoZera(msg.getMoney()) + "",



            contentList.add(new ClientTextStyleVO("¥" + filterMoney(msg.getMoney()) + "",



                    COLOR_HIGHLIGHT_CONTENT));



            items.add(new CommonMsgItemVO(new ClientTextStyleVO("奖励金额", COLOR_TITLE), contentList));







            contentList = new ArrayList<>();



            contentList.add(new ClientTextStyleVO("¥" + MoneyBigDecimalUtil.getWithNoZera(msg.getBalance()) + "",



            contentList.add(new ClientTextStyleVO("¥" + filterMoney(msg.getBalance()) + "",



                    COLOR_CONTENT));



            items.add(new CommonMsgItemVO(new ClientTextStyleVO("账号余额", COLOR_TITLE), contentList));







@@ -490,21 +499,21 @@






            if (dto.getFanLiMoney() != null) {



                contentList = new ArrayList<>();



                contentList.add(new ClientTextStyleVO("¥" + MoneyBigDecimalUtil.getWithNoZera(dto.getFanLiMoney()),



                contentList.add(new ClientTextStyleVO("¥" + filterMoney(dto.getFanLiMoney()),



                        COLOR_CONTENT));



                items.add(new CommonMsgItemVO(new ClientTextStyleVO("预估返利", COLOR_TITLE), contentList));



            }







            if (dto.getOrderFanLiMoney() != null) {



                contentList = new ArrayList<>();



                contentList.add(new ClientTextStyleVO("¥" + MoneyBigDecimalUtil.getWithNoZera(dto.getOrderFanLiMoney()),



                contentList.add(new ClientTextStyleVO("¥" + filterMoney(dto.getOrderFanLiMoney()),



                        COLOR_CONTENT));



                items.add(new CommonMsgItemVO(new ClientTextStyleVO("订单返利", COLOR_TITLE), contentList));



            }







            if (dto.getRewardMoney() != null) {



                contentList = new ArrayList<>();



                contentList.add(new ClientTextStyleVO("¥" + MoneyBigDecimalUtil.getWithNoZera(dto.getRewardMoney()),



                contentList.add(new ClientTextStyleVO("¥" + filterMoney(dto.getRewardMoney()),



                        COLOR_HIGHLIGHT_CONTENT));



                items.add(new CommonMsgItemVO(new ClientTextStyleVO("奖励金", COLOR_TITLE), contentList));



            }





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


@@ -174,13 +174,16 @@


    public static void punish() {



        Map<String, String> map = new HashMap<>();



        map.put("method", "taobao.tbk.dg.punish.order.get");



        map.put("span", "3600");



//        map.put("start_time", "2019-01-01 00:00:00");



        map.put("span", "1800");



        map.put("page_no", "1");



        map.put("page_size", "20");



        map.put("start_time", "2019-01-01 00:00:00");



        map.put("tb_trade_parent_id", "370829441412331676");



        map.put("violation_type", "1");



        map.put("relation_id", "550913878");



//        map.put("violation_type", "1");



//        map.put("relation_id", "550913878");



		


		


//        map.put("start_time", "2019-01-01 00:00:00");



//        map.put("tb_trade_parent_id", "370829441412331676");







        // map.put("start_time", "2019-01-01 00:00:00");



        TaoKeAppInfo app = new TaoKeAppInfo();