系统区分BUG修复

admin

2020-07-14 eec7e789a87863c25d92c10ad5dfc22ad80c448d

 fanli/src/main/java/com/yeshi/fanli/controller/client/v1/UserOrderController.java

@@ -12,6 +12,7 @@
import javax.annotation.Resource;

import javax.servlet.http.HttpServletRequest;



import com.yeshi.fanli.util.*;

import org.springframework.stereotype.Controller;

import org.springframework.web.bind.annotation.RequestMapping;

import org.springframework.web.bind.annotation.RequestMethod;

@@ -46,12 +47,6 @@
import com.yeshi.fanli.service.inter.user.UserInfoExtraService;

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

import com.yeshi.fanli.service.inter.user.tb.UserExtraTaoBaoInfoService;

import com.yeshi.fanli.util.CMQManager;

import com.yeshi.fanli.util.Constant;

import com.yeshi.fanli.util.RedisManager;

import com.yeshi.fanli.util.StringUtil;

import com.yeshi.fanli.util.TimeUtil;

import com.yeshi.fanli.util.VersionUtil;

import com.yeshi.fanli.util.account.UserUtil;

import com.yeshi.fanli.vo.order.CommonOrderVO;

import com.yeshi.fanli.vo.order.TeamOrderStatisticVO;

@@ -253,14 +248,14 @@
         if (VersionUtil.greaterThan_2_0_2(acceptData.getPlatform(), acceptData.getVersion()))

            if (state == null && page == 1) {

               if (redisManager.frequencyLimit("orderlist-" + acceptData.getDevice(), 8, 4) || count == 0L) {// 8秒内请求3次触发

                  orderFindUrl = configService.get(ConfigKeyEnum.orderFindNotifyUrl.getKey());

                  orderFindUrl = configService.getValue(ConfigKeyEnum.orderFindNotifyUrl.getKey(), SystemInfoUtil.getSystem(acceptData));

               }

            }



         JSONObject data = new JSONObject();

         data.put("count", count);

         data.put("result_list", JsonUtil.getApiCommonGson().toJson(list));

         data.put("helpUrl", configService.get(ConfigKeyEnum.orderListHelp.getKey()));

         data.put("helpUrl", configService.getValue(ConfigKeyEnum.orderListHelp.getKey(),SystemInfoUtil.getSystem(acceptData)));



         if (type != null && type == 1) {

            data.put("todayMoney", "预估返利总额 ¥" + todayMoney.setScale(2, BigDecimal.ROUND_DOWN).toString());

@@ -316,7 +311,7 @@
            int versionCode = Integer.parseInt(version);

            String platform = acceptData.getPlatform();



            AppVersionInfo versionInfo = appVersionService.getByPlatformAndVersion(platform, "1.5.0");

            AppVersionInfo versionInfo = appVersionService.getByPlatformAndVersion(platform, "1.5.0",acceptData.getSystem());

            if (versionInfo != null) {

               int versionCode150 = versionInfo.getVersionCode();

               if (versionCode >= versionCode150) {