utils包添加工具类，抖音广告修改

admin

2019-10-10 e19ce4be094d93f68bdb6ee1c28e9caa502bf2c4

 fanli/src/main/java/com/yeshi/fanli/service/impl/order/CommonOrderServiceImpl.java

@@ -46,9 +46,9 @@
import com.yeshi.fanli.service.inter.config.ConfigService;

import com.yeshi.fanli.service.inter.config.SystemCouponService;

import com.yeshi.fanli.service.inter.goods.CommonGoodsService;

import com.yeshi.fanli.service.inter.hongbao.HongBaoV2Service;

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.user.UserSystemCouponRecordService;

import com.yeshi.fanli.service.inter.user.UserSystemCouponService;

import com.yeshi.fanli.util.Constant;

@@ -649,7 +649,7 @@
            Date thirdCreateTime = order.getThirdCreateTime();

            if (thirdCreateTime != null) {

               long downOrderTime = thirdCreateTime.getTime();

               long limitDate = TimeUtil.convertDateToTemp("2019-09-05");

               long limitDate = TimeUtil.convertDateToTemp("2019-09-10");

               if (downOrderTime > limitDate)

                  hasRewardCoupon = true;

            }

@@ -681,7 +681,7 @@
         Map<String, Object> jumpLink = new HashMap<String, Object>();

         jumpLink.put("orderNo", order.getOrderNo());

         if (VersionUtil.greaterThan_1_6_0(acceptData.getPlatform(), acceptData.getVersion())) {

            jumpLink.put("goodsType", order.getSourceType());

            jumpLink.put("goodsType", order.getSourceType()+"");

         }



         Map<String, Object> jump = new HashMap<String, Object>();

@@ -706,7 +706,7 @@
         Map<String, Object> jumpLink = new HashMap<String, Object>();

         jumpLink.put("orderNo", order.getOrderNo());

         if (VersionUtil.greaterThan_1_6_0(acceptData.getPlatform(), acceptData.getVersion())) {

            jumpLink.put("goodsType", order.getSourceType());

            jumpLink.put("goodsType", order.getSourceType()+"");

         }



         Map<String, Object> jump = new HashMap<String, Object>();

@@ -1372,7 +1372,7 @@
   }



   @Override

   public JSONObject getRewardJumpInfo(String orderNo) {

   public JSONObject getRewardJumpInfo(String orderNo, Integer goodsType) {



      JSONObject map = new JSONObject();

      // 订单标识

@@ -1389,6 +1389,7 @@


      Map<String, Object> jumpLink = new HashMap<String, Object>();

      jumpLink.put("orderNo", orderNo);

      jumpLink.put("goodsType", goodsType == null? goodsType: goodsType +"");



      Map<String, Object> jump = new HashMap<String, Object>();

      jump.put("type", 1);