fanli/src/main/java/com/yeshi/fanli/job/order/taobao/UpdateOrderJob.java
@@ -53,21 +53,10 @@ @Resource private OrderProcessService orderProcessService; @Resource private TaoBaoOrderUtil taoBaoOrderUtil; @Resource private TaoBaoOrderService taoBaoOrderService; @Resource private TaoBaoUnionConfigService taoBaoUnionConfigService; @Resource private TaoBaoWeiQuanOrderService taoBaoWeiQuanOrderService; @Resource private DataMonitorService dataMonitorService; @Resource private RedisManager redisManager; @@ -81,8 +70,6 @@ @Resource private CommonOrderService commonOrderService; @Resource private OrderMoneySettleService orderMoneySettleService; /** * 新版获取普通订单 @@ -363,6 +350,29 @@ return ReturnT.SUCCESS; } /** * 处理淘宝订单 * * @param param 订单号 * @return * @throws Exception */ @XxlJob("processTaoBaoOrder") public ReturnT<String> processTaoBaoOrder(String param) throws Exception { String[] orderIds = param.split(","); if (orderIds == null || orderIds.length == 0) throw new Exception("订单不存在"); for (String orderId : orderIds) { List<TaoBaoOrder> orderList = taoBaoOrderService.getTaoBaoOrderByOrderId(orderId); if (orderList == null || orderList.size() == 0) continue; orderProcessService.processOrder(TaoBaoOrderUtil.classifyTaoBaoOrderByOrderId(orderList)); } return ReturnT.SUCCESS; } // 淘宝推广订单 每隔1分执行一次 private void pullLatestCommonOrder() { LogHelper.job("pullLatestCommonOrder"); @@ -464,8 +474,6 @@ orderProcessService.processOrder(orders); return ReturnT.SUCCESS; } /** fanli/src/main/java/com/yeshi/fanli/service/impl/order/CommonOrderServiceImpl.java
@@ -1376,7 +1376,7 @@ && oldCommonOrder.getSourceType() != Constant.SOURCE_TYPE_JD) || oldCommonOrder.getState() == CommonOrder.STATE_SX || oldCommonOrder.getState() == CommonOrder.STATE_WQ || (oldCommonOrder.getState().intValue() == commonOrder.getState())) { || (oldCommonOrder.getState().intValue() == commonOrder.getState()&&oldCommonOrder.getPayment().compareTo(commonOrder.getPayment())==0)) { return new CommonOrderAddResultDTO(oldCommonOrder, CommonOrderAddResultDTO.TYPE_NOUPDATE); } // 交易ID一致才修改 fanli/src/main/java/com/yeshi/fanli/service/impl/order/OrderProcessServiceImpl.java
@@ -1663,6 +1663,7 @@ // 返利到账 } /** * 添加红包与事务消息 * @@ -1719,4 +1720,19 @@ return false; } @Override public void invalidTaoBaoOrder(String tradeId) { TaoBaoOrder taoBaoOrder = taoBaoOrderService.selectByTradeId(tradeId); //订单付款和订单成功的状态才允许失效 if (taoBaoOrder != null && ("订单付款".equalsIgnoreCase(taoBaoOrder.getOrderState()) || "订单成功".equalsIgnoreCase(taoBaoOrder.getOrderState()))) { TaoBaoOrder update = new TaoBaoOrder(); update.setId(taoBaoOrder.getId()); update.setLatestUpdateTime(new Date()); update.setOrderState("订单失效"); taoBaoOrderService.updateSelectiveByPrimaryKey(update); CMQManager.getInstance().addTaoBaoOrderMsg(taoBaoOrder.getOrderId()); } } } fanli/src/main/java/com/yeshi/fanli/service/impl/order/tb/TaoBaoOrderServiceImpl.java
@@ -269,5 +269,10 @@ goods.setCreateTime(new Date()); taoBaoOrderGoodsMapper.insertSelective(goods); } @Override public void updateSelectiveByPrimaryKey(TaoBaoOrder order) { taoBaoOrderMapper.updateByPrimaryKeySelective(order); } } fanli/src/main/java/com/yeshi/fanli/service/inter/order/OrderProcessService.java
@@ -159,4 +159,11 @@ * @param hongBaoId */ public void elmeFanli(Long hongBaoId); /** * 使淘宝订单失效 * @param tradeId */ public void invalidTaoBaoOrder(String tradeId); } fanli/src/main/java/com/yeshi/fanli/service/inter/order/tb/TaoBaoOrderService.java
@@ -10,7 +10,6 @@ * 淘宝订单服务 * * @author Administrator * */ public interface TaoBaoOrderService { @@ -23,11 +22,8 @@ public void addTaoBaoOrderList(List<TaoBaoOrder> list); /** * * @param orderId * 订单号 * @param list * 订单号下面的订单 * @param orderId 订单号 * @param list 订单号下面的订单 */ public void addTaoBaoOrder(String orderId, List<TaoBaoOrder> list); @@ -40,13 +36,10 @@ public List<TaoBaoOrder> getTaoBaoOrderByOrderId(String orderId); /** * 统计当日预估收益 * * @param date * 2018-09-01 * @param date 2018-09-01 * @return */ public double countEstimate(String date) throws Exception; @@ -124,11 +117,19 @@ /** * 添加订单商品 * * @param goods void 返回类型 * @throws * @Title: addTaoBaoOrderGoods * @Description: * @param goods * void 返回类型 * @throws */ public void addTaoBaoOrderGoods(TaoBaoOrderGoods goods); /** * 根据订单更新 * * @param order */ public void updateSelectiveByPrimaryKey(TaoBaoOrder order); } fanli/src/main/java/com/yeshi/fanli/service/manger/order/HongBaoV2AddManager.java
@@ -309,8 +309,8 @@ HongBaoV2 hongBao = createFanLiUpdateHongBao(commonOrder, money, hongBaoOrder.getHongBaoV2().getId(), mianDan); // 新老红包状态一致不处理 if (oldHongBao.getState().intValue() == hongBao.getState()) // 新老红包状态一致且佣金金额不变则不处理 if (oldHongBao.getState().intValue() == hongBao.getState()&&oldHongBao.getMoney().compareTo(hongBao.getMoney())==0) return false; if (hongBao.getState() == HongBaoV2.STATE_SHIXIAO) { fanli/src/main/java/com/yeshi/fanli/util/jd/JDApiUtil.java
@@ -116,7 +116,7 @@ * * @return */ public static String convertLink1(String materialId, String couponUrl, String positionId, String ext1) { public static String convertLink1(String materialId, String couponUrl, String positionId, String ext1, String giftCouponKey) { JSONObject json = new JSONObject(); json.put("materialId", materialId); json.put("siteId", APP_ID); @@ -127,6 +127,8 @@ if (!StringUtil.isNullOrEmpty(ext1)) json.put("ext1", ext1); if (!StringUtil.isNullOrEmpty(giftCouponKey)) json.put("giftCouponKey", giftCouponKey); JSONObject root = new JSONObject(); root.put("promotionCodeReq", json); @@ -726,7 +728,7 @@ JSONObject json = new JSONObject(); JSONObject couponReq = new JSONObject(); couponReq.put("skuMaterialId", sku); couponReq.put("discount", 10); couponReq.put("discount", 10.01); couponReq.put("amount", 5); couponReq.put("receiveStartTime", TimeUtil.getGernalTime(System.currentTimeMillis(), "yyyy-MM-dd HH")); couponReq.put("receiveEndTime", TimeUtil.getGernalTime(System.currentTimeMillis() + 1000 * 60 * 2, "yyyy-MM-dd HH")); fanli/src/main/resource/env-dev/constant.properties
@@ -1,3 +1,3 @@ task =false outnetwork =false test=true test=false
