From 64bd2204be459b47e008b79073a143684140ff24 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期六, 04 七月 2020 18:20:45 +0800
Subject: [PATCH] mapper xml文件位置移动
---
fanli/src/main/java/com/yeshi/fanli/controller/CallBackController.java | 14 +++++++-------
1 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/CallBackController.java b/fanli/src/main/java/com/yeshi/fanli/controller/CallBackController.java
index 6609362..f2a00e40 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/CallBackController.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/CallBackController.java
@@ -8,7 +8,6 @@
import java.util.ArrayList;
import java.util.Date;
import java.util.HashMap;
-import java.util.Iterator;
import java.util.List;
import java.util.Map;
@@ -18,20 +17,19 @@
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
+import com.yeshi.fanli.entity.SystemEnum;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.RequestMapping;
import org.yeshi.utils.taobao.TbImgUtil;
import org.yeshi.utils.wx.WXUtil;
import com.aliyun.openservices.ons.api.Message;
-import com.aliyun.openservices.ons.api.Producer;
import com.yeshi.fanli.dto.ConfigParamsDTO;
import com.yeshi.fanli.dto.mq.order.OrderTopicTagEnum;
import com.yeshi.fanli.dto.mq.order.body.BanLiShopOrderMQMsg;
import com.yeshi.fanli.entity.bus.activity.ActivityRuleUser;
import com.yeshi.fanli.entity.bus.activity.ActivityUser;
import com.yeshi.fanli.entity.bus.msg.MsgDeviceReadState;
-import com.yeshi.fanli.entity.bus.user.cloud.UserCloud;
import com.yeshi.fanli.entity.dynamic.ImgInfo;
import com.yeshi.fanli.entity.dynamic.ImgInfo.ImgEnum;
import com.yeshi.fanli.entity.dynamic.SimpleGoods;
@@ -50,6 +48,7 @@
import com.yeshi.fanli.service.inter.push.PushService;
import com.yeshi.fanli.service.inter.shop.BanLiShopOrderService;
import com.yeshi.fanli.service.inter.user.cloud.UserCloudService;
+import com.yeshi.fanli.service.manger.msg.RocketMQManager;
import com.yeshi.fanli.util.Constant;
import com.yeshi.fanli.util.StringUtil;
import com.yeshi.fanli.util.factory.goods.GoodsDetailVOFactory;
@@ -82,8 +81,8 @@
@Resource
private MsgDeviceReadStateService msgDeviceReadStateService;
- @Resource(name = "producer")
- private Producer producer;
+ @Resource
+ private RocketMQManager rocketMQManager;
@Resource
private BanLiShopOrderService banLiShopOrderService;
@@ -233,7 +232,7 @@
new BigDecimal(map.get("total_fee")).multiply(new BigDecimal("0.01")));
Message message = MQMsgBodyFactory.create(MQTopicName.TOPIC_ORDER,
OrderTopicTagEnum.banLiShopOrderPaid, msg);
- producer.send(message);
+ rocketMQManager.sendNormalMsg(message, null,null);
Map<String, String> returnMap = new HashMap<>();
returnMap.put("return_code", "SUCCESS");
returnMap.put("return_msg", "OK");
@@ -339,8 +338,9 @@
ActivityUser user = ruleList.get((int) (ruleList.size() * Math.random())).getActivityUser();
try {
+ for(SystemEnum system:SystemEnum.values())
goodsEvaluateService.addGoodsEvaluate(itemId + "", imageList, user, doc, null,
- new Date(startTime - 1000 * 60 * 20L * i));
+ new Date(startTime - 1000 * 60 * 20L * i),system);
} catch (GoodsEvaluateException e) {
e.printStackTrace();
} catch (Exception e) {
--
Gitblit v1.8.0