yujian
2020-03-24 1d841af6d10c30b5eba4089a983c64fee662bbc9
发圈bug + 刷单预警改为100单
3个文件已修改
53 ■■■■ 已修改文件
fanli/src/main/java/com/yeshi/fanli/controller/admin/ExtractAdminController.java 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
fanli/src/main/java/com/yeshi/fanli/mapping/order/CommonOrderCountMapper.xml 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
fanli/src/main/java/com/yeshi/fanli/service/impl/dynamic/GoodsEvaluateServiceImpl.java 47 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
fanli/src/main/java/com/yeshi/fanli/controller/admin/ExtractAdminController.java
@@ -627,7 +627,7 @@
                }
                Integer countOrder = commonOrderCountService.countOderByUidAndLess10(extract.getUserInfo().getId());
                if (countOrder != null && countOrder > 10) {
                if (countOrder != null && countOrder >= 10) {
                    if (StringUtil.isNullOrEmpty(mark)) {
                        mark = "刷单预警!!";
                    } else {
@@ -705,7 +705,7 @@
                    }
                    Integer countOrder = commonOrderCountService.countOderByUidAndLess10(extract.getUserInfo().getId());
                    if (countOrder != null && countOrder > 10) {
                    if (countOrder != null && countOrder >= 10) {
                        if (StringUtil.isNullOrEmpty(mark)) {
                            mark = "刷单预警!!";
                        } else {
fanli/src/main/java/com/yeshi/fanli/mapping/order/CommonOrderCountMapper.xml
@@ -333,7 +333,7 @@
        where d.co_uid = #{uid} and d.co_source_type = 1  and d.co_state <![CDATA[<>]]> 4
        GROUP BY d.`co_order_no`
        ORDER BY d.co_third_create_time desc
        limit 50)A where A.payment<![CDATA[<]]> 10
        limit 100)A where A.payment<![CDATA[<]]> 10
    </select>
    
</mapper>
fanli/src/main/java/com/yeshi/fanli/service/impl/dynamic/GoodsEvaluateServiceImpl.java
@@ -70,10 +70,8 @@
import com.yeshi.fanli.util.jd.JDApiUtil;
import com.yeshi.fanli.util.jd.JDUtil;
import com.yeshi.fanli.util.pinduoduo.PinDuoDuoApiUtil;
import com.yeshi.fanli.util.pinduoduo.PinDuoDuoUtil;
import com.yeshi.fanli.util.taobao.DaTaoKeUtil;
import com.yeshi.fanli.util.taobao.TaoBaoUtil;
import com.yeshi.fanli.util.taobao.TaoKeApiUtil;
import com.yeshi.fanli.vo.goods.CouponInfoVO;
import com.yeshi.fanli.vo.goods.GoodsDetailVO;
import com.yeshi.fanli.vo.msg.ClientTextStyleVO;
@@ -1258,47 +1256,48 @@
            listImg.add(imgActivity);
        }
        int totalImg = 0;
        // 编辑图片
        List<String> listpic = new ArrayList<>();
        if (!StringUtil.isNullOrEmpty(picUrls)) {
            String[] pics = picUrls.split(",");
            if (pics != null) {
                for (int i = 0; i < pics.length; i++) {
                    String picLink = pics[i];
                    if (picLink.startsWith("http")) {
                        listpic.add(picLink);
                    }
                }
            }
        }
        // 上传文件替换
                    if (fileRequest != null) {
            for (int i = 0; i < 9; i++) {
                        MultipartFile file = fileRequest.getFile("file" + i);
                        if (file != null) {
                            picLink = uploadPicture(file);
                    String picLink = uploadPicture(file);
                    if (i < listpic.size()) {
                        listpic.set(i, picLink);
                    } else {
                        listpic.add(picLink);
                    }
                }
            }
        }
        int totalImg = 0;
        for (String pic : listpic) {
                            ImgInfo imgInfo0 = new ImgInfo();
                            imgInfo0.setId(UUID.randomUUID().toString().replace("-", ""));
                            imgInfo0.setLarge(false);
                            imgInfo0.setPid(pid);
                            imgInfo0.setUrl(picLink);
                            imgInfo0.setUrlHD(picLink);
            imgInfo0.setUrl(pic);
            imgInfo0.setUrlHD(pic);
                            imgInfo0.setType(ImgEnum.img);
                            imgInfo0.setW(1);
                            imgInfo0.setH(1);
                            listImg.add(imgInfo0);
                            totalImg++;
                            continue;
                        }
                    }
                    if (picLink.startsWith("http")) {
                        if (listOldImgInfo != null) {
                            for (ImgInfo imgInfo : listOldImgInfo) {
                                String url = imgInfo.getUrl();
                                if (picLink.equals(url)) {
                                    listImg.add(imgInfo);
                                    totalImg++;
                                    break;
                                }
                            }
                        }
                    }
                }
            }
        }
        if (listOld != null && listOld.size() > 0) {