fanli/src/main/java/com/yeshi/fanli/entity/money/UserMoneyDetail.java
@@ -57,7 +57,7 @@ extractAutoWX("自动提现", "http://img.flqapp.com/resource/money_detail/icon_extract.png", ""), extractAutoWXRefund("自动提现失败", "http://img.flqapp.com/resource/money_detail/icon_extract.png", ""), subsidy("额外补贴", "http://img.flqapp.com/resource/msg/icon_msg_subsidy.png", ""), orderTeamReward("团队奖励", "http://img.flqapp.com/resource/msg/icon_msg_subsidy.png", ""); orderTeamReward("团队奖励", "http://img.flqapp.com/resource/msg/icon_msg_team_reward.png", ""); private final String desc; private final String picture; fanli/src/main/java/com/yeshi/fanli/service/impl/order/CommonOrderServiceImpl.java
@@ -71,7 +71,6 @@ import com.yeshi.fanli.util.jd.JDApiUtil; import com.yeshi.fanli.util.jd.JDUtil; import com.yeshi.fanli.util.pinduoduo.PinDuoDuoApiUtil; import com.yeshi.fanli.util.taobao.TaoBaoOrderUtil; import com.yeshi.fanli.util.taobao.TaoBaoUtil; import com.yeshi.fanli.util.taobao.TaoKeApiUtil; import com.yeshi.fanli.util.user.UserLevelUtil; @@ -944,7 +943,7 @@ wholeOrderState = CommonOrder.STATE_WHOLE_ORDER_BUFENYOUXIAO; for (TaoBaoOrder taoBaoOrder : taoBaoOrders) { CommonOrder newCommonOrder = TaoBaoOrderUtil.convert(taoBaoOrder); CommonOrder newCommonOrder = CommonOrderFactory.create(taoBaoOrder); CommonOrderGoods cog = new CommonOrderGoods(); cog.setGoodsId(taoBaoOrder.getAuctionId() + ""); cog.setGoodsType(Constant.SOURCE_TYPE_TAOBAO); fanli/src/main/java/com/yeshi/fanli/service/impl/order/OrderRepairServiceImpl.java
@@ -69,7 +69,7 @@ import com.yeshi.fanli.util.TimeUtil; import com.yeshi.fanli.util.factory.CommonOrderGoodsFactory; import com.yeshi.fanli.util.factory.UserMoneyDetailFactory; import com.yeshi.fanli.util.taobao.TaoBaoOrderUtil; import com.yeshi.fanli.util.factory.goods.CommonOrderFactory; import com.yeshi.fanli.util.taobao.TaoBaoUtil; import com.yeshi.fanli.util.taobao.TaoKeApiUtil; @@ -289,7 +289,7 @@ wholeOrderState = CommonOrder.STATE_WHOLE_ORDER_BUFENYOUXIAO; for (TaoBaoOrder taoBaoOrder : taoBaoOrderList) { CommonOrder commonOrder = TaoBaoOrderUtil.convert(taoBaoOrder); CommonOrder commonOrder = CommonOrderFactory.create(taoBaoOrder); commonOrder.setStateWholeOrder(wholeOrderState); commonOrder.setCommonOrderGoods(getCommonOrderGoods(taoBaoOrder.getAuctionId())); commonOrder.setUserInfo(new UserInfo(mainUid)); @@ -394,7 +394,7 @@ @Transactional(rollbackFor=Exception.class) private void updateOrderInfo(TaoBaoOrder taoBaoOrder, Long commonOrderId) throws Exception { HongBaoOrder hongBaoOrder = hongBaoOrderService.selectDetailByCommonOrderId(commonOrderId); CommonOrder newCommonOrder = TaoBaoOrderUtil.convert(taoBaoOrder); CommonOrder newCommonOrder = CommonOrderFactory.create(taoBaoOrder); List<CommonOrderGoods> commonGoodsList = commonOrderGoodsMapper .listByGoodsIdAndGoodsType(taoBaoOrder.getAuctionId() + "", newCommonOrder.getSourceType()); CommonOrderGoods cog = null; fanli/src/main/java/com/yeshi/fanli/util/factory/goods/CommonOrderFactory.java
@@ -6,8 +6,11 @@ import com.yeshi.fanli.entity.jd.JDOrderItem; import com.yeshi.fanli.entity.order.CommonOrder; import com.yeshi.fanli.entity.pdd.PDDOrder; import com.yeshi.fanli.entity.taobao.TaoBaoOrder; import com.yeshi.fanli.util.Constant; import com.yeshi.fanli.util.MoneyBigDecimalUtil; import com.yeshi.fanli.util.StringUtil; import com.yeshi.fanli.util.TimeUtil; public class CommonOrderFactory { @@ -123,4 +126,41 @@ return commonOrder; } public static CommonOrder create(TaoBaoOrder taoBaoOrder) { CommonOrder commonOrder = new CommonOrder(); commonOrder.setCount(taoBaoOrder.getCount()); commonOrder.setCreateTime(new Date()); if (taoBaoOrder.geteIncome() != null && taoBaoOrder.getSubsidy() != null) commonOrder.seteIncome(taoBaoOrder.geteIncome().add(taoBaoOrder.getSubsidy())); else commonOrder.seteIncome(taoBaoOrder.geteIncome()); commonOrder.setEstimate(taoBaoOrder.getEstimate()); commonOrder.setOrderNo(taoBaoOrder.getOrderId()); commonOrder.setPayment(taoBaoOrder.getPayment()); commonOrder.setSettlement(taoBaoOrder.getSettlement()); if (!StringUtil.isNullOrEmpty(taoBaoOrder.getSettlementTime())) commonOrder.setSettleTime( new Date(TimeUtil.convertToTimeTemp(taoBaoOrder.getSettlementTime(), "yyyy-MM-dd HH:mm:ss"))); commonOrder.setSourcePosition(String.format("mm_%s_%s_%s", "124933865", taoBaoOrder.getSourceMediaId(), taoBaoOrder.getAdPositionId())); commonOrder.setSourceType(Constant.SOURCE_TYPE_TAOBAO); int state = 0; if ("订单付款".equalsIgnoreCase(taoBaoOrder.getOrderState())) { state = CommonOrder.STATE_FK; } else if ("订单成功".equalsIgnoreCase(taoBaoOrder.getOrderState())) { state = CommonOrder.STATE_FK; } else if ("订单失效".equalsIgnoreCase(taoBaoOrder.getOrderState())) { state = CommonOrder.STATE_SX; } else if ("订单结算".equalsIgnoreCase(taoBaoOrder.getOrderState())) { state = CommonOrder.STATE_JS; } commonOrder.setOrderBy(taoBaoOrder.getOrderBy()); commonOrder.setState(state); commonOrder.setThirdCreateTime( new Date(TimeUtil.convertToTimeTemp(taoBaoOrder.getCreateTime(), "yyyy-MM-dd HH:mm:ss"))); commonOrder.setUpdateTime(new Date()); commonOrder.setTradeId(taoBaoOrder.getTradeId()); return commonOrder; } } fanli/src/main/java/com/yeshi/fanli/util/factory/msg/UserMsgVOFactory.java
@@ -608,7 +608,7 @@ COLOR_CONTENT)); items.add(new CommonMsgItemVO(new ClientTextStyleVO("备注", COLOR_TITLE), contentList)); return new UserMsgVO("http://img.flqapp.com/resource/msg/icon_msg_subsidy.png", msg.getMsgType().getDesc(), return new UserMsgVO("http://img.flqapp.com/resource/msg/icon_msg_team_reward.png", msg.getMsgType().getDesc(), msg.getUpdateTime() == null ? msg.getCreateTime() : msg.getUpdateTime(), items); } else if (msg.getMsgType() == MsgTypeMoneyTypeEnum.redPackReceiveOff) { // 红包成功领取 if (StringUtil.isNullOrEmpty(msg.getContent())) fanli/src/main/java/com/yeshi/fanli/util/taobao/TaoBaoOrderUtil.java
@@ -763,45 +763,6 @@ return TimeUtil.convertToTimeTemp(time, "yyyy-M-dd HH:mm:ss"); } public static CommonOrder convert(TaoBaoOrder taoBaoOrder) { CommonOrder commonOrder = new CommonOrder(); commonOrder.setCount(taoBaoOrder.getCount()); commonOrder.setCreateTime(new Date()); if (taoBaoOrder.geteIncome() != null && taoBaoOrder.getSubsidy() != null) commonOrder.seteIncome(taoBaoOrder.geteIncome().add(taoBaoOrder.getSubsidy())); else commonOrder.seteIncome(taoBaoOrder.geteIncome()); commonOrder.setEstimate(taoBaoOrder.getEstimate()); commonOrder.setOrderNo(taoBaoOrder.getOrderId()); commonOrder.setPayment(taoBaoOrder.getPayment()); commonOrder.setSettlement(taoBaoOrder.getSettlement()); if (!StringUtil.isNullOrEmpty(taoBaoOrder.getSettlementTime())) commonOrder.setSettleTime( new Date(TimeUtil.convertToTimeTemp(taoBaoOrder.getSettlementTime(), "yyyy-MM-dd HH:mm:ss"))); commonOrder.setSourcePosition(String.format("mm_%s_%s_%s", "124933865", taoBaoOrder.getSourceMediaId(), taoBaoOrder.getAdPositionId())); commonOrder.setSourceType(Constant.SOURCE_TYPE_TAOBAO); int state = 0; if ("订单付款".equalsIgnoreCase(taoBaoOrder.getOrderState())) { state = CommonOrder.STATE_FK; } else if ("订单成功".equalsIgnoreCase(taoBaoOrder.getOrderState())) { state = CommonOrder.STATE_FK; } else if ("订单失效".equalsIgnoreCase(taoBaoOrder.getOrderState())) { state = CommonOrder.STATE_SX; } else if ("订单结算".equalsIgnoreCase(taoBaoOrder.getOrderState())) { state = CommonOrder.STATE_JS; } commonOrder.setOrderBy(taoBaoOrder.getOrderBy()); commonOrder.setState(state); commonOrder.setThirdCreateTime( new Date(TimeUtil.convertToTimeTemp(taoBaoOrder.getCreateTime(), "yyyy-MM-dd HH:mm:ss"))); commonOrder.setUpdateTime(new Date()); commonOrder.setTradeId(taoBaoOrder.getTradeId()); return commonOrder; } /** * 获取一组订单的hash值 *
