From 91c402a107aaaf9e9cb2d8a84460b9a20ab19f86 Mon Sep 17 00:00:00 2001
From: yujian <yujian@123.com>
Date: 星期二, 22 十月 2019 09:43:38 +0800
Subject: [PATCH] 邀请订单补贴更名
---
fanli/src/main/java/com/yeshi/fanli/service/impl/order/CommonOrderServiceImpl.java | 14 +++++++-------
1 files changed, 7 insertions(+), 7 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 3d5531c..cca4d2b 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
@@ -36,7 +36,7 @@
import com.yeshi.fanli.entity.order.CommonOrderGoods;
import com.yeshi.fanli.entity.order.CommonOrderTradeIdMap;
import com.yeshi.fanli.entity.order.HongBaoOrder;
-import com.yeshi.fanli.entity.order.OrderSubsidy;
+import com.yeshi.fanli.entity.order.InviteOrderSubsidy;
import com.yeshi.fanli.entity.pdd.PDDOrder;
import com.yeshi.fanli.entity.system.SystemCoupon.CouponTypeEnum;
import com.yeshi.fanli.entity.taobao.TaoBaoGoodsBrief;
@@ -52,7 +52,7 @@
import com.yeshi.fanli.service.inter.order.CommonOrderService;
import com.yeshi.fanli.service.inter.order.HongBaoOrderService;
import com.yeshi.fanli.service.inter.order.HongBaoV2Service;
-import com.yeshi.fanli.service.inter.order.OrderSubsidyService;
+import com.yeshi.fanli.service.inter.order.InviteOrderSubsidyService;
import com.yeshi.fanli.service.inter.user.UserSystemCouponRecordService;
import com.yeshi.fanli.service.inter.user.UserSystemCouponService;
import com.yeshi.fanli.util.Constant;
@@ -116,7 +116,7 @@
private HongBaoOrderService hongBaoOrderService;
@Resource
- private OrderSubsidyService orderSubsidyService;
+ private InviteOrderSubsidyService inviteOrderSubsidyService;
// 濂栧姳璁㈠崟鍥剧墖
@@ -509,10 +509,10 @@
// 鐗堟湰鍖哄垎锛�2-0-2
if (VersionUtil.greaterThan_2_0_2(acceptData.getPlatform(), acceptData.getVersion())) {
- OrderSubsidy orderSubsidy = orderSubsidyService.getByOrderNoAndType(uid, order.getOrderNo(), sourceType2);
+ InviteOrderSubsidy orderSubsidy = inviteOrderSubsidyService.getByOrderNoAndType(uid, order.getOrderNo(), sourceType2);
if (orderSubsidy != null) {
ClientTextStyleVO subsidyInfo = new ClientTextStyleVO();
- if (orderSubsidy.getState() == OrderSubsidy.STATE_SUBSIDIZED) {
+ if (orderSubsidy.getState() == InviteOrderSubsidy.STATE_SUBSIDIZED) {
subsidyInfo.setColor("#E5005C");
subsidyInfo.setContent("宸茶ˉ璐绰�" + orderSubsidy.getMoney());
} else {
@@ -1062,10 +1062,10 @@
// 鐗堟湰鍖哄垎锛�2-0-2
if (VersionUtil.greaterThan_2_0_2(acceptData.getPlatform(), acceptData.getVersion())) {
- OrderSubsidy orderSubsidy = orderSubsidyService.getByOrderNoAndType(uid, order.getOrderNo(), sourceType);
+ InviteOrderSubsidy orderSubsidy = inviteOrderSubsidyService.getByOrderNoAndType(uid, order.getOrderNo(), sourceType);
if (orderSubsidy != null) {
ClientTextStyleVO subsidyInfo = new ClientTextStyleVO();
- if (orderSubsidy.getState() == OrderSubsidy.STATE_SUBSIDIZED) {
+ if (orderSubsidy.getState() == InviteOrderSubsidy.STATE_SUBSIDIZED) {
subsidyInfo.setColor("#E5005C");
subsidyInfo.setContent("宸茶ˉ璐绰�" + orderSubsidy.getMoney());
} else {
--
Gitblit v1.8.0