admin
2020-06-15 3e4ef41ffacd7f5fda2e81c3810cd11a6375b83c
好单库转链支持
4个文件已修改
67 ■■■■ 已修改文件
fanli/src/main/java/com/yeshi/fanli/service/impl/money/extract/ExtractServiceImpl.java 5 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
fanli/src/main/java/com/yeshi/fanli/service/manger/goods/ConvertLinkManager.java 23 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
fanli/src/main/java/com/yeshi/fanli/util/AlipayUtil.java 23 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
fanli/src/main/java/com/yeshi/fanli/util/taobao/HaoDanKuApiUtil.java 16 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
fanli/src/main/java/com/yeshi/fanli/service/impl/money/extract/ExtractServiceImpl.java
@@ -424,12 +424,9 @@
        LogHelper.userErrorInfo("提现:开始通过提现-" + extract.getId());
        AlipayFundTransUniTransferResponse response = null;
        try {
            response = AlipayUtil.transfer("widthdraw_" + extract.getId(), extract.getAccount(),  extract.getName(),  extract.getMoney(), "板栗快省提现到账", "来自板栗快省的提现");
            response = AlipayUtil.transferNoThrowException("widthdraw_" + extract.getId(), extract.getAccount(),  extract.getName(),  extract.getMoney(), "板栗快省提现到账", "来自板栗快省的提现");
            LogHelper.userErrorInfo("提现:支付宝通过提现成功-" + extract.getId());
        } catch (AlipayApiException e) {
            LogHelper.errorDetailInfo(e, "支付宝转账异常:" + extract.getId(), "");
            LogHelper.userErrorInfo("提现:支付宝提现异常:" + response + ",提现信息" + GsonUtil.toJson(extract));
        }catch(AlipayTransferException e){
            LogHelper.errorDetailInfo(e, "支付宝转账异常:" + extract.getId(), "");
            LogHelper.userErrorInfo("提现:支付宝提现异常:" + response + ",提现信息" + GsonUtil.toJson(extract));
        }
fanli/src/main/java/com/yeshi/fanli/service/manger/goods/ConvertLinkManager.java
@@ -29,6 +29,7 @@
import com.yeshi.fanli.util.jd.JDUtil;
import com.yeshi.fanli.util.pinduoduo.PinDuoDuoApiUtil;
import com.yeshi.fanli.util.pinduoduo.PinDuoDuoUtil;
import com.yeshi.fanli.util.taobao.HaoDanKuApiUtil;
import com.yeshi.fanli.util.taobao.TaoBaoUtil;
import com.yeshi.fanli.util.taobao.TaoKeApiUtil;
@@ -174,16 +175,18 @@
                    throw new Exception("商品信息获取失败");
                String link = null;
                if (share) {
                    TaoBaoGoodsBrief goods = TaoKeApiUtil.specialConvertCoupon(auctionId,
                            new TaoKeAppInfo(TaoBaoConstant.TAOBAO_AUTH_APPKEY, TaoBaoConstant.TAOBAO_AUTH_APPSECRET,
                                    TaoBaoConstant.TAOBAO_RELATION_PID_DEFAULT));
                    if (goods == null)
                        throw new Exception("商品转链失败");
                    link = goods.getCouponLink();
                    if (StringUtil.isNullOrEmpty(link)) {
                        link = goods.getAuctionUrl();
                    }
                    //暂时调用好单库API
                     link=HaoDanKuApiUtil.getInstance().convertLink(auctionId, TaoBaoConstant.TAOBAO_RELATION_PID_DEFAULT, null);
//                    TaoBaoGoodsBrief goods =  TaoKeApiUtil.specialConvertCoupon(auctionId,
//                            new TaoKeAppInfo(TaoBaoConstant.TAOBAO_AUTH_APPKEY, TaoBaoConstant.TAOBAO_AUTH_APPSECRET,
//                                    TaoBaoConstant.TAOBAO_RELATION_PID_DEFAULT));
//                    if (goods == null)
//                        throw new Exception("商品转链失败");
//
//                    link = goods.getCouponLink();
//                    if (StringUtil.isNullOrEmpty(link)) {
//                        link = goods.getAuctionUrl();
//                    }
                    if (StringUtil.isNullOrEmpty(link))
                        throw new Exception("商品转链失败");
                    link += "&relationId=" + relationId;
fanli/src/main/java/com/yeshi/fanli/util/AlipayUtil.java
@@ -6,6 +6,7 @@
import com.alipay.api.CertAlipayRequest;
import com.alipay.api.DefaultAlipayClient;
import com.alipay.api.request.AlipayFundTransUniTransferRequest;
import com.alipay.api.request.AlipayTradeQueryRequest;
import com.alipay.api.response.AlipayFundTransUniTransferResponse;
import com.yeshi.fanli.exception.user.AlipayTransferException;
@@ -68,4 +69,26 @@
        }
    }
    public static AlipayFundTransUniTransferResponse transferNoThrowException(String outBizNo, String account, String name,
            BigDecimal money, String orderTitle, String mark) throws AlipayApiException{
        AlipayFundTransUniTransferRequest request = new AlipayFundTransUniTransferRequest();
        JSONObject json = new JSONObject();
        json.put("out_biz_no", outBizNo);
        json.put("trans_amount", money.toString());
        json.put("product_code", "TRANS_ACCOUNT_NO_PWD");
        json.put("order_title", orderTitle);
        JSONObject payee_info = new JSONObject();
        payee_info.put("identity", account);
        payee_info.put("identity_type", "ALIPAY_LOGON_ID");
        payee_info.put("name", name);
        json.put("payee_info", payee_info);
        json.put("remark", mark);
        json.put("biz_scene", "DIRECT_TRANSFER");
        request.setBizContent(json.toString());
        AlipayFundTransUniTransferResponse response = null;
        response = alipayClient.certificateExecute(request);
        return response;
    }
}
fanli/src/main/java/com/yeshi/fanli/util/taobao/HaoDanKuApiUtil.java
@@ -68,14 +68,24 @@
        System.out.println(result);
    }
    public void convertLink(Long auctionId, String pid, String activityId) {
    public String convertLink(Long auctionId, String pid, String activityId) {
        List<ParamsKeyValue> params = new ArrayList<HaoDanKuApiUtil.ParamsKeyValue>();
        params.add(new ParamsKeyValue("itemid", auctionId + ""));
        params.add(new ParamsKeyValue("pid", pid));
        if (activityId != null)
            params.add(new ParamsKeyValue("activityid", activityId));
        String result = basePostRequest("http://v2.api.haodanku.com/ratesurl", params);
        System.out.println(result);
        JSONObject resultData = JSONObject.fromObject(result);
        String link = "";
        if (resultData.optInt("code") == 1) {
            resultData = resultData.optJSONObject("data");
            link = resultData.optString("coupon_click_url");
            if (StringUtil.isNullOrEmpty(link)) {
                link = resultData.optString("item_url");
            }
        }
        return link;
    }
    /**
@@ -94,7 +104,7 @@
        if (minId == null)
            minId = 1;
        List<ParamsKeyValue> params = new ArrayList<HaoDanKuApiUtil.ParamsKeyValue>();
        params.add(new ParamsKeyValue("nav", 3+ ""));
        params.add(new ParamsKeyValue("nav", 3 + ""));
        params.add(new ParamsKeyValue("back", pageSize + ""));
        params.add(new ParamsKeyValue("min_id", minId + ""));
        params.add(new ParamsKeyValue("sort", 0 + ""));