自动提现优化

yujian

2019-10-18 b26ab14c4cdfa3329ac1b057abf09461115fb8b3

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

@@ -543,6 +543,10 @@
         order.setHongBaoState(orderHongBaoState);

         order.setHongBaoDate(hongBaoDate);



         if (!StringUtil.isNullOrEmpty(order.getStateDesc())) {

            stateContent = stateContent + "-" + order.getStateDesc();

         }

			
         Map<String, String> stateMap = new HashMap<String, String>();

         stateMap.put("content", stateContent);

         stateMap.put("fontColor", stateFontColor);

@@ -649,7 +653,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 +685,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 +710,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 +1376,7 @@
   }



   @Override

   public JSONObject getRewardJumpInfo(String orderNo) {

   public JSONObject getRewardJumpInfo(String orderNo, Integer goodsType) {



      JSONObject map = new JSONObject();

      // 订单标识

@@ -1389,6 +1393,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);