IOS上线隐藏我的界面的banner与超级会员升级信息

admin

2020-05-06 24a8d17e007545f7426c48352109aa1a9c6587ee

 fanli/src/main/java/com/yeshi/fanli/controller/CallBackController.java

@@ -12,7 +12,6 @@
import java.util.HashMap;

import java.util.List;

import java.util.Map;

import java.util.Scanner;



import javax.annotation.Resource;

import javax.crypto.Mac;

@@ -24,7 +23,6 @@
import org.springframework.web.bind.annotation.RequestMapping;

import org.springframework.web.multipart.MultipartFile;

import org.springframework.web.multipart.MultipartHttpServletRequest;

import org.yeshi.utils.JsonUtil;

import org.yeshi.utils.taobao.TbImgUtil;

import org.yeshi.utils.wx.WXUtil;



@@ -33,11 +31,9 @@
import com.yeshi.fanli.dto.ConfigParamsDTO;

import com.yeshi.fanli.dto.mq.order.OrderTopicTagEnum;

import com.yeshi.fanli.dto.mq.order.body.BanLiShopOrderMQMsg;

import com.yeshi.fanli.dto.push.PushContentDTO;

import com.yeshi.fanli.entity.bus.activity.ActivityRuleUser;

import com.yeshi.fanli.entity.bus.activity.ActivityUser;

import com.yeshi.fanli.entity.bus.msg.MsgDeviceReadState;

import com.yeshi.fanli.entity.config.push.PushMsgFactory;

import com.yeshi.fanli.entity.dynamic.ImgInfo;

import com.yeshi.fanli.entity.dynamic.ImgInfo.ImgEnum;

import com.yeshi.fanli.entity.dynamic.SimpleGoods;

@@ -45,13 +41,13 @@
import com.yeshi.fanli.entity.shop.BanLiShopOrder;

import com.yeshi.fanli.entity.taobao.TaoBaoGoodsBrief;

import com.yeshi.fanli.exception.dynamic.GoodsEvaluateException;

import com.yeshi.fanli.exception.push.PushException;

import com.yeshi.fanli.exception.taobao.TaobaoGoodsDownException;

import com.yeshi.fanli.log.LogHelper;

import com.yeshi.fanli.service.inter.activity.ActivityUserService;

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;

@@ -98,6 +94,9 @@


   @Resource

   private HongBaoManageService hongBaoManageService;

	
   @Resource

   private OrderHongBaoMoneyComputeService orderHongBaoMoneyComputeService;



   @Resource

   private ActivityUserService activityUserService;

@@ -165,17 +164,6 @@
         String uid = json.optJSONObject("customizedData").optString("用户ID");

         msgDeviceReadStateService.addUnreadDeviceMsg(MsgDeviceReadState.TYPE_KEFU, customizedId,

               "android".equalsIgnoreCase(deviceOS) ? 1 : 2, 1, msg, new Date());

         if (!StringUtil.isNullOrEmpty(uid))// 推送客服消息

         {

            PushContentDTO dto = PushMsgFactory.createMsgKefu();

            try {

               pushService.pushZNX(Long.parseLong(uid), dto.getTitle(), dto.getContent(), null, null);

            } catch (NumberFormatException e) {

               e.printStackTrace();

            } catch (PushException e) {

               e.printStackTrace();

            }

         }

      }



   }

@@ -271,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);

@@ -288,12 +276,12 @@
      JSONObject data = JSONObject.fromObject(contentDecode).optJSONObject("data");



      JSONArray array = data.optJSONObject("recommend").optJSONArray("resultList");

      for (int i = array.size()-1; i >=0; i--) {

      for (int i = array.size() - 1; i >= 0; i--) {

         JSONObject item = array.optJSONObject(i);

         String title = item.optString("itemName");

         String doc = item.optString("cusShareText");

         long itemId = item.optLong("itemId");

         String publishTime=item.optString("cusPublishTime");

         String publishTime = item.optString("cusPublishTime");

         JSONArray imageArray = item.optJSONArray("imageList");

         List<String> imgList = new ArrayList<>();

         for (int j = 0; j < imageArray.size(); j++) {

@@ -309,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);