diff --git a/.idea/sqldialects.xml b/.idea/sqldialects.xml deleted file mode 100644 index 56782ca..0000000 --- a/.idea/sqldialects.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/src/main/java/cn/van/business/util/JDUtils.java b/src/main/java/cn/van/business/util/JDUtils.java index b519e42..cce4447 100644 --- a/src/main/java/cn/van/business/util/JDUtils.java +++ b/src/main/java/cn/van/business/util/JDUtils.java @@ -11,6 +11,7 @@ import com.jd.open.api.sdk.JdClient; import com.jd.open.api.sdk.domain.kplunion.OrderService.request.query.OrderRowReq; import com.jd.open.api.sdk.domain.kplunion.OrderService.response.query.GoodsInfo; import com.jd.open.api.sdk.domain.kplunion.OrderService.response.query.OrderRowResp; +import com.jd.open.api.sdk.domain.kplunion.promotionbysubunioni.PromotionService.request.get.PromotionCodeReq; import com.jd.open.api.sdk.request.kplunion.UnionOpenOrderRowQueryRequest; import com.jd.open.api.sdk.request.kplunion.UnionOpenPromotionBysubunionidGetRequest; import com.jd.open.api.sdk.response.kplunion.UnionOpenOrderRowQueryResponse; @@ -52,8 +53,7 @@ public class JDUtils { private static final String JD_REFRESH_TAG = "jd:refresh:tag:"; // 导购的 private static final String APP_KEY_DG = "faf410cb9587dc80dc7b31e321d7d322"; - private static final String SECRET_KEY_DG = - "a4fb15d7bedd4316b97b4e96e4effc1c"; + private static final String SECRET_KEY_DG = "a4fb15d7bedd4316b97b4e96e4effc1c"; //accessToken private static final String ACCESS_TOKEN = ""; @@ -523,6 +523,16 @@ public class JDUtils { break; } + case "已付款": { + List yfkOrders = orderRows.stream().filter(orderRow -> orderRow.getValidCode() == 16).collect(Collectors.toList()); + content.append("已付款:\n"); + content.append("订单总数:").append(yfkOrders.size()).append("\r"); + content.append("佣金总数:").append(yfkOrders.stream().mapToDouble(OrderRow::getEstimateFee).sum()); + for (OrderRow orderRow : yfkOrders) { + orderUtil.orderToWx(orderRow, false); + } + break; + } case "昨日统计": { List yesterdayOrders = filterOrdersByDate(orderRows, 1); List todayOrders = filterOrdersByDate(orderRows, 0); @@ -893,7 +903,7 @@ public class JDUtils { } /** - * 转链 + * 接口描述:通过商品链接、领券链接、活动链接获取普通推广链接或优惠券二合一推广链接 */ //String transfer(String url) throws Exception { // JdClient client = new DefaultJdClient(SERVER_URL, ACCESS_TOKEN, APP_KEY_DG, SECRET_KEY_DG); @@ -910,19 +920,19 @@ public class JDUtils { // // // getRequest.setPromotionCodeReq(promotionCodeReq); - // UnionOpenPromotionCommonGetResponse response = client.execute(request); + // client.execute(getRequest); // // String jsonString = JSON.toJSONString(response); // System.out.println(jsonString); // - //System.out.println(request.getAppJsonParams()); - //System.out.println(request.getPromotionCodeReq()); + // System.out.println(request.getAppJsonParams()); + // System.out.println(request.getPromotionCodeReq()); // - //System.out.println("--------"); - //System.out.println(response.getGetResult().getCode()); - //System.out.println(response.getGetResult().getMessage()); - //System.out.println(response.getGetResult().getData().getClickURL()); - //System.out.println(response.getGetResult().getData().getJCommand()); + // System.out.println("--------"); + // System.out.println(response.getGetResult().getCode()); + // System.out.println(response.getGetResult().getMessage()); + // System.out.println(response.getGetResult().getData().getClickURL()); + // System.out.println(response.getGetResult().getData().getJCommand()); // return response.getGetResult().getData().getClickURL(); //}