From 7912a94e5de72b628bde39b16e6c7b21172910eb Mon Sep 17 00:00:00 2001
From: yujian <yujian@163.com>
Date: 星期一, 08 六月 2020 17:15:39 +0800
Subject: [PATCH] 2.1.2bug
---
fanli/src/main/java/com/yeshi/fanli/controller/CallBackController.java | 25 ++++++++++++++++++++++---
1 files changed, 22 insertions(+), 3 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 ee11d87..225f845 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/CallBackController.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/CallBackController.java
@@ -47,6 +47,7 @@
import com.yeshi.fanli.service.inter.config.ConfigService;
import com.yeshi.fanli.service.inter.dynamic.GoodsEvaluateService;
import com.yeshi.fanli.service.inter.msg.MsgDeviceReadStateService;
+import com.yeshi.fanli.service.inter.order.OrderHongBaoMoneyComputeService;
import com.yeshi.fanli.service.inter.order.config.HongBaoManageService;
import com.yeshi.fanli.service.inter.push.PushService;
import com.yeshi.fanli.service.inter.shop.BanLiShopOrderService;
@@ -93,6 +94,9 @@
@Resource
private HongBaoManageService hongBaoManageService;
+
+ @Resource
+ private OrderHongBaoMoneyComputeService orderHongBaoMoneyComputeService;
@Resource
private ActivityUserService activityUserService;
@@ -188,6 +192,21 @@
@RequestMapping(value = "vip")
public void VIP(PrintWriter out) {
+ out.print("success");
+ }
+
+
+
+ /**
+ * 鏀粯瀹濇敮浠樺洖璋�
+ * @Title: alipay
+ * @Description:
+ * @param out
+ * void 杩斿洖绫诲瀷
+ * @throws
+ */
+ @RequestMapping(value = "alipay")
+ public void alipay(PrintWriter out) {
out.print("success");
}
@@ -293,7 +312,7 @@
if (goodsBrief == null)
continue;
// 鍟嗗搧VO
- ConfigParamsDTO paramsDTO = hongBaoManageService.getShowComputeRate("android", "55");
+ ConfigParamsDTO paramsDTO = orderHongBaoMoneyComputeService.getShowComputeRate("android", "55");
paramsDTO.setBaseFanliRate(hongBaoManageService.getBaseFanliRate());
GoodsDetailVO goodsVO = GoodsDetailVOFactory.convertTaoBao(goodsBrief, paramsDTO);
@@ -318,7 +337,7 @@
} else {
imgInfo.setType(ImgEnum.goods);
SimpleGoods simpleGoods = new SimpleGoods();
- simpleGoods.setGoodsId(itemId);
+ simpleGoods.setGoodsId(itemId+"");
simpleGoods.setGoodsType(Constant.SOURCE_TYPE_TAOBAO);
simpleGoods.setState(CommonGoods.STATE_NORMAL);
CouponInfoVO couponInfo = goodsVO.getCouponInfo();
@@ -338,7 +357,7 @@
ActivityUser user = ruleList.get((int) (ruleList.size() * Math.random())).getActivityUser();
try {
- goodsEvaluateService.addGoodsEvaluate(itemId, imageList, user, doc, null, null);
+ goodsEvaluateService.addGoodsEvaluate(itemId+"", imageList, user, doc, null, null);
} catch (GoodsEvaluateException e) {
e.printStackTrace();
}
--
Gitblit v1.8.0