From 651a15c78f668bef3859d9ed1bb7ad0b669d3600 Mon Sep 17 00:00:00 2001 From: admin <weikou2014> Date: 星期五, 03 七月 2020 17:52:07 +0800 Subject: [PATCH] 多APP优化 --- fanli/src/main/java/com/yeshi/fanli/service/impl/order/CommonOrderServiceImpl.java | 23 ++++++++++++++++++----- 1 files changed, 18 insertions(+), 5 deletions(-) diff --git a/fanli/src/main/java/com/yeshi/fanli/service/impl/order/CommonOrderServiceImpl.java b/fanli/src/main/java/com/yeshi/fanli/service/impl/order/CommonOrderServiceImpl.java index 36c0d49..f140a2f 100644 --- a/fanli/src/main/java/com/yeshi/fanli/service/impl/order/CommonOrderServiceImpl.java +++ b/fanli/src/main/java/com/yeshi/fanli/service/impl/order/CommonOrderServiceImpl.java @@ -18,7 +18,6 @@ import org.yeshi.utils.taobao.TbImgUtil; import com.aliyun.openservices.ons.api.Message; -import com.aliyun.openservices.ons.api.Producer; import com.yeshi.fanli.dao.mybatis.order.CommonOrderGoodsMapper; import com.yeshi.fanli.dao.mybatis.order.CommonOrderMapper; import com.yeshi.fanli.dao.mybatis.order.CommonOrderTradeIdMapMapper; @@ -74,6 +73,7 @@ import com.yeshi.fanli.service.inter.user.UserSystemCouponService; import com.yeshi.fanli.service.inter.user.invite.UserInviteService; import com.yeshi.fanli.service.inter.user.vip.UserVIPInfoService; +import com.yeshi.fanli.service.manger.msg.RocketMQManager; import com.yeshi.fanli.service.manger.user.UserLevelManager; import com.yeshi.fanli.util.Constant; import com.yeshi.fanli.util.MoneyBigDecimalUtil; @@ -160,8 +160,8 @@ @Resource private TaoBaoOrderGoodsMapper taoBaoOrderGoodsMapper; - @Resource(name = "producer") - private Producer orderProducer; + @Resource + private RocketMQManager rocketMQManager; // 濂栧姳璁㈠崟鍥剧墖 public final static String PIC_REWARD = "http://img.flqapp.com/resource/order/order_state_reward.png"; @@ -1097,7 +1097,7 @@ settlement, firstOrder.getUserInfo().getId(), placeDate, new Date()); Message msg = MQMsgBodyFactory.create(MQTopicName.TOPIC_ORDER, OrderTopicTagEnum.orderConfirm, mqMsg); - orderProducer.send(msg); + rocketMQManager.sendNormalMsg(msg, null); } } } @@ -1854,6 +1854,13 @@ return commonOrderMapper.getByOrderNo(uid, orderNO); } + + @Override + public List<CommonOrder> getByOrderNoAndSourceType(Long uid, String orderNO, int sourceType) { + return commonOrderMapper.getByOrderNoAndSourceType(uid, orderNO, sourceType); + } + + @Override public CommonOrder selectLatestValidByUid(Long uid) { List<Integer> stateList = new ArrayList<>(); @@ -2109,6 +2116,7 @@ Integer goodsType = commonGoodsVO.getGoodsType(); if (goodsType != null & goodsType == Constant.SOURCE_TYPE_ELME) { order.setOrderType(Constant.SOURCE_TYPE_ELME); // 楗夸簡涔堣鍗� + commonGoodsVO.setGoodsId("0"); } if (goodsType == Constant.SOURCE_TYPE_SUNING) { @@ -2172,7 +2180,7 @@ // 鏄剧ず杩斿埄璇存槑杩炴帴> 鏈け鏁� if (CommonOrder.STATE_SX != orderState && thirdCreateTime.getTime() > TimeUtil.convertDateToTemp(Constant.ORDER_SHOW_BRACE_TIME)) { - String rebateLink = configService.get(ConfigKeyEnum.orderRebateDescLink.getKey()); + String rebateLink = configService.getValue(ConfigKeyEnum.orderRebateDescLink.getKey(),acceptData.getSystem()); order.setRebateLink(rebateLink + "?orderNo=" + orderNo + "&sourceType=" + sourceType); } @@ -2373,4 +2381,9 @@ return commonOrderMapper.listByOrderNo(orderNo); } + @Override + public CommonOrder getFirstOrder(Long uid) { + return commonOrderMapper.getFirstOrder(uid); + } + } -- Gitblit v1.8.0