From 7e7db2fa55a9a3af46d4fd8ede0dee147f101d64 Mon Sep 17 00:00:00 2001
From: yujian <yujian@163.com>
Date: 星期六, 09 五月 2020 21:41:27 +0800
Subject: [PATCH] 2.1需求
---
fanli/src/main/java/com/yeshi/fanli/controller/CallBackController.java | 8 ++++++--
1 files changed, 6 insertions(+), 2 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 a92a750..0644b97 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;
@@ -255,7 +259,7 @@
System.out.println(st);
contentDecode = st;
- contentDecode = contentDecode.substring(contentDecode.indexOf("mtopjsonp1(") + "mtopjsonp1(".length(),
+ contentDecode = contentDecode.substring(contentDecode.indexOf("(") +1,
contentDecode.length()).trim();
if (contentDecode.endsWith(")"))
contentDecode = contentDecode.substring(0, contentDecode.length() - 1);
@@ -293,7 +297,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);
--
Gitblit v1.8.0