fanli/src/main/java/com/yeshi/fanli/service/impl/hongbao/HongBaoV2ServiceImpl.java
@@ -301,9 +301,9 @@ hongBao.setState(HongBaoV2.STATE_KELINGQU); hongBao.setMoney( MoneyBigDecimalUtil.mul(commonOrder.geteIncome(), fanliRate.divide(new BigDecimal(100)))); if (commonOrder.getSourceType() == Constant.SOURCE_TYPE_PDD)// 拼多多15天半到账 if (commonOrder.getSourceType() == Constant.SOURCE_TYPE_PDD)// 拼多多15天过1个小时到账 hongBao.setPreGetTime(new Date( commonOrder.getSettleTime().getTime() + 1000 * 60 * 60 * 24 * 15L + 1000 * 60 * 60 * 12L)); commonOrder.getSettleTime().getTime() + 1000 * 60 * 60 * 24 * 15L + 1000 * 60 * 60 * 1L)); else hongBao.setPreGetTime(new Date(commonOrder.getSettleTime().getTime() + 1000 * 60 * 60 * 24 * 15L)); if (mianDan) fanli/src/main/java/com/yeshi/fanli/service/impl/order/OrderProcessServiceImpl.java
@@ -308,10 +308,12 @@ return; } // 灰度测试中，京东/拼多多不返利 if (hongBaoOrder.getCommonOrder() == null || hongBaoOrder.getCommonOrder().getSourceType() == Constant.SOURCE_TYPE_JD || hongBaoOrder.getCommonOrder().getSourceType() == Constant.SOURCE_TYPE_PDD) { if (hongBaoOrder.getCommonOrder() == null) {// || // hongBaoOrder.getCommonOrder().getSourceType() // == // Constant.SOURCE_TYPE_JD // || hongBaoOrder.getCommonOrder().getSourceType() == // Constant.SOURCE_TYPE_PDD return; } @@ -602,17 +604,13 @@ HongBaoOrder hongBaoOrder = hongBaoOrderMapper.selectByHongBaoId(item.getId()); if (hongBaoOrder != null && hongBaoOrder.getCommonOrder() != null) { CommonOrder co = hongBaoOrder.getCommonOrder(); if (co.getSourceType() == Constant.SOURCE_TYPE_JD || co.getSourceType() == Constant.SOURCE_TYPE_PDD) { // 上级用户不是正常用户，订单均不能到账 UserInfo userInfo = userInfoMapper.selectByPrimaryKey(co.getUserInfo().getId()); if (userInfo == null || userInfo.getState() != UserInfo.STATE_NORMAL) { hongBaoList.remove(i); i--; } else {// 上级用户不是正常用户，订单均不能到账 UserInfo userInfo = userInfoMapper.selectByPrimaryKey(co.getUserInfo().getId()); if (userInfo == null || userInfo.getState() != UserInfo.STATE_NORMAL) { hongBaoList.remove(i); i--; } } } } } fanli/src/main/java/com/yeshi/fanli/service/inter/hongbao/HongBaoV2Service.java
@@ -4,8 +4,6 @@ import java.util.Date; import java.util.List; import org.apache.ibatis.annotations.Param; import com.yeshi.fanli.dto.HongBaoDTO; import com.yeshi.fanli.entity.bus.user.HongBaoV2; import com.yeshi.fanli.entity.order.CommonOrder; fanli/src/main/java/com/yeshi/fanli/util/Constant.java
@@ -92,6 +92,10 @@ public static final int SOURCE_TYPE_JD = 2; // 来源-拼多多 public static final int SOURCE_TYPE_PDD = 3; // 来源-唯品会 public static final int SOURCE_TYPE_WPH = 4; // 来源-苏宁 public static final int SOURCE_TYPE_SUNING = 5; // 自购-返利 public static final int TYPE_REBATE = 1; @@ -99,7 +103,7 @@ public static final int TYPE_SHAER = 2; // 邀请 public static final int TYPE_INVITE = 3; // 口令有效期-天 public static final int TOKEN_DAYS = 1; // 赠送有效期-天 @@ -235,6 +239,10 @@ return "京东"; case SOURCE_TYPE_PDD: return "拼多多"; case SOURCE_TYPE_WPH: return "唯品会"; case SOURCE_TYPE_SUNING: return "苏宁"; default:// 其他类型 return ""; } fanli/src/main/java/com/yeshi/fanli/util/SpringContext.java
@@ -142,7 +142,7 @@ doUserMoneyDebtJob();// 债务偿还 initScheduler();// 启动商品更新定时任务 doUpdateGoodsJob(); // 更新商品队列 doJDOrderJob();// 京东订单处理 // doJDOrderJob();// 京东订单处理 doPDDOrderJob();// 拼多多订单处理 doImportantTaoBaoGoodsUpdateJob();// 淘宝重要商品的信息更新 doHongBaoRecieveIntegralGetJob();// 返利到账，金币增加 fanli/src/main/java/com/yeshi/fanli/util/factory/CommonOrderGoodsFactory.java
@@ -53,8 +53,10 @@ if (jdGoods.getImageList() != null && jdGoods.getImageList().size() > 0) goods.setPicture(jdGoods.getImageList().get(0)); goods.setPrice(jdGoods.getPrice()); goods.setShopId((long) jdGoods.getShopInfo().getShopId()); goods.setShopName(jdGoods.getShopInfo().getShopName()); if (jdGoods.getShopInfo() != null) { goods.setShopId((long) jdGoods.getShopInfo().getShopId()); goods.setShopName(jdGoods.getShopInfo().getShopName()); } goods.setShopType(jdGoods.getOwner()); goods.setState(0); goods.setTitle(jdGoods.getSkuName());
