淘宝维权退款服务修改

admin

2019-10-26 a56bd9db6b5c989fb2eaecd3a854ac6782b55f95

 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 {